[MPlayer-cvslog] r34539 - trunk/gui/win32/interface.c

[ib]

Author: ib
Date: Tue Jan 10 13:04:50 2012
New Revision: 34539

Log:
Retrieve DVD's titles, chapters and angles by stream control commands.

Don't access the private vmg_file member structure.

(This is missing in r34477.)

Modified:
   trunk/gui/win32/interface.c

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Tue Jan 10 12:51:30 2012	(r34538)
+++ trunk/gui/win32/interface.c	Tue Jan 10 13:04:50 2012	(r34539)
@@ -667,10 +667,13 @@ int gui(int what, void *data)
             {
 #ifdef CONFIG_DVDREAD
                 case STREAMTYPE_DVD:
+                    guiInfo.Tracks = 0;
+                    stream_control(stream, STREAM_CTRL_GET_NUM_TITLES, &guiInfo.Tracks);
+                    guiInfo.Chapters = 0;
+                    stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiInfo.Chapters);
+                    guiInfo.Angles = 0;
+                    stream_control(stream, STREAM_CTRL_GET_NUM_ANGLES, &guiInfo.Angles);
                     dvdp = stream->priv;
-                    guiInfo.Tracks = dvdp->vmg_file->tt_srpt->nr_of_srpts;
-                    guiInfo.Chapters = dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts;
-                    guiInfo.Angles = dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_angles;
                     guiInfo.AudioStreams = dvdp->nr_of_channels;
                     memcpy(guiInfo.AudioStream, dvdp->audio_streams, sizeof(dvdp->audio_streams));
                     guiInfo.Subtitles = dvdp->nr_of_subtitles;