Mercurial > mplayer.hg

changeset 34417:1745c2a7a628

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move some DVD related events. This saves a #ifdef CONFIG_DVDREAD.
author ib
date Thu, 05 Jan 2012 12:06:03 +0000
parents b3837500181a
children 6faf474f9ce3
files gui/ui/main.c
diffstat 1 files changed, 18 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/gui/ui/main.c	Thu Jan 05 11:39:27 2012 +0000
+++ b/gui/ui/main.c	Thu Jan 05 12:06:03 2012 +0000
@@ -179,6 +179,24 @@
 	goto play;
 #endif
 #ifdef CONFIG_DVDREAD
+   case ivSetDVDSubtitle:
+        dvdsub_id=iparam;
+        goto play_dvd_2;
+        break;
+   case ivSetDVDAudio:
+        audio_id=iparam;
+        goto play_dvd_2;
+        break;
+   case ivSetDVDChapter:
+        guiInfo.Chapter=iparam;
+        goto play_dvd_2;
+        break;
+   case ivSetDVDTitle:
+        guiInfo.Track=iparam;
+        guiInfo.Chapter=1;
+        guiInfo.Angle=1;
+        goto play_dvd_2;
+        break;
    case evPlayDVD:
         guiInfo.Track=1;
         guiInfo.Chapter=1;
@@ -244,26 +262,6 @@
          }
         uiPlay();
         break;
-#ifdef CONFIG_DVDREAD
-   case ivSetDVDSubtitle:
-        dvdsub_id=iparam;
-        goto play_dvd_2;
-        break;
-   case ivSetDVDAudio:
-        audio_id=iparam;
-        goto play_dvd_2;
-        break;
-   case ivSetDVDChapter:
-        guiInfo.Chapter=iparam;
-        goto play_dvd_2;
-        break;
-   case ivSetDVDTitle:
-        guiInfo.Track=iparam;
-	guiInfo.Chapter=1;
-	guiInfo.Angle=1;
-        goto play_dvd_2;
-        break;
-#endif
 
    case evPause:
    case evPauseSwitchToPlay: