[MPlayer-cvslog] r33743 - in trunk/gui: interface.c interface.h ui/actions.c ui/gtk/menu.c ui/main.c

[ib]

Author: ib
Date: Mon Jun 27 16:27:33 2011
New Revision: 33743

Log:
Rename guiInterface_t member NoWindow MovieWindow.

This variable holds the current state of visibility of the movie window
and is easier to understand if it is phrased in the positive.

Modified:
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/ui/actions.c
   trunk/gui/ui/gtk/menu.c
   trunk/gui/ui/main.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Mon Jun 27 16:08:30 2011	(r33742)
+++ trunk/gui/interface.c	Mon Jun 27 16:27:33 2011	(r33743)
@@ -596,7 +596,7 @@ int guiGetEvent(int type, void *arg)
         guiInfo.AudioOnly = (int)arg;
 
         if (guiInfo.AudioOnly) {
-            guiInfo.NoWindow = True;
+            guiInfo.MovieWindow = False;
             wsVisibleWindow(&guiApp.subWindow, wsHideWindow);
         } else
             wsVisibleWindow(&guiApp.subWindow, wsShowWindow);
@@ -723,7 +723,7 @@ int guiGetEvent(int type, void *arg)
             guiInfo.FPS = sh->fps;
         }
 
-        if (guiInfo.NoWindow)
+        if (!guiInfo.MovieWindow)
             wsVisibleWindow(&guiApp.subWindow, wsHideWindow);
 
         if (guiInfo.StreamType == STREAMTYPE_STREAM)
@@ -858,12 +858,12 @@ int guiGetEvent(int type, void *arg)
         {
             int i = 0;
 
-            guiInfo.NoWindow = False;
+            guiInfo.MovieWindow = True;
 
             while (video_out_drivers[i++]) {
                 if (video_out_drivers[i - 1]->control(VOCTRL_GUISUPPORT, NULL) == VO_TRUE) {
                     if ((video_driver_list && !gstrcmp(video_driver_list[0], (char *)video_out_drivers[i - 1]->info->short_name)) && (video_out_drivers[i - 1]->control(VOCTRL_GUI_NOWINDOW, NULL) == VO_TRUE)) {
-                        guiInfo.NoWindow = True;
+                        guiInfo.MovieWindow = False;
                         break;
                     }
                 }
@@ -1013,7 +1013,7 @@ int guiGetEvent(int type, void *arg)
 
 void guiEventHandling(void)
 {
-    if (!guiInfo.Playing || guiInfo.NoWindow)
+    if (!guiInfo.Playing || !guiInfo.MovieWindow)
         wsHandleEvents();
 
     gtkEventHandling();

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Mon Jun 27 16:08:30 2011	(r33742)
+++ trunk/gui/interface.h	Mon Jun 27 16:27:33 2011	(r33743)
@@ -172,7 +172,7 @@ typedef struct {
 
     int MovieWidth;
     int MovieHeight;
-    int NoWindow;
+    int MovieWindow;
 
     float Volume;
     float Balance;

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Mon Jun 27 16:08:30 2011	(r33742)
+++ trunk/gui/ui/actions.c	Mon Jun 27 16:27:33 2011	(r33743)
@@ -40,7 +40,7 @@ int uiGotoTheNext = 1;
 
 void uiFullScreen(void)
 {
-    if (guiInfo.NoWindow && guiInfo.Playing)
+    if (!guiInfo.MovieWindow && guiInfo.Playing)
         return;
 
     if (guiInfo.Playing && guiApp.subWindow.isFullScreen) {
@@ -114,7 +114,7 @@ void uiEnd(void)
         guiInfo.TimeSec       = 0;
         guiInfo.Position      = 0;
         guiInfo.AudioChannels = 0;
-        guiInfo.NoWindow      = False;
+        guiInfo.MovieWindow   = True;
 
 #ifdef CONFIG_DVDREAD
         guiInfo.DVD.current_title   = 1;

Modified: trunk/gui/ui/gtk/menu.c
==============================================================================
--- trunk/gui/ui/gtk/menu.c	Mon Jun 27 16:08:30 2011	(r33742)
+++ trunk/gui/ui/gtk/menu.c	Mon Jun 27 16:27:33 2011	(r33743)
@@ -615,7 +615,7 @@ GtkWidget * create_PopUpMenu( void )
   AddMenuItem( window1, (const char*)prefs_xpm, Menu,MSGTR_MENU_Preferences, evPreferences );
   AddMenuItem( window1, (const char*)equalizer_xpm, Menu,MSGTR_Equalizer, evEqualizer );
 
-  if ( guiInfo.NoWindow == False )
+  if ( guiInfo.MovieWindow )
    {
     int b1 = 0, b2 = 0, b_half = 0;
     AddSeparator( Menu );

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Mon Jun 27 16:08:30 2011	(r33742)
+++ trunk/gui/ui/main.c	Mon Jun 27 16:27:33 2011	(r33743)
@@ -229,7 +229,7 @@ NoPause:
    case evStop:
 	guiInfo.Playing=GUI_STOP;
 	uiState();
-	guiInfo.NoWindow=False;
+	guiInfo.MovieWindow=True;
 	break;
 
    case evLoadPlay: