[MPlayer-cvslog] r34543 - in trunk/gui: app.h ui/main.c win32/skinload.h

[ib]

Author: ib
Date: Thu Jan 12 11:31:39 2012
New Revision: 34543

Log:
Replace goto label by an internal event case expression.

Modified:
   trunk/gui/app.h
   trunk/gui/ui/main.c
   trunk/gui/win32/skinload.h

Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h	Thu Jan 12 11:08:25 2012	(r34542)
+++ trunk/gui/app.h	Thu Jan 12 11:31:39 2012	(r34543)
@@ -88,6 +88,7 @@
 #define ivSetCDTrack      5014
 
 #define ivRedraw          7002
+#define ivPlayDVD         7003
 
 typedef struct {
     int message;

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Thu Jan 12 11:08:25 2012	(r34542)
+++ trunk/gui/ui/main.c	Thu Jan 12 11:31:39 2012	(r34543)
@@ -177,27 +177,27 @@ void uiEventHandling( int msg,float para
 #ifdef CONFIG_DVDREAD
    case ivSetDVDSubtitle:
         dvdsub_id=iparam;
-        goto play_dvd_2;
+        uiEventHandling( ivPlayDVD, 0 );
         break;
    case ivSetDVDAudio:
         audio_id=iparam;
-        goto play_dvd_2;
+        uiEventHandling( ivPlayDVD, 0 );
         break;
    case ivSetDVDChapter:
         guiInfo.Chapter=iparam;
-        goto play_dvd_2;
+        uiEventHandling( ivPlayDVD, 0 );
         break;
    case ivSetDVDTitle:
         guiInfo.Track=iparam;
         guiInfo.Chapter=1;
         guiInfo.Angle=1;
-        goto play_dvd_2;
+        uiEventHandling( ivPlayDVD, 0 );
         break;
    case evPlayDVD:
         guiInfo.Track=1;
         guiInfo.Chapter=1;
         guiInfo.Angle=1;
-play_dvd_2:
+   case ivPlayDVD:
  	guiInfoMediumClear( CLEAR_ALL - CLEAR_DVD );
         guiInfo.StreamType=STREAMTYPE_DVD;
 	goto play;
@@ -393,7 +393,7 @@ set_volume:
 	 }
 	wsClearWindow( guiApp.subWindow );
 #ifdef CONFIG_DVDREAD
-	if ( guiInfo.StreamType == STREAMTYPE_VCD || guiInfo.StreamType == STREAMTYPE_DVD ) goto play_dvd_2;
+	if ( guiInfo.StreamType == STREAMTYPE_VCD || guiInfo.StreamType == STREAMTYPE_DVD ) uiEventHandling( ivPlayDVD, 0 );
 	 else
 #endif
 	 guiInfo.NewPlay=GUI_FILE_NEW;

Modified: trunk/gui/win32/skinload.h
==============================================================================
--- trunk/gui/win32/skinload.h	Thu Jan 12 11:08:25 2012	(r34542)
+++ trunk/gui/win32/skinload.h	Thu Jan 12 11:31:39 2012	(r34543)
@@ -195,5 +195,6 @@ skin_t *loadskin(char *skindir, int desk
 #define ivSetCDTrack      5014
 
 #define ivRedraw          7002
+#define ivPlayDVD         7003
 
 #endif /* MPLAYER_GUI_SKINLOAD_H */