[MPlayer-cvslog] r33744 - in trunk: gui/interface.c gui/interface.h gui/win32/interface.c mplayer.c

[ib]

Author: ib
Date: Mon Jun 27 20:55:18 2011
New Revision: 33744

Log:
Remove guiGetEvent type guiSetFileFormat.

Directly retrieve the information from the demuxer.

Modified:
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/win32/interface.c
   trunk/mplayer.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Mon Jun 27 16:27:33 2011	(r33743)
+++ trunk/gui/interface.c	Mon Jun 27 20:55:18 2011	(r33744)
@@ -708,10 +708,6 @@ int guiGetEvent(int type, void *arg)
         }
         break;
 
-    case guiSetFileFormat:
-        guiInfo.FileFormat = (int)arg;
-        break;
-
     case guiSetValues:
 
         // video
@@ -765,7 +761,7 @@ int guiGetEvent(int type, void *arg)
         // subtitle
 
 #ifdef CONFIG_DXR3
-        if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (guiInfo.FileFormat != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) {
+        if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (((demuxer_t *)mpctx_get_demuxer(guiInfo.mpcontext))->file_format != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) {
             gtkMessageBox(GTK_MB_FATAL, MSGTR_NEEDLAVC);
             guiInfo.Playing = 0;
             return True;

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Mon Jun 27 16:27:33 2011	(r33743)
+++ trunk/gui/interface.h	Mon Jun 27 20:55:18 2011	(r33744)
@@ -49,7 +49,6 @@ extern int use_gui;             // this 
 #define guiSetVolume       11
 #define guiSetDefaults     12
 #define guiSetValues       13
-#define guiSetFileFormat   14
 #define guiSetDemuxer      15
 #define guiSetParameters   16
 #define guiSetAfilter      17
@@ -184,7 +183,6 @@ typedef struct {
     int TimeSec;
     int LengthInSec;
     int FrameDrop;
-    int FileFormat;
     float FPS;
 
     char *Filename;

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Mon Jun 27 16:27:33 2011	(r33743)
+++ trunk/gui/win32/interface.c	Mon Jun 27 20:55:18 2011	(r33744)
@@ -551,9 +551,6 @@ int guiGetEvent(int type, void *arg)
 
     switch (type)
     {
-        case guiSetFileFormat:
-            guiInfo.FileFormat = (int) arg;
-            break;
         case guiSetParameters:
         {
             guiGetEvent(guiSetDefaults, NULL);

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Mon Jun 27 16:27:33 2011	(r33743)
+++ trunk/mplayer.c	Mon Jun 27 20:55:18 2011	(r33744)
@@ -3679,10 +3679,9 @@ goto_enable_cache:
         if (use_gui) {
             guiInfo.AudioChannels = mpctx->sh_audio ? mpctx->sh_audio->channels : 0;
             guiGetEvent(guiSetAudioOnly, (void *)(mpctx->sh_audio && !mpctx->sh_video));
-            guiGetEvent(guiSetFileFormat, (void *)mpctx->demuxer->file_format);
+            guiGetEvent(guiSetDemuxer, mpctx->demuxer);
             if (guiGetEvent(guiSetValues, mpctx->sh_video))
                 goto goto_next_file;
-            guiGetEvent(guiSetDemuxer, mpctx->demuxer);
         }
 #endif