[MPlayer-cvslog] r34409 - in trunk/gui: app.c app.h ui/gtk/menu.c ui/main.c ui/widgets.c win32/gui.c win32/skinload.c win32/skinload.h

[ib]

Author: ib
Date: Thu Dec  8 17:06:24 2011
New Revision: 34409

Log:
Cosmetic: Synchronize evPlaylist event and message names.

Modified:
   trunk/gui/app.c
   trunk/gui/app.h
   trunk/gui/ui/gtk/menu.c
   trunk/gui/ui/main.c
   trunk/gui/ui/widgets.c
   trunk/gui/win32/gui.c
   trunk/gui/win32/skinload.c
   trunk/gui/win32/skinload.h

Modified: trunk/gui/app.c
==============================================================================
--- trunk/gui/app.c	Thu Dec  8 16:58:18 2011	(r34408)
+++ trunk/gui/app.c	Thu Dec  8 17:06:24 2011	(r34409)
@@ -45,7 +45,7 @@ static const evName evNames[] = {
     { evLoadAudioFile,     "evLoadAudioFile"     },
     { evLoadSubtitle,      "evLoadSubtitle"      },
     { evDropSubtitle,      "evDropSubtitle"      },
-    { evPlayList,          "evPlaylist"          },
+    { evPlaylist,          "evPlaylist"          },
     { evPlayVCD,           "evPlayVCD"           },
     { evPlayDVD,           "evPlayDVD"           },
     { evSetURL,            "evSetURL"            },

Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h	Thu Dec  8 16:58:18 2011	(r34408)
+++ trunk/gui/app.h	Thu Dec  8 17:06:24 2011	(r34409)
@@ -36,7 +36,7 @@
 #define evLoadAudioFile     42
 #define evLoadSubtitle      38
 #define evDropSubtitle      43
-#define evPlayList          10
+#define evPlaylist          10
 #define evPlayVCD           40
 #define evPlayDVD           39
 #define evSetURL          5013

Modified: trunk/gui/ui/gtk/menu.c
==============================================================================
--- trunk/gui/ui/gtk/menu.c	Thu Dec  8 16:58:18 2011	(r34408)
+++ trunk/gui/ui/gtk/menu.c	Thu Dec  8 17:06:24 2011	(r34409)
@@ -612,7 +612,7 @@ GtkWidget * create_PopUpMenu( void )
   AddSeparator( Menu );
   MenuItem=AddMenuCheckItem( window1, (const char*)sound_xpm, Menu,MSGTR_MENU_Mute,mixer->muted,evMute );
   if ( !guiInfo.AudioChannels ) gtk_widget_set_sensitive( MenuItem,FALSE );
-  AddMenuItem( window1, (const char*)playlist_xpm, Menu,MSGTR_MENU_PlayList, evPlayList );
+  AddMenuItem( window1, (const char*)playlist_xpm, Menu,MSGTR_MENU_PlayList, evPlaylist );
   AddMenuItem( window1, (const char*)skin_xpm, Menu,MSGTR_MENU_SkinBrowser, evSkinBrowser );
   AddMenuItem( window1, (const char*)prefs_xpm, Menu,MSGTR_MENU_Preferences, evPreferences );
   AddMenuItem( window1, (const char*)equalizer_xpm, Menu,MSGTR_Equalizer, evEqualizer );

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Thu Dec  8 16:58:18 2011	(r34408)
+++ trunk/gui/ui/main.c	Thu Dec  8 17:06:24 2011	(r34409)
@@ -277,7 +277,7 @@ NoPause:
    case evPrev: uiPrev(); break;
    case evNext: uiNext(); break;
 
-   case evPlayList:    gtkShow( evPlayList,NULL );        break;
+   case evPlaylist:    gtkShow( evPlaylist,NULL );        break;
    case evSkinBrowser: gtkShow( evSkinBrowser,skinName ); break;
    case evAbout:       gtkShow( evAbout,NULL );           break;
    case evPreferences: gtkShow( evPreferences,NULL );     break;

Modified: trunk/gui/ui/widgets.c
==============================================================================
--- trunk/gui/ui/widgets.c	Thu Dec  8 16:58:18 2011	(r34408)
+++ trunk/gui/ui/widgets.c	Thu Dec  8 17:06:24 2011	(r34409)
@@ -255,7 +255,7 @@ void gtkShow(int type, char *param)
         ShowPreferences();
         break;
 
-    case evPlayList:
+    case evPlaylist:
         ShowPlayList();
         gtkSetLayer(PlayList);
         break;

Modified: trunk/gui/win32/gui.c
==============================================================================
--- trunk/gui/win32/gui.c	Thu Dec  8 16:58:18 2011	(r34408)
+++ trunk/gui/win32/gui.c	Thu Dec  8 17:06:24 2011	(r34409)
@@ -246,7 +246,7 @@ static void handlemsg(HWND hWnd, int msg
         case evPreferences:
             display_prefswindow(gui);
             return;
-        case evPlayList:
+        case evPlaylist:
             display_playlistwindow(gui);
             return;
         case evSkinBrowser:
@@ -1021,7 +1021,7 @@ static LRESULT CALLBACK EventProc(HWND h
                     break;
                 }
                 case ID_PLAYLIST:
-                    handlemsg(hWnd, evPlayList);
+                    handlemsg(hWnd, evPlaylist);
                     break;
                 case ID_PREFS:
                     handlemsg(hWnd, evPreferences);

Modified: trunk/gui/win32/skinload.c
==============================================================================
--- trunk/gui/win32/skinload.c	Thu Dec  8 16:58:18 2011	(r34408)
+++ trunk/gui/win32/skinload.c	Thu Dec  8 17:06:24 2011	(r34409)
@@ -56,7 +56,7 @@ static const evName evNames[] =
     {   evLoadAudioFile,        "evLoadAudioFile"       },
     {   evLoadSubtitle,         "evLoadSubtitle"        },
     {   evDropSubtitle,         "evDropSubtitle"        },
-    {   evPlayList,             "evPlaylist"            },
+    {   evPlaylist,             "evPlaylist"            },
     {   evPlayVCD,              "evPlayVCD"             },
     {   evPlayDVD,              "evPlayDVD"             },
     {   evSetURL,               "evSetURL"              },

Modified: trunk/gui/win32/skinload.h
==============================================================================
--- trunk/gui/win32/skinload.h	Thu Dec  8 16:58:18 2011	(r34408)
+++ trunk/gui/win32/skinload.h	Thu Dec  8 17:06:24 2011	(r34409)
@@ -143,7 +143,7 @@ skin_t *loadskin(char *skindir, int desk
 #define evLoadAudioFile     42
 #define evLoadSubtitle      38
 #define evDropSubtitle      43
-#define evPlayList          10
+#define evPlaylist          10
 #define evPlayVCD           40
 #define evPlayDVD           39
 #define evSetURL          5013