diff gui/ui/actions.c @ 34697:ac6b38cd0d45

Rename sub window video window. It was a bad idea to name the video window "sub window" at the time the GUI was written. The term "sub window" does make sense from the programmer's point of view, but it doesn't make any sense at all from the user's point of view, because the sub window simply is the window where the video will be displayed. Moreover, since the term "sub" is generally short for "subtitles", the renaming makes the code much easier to understand.

--- a/gui/ui/actions.c	Sat Mar 03 14:03:18 2012 +0000
+++ b/gui/ui/actions.c	Sat Mar 03 16:45:15 2012 +0000
@@ -45,19 +45,19 @@
     if (!guiInfo.VideoWindow)
         return;
 
-    wsFullScreen(&guiApp.subWindow);
+    wsFullScreen(&guiApp.videoWindow);
 
-    vo_fs = guiApp.subWindow.isFullScreen;
+    vo_fs = guiApp.videoWindow.isFullScreen;
 
-    wsSetLayer(wsDisplay, guiApp.mainWindow.WindowID, guiApp.subWindow.isFullScreen);
+    wsSetLayer(wsDisplay, guiApp.mainWindow.WindowID, guiApp.videoWindow.isFullScreen);
 
     if (guiApp.menuIsPresent)
-        wsSetLayer(wsDisplay, guiApp.menuWindow.WindowID, guiApp.subWindow.isFullScreen);
+        wsSetLayer(wsDisplay, guiApp.menuWindow.WindowID, guiApp.videoWindow.isFullScreen);
 
     if (guiInfo.Playing)
-        wsSetBackgroundRGB(&guiApp.subWindow, 0, 0, 0);
+        wsSetBackgroundRGB(&guiApp.videoWindow, 0, 0, 0);
     else
-        wsSetBackgroundRGB(&guiApp.subWindow, guiApp.sub.R, guiApp.sub.G, guiApp.sub.B);
+        wsSetBackgroundRGB(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
 }
 
 void uiPlay(void)
@@ -77,9 +77,9 @@
     }
 
     gui(GUI_SET_STATE, (void *)GUI_PLAY);
-    uiSubRender = 0;
-    wsSetBackgroundRGB(&guiApp.subWindow, 0, 0, 0);
-    wsClearWindow(guiApp.subWindow);
+    uiVideoRender = 0;
+    wsSetBackgroundRGB(&guiApp.videoWindow, 0, 0, 0);
+    wsClearWindow(guiApp.videoWindow);
 }
 
 void uiPause(void)
@@ -153,24 +153,24 @@
     } else
         uiMenuInit();
 
-    /* reload sub window */
+    /* reload video window */
 
-    if (guiApp.sub.Bitmap.Image)
-        wsResizeImage(&guiApp.subWindow, guiApp.sub.Bitmap.Width, guiApp.sub.Bitmap.Height);
+    if (guiApp.video.Bitmap.Image)
+        wsResizeImage(&guiApp.videoWindow, guiApp.video.Bitmap.Width, guiApp.video.Bitmap.Height);
 
-    if (!guiApp.subWindow.isFullScreen && !guiInfo.Playing) {
-        wsResizeWindow(&guiApp.subWindow, guiApp.sub.width, guiApp.sub.height);
-        wsMoveWindow(&guiApp.subWindow, False, guiApp.sub.x, guiApp.sub.y);
+    if (!guiApp.videoWindow.isFullScreen && !guiInfo.Playing) {
+        wsResizeWindow(&guiApp.videoWindow, guiApp.video.width, guiApp.video.height);
+        wsMoveWindow(&guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y);
     }
 
-    if (guiApp.sub.Bitmap.Image)
-        wsConvert(&guiApp.subWindow, guiApp.sub.Bitmap.Image);
+    if (guiApp.video.Bitmap.Image)
+        wsConvert(&guiApp.videoWindow, guiApp.video.Bitmap.Image);
 
     if (!guiInfo.Playing) {
-        uiSubRender = 1;
-        wsSetBackgroundRGB(&guiApp.subWindow, guiApp.sub.R, guiApp.sub.G, guiApp.sub.B);
-        wsClearWindow(guiApp.subWindow);
-        wsPostRedisplay(&guiApp.subWindow);
+        uiVideoRender = 1;
+        wsSetBackgroundRGB(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
+        wsClearWindow(guiApp.videoWindow);
+        wsPostRedisplay(&guiApp.videoWindow);
     }
 
     /* reload playbar */
@@ -213,10 +213,10 @@
     btnModify(evSetVolume, guiInfo.Volume);
     btnModify(evSetBalance, guiInfo.Balance);
     btnModify(evSetMoviePosition, guiInfo.Position);
-    btnSet(evFullScreen, (guiApp.subWindow.isFullScreen ? btnPressed : btnReleased));
+    btnSet(evFullScreen, (guiApp.videoWindow.isFullScreen ? btnPressed : btnReleased));
 
-    wsSetLayer(wsDisplay, guiApp.mainWindow.WindowID, guiApp.subWindow.isFullScreen);
-    wsSetLayer(wsDisplay, guiApp.menuWindow.WindowID, guiApp.subWindow.isFullScreen);
+    wsSetLayer(wsDisplay, guiApp.mainWindow.WindowID, guiApp.videoWindow.isFullScreen);
+    wsSetLayer(wsDisplay, guiApp.menuWindow.WindowID, guiApp.videoWindow.isFullScreen);
 }
 
 void uiSetFileName(char *dir, char *name, int type)