Mercurial > mplayer.hg

changeset 33731:81f71d910333

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Change prefix for symbolic constants from GMP to GUI. GMP could be confused with the GNU Multiple Precision Arithmetic Library. Additionally, rename NEW_FILE SET_FILE and PREPARATION PREPARE to phrase requests.
author ib
date Tue, 05 Jul 2011 12:05:06 +0000
parents b4c64f168b29
children 90c992ac5011
files command.c gui/interface.c gui/interface.h gui/skin/font.c gui/ui/actions.c gui/ui/gtk/fileselect.c gui/util/bitmap.h gui/win32/dialogs.c gui/win32/interface.c gui/win32/preferences.c libvo/video_out.c libvo/vo_dxr3.c libvo/vo_xover.c libvo/x11_common.c mplayer.c
diffstat 15 files changed, 86 insertions(+), 86 deletions(-) [+]
line wrap: on
line diff
--- a/command.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/command.c	Tue Jul 05 12:05:06 2011 +0000
@@ -1075,7 +1075,7 @@
     case M_PROPERTY_STEP_DOWN:
 #ifdef CONFIG_GUI
         if (use_gui)
-            gui(GMP_RUN_COMMAND, (void *) MP_CMD_VO_FULLSCREEN);
+            gui(GUI_RUN_COMMAND, (void *) MP_CMD_VO_FULLSCREEN);
         else
 #endif
         if (vo_config_count)
@@ -2801,10 +2801,10 @@
                     int i = 0;
                     if (n > 0)
                         for (i = 0; i < n; i++)
-                            gui(GMP_RUN_COMMAND, (void *)MP_CMD_PLAY_TREE_STEP);
+                            gui(GUI_RUN_COMMAND, (void *)MP_CMD_PLAY_TREE_STEP);
                     else
                         for (i = 0; i < -1 * n; i++)
-                            gui(GMP_RUN_COMMAND, (void *)-MP_CMD_PLAY_TREE_STEP);
+                            gui(GUI_RUN_COMMAND, (void *)-MP_CMD_PLAY_TREE_STEP);
                 } else
 #endif
                 {
@@ -2966,7 +2966,7 @@
 #ifdef CONFIG_GUI
             // playtree_iter isn't used by the GUI
             if (use_gui)
-                gui(GMP_RUN_COMMAND, (void *)MP_CMD_STOP);
+                gui(GUI_RUN_COMMAND, (void *)MP_CMD_STOP);
             else
 #endif
             // Go back to the starting point.
--- a/gui/interface.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/gui/interface.c	Tue Jul 05 12:05:06 2011 +0000
@@ -561,11 +561,11 @@
         mixer = mpctx_get_mixer(guiInfo.mpcontext);
 
     switch (what) {
-    case GMP_SET_CONTEXT:
+    case GUI_SET_CONTEXT:
         guiInfo.mpcontext = arg;
         break;
 
-    case GMP_SET_STATE:
+    case GUI_SET_STATE:
 
         switch ((int)arg) {
         case GUI_STOP:
@@ -579,7 +579,7 @@
         uiState();
         break;
 
-    case GMP_NEW_FILE:
+    case GUI_SET_FILE:
 
 // if ( guiInfo.Playing == 1 && guiInfo.FilenameChanged )
         if (guiInfo.FilenameChanged) {
@@ -598,9 +598,9 @@
 
         break;
 
-    case GMP_RUN_COMMAND:
+    case GUI_RUN_COMMAND:
 
-        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GMP_RUN_COMMAND: %d\n", (int)arg);
+        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GUI_RUN_COMMAND: %d\n", (int)arg);
 
         switch ((int)arg) {
         case MP_CMD_VO_FULLSCREEN:
@@ -626,9 +626,9 @@
 
         break;
 
-    case GMP_PREPARATION:
+    case GUI_PREPARE:
 
-        gui(GMP_NEW_FILE, 0);
+        gui(GUI_SET_FILE, 0);
 
         switch (guiInfo.StreamType) {
         case STREAMTYPE_PLAYLIST:
@@ -839,7 +839,7 @@
 
         break;
 
-    case GMP_SET_STREAM:
+    case GUI_SET_STREAM:
 
         stream = arg;
         guiInfo.StreamType = stream->type;
@@ -875,11 +875,11 @@
 
         break;
 
-    case GMP_SET_AFILTER:
+    case GUI_SET_AFILTER:
         guiInfo.afilter = arg;
         break;
 
-    case GMP_SET_VIDEO:
+    case GUI_SET_VIDEO:
 
         // video
 
@@ -904,14 +904,14 @@
 
         break;
 
-    case GMP_SET_AUDIO:
+    case GUI_SET_AUDIO:
 
         guiInfo.AudioChannels = arg ? ((sh_audio_t *)arg)->channels : 0;
 
         if (arg && !guiInfo.sh_video)
             guiInfo.MovieWindow = False;
 
-        gui(GMP_SET_MIXER, 0);
+        gui(GUI_SET_MIXER, 0);
 
         if (gtkEnableAudioEqualizer) {
             equalizer_t eq;
@@ -930,7 +930,7 @@
         wsVisibleWindow(&guiApp.subWindow, (guiInfo.MovieWindow ? wsShowWindow : wsHideWindow));
         break;
 
-    case GMP_SET_MIXER:
+    case GUI_SET_MIXER:
         if (mixer) {
             float l, r;
             static float last_balance = -1;
@@ -952,11 +952,11 @@
         }
         break;
 
-    case GMP_REDRAW:
+    case GUI_REDRAW:
         uiEventHandling(evRedraw, 0);
         break;
 
-    case GMP_SETUP_VIDEO_WINDOW:
+    case GUI_SETUP_VIDEO_WINDOW:
 
         if (!guiApp.subWindow.isFullScreen) {
             wsResizeWindow(&guiApp.subWindow, vo_dwidth, vo_dheight);
@@ -972,13 +972,13 @@
         WinID = guiApp.subWindow.WindowID;
         break;
 
-    case GMP_X_EVENT:
+    case GUI_X_EVENT:
         guiInfo.event_struct = arg;
         wsEvents(wsDisplay, arg);
         gtkEventHandling();
         break;
 
-    case GMP_END_FILE:
+    case GUI_END_FILE:
 
         if (!uiGotoTheNext && guiInfo.Playing) {
             uiGotoTheNext = 1;
@@ -1013,7 +1013,7 @@
             } else
                 wsVisibleWindow(&guiApp.subWindow, wsHideWindow);
 
-            gui(GMP_SET_STATE, (void *)GUI_STOP);
+            gui(GUI_SET_STATE, (void *)GUI_STOP);
             uiSubRender = 1;
             wsSetBackgroundRGB(&guiApp.subWindow, guiApp.sub.R, guiApp.sub.G, guiApp.sub.B);
             wsClearWindow(guiApp.subWindow);
--- a/gui/interface.h	Tue Jul 05 11:34:26 2011 +0000
+++ b/gui/interface.h	Tue Jul 05 12:05:06 2011 +0000
@@ -35,20 +35,20 @@
 
 #define GMPlayer "gmplayer"
 
-#define GMP_X_EVENT            0
-#define GMP_SET_STATE          1
-#define GMP_RUN_COMMAND        2
-#define GMP_SET_AUDIO          6
-#define GMP_SETUP_VIDEO_WINDOW 8
-#define GMP_SET_STREAM         9
-#define GMP_REDRAW             10
-#define GMP_SET_MIXER          11
-#define GMP_NEW_FILE           12
-#define GMP_SET_VIDEO          13
-#define GMP_PREPARATION        16
-#define GMP_SET_AFILTER        17
-#define GMP_SET_CONTEXT        18
-#define GMP_END_FILE           19
+#define GUI_X_EVENT            0
+#define GUI_SET_STATE          1
+#define GUI_RUN_COMMAND        2
+#define GUI_SET_AUDIO          6
+#define GUI_SETUP_VIDEO_WINDOW 8
+#define GUI_SET_STREAM         9
+#define GUI_REDRAW             10
+#define GUI_SET_MIXER          11
+#define GUI_SET_FILE           12
+#define GUI_SET_VIDEO          13
+#define GUI_PREPARE            16
+#define GUI_SET_AFILTER        17
+#define GUI_SET_CONTEXT        18
+#define GUI_END_FILE           19
 
 #define GUI_STOP  0
 #define GUI_PLAY  1
--- a/gui/skin/font.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/gui/skin/font.c	Tue Jul 05 12:05:06 2011 +0000
@@ -312,7 +312,7 @@
     ibuf = (uint32_t *)Fonts[id]->Bitmap.Image;
 
     for (i = 0; i < item->Bitmap.ImageSize / 4; i++)
-        obuf[i] = GMP_TRANSPARENT;
+        obuf[i] = GUI_TRANSPARENT;
 
     if (tw <= iw) {
         switch (item->align) {
--- a/gui/ui/actions.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/gui/ui/actions.c	Tue Jul 05 12:05:06 2011 +0000
@@ -103,7 +103,7 @@
         return;
     }
 
-    gui(GMP_SET_STATE, (void *)GUI_PLAY);
+    gui(GUI_SET_STATE, (void *)GUI_PLAY);
     uiSubRender = 0;
     wsSetBackgroundRGB(&guiApp.subWindow, 0, 0, 0);
     wsClearWindow(guiApp.subWindow);
--- a/gui/ui/gtk/fileselect.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/gui/ui/gtk/fileselect.c	Tue Jul 05 12:05:06 2011 +0000
@@ -510,7 +510,7 @@
   }
  if ( i ) fsTopList_items=g_list_prepend( fsTopList_items,(gchar *)get_current_dir_name_utf8() );
  if ( uiMainAutoPlay ) { uiMainAutoPlay=0; uiEventHandling( evPlay,0 ); }
-  else gui( GMP_SET_STATE,(void *) GUI_STOP );
+  else gui( GUI_SET_STATE,(void *) GUI_STOP );
 }
 
 static void fs_Cancel_released( GtkButton * button,gpointer user_data )
--- a/gui/util/bitmap.h	Tue Jul 05 11:34:26 2011 +0000
+++ b/gui/util/bitmap.h	Tue Jul 05 12:05:06 2011 +0000
@@ -19,11 +19,11 @@
 #ifndef MPLAYER_GUI_BITMAP_H
 #define MPLAYER_GUI_BITMAP_H
 
-#define GMP_TRANSPARENT 0xffff00ff   // transparent color (opaque fuchsia/magenta)
+#define GUI_TRANSPARENT 0xffff00ff   // transparent color (opaque fuchsia/magenta)
 #define ALPHA_OPAQUE    0xff000000
 
 // for legacy reasons, we must treat all kind of fuchsia/magenta as transparent
-#define IS_TRANSPARENT(c) ((ALPHA_OPAQUE | (c)) == GMP_TRANSPARENT)
+#define IS_TRANSPARENT(c) ((ALPHA_OPAQUE | (c)) == GUI_TRANSPARENT)
 
 typedef struct {
     unsigned long Width;
--- a/gui/win32/dialogs.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/gui/win32/dialogs.c	Tue Jul 05 12:05:06 2011 +0000
@@ -708,7 +708,7 @@
                     int len = SendMessage(listbox, LB_GETTEXTLEN, index, 0);
                     if (len)
                     {
-                        if (guiInfo.Playing) gui(GMP_SET_STATE, (void *) GUI_STOP);
+                        if (guiInfo.Playing) gui(GUI_SET_STATE, (void *) GUI_STOP);
                         free(skinName);
                         skinName = malloc(len + 1);
                         SendMessage(listbox, LB_GETTEXT, (WPARAM) index, (LPARAM) skinName);
--- a/gui/win32/interface.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/gui/win32/interface.c	Tue Jul 05 12:05:06 2011 +0000
@@ -174,7 +174,7 @@
             GetVolumeInformation(dvd_device, dvdname, MAX_PATH, NULL, NULL, NULL, NULL, 0);
             capitalize(dvdname);
             mp_msg(MSGT_GPLAYER, MSGL_V, "Opening DVD %s -> %s\n", dvd_device, dvdname);
-            gui(GMP_PREPARATION, (void *) STREAMTYPE_DVD);
+            gui(GUI_PREPARE, (void *) STREAMTYPE_DVD);
             mygui->playlist->clear_playlist(mygui->playlist);
             mygui->playlist->add_track(mygui->playlist, filename, NULL, dvdname, 0);
             mygui->startplay(mygui);
@@ -218,7 +218,7 @@
         }
         case evStop:
             if(guiInfo.Playing)
-                gui(GMP_SET_STATE, (void *) GUI_STOP);
+                gui(GUI_SET_STATE, (void *) GUI_STOP);
             break;
         case evSetMoviePosition:
         {
@@ -288,7 +288,7 @@
                     guiInfo.Chapter = guiInfo.DVD.current_chapter;
                     guiInfo.Angle = guiInfo.DVD.current_angle;
                     guiInfo.DiskChanged = 1;
-                    gui(GMP_SET_STATE, (void *) GUI_PLAY);
+                    gui(GUI_SET_STATE, (void *) GUI_PLAY);
                     break;
                 }
 #endif
@@ -297,8 +297,8 @@
                     guiInfo.FilenameChanged = guiInfo.NewPlay = 1;
                     update_playlistwindow();
                     uiGotoTheNext = guiInfo.Playing? 0 : 1;
-                    gui(GMP_SET_STATE, (void *) GUI_STOP);
-                    gui(GMP_SET_STATE, (void *) GUI_PLAY);
+                    gui(GUI_SET_STATE, (void *) GUI_STOP);
+                    gui(GUI_SET_STATE, (void *) GUI_PLAY);
                     break;
                }
            }
@@ -324,7 +324,7 @@
        return;
    }
    guiInfo.NewPlay = 1;
-   gui(GMP_SET_STATE, (void *) GUI_PLAY);
+   gui(GUI_SET_STATE, (void *) GUI_PLAY);
 }
 
 void uiPause( void )
@@ -499,9 +499,9 @@
 
     switch (what)
     {
-        case GMP_PREPARATION:
+        case GUI_PREPARE:
         {
-            gui(GMP_NEW_FILE, 0);
+            gui(GUI_SET_FILE, 0);
             guiInfo.DiskChanged = 0;
             guiInfo.FilenameChanged = 0;
             guiInfo.NewPlay = 0;
@@ -528,7 +528,7 @@
                 strcpy(guiInfo.Filename, filename);
             break;
         }
-        case GMP_SET_AUDIO:
+        case GUI_SET_AUDIO:
         {
             guiInfo.MovieWindow = (arg && !guiInfo.sh_video);
             // NOTE: This type doesn't mean (and never meant) that we have
@@ -538,10 +538,10 @@
                 ShowWindow(mygui->subwindow, SW_HIDE);
             break;
         }
-        case GMP_SET_CONTEXT:
+        case GUI_SET_CONTEXT:
             guiInfo.mpcontext = arg;
             break;
-        case GMP_SET_VIDEO:
+        case GUI_SET_VIDEO:
         {
             guiInfo.sh_video = arg;
             if (arg)
@@ -559,7 +559,7 @@
             }
             break;
         }
-        case GMP_SETUP_VIDEO_WINDOW:
+        case GUI_SETUP_VIDEO_WINDOW:
         {
             guiInfo.MovieWidth = vo_dwidth;
             guiInfo.MovieHeight = vo_dheight;
@@ -569,7 +569,7 @@
                update_subwindow();
             break;
         }
-        case GMP_SET_STREAM:
+        case GUI_SET_STREAM:
         {
             guiInfo.StreamType = stream->type;
             switch(stream->type)
@@ -593,13 +593,13 @@
             }
             break;
         }
-        case GMP_REDRAW:
+        case GUI_REDRAW:
             mygui->updatedisplay(mygui, mygui->mainwindow);
             break;
-        case GMP_SET_AFILTER:
+        case GUI_SET_AFILTER:
             guiInfo.afilter = arg;
             break;
-        case GMP_SET_STATE:
+        case GUI_SET_STATE:
         {
             guiInfo.Playing = (int) arg;
             switch (guiInfo.Playing)
@@ -623,7 +623,7 @@
             }
             break;
         }
-        case GMP_RUN_COMMAND:
+        case GUI_RUN_COMMAND:
         {
             mp_msg(MSGT_GPLAYER,MSGL_V, "cmd: %d\n", (int) arg);
             /* MPlayer asks us to quit */
@@ -654,7 +654,7 @@
             }
             break;
         }
-        case GMP_NEW_FILE:
+        case GUI_SET_FILE:
         {
             audio_id = -1;
             video_id = -1;
@@ -680,7 +680,7 @@
             if(gtkAutoSyncOn) autosync = gtkAutoSync;
             break;
         }
-        case GMP_SET_MIXER:
+        case GUI_SET_MIXER:
         {
             if(audio_out)
             {
@@ -696,7 +696,7 @@
             }
             break;
         }
-        case GMP_END_FILE:
+        case GUI_END_FILE:
         {
           if(!uiGotoTheNext && guiInfo.Playing)
           {
@@ -740,7 +740,7 @@
               style = WS_OVERLAPPEDWINDOW | WS_SIZEBOX;
               SetWindowLong(mygui->subwindow, GWL_STYLE, style);
           }
-          gui(GMP_SET_STATE, (void *) GUI_STOP);
+          gui(GUI_SET_STATE, (void *) GUI_STOP);
           break;
         }
         default:
--- a/gui/win32/preferences.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/gui/win32/preferences.c	Tue Jul 05 12:05:06 2011 +0000
@@ -575,7 +575,7 @@
                 case ID_APPLY:
                 {
                     int strl;
-                    if(guiInfo.Playing) gui(GMP_SET_STATE, (void *)GUI_STOP);
+                    if(guiInfo.Playing) gui(GUI_SET_STATE, (void *)GUI_STOP);
 
                     /* Set the video driver */
                     free(video_driver_list[0]);
--- a/libvo/video_out.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/libvo/video_out.c	Tue Jul 05 12:05:06 2011 +0000
@@ -372,7 +372,7 @@
 #ifdef CONFIG_GUI
     if (use_gui) {
       // GUI creates and manages window for us
-      gui(GMP_SETUP_VIDEO_WINDOW, 0);
+      gui(GUI_SETUP_VIDEO_WINDOW, 0);
     }
 #endif
   }
--- a/libvo/vo_dxr3.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/libvo/vo_dxr3.c	Tue Jul 05 12:05:06 2011 +0000
@@ -491,7 +491,7 @@
 		vo_dheight = d_height;
 #ifdef CONFIG_GUI
 		if (use_gui)
-			gui(GMP_SETUP_VIDEO_WINDOW, 0);
+			gui(GUI_SETUP_VIDEO_WINDOW, 0);
 #endif
 		XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &xwin_attribs);
 		depth = xwin_attribs.depth;
--- a/libvo/vo_xover.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/libvo/vo_xover.c	Tue Jul 05 12:05:06 2011 +0000
@@ -269,7 +269,7 @@
   vo_dwidth=d_width; vo_dheight=d_height;
 
 #ifdef CONFIG_GUI
-  if(use_gui) gui(GMP_SETUP_VIDEO_WINDOW, 0); // the GUI will set up / resize the window
+  if(use_gui) gui(GUI_SETUP_VIDEO_WINDOW, 0); // the GUI will set up / resize the window
   else
     {
 #endif
--- a/libvo/x11_common.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/libvo/x11_common.c	Tue Jul 05 12:05:06 2011 +0000
@@ -821,7 +821,7 @@
 #ifdef CONFIG_GUI
         if (use_gui)
         {
-            gui(GMP_X_EVENT, &Event);
+            gui(GUI_X_EVENT, &Event);
             if (vo_window != Event.xany.window)
                 continue;
         }
--- a/mplayer.c	Tue Jul 05 11:34:26 2011 +0000
+++ b/mplayer.c	Tue Jul 05 12:05:06 2011 +0000
@@ -584,7 +584,7 @@
             uninit_audio(mpctx->sh_audio);
 #ifdef CONFIG_GUI
         if (use_gui)
-            gui(GMP_SET_AFILTER, NULL);
+            gui(GUI_SET_AFILTER, NULL);
 #endif
         mpctx->sh_audio      = NULL;
         mpctx->mixer.afilter = NULL;
@@ -1334,7 +1334,7 @@
     if (!sh_audio) {
 #ifdef CONFIG_GUI
         if (use_gui)
-            gui(GMP_SET_AFILTER, NULL);
+            gui(GUI_SET_AFILTER, NULL);
 #endif
         mpctx->mixer.afilter = NULL;
         return 0;
@@ -1359,7 +1359,7 @@
     mpctx->mixer.afilter = sh_audio->afilter;
 #ifdef CONFIG_GUI
     if (use_gui)
-        gui(GMP_SET_AFILTER, sh_audio->afilter);
+        gui(GUI_SET_AFILTER, sh_audio->afilter);
 #endif
     return result;
 }
@@ -2537,7 +2537,7 @@
     }
 #ifdef CONFIG_GUI
     if (use_gui)
-        gui(GMP_SET_STATE, (void *)GUI_PAUSE);
+        gui(GUI_SET_STATE, (void *)GUI_PAUSE);
 #endif
     if (mpctx->video_out && mpctx->sh_video && vo_config_count)
         mpctx->video_out->control(VOCTRL_PAUSE, NULL);
@@ -2557,7 +2557,7 @@
 #ifdef CONFIG_GUI
         if (use_gui) {
             guiEventHandling();
-            gui(GMP_REDRAW, 0);
+            gui(GUI_REDRAW, 0);
             if (guiInfo.Playing != GUI_PAUSE || (rel_seek_secs || abs_seek_pos))
                 break;
         }
@@ -2604,7 +2604,7 @@
         if (guiInfo.Playing == GUI_STOP)
             mpctx->eof = 1;
         else
-            gui(GMP_SET_STATE, (void *)GUI_PLAY);
+            gui(GUI_SET_STATE, (void *)GUI_PLAY);
     }
 #endif
 }
@@ -3051,8 +3051,8 @@
 #ifdef CONFIG_GUI
     if (use_gui) {
         guiInit();
-        gui(GMP_SET_CONTEXT, mpctx);
-        gui(GMP_SET_STATE, (void *)(gui_no_filename ? GUI_STOP : GUI_PLAY));
+        gui(GUI_SET_CONTEXT, mpctx);
+        gui(GUI_SET_STATE, (void *)(gui_no_filename ? GUI_STOP : GUI_PLAY));
     }
 #endif
 
@@ -3090,18 +3090,18 @@
 #ifdef CONFIG_GUI
     if (use_gui) {
         mpctx->file_format = DEMUXER_TYPE_UNKNOWN;
-        gui(GMP_NEW_FILE, 0);
+        gui(GUI_SET_FILE, 0);
         while (guiInfo.Playing != GUI_PLAY) {
             mp_cmd_t *cmd;
             usec_sleep(20000);
             guiEventHandling();
-            gui(GMP_REDRAW, 0);
+            gui(GUI_REDRAW, 0);
             if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) {
-                gui(GMP_RUN_COMMAND, (void *)cmd->id);
+                gui(GUI_RUN_COMMAND, (void *)cmd->id);
                 mp_cmd_free(cmd);
             }
         }
-        gui(GMP_PREPARATION, 0);
+        gui(GUI_PREPARE, 0);
         if (guiInfo.StreamType == STREAMTYPE_STREAM) {
             play_tree_t *entry = play_tree_new();
             play_tree_add_file(entry, guiInfo.Filename);
@@ -3244,7 +3244,7 @@
 
 #ifdef CONFIG_GUI
     if (use_gui)
-        gui(GMP_SET_STREAM, mpctx->stream);
+        gui(GUI_SET_STREAM, mpctx->stream);
 #endif
 
     if (mpctx->file_format == DEMUXER_TYPE_PLAYLIST) {
@@ -3677,9 +3677,9 @@
 
 #ifdef CONFIG_GUI
         if (use_gui) {
-            if (!gui(GMP_SET_VIDEO, mpctx->sh_video))
+            if (!gui(GUI_SET_VIDEO, mpctx->sh_video))
                 goto goto_next_file;
-            gui(GMP_SET_AUDIO, mpctx->sh_audio);
+            gui(GUI_SET_AUDIO, mpctx->sh_audio);
         }
 #endif
 
@@ -3995,8 +3995,8 @@
                 else if (mpctx->sh_audio)
                     guiInfo.TimeSec = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out);
                 guiInfo.LengthInSec = demuxer_get_time_length(mpctx->demuxer);
-                gui(GMP_SET_MIXER, 0);
-                gui(GMP_REDRAW, 0);
+                gui(GUI_SET_MIXER, 0);
+                gui(GUI_REDRAW, 0);
                 if (guiInfo.Playing == GUI_STOP)
                     break;                  // STOP
                 if (guiInfo.Playing == GUI_PAUSE)
@@ -4103,7 +4103,7 @@
 #ifdef CONFIG_DVDREAD
         if (!guiInfo.DiskChanged)
 #endif
-        gui(GMP_END_FILE, 0);
+        gui(GUI_END_FILE, 0);
     }
 #endif