# HG changeset patch # User ib # Date 1323358715 0 # Node ID e905a896243d1441920de90bb759fab85c53a8b3 # Parent 446aeefc216b3b9208c318361585cb72faa49188 Cosmetic: Rearrange and group GUI user events. diff -r 446aeefc216b -r e905a896243d gui/app.c --- a/gui/app.c Thu Dec 08 12:09:00 2011 +0000 +++ b/gui/app.c Thu Dec 08 15:38:35 2011 +0000 @@ -41,45 +41,45 @@ { evPrev, "evPrev" }, { evNext, "evNext" }, { evLoad, "evLoad" }, - { evEqualizer, "evEqualizer" }, + { evLoadPlay, "evLoadPlay" }, + { evLoadAudioFile, "evLoadAudioFile" }, + { evLoadSubtitle, "evLoadSubtitle" }, + { evDropSubtitle, "evDropSubtitle" }, { evPlayList, "evPlaylist" }, - { evExit, "evExit" }, - { evIconify, "evIconify" }, - { evIncBalance, "evIncBalance" }, // NOTE TO MYSELF: not all of these events - { evDecBalance, "evDecBalance" }, // are actually implemented, and update doc - { evFullScreen, "evFullScreen" }, - { evFName, "evFName" }, - { evMovieTime, "evMovieTime" }, - { evAbout, "evAbout" }, - { evLoadPlay, "evLoadPlay" }, - { evPreferences, "evPreferences" }, - { evSkinBrowser, "evSkinBrowser" }, + { evPlayVCD, "evPlayVCD" }, + { evPlayDVD, "evPlayDVD" }, + { evSetURL, "evSetURL" }, + { evPlaySwitchToPause, "evPlaySwitchToPause" }, + { evPauseSwitchToPlay, "evPauseSwitchToPlay" }, { evBackward10sec, "evBackward10sec" }, { evForward10sec, "evForward10sec" }, { evBackward1min, "evBackward1min" }, { evForward1min, "evForward1min" }, { evBackward10min, "evBackward10min" }, { evForward10min, "evForward10min" }, + { evSetMoviePosition, "evSetMoviePosition" }, + { evNormalSize, "evHalfSize" }, + { evDoubleSize, "evDoubleSize" }, + { evFullScreen, "evFullScreen" }, + { evNormalSize, "evNormalSize" }, { evIncVolume, "evIncVolume" }, { evDecVolume, "evDecVolume" }, + { evSetVolume, "evSetVolume" }, { evMute, "evMute" }, + { evSetBalance, "evSetBalance" }, + { evEqualizer, "evEqualizer" }, + { evAbout, "evAbout" }, + { evPreferences, "evPreferences" }, + { evSkinBrowser, "evSkinBrowser" }, + { evIconify, "evIconify" }, + { evExit, "evExit" }, + { evIncBalance, "evIncBalance" }, // NOTE TO MYSELF: not all of these events + { evDecBalance, "evDecBalance" }, // are actually implemented, and update doc + { evFName, "evFName" }, + { evMovieTime, "evMovieTime" }, { evIncAudioBufDelay, "evIncAudioBufDelay" }, { evDecAudioBufDelay, "evDecAudioBufDelay" }, - { evPlaySwitchToPause, "evPlaySwitchToPause" }, - { evPauseSwitchToPlay, "evPauseSwitchToPlay" }, - { evNormalSize, "evHalfSize" }, - { evNormalSize, "evNormalSize" }, - { evDoubleSize, "evDoubleSize" }, - { evSetMoviePosition, "evSetMoviePosition" }, - { evSetVolume, "evSetVolume" }, - { evSetBalance, "evSetBalance" }, { evHelp, "evHelp" }, - { evLoadSubtitle, "evLoadSubtitle" }, - { evPlayDVD, "evPlayDVD" }, - { evPlayVCD, "evPlayVCD" }, - { evSetURL, "evSetURL" }, - { evLoadAudioFile, "evLoadAudioFile" }, - { evDropSubtitle, "evDropSubtitle" }, { evSetAspect, "evSetAspect" } }; diff -r 446aeefc216b -r e905a896243d gui/app.h --- a/gui/app.h Thu Dec 08 12:09:00 2011 +0000 +++ b/gui/app.h Thu Dec 08 15:38:35 2011 +0000 @@ -25,19 +25,21 @@ // User events #define evNone 0 + #define evPlay 1 #define evStop 2 #define evPause 3 #define evPrev 6 #define evNext 7 #define evLoad 8 -#define evEqualizer 9 +#define evLoadPlay 13 +#define evLoadAudioFile 42 +#define evLoadSubtitle 38 +#define evDropSubtitle 43 #define evPlayList 10 -#define evIconify 11 -#define evAbout 12 -#define evLoadPlay 13 -#define evPreferences 14 -#define evSkinBrowser 15 +#define evPlayVCD 40 +#define evPlayDVD 39 +#define evSetURL 5013 #define evPlaySwitchToPause 16 #define evPauseSwitchToPlay 17 @@ -47,19 +49,29 @@ #define evForward1min 21 #define evBackward10min 22 #define evForward10min 23 +#define evSetMoviePosition 27 #define evHalfSize 301 -#define evNormalSize 24 #define evDoubleSize 25 #define evFullScreen 26 - -#define evSetMoviePosition 27 -#define evSetVolume 28 -#define evSetBalance 29 -#define evMute 30 +#define evNormalSize 24 #define evIncVolume 31 #define evDecVolume 32 +#define evSetVolume 28 +#define evMute 30 +#define evSetBalance 29 +#define evEqualizer 9 + +#define evAbout 12 +#define evPreferences 14 +#define evSkinBrowser 15 + +#define evIconify 11 +#define evExit 1000 + +// Internal events + #define evIncAudioBufDelay 33 // NOTE TO MYSELF: not all of these events #define evDecAudioBufDelay 34 // are actually implemented, and update doc #define evIncBalance 35 @@ -67,19 +79,12 @@ #define evHelp 37 -#define evLoadSubtitle 38 -#define evDropSubtitle 43 -#define evPlayDVD 39 -#define evPlayVCD 40 #define evPlayNetwork 41 -#define evLoadAudioFile 42 #define evSetAspect 44 #define evSetAudio 45 #define evSetVideo 46 #define evSetSubtitle 47 -#define evExit 1000 - // General events #define evFileLoaded 5000 @@ -95,7 +100,6 @@ #define evSetDVDChapter 5010 #define evSubtitleLoaded 5011 #define evSetVCDTrack 5012 -#define evSetURL 5013 #define evFName 7000 #define evMovieTime 7001 diff -r 446aeefc216b -r e905a896243d gui/win32/skinload.c --- a/gui/win32/skinload.c Thu Dec 08 12:09:00 2011 +0000 +++ b/gui/win32/skinload.c Thu Dec 08 15:38:35 2011 +0000 @@ -52,44 +52,44 @@ { evPrev, "evPrev" }, { evNext, "evNext" }, { evLoad, "evLoad" }, - { evEqualizer, "evEqualizer" }, + { evLoadPlay, "evLoadPlay" }, + { evLoadAudioFile, "evLoadAudioFile" }, + { evLoadSubtitle, "evLoadSubtitle" }, + { evDropSubtitle, "evDropSubtitle" }, { evPlayList, "evPlaylist" }, - { evExit, "evExit" }, - { evIconify, "evIconify" }, - { evIncBalance, "evIncBalance" }, - { evDecBalance, "evDecBalance" }, - { evFullScreen, "evFullScreen" }, - { evFName, "evFName" }, - { evMovieTime, "evMovieTime" }, - { evAbout, "evAbout" }, - { evLoadPlay, "evLoadPlay" }, - { evPreferences, "evPreferences" }, - { evSkinBrowser, "evSkinBrowser" }, + { evPlayVCD, "evPlayVCD" }, + { evPlayDVD, "evPlayDVD" }, + { evSetURL, "evSetURL" }, + { evPlaySwitchToPause, "evPlaySwitchToPause" }, + { evPauseSwitchToPlay, "evPauseSwitchToPlay" }, { evBackward10sec, "evBackward10sec" }, { evForward10sec, "evForward10sec" }, { evBackward1min, "evBackward1min" }, { evForward1min, "evForward1min" }, { evBackward10min, "evBackward10min" }, { evForward10min, "evForward10min" }, + { evSetMoviePosition, "evSetMoviePosition" }, + { evDoubleSize, "evDoubleSize" }, + { evFullScreen, "evFullScreen" }, + { evNormalSize, "evNormalSize" }, { evIncVolume, "evIncVolume" }, { evDecVolume, "evDecVolume" }, + { evSetVolume, "evSetVolume" }, { evMute, "evMute" }, + { evSetBalance, "evSetBalance" }, + { evEqualizer, "evEqualizer" }, + { evAbout, "evAbout" }, + { evPreferences, "evPreferences" }, + { evSkinBrowser, "evSkinBrowser" }, + { evIconify, "evIconify" }, + { evExit, "evExit" }, + { evIncBalance, "evIncBalance" }, + { evDecBalance, "evDecBalance" }, + { evFName, "evFName" }, + { evMovieTime, "evMovieTime" }, { evIncAudioBufDelay, "evIncAudioBufDelay" }, { evDecAudioBufDelay, "evDecAudioBufDelay" }, - { evPlaySwitchToPause, "evPlaySwitchToPause" }, - { evPauseSwitchToPlay, "evPauseSwitchToPlay" }, - { evNormalSize, "evNormalSize" }, - { evDoubleSize, "evDoubleSize" }, - { evSetMoviePosition, "evSetMoviePosition" }, - { evSetVolume, "evSetVolume" }, - { evSetBalance, "evSetBalance" }, { evHelp, "evHelp" }, - { evLoadSubtitle, "evLoadSubtitle" }, - { evPlayDVD, "evPlayDVD" }, - { evPlayVCD, "evPlayVCD" }, - { evSetURL, "evSetURL" }, - { evLoadAudioFile, "evLoadAudioFile" }, - { evDropSubtitle, "evDropSubtitle" }, { evSetAspect, "evSetAspect" } }; diff -r 446aeefc216b -r e905a896243d gui/win32/skinload.h --- a/gui/win32/skinload.h Thu Dec 08 12:09:00 2011 +0000 +++ b/gui/win32/skinload.h Thu Dec 08 15:38:35 2011 +0000 @@ -139,13 +139,14 @@ #define evPrev 6 #define evNext 7 #define evLoad 8 -#define evEqualizer 9 +#define evLoadPlay 13 +#define evLoadAudioFile 42 +#define evLoadSubtitle 38 +#define evDropSubtitle 43 #define evPlayList 10 -#define evIconify 11 -#define evAbout 12 -#define evLoadPlay 13 -#define evPreferences 14 -#define evSkinBrowser 15 +#define evPlayVCD 40 +#define evPlayDVD 39 +#define evSetURL 5013 #define evPlaySwitchToPause 16 #define evPauseSwitchToPlay 17 @@ -155,18 +156,28 @@ #define evForward1min 21 #define evBackward10min 22 #define evForward10min 23 +#define evSetMoviePosition 27 -#define evNormalSize 24 #define evDoubleSize 25 #define evFullScreen 26 - -#define evSetMoviePosition 27 -#define evSetVolume 28 -#define evSetBalance 29 -#define evMute 30 +#define evNormalSize 24 #define evIncVolume 31 #define evDecVolume 32 +#define evSetVolume 28 +#define evMute 30 +#define evSetBalance 29 +#define evEqualizer 9 + +#define evAbout 12 +#define evPreferences 14 +#define evSkinBrowser 15 + +#define evIconify 11 +#define evExit 1000 + +// --- Internal events --- + #define evIncAudioBufDelay 33 #define evDecAudioBufDelay 34 #define evIncBalance 35 @@ -174,19 +185,12 @@ #define evHelp 37 -#define evLoadSubtitle 38 -#define evDropSubtitle 43 -#define evPlayDVD 39 -#define evPlayVCD 40 #define evPlayNetwork 41 -#define evLoadAudioFile 42 #define evSetAspect 44 #define evSetAudio 45 #define evSetVideo 46 #define evPlayCD 48 -#define evExit 1000 - // --- General events --- #define evFileLoaded 5000 @@ -202,7 +206,6 @@ #define evSetDVDChapter 5010 #define evSubtitleLoaded 5011 #define evSetVCDTrack 5012 -#define evSetURL 5013 #define evFName 7000 #define evMovieTime 7001