# HG changeset patch
# User ib
# Date 1309200918 0
# Node ID 3c300c37766ff49c7fac61aad780e2132515d609
# Parent  cbb7cfeb8c7163f32fd7d850fd4b59d4bfb758d3
Remove guiGetEvent type guiSetFileFormat.

Directly retrieve the information from the demuxer.

diff -r cbb7cfeb8c71 -r 3c300c37766f gui/interface.c
--- a/gui/interface.c	Mon Jun 27 14:27:33 2011 +0000
+++ b/gui/interface.c	Mon Jun 27 18:55:18 2011 +0000
@@ -708,10 +708,6 @@
         }
         break;
 
-    case guiSetFileFormat:
-        guiInfo.FileFormat = (int)arg;
-        break;
-
     case guiSetValues:
 
         // video
@@ -765,7 +761,7 @@
         // 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;
diff -r cbb7cfeb8c71 -r 3c300c37766f gui/interface.h
--- a/gui/interface.h	Mon Jun 27 14:27:33 2011 +0000
+++ b/gui/interface.h	Mon Jun 27 18:55:18 2011 +0000
@@ -49,7 +49,6 @@
 #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 @@
     int TimeSec;
     int LengthInSec;
     int FrameDrop;
-    int FileFormat;
     float FPS;
 
     char *Filename;
diff -r cbb7cfeb8c71 -r 3c300c37766f gui/win32/interface.c
--- a/gui/win32/interface.c	Mon Jun 27 14:27:33 2011 +0000
+++ b/gui/win32/interface.c	Mon Jun 27 18:55:18 2011 +0000
@@ -551,9 +551,6 @@
 
     switch (type)
     {
-        case guiSetFileFormat:
-            guiInfo.FileFormat = (int) arg;
-            break;
         case guiSetParameters:
         {
             guiGetEvent(guiSetDefaults, NULL);
diff -r cbb7cfeb8c71 -r 3c300c37766f mplayer.c
--- a/mplayer.c	Mon Jun 27 14:27:33 2011 +0000
+++ b/mplayer.c	Mon Jun 27 18:55:18 2011 +0000
@@ -3679,10 +3679,9 @@
         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