diff gui/interface.c @ 33876:4789b8eed97e

Get rid of a bunch of needless or redundant guiInfo members. Remove Title, use existing Track. Remove DVD.titles, use existing Tracks (see below). Remove DVD.current_title, use existing Track. Remove DVD.current_chapter, use existing Chapter. Remove DVD.current_angle, use existing Angle. Additionally rename member VCDTracks Tracks, move guiDVDStruct member chapters and angles to guiInterface_t struct and rename chapters Chapters and angles Angles for consistency.

--- a/gui/interface.c	Wed Aug 10 20:17:20 2011 +0000
+++ b/gui/interface.c	Thu Aug 11 13:54:24 2011 +0000
@@ -457,7 +457,7 @@
         {
             char tmp[512];
 
-            sprintf(tmp, "dvd://%d", guiInfo.Title);
+            sprintf(tmp, "dvd://%d", guiInfo.Track);
             setdup(&guiInfo.Filename, tmp);
         }
 
@@ -655,24 +655,23 @@
 #ifdef CONFIG_DVDREAD
         case STREAMTYPE_DVD:
             dvd = stream->priv;
-            guiInfo.DVD.titles   = dvd->vmg_file->tt_srpt->nr_of_srpts;
-            guiInfo.DVD.chapters = dvd->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts;
-            guiInfo.DVD.angles   = dvd->vmg_file->tt_srpt->title[dvd_title].nr_of_angles;
+            guiInfo.Tracks   = dvd->vmg_file->tt_srpt->nr_of_srpts;
+            guiInfo.Chapters = dvd->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts;
+            guiInfo.Angles   = dvd->vmg_file->tt_srpt->title[dvd_title].nr_of_angles;
             guiInfo.DVD.nr_of_audio_channels = dvd->nr_of_channels;
             memcpy(guiInfo.DVD.audio_streams, dvd->audio_streams, sizeof(dvd->audio_streams));
             guiInfo.DVD.nr_of_subtitles = dvd->nr_of_subtitles;
             memcpy(guiInfo.DVD.subtitles, dvd->subtitles, sizeof(dvd->subtitles));
-            guiInfo.DVD.current_title   = dvd_title + 1;
-            guiInfo.DVD.current_chapter = dvd_chapter + 1;
-            guiInfo.DVD.current_angle   = dvd_angle + 1;
-            guiInfo.Track = dvd_title + 1;
+            guiInfo.Track   = dvd_title + 1;
+            guiInfo.Chapter = dvd_chapter + 1;
+            guiInfo.Angle   = dvd_angle + 1;
             break;
 #endif
 
 #ifdef CONFIG_VCD
         case STREAMTYPE_VCD:
-            guiInfo.VCDTracks = 0;
-            stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiInfo.VCDTracks);
+            guiInfo.Tracks = 0;
+            stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiInfo.Tracks);
             break;
 #endif
 
@@ -803,9 +802,9 @@
             guiInfo.MovieWindow   = True;
 
 #ifdef CONFIG_DVDREAD
-            guiInfo.DVD.current_title   = 1;
-            guiInfo.DVD.current_chapter = 1;
-            guiInfo.DVD.current_angle   = 1;
+            guiInfo.Track   = 1;
+            guiInfo.Chapter = 1;
+            guiInfo.Angle   = 1;
 #endif
 
             if (!guiApp.subWindow.isFullScreen && gtkShowVideoWindow) {