Mercurial > mplayer.hg
changeset 34321:daebf766dea6
Cosmetic: Synchronize evPlaylist event and message names.
| author | ib |
|---|---|
| date | Thu, 08 Dec 2011 16:06:24 +0000 |
| parents | e3e77ce76c13 |
| children | 6075b19ad3ad |
| files | gui/app.c gui/app.h gui/ui/gtk/menu.c gui/ui/main.c gui/ui/widgets.c gui/win32/gui.c gui/win32/skinload.c gui/win32/skinload.h |
| diffstat | 8 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/app.c Thu Dec 08 15:58:18 2011 +0000 +++ b/gui/app.c Thu Dec 08 16:06:24 2011 +0000 @@ -45,7 +45,7 @@ { evLoadAudioFile, "evLoadAudioFile" }, { evLoadSubtitle, "evLoadSubtitle" }, { evDropSubtitle, "evDropSubtitle" }, - { evPlayList, "evPlaylist" }, + { evPlaylist, "evPlaylist" }, { evPlayVCD, "evPlayVCD" }, { evPlayDVD, "evPlayDVD" }, { evSetURL, "evSetURL" },
--- a/gui/app.h Thu Dec 08 15:58:18 2011 +0000 +++ b/gui/app.h Thu Dec 08 16:06:24 2011 +0000 @@ -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
--- a/gui/ui/gtk/menu.c Thu Dec 08 15:58:18 2011 +0000 +++ b/gui/ui/gtk/menu.c Thu Dec 08 16:06:24 2011 +0000 @@ -612,7 +612,7 @@ 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 );
--- a/gui/ui/main.c Thu Dec 08 15:58:18 2011 +0000 +++ b/gui/ui/main.c Thu Dec 08 16:06:24 2011 +0000 @@ -277,7 +277,7 @@ 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;
--- a/gui/ui/widgets.c Thu Dec 08 15:58:18 2011 +0000 +++ b/gui/ui/widgets.c Thu Dec 08 16:06:24 2011 +0000 @@ -255,7 +255,7 @@ ShowPreferences(); break; - case evPlayList: + case evPlaylist: ShowPlayList(); gtkSetLayer(PlayList); break;
--- a/gui/win32/gui.c Thu Dec 08 15:58:18 2011 +0000 +++ b/gui/win32/gui.c Thu Dec 08 16:06:24 2011 +0000 @@ -246,7 +246,7 @@ case evPreferences: display_prefswindow(gui); return; - case evPlayList: + case evPlaylist: display_playlistwindow(gui); return; case evSkinBrowser: @@ -1021,7 +1021,7 @@ break; } case ID_PLAYLIST: - handlemsg(hWnd, evPlayList); + handlemsg(hWnd, evPlaylist); break; case ID_PREFS: handlemsg(hWnd, evPreferences);
--- a/gui/win32/skinload.c Thu Dec 08 15:58:18 2011 +0000 +++ b/gui/win32/skinload.c Thu Dec 08 16:06:24 2011 +0000 @@ -56,7 +56,7 @@ { evLoadAudioFile, "evLoadAudioFile" }, { evLoadSubtitle, "evLoadSubtitle" }, { evDropSubtitle, "evDropSubtitle" }, - { evPlayList, "evPlaylist" }, + { evPlaylist, "evPlaylist" }, { evPlayVCD, "evPlayVCD" }, { evPlayDVD, "evPlayDVD" }, { evSetURL, "evSetURL" },
--- a/gui/win32/skinload.h Thu Dec 08 15:58:18 2011 +0000 +++ b/gui/win32/skinload.h Thu Dec 08 16:06:24 2011 +0000 @@ -143,7 +143,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