diff gui/interface.c @ 35773:c688b0dcbe66

Cosmetic: Rename uiMainEvent() uiEvent(). This completes r35865 and r35866. Additionally, rename parameter msg ev.
author ib
date Fri, 25 Jan 2013 10:43:15 +0000
parents 3fec1d4b2736
children 4073fff5efc7
line wrap: on
line diff
--- a/gui/interface.c	Fri Jan 25 10:28:38 2013 +0000
+++ b/gui/interface.c	Fri Jan 25 10:43:15 2013 +0000
@@ -377,23 +377,23 @@
 
         switch ((int)data) {
         case MP_CMD_VO_FULLSCREEN:
-            uiMainEvent(evFullScreen, True);
+            uiEvent(evFullScreen, True);
             break;
 
         case MP_CMD_PLAY_TREE_STEP:
-            uiMainEvent(evNext, 0);
+            uiEvent(evNext, 0);
             break;
 
         case -MP_CMD_PLAY_TREE_STEP:
-            uiMainEvent(evPrev, 0);
+            uiEvent(evPrev, 0);
             break;
 
         case MP_CMD_STOP:
-            uiMainEvent(evStop, 0);
+            uiEvent(evStop, 0);
             break;
 
         case MP_CMD_QUIT:
-            uiMainEvent(evExit, 0);
+            uiEvent(evExit, 0);
             break;
         }
 
@@ -405,7 +405,7 @@
         msg = appFindMessage((const char *)data);
 
         if ((msg == evMenu) || appFindItem(msg))
-            uiMainEvent(msg, 0);
+            uiEvent(msg, 0);
 
         break;
 
@@ -762,7 +762,7 @@
 
     case GUI_REDRAW:
 
-        uiMainEvent(ivRedraw, 0);
+        uiEvent(ivRedraw, 0);
         break;
 
     case GUI_SETUP_VIDEO_WINDOW:
@@ -778,7 +778,7 @@
         }
 
         if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
-            uiMainEvent(evFullScreen, True);
+            uiEvent(evFullScreen, True);
 
         if (guiWinID >= 0)
             wsWindowMove(&guiApp.mainWindow, True, 0, guiInfo.VideoHeight);
@@ -797,7 +797,7 @@
 
         guiInfo.sh_video = NULL;
 
-        uiMainEvent(ivRedraw, True);
+        uiEvent(ivRedraw, True);
 
         if (guiInfo.Playing) {
             if (!guiInfo.PlaylistNext) {
@@ -860,7 +860,7 @@
                     wsWindowVisibility(&guiApp.videoWindow, wsShowWindow);
 
                 if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
-                    uiMainEvent(evFullScreen, False);
+                    uiEvent(evFullScreen, False);
             } else {
                 wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
                 guiInfo.VideoWindow = False;