[MPlayer-cvslog] r33861 - in trunk/gui: interface.c interface.h ui/main.c ui/render.c win32/dialogs.c

[ib]

Author: ib
Date: Sun Jul 10 13:21:40 2011
New Revision: 33861

Log:
Remove unused members from struct guiInterface_t.

Dynamic label variable $d isn't documented and would not return anything
of value.

Setting XEvent type KeyPress to None in gui/ui/main.c isn't necessary,
because for this event there is a 'break' in libvo/x11_common.c in case
CONFIG_GUI is defined.

Modified:
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/ui/main.c
   trunk/gui/ui/render.c
   trunk/gui/win32/dialogs.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sat Jul  9 20:11:42 2011	(r33860)
+++ trunk/gui/interface.c	Sun Jul 10 13:21:40 2011	(r33861)
@@ -781,7 +781,6 @@ int gui(int what, void *arg)
         break;
 
     case GUI_HANDLE_X_EVENT:
-        guiInfo.event_struct = arg;
         wsEvents(wsDisplay, arg);
         gtkEventHandling();
         break;
@@ -1114,10 +1113,8 @@ void mplayerLoadFont(void)
 
 void mplayerLoadSubtitle(char *name)
 {
-    if (guiInfo.Playing == 0) {
-        guiInfo.SubtitleChanged = 1; // what is this for? (mw)
+    if (guiInfo.Playing == 0)
         return;
-    }
 
     if (subdata) {
         mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_DeletingSubtitles);

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Sat Jul  9 20:11:42 2011	(r33860)
+++ trunk/gui/interface.h	Sun Jul 10 13:21:40 2011	(r33861)
@@ -76,26 +76,6 @@ enum {
     MPLAYER_SET_SUB_ENCODING
 };
 
-typedef struct {
-    int x;
-    int y;
-    int width;
-    int height;
-} guiResizeStruct;
-
-typedef struct {
-    int signal;
-    char module[512];
-} guiUnknownErrorStruct;
-
-typedef struct {
-    int seek;
-    int format;
-    int width;
-    int height;
-    char codecdll[128];
-} guiVideoStruct;
-
 #ifdef CONFIG_DVDREAD
 typedef struct {
     int titles;
@@ -112,15 +92,9 @@ typedef struct {
 #endif
 
 typedef struct {
-    int message;
-    guiResizeStruct resize;
-    guiVideoStruct videodata;
-    guiUnknownErrorStruct error;
-
     struct MPContext *mpcontext;
     void *sh_video;
     void *afilter;
-    void *event_struct;
 
     int DiskChanged;
     int NewPlay;
@@ -151,22 +125,16 @@ typedef struct {
     int StreamType;
     int TimeSec;
     int LengthInSec;
-    int FrameDrop;
     float FPS;
 
     char *Filename;
     int FilenameChanged;
 
     char *Subtitlename;
-    int SubtitleChanged;
 
     char *Othername;
-    int OtherChanged;
 
     char *AudioFile;
-    int AudioFileChanged;
-
-    int SkinChange;
 } guiInterface_t;
 
 extern guiInterface_t guiInfo;

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Sat Jul  9 20:11:42 2011	(r33860)
+++ trunk/gui/ui/main.c	Sun Jul 10 13:21:40 2011	(r33861)
@@ -576,7 +576,6 @@ void uiMainKeyHandle( int KeyCode,int Ty
       case wsEscape:
     	    if ( guiApp.subWindow.isFullScreen )
 	     {
-	      if ( guiInfo.event_struct ) ((XEvent *)guiInfo.event_struct)->type=None;
 	      uiEventHandling( evNormalSize,0 );
 	      return;
 	     }

Modified: trunk/gui/ui/render.c
==============================================================================
--- trunk/gui/ui/render.c	Sat Jul  9 20:11:42 2011	(r33860)
+++ trunk/gui/ui/render.c	Sun Jul 10 13:21:40 2011	(r33861)
@@ -209,11 +209,6 @@ calclengthmmmmss:
                 av_strlcat(trbuf, tmp, sizeof(trbuf));
                 break;
 
-            case 'd':
-                snprintf(tmp, sizeof(tmp), "%d", guiInfo.FrameDrop);
-                av_strlcat(trbuf, tmp, sizeof(trbuf));
-                break;
-
             case 'x':
                 snprintf(tmp, sizeof(tmp), "%d", guiInfo.MovieWidth);
                 av_strlcat(trbuf, tmp, sizeof(trbuf));

Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c	Sat Jul  9 20:11:42 2011	(r33860)
+++ trunk/gui/win32/dialogs.c	Sun Jul 10 13:21:40 2011	(r33861)
@@ -47,11 +47,8 @@ int addurl = 0;
 
 void mplayerLoadSubtitle(char *name)
 {
-    if (!guiInfo.Playing)
-    {
-        guiInfo.SubtitleChanged = 1;
-        return;
-    }
+    if (!guiInfo.Playing) return;
+
     if (subdata)
     {
         mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_DeletingSubtitles);