From 9fd2acb40995537be85aebb812d957d63e4eb088 Mon Sep 17 00:00:00 2001 From: uNiversaI Date: Wed, 22 Jul 2015 20:25:21 +0900 Subject: [PATCH] squash typos + align --- xbmc/Application.cpp | 2 +- xbmc/messaging/ApplicationMessenger.h | 106 +++++++++++++------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index 339e072774ab0..7ad505e062910 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -448,7 +448,7 @@ bool CApplication::Create() Preflight(); // here we register all global classes for the CApplicationMessenger, - // after that we can send messages to the correspnding modules + // after that we can send messages to the corresponding modules CApplicationMessenger::Get().RegisterReceiver(this); CApplicationMessenger::Get().RegisterReceiver(&g_playlistPlayer); CApplicationMessenger::Get().RegisterReceiver(&g_infoManager); diff --git a/xbmc/messaging/ApplicationMessenger.h b/xbmc/messaging/ApplicationMessenger.h index 01e3ab2d1a70c..b77c22367141e 100644 --- a/xbmc/messaging/ApplicationMessenger.h +++ b/xbmc/messaging/ApplicationMessenger.h @@ -30,13 +30,13 @@ #include #include -#define TMSG_MASK_MESSAGE 0xFFFF0000 // only keep the high bits to route messages -#define TMSG_MASK_APPLICATION (1<<30) //Don't use bit 31 as it'll fail to build, using unsigned variable to hold the message. -#define TMSG_MASK_PLAYLISTPLAYER (1<<29) -#define TMSG_MASK_GUIINFOMANAGER (1<<28) -#define TMSG_MASK_WINDOWMANAGER (1<<27) -#define TMSG_MASK_PERIPHERALS (1<<26) -#define TMSG_MASK_AUDIO_DSP (1<<25) +#define TMSG_MASK_MESSAGE 0xFFFF0000 // only keep the high bits to route messages +#define TMSG_MASK_APPLICATION (1<<30) //Don't use bit 31 as it'll fail to build, using unsigned variable to hold the message. +#define TMSG_MASK_PLAYLISTPLAYER (1<<29) +#define TMSG_MASK_GUIINFOMANAGER (1<<28) +#define TMSG_MASK_WINDOWMANAGER (1<<27) +#define TMSG_MASK_PERIPHERALS (1<<26) +#define TMSG_MASK_AUDIO_DSP (1<<25) // defines here #define TMSG_PLAYLISTPLAYER_PLAY TMSG_MASK_PLAYLISTPLAYER + 0 @@ -61,61 +61,61 @@ -#define TMSG_SHUTDOWN TMSG_MASK_APPLICATION + 0 -#define TMSG_POWERDOWN TMSG_MASK_APPLICATION + 1 -#define TMSG_QUIT TMSG_MASK_APPLICATION + 2 -#define TMSG_HIBERNATE TMSG_MASK_APPLICATION + 3 -#define TMSG_SUSPEND TMSG_MASK_APPLICATION + 4 -#define TMSG_RESTART TMSG_MASK_APPLICATION + 5 -#define TMSG_RESET TMSG_MASK_APPLICATION + 6 -#define TMSG_RESTARTAPP TMSG_MASK_APPLICATION + 7 -#define TMSG_ACTIVATESCREENSAVER TMSG_MASK_APPLICATION + 8 -#define TMSG_NETWORKMESSAGE TMSG_MASK_APPLICATION + 9 -#define TMSG_SETPVRMANAGERSTATE TMSG_MASK_APPLICATION + 10 -#define TMSG_VOLUME_SHOW TMSG_MASK_APPLICATION + 11 -#define TMSG_SPLASH_MESSAGE TMSG_MASK_APPLICATION + 12 -#define TMSG_DISPLAY_SETUP TMSG_MASK_APPLICATION + 13 -#define TMSG_DISPLAY_DESTROY TMSG_MASK_APPLICATION + 14 -#define TMSG_SETVIDEORESOLUTION TMSG_MASK_APPLICATION + 15 -#define TMSG_SWITCHTOFULLSCREEN TMSG_MASK_APPLICATION + 16 -#define TMSG_MINIMIZE TMSG_MASK_APPLICATION + 17 -#define TMSG_TOGGLEFULLSCREEN TMSG_MASK_APPLICATION + 18 -#define TMSG_SETLANGUAGE TMSG_MASK_APPLICATION + 19 -#define TMSG_RENDERER_FLUSH TMSG_MASK_APPLICATION + 20 -#define TMSG_INHIBITIDLESHUTDOWN TMSG_MASK_APPLICATION + 21 -#define TMSG_START_ANDROID_ACTIVITY TMSG_MASK_APPLICATION + 22 -#define TMSG_EXECUTE_SCRIPT TMSG_MASK_APPLICATION + 23 -#define TMSG_EXECUTE_BUILT_IN TMSG_MASK_APPLICATION + 24 -#define TMSG_EXECUTE_OS TMSG_MASK_APPLICATION + 25 -#define TMSG_PICTURE_SHOW TMSG_MASK_APPLICATION + 26 -#define TMSG_PICTURE_SLIDESHOW TMSG_MASK_APPLICATION + 27 -#define TMSG_LOADPROFILE TMSG_MASK_APPLICATION + 28 -#define TMSG_VIDEORESIZE TMSG_MASK_APPLICATION + 29 +#define TMSG_SHUTDOWN TMSG_MASK_APPLICATION + 0 +#define TMSG_POWERDOWN TMSG_MASK_APPLICATION + 1 +#define TMSG_QUIT TMSG_MASK_APPLICATION + 2 +#define TMSG_HIBERNATE TMSG_MASK_APPLICATION + 3 +#define TMSG_SUSPEND TMSG_MASK_APPLICATION + 4 +#define TMSG_RESTART TMSG_MASK_APPLICATION + 5 +#define TMSG_RESET TMSG_MASK_APPLICATION + 6 +#define TMSG_RESTARTAPP TMSG_MASK_APPLICATION + 7 +#define TMSG_ACTIVATESCREENSAVER TMSG_MASK_APPLICATION + 8 +#define TMSG_NETWORKMESSAGE TMSG_MASK_APPLICATION + 9 +#define TMSG_SETPVRMANAGERSTATE TMSG_MASK_APPLICATION + 10 +#define TMSG_VOLUME_SHOW TMSG_MASK_APPLICATION + 11 +#define TMSG_SPLASH_MESSAGE TMSG_MASK_APPLICATION + 12 +#define TMSG_DISPLAY_SETUP TMSG_MASK_APPLICATION + 13 +#define TMSG_DISPLAY_DESTROY TMSG_MASK_APPLICATION + 14 +#define TMSG_SETVIDEORESOLUTION TMSG_MASK_APPLICATION + 15 +#define TMSG_SWITCHTOFULLSCREEN TMSG_MASK_APPLICATION + 16 +#define TMSG_MINIMIZE TMSG_MASK_APPLICATION + 17 +#define TMSG_TOGGLEFULLSCREEN TMSG_MASK_APPLICATION + 18 +#define TMSG_SETLANGUAGE TMSG_MASK_APPLICATION + 19 +#define TMSG_RENDERER_FLUSH TMSG_MASK_APPLICATION + 20 +#define TMSG_INHIBITIDLESHUTDOWN TMSG_MASK_APPLICATION + 21 +#define TMSG_START_ANDROID_ACTIVITY TMSG_MASK_APPLICATION + 22 +#define TMSG_EXECUTE_SCRIPT TMSG_MASK_APPLICATION + 23 +#define TMSG_EXECUTE_BUILT_IN TMSG_MASK_APPLICATION + 24 +#define TMSG_EXECUTE_OS TMSG_MASK_APPLICATION + 25 +#define TMSG_PICTURE_SHOW TMSG_MASK_APPLICATION + 26 +#define TMSG_PICTURE_SLIDESHOW TMSG_MASK_APPLICATION + 27 +#define TMSG_LOADPROFILE TMSG_MASK_APPLICATION + 28 +#define TMSG_VIDEORESIZE TMSG_MASK_APPLICATION + 29 -#define TMSG_SETAUDIODSPSTATE TMSG_MASK_AUDIO_DSP + 30 +#define TMSG_SETAUDIODSPSTATE TMSG_MASK_AUDIO_DSP + 30 -#define TMSG_GUI_INFOLABEL TMSG_MASK_GUIINFOMANAGER + 0 -#define TMSG_GUI_INFOBOOL TMSG_MASK_GUIINFOMANAGER + 1 -#define TMSG_UPDATE_CURRENT_ITEM TMSG_MASK_GUIINFOMANAGER + 2 +#define TMSG_GUI_INFOLABEL TMSG_MASK_GUIINFOMANAGER + 0 +#define TMSG_GUI_INFOBOOL TMSG_MASK_GUIINFOMANAGER + 1 +#define TMSG_UPDATE_CURRENT_ITEM TMSG_MASK_GUIINFOMANAGER + 2 -#define TMSG_CECTOGGLESTATE TMSG_MASK_PERIPHERALS + 1 -#define TMSG_CECACTIVATESOURCE TMSG_MASK_PERIPHERALS + 2 -#define TMSG_CECSTANDBY TMSG_MASK_PERIPHERALS + 3 +#define TMSG_CECTOGGLESTATE TMSG_MASK_PERIPHERALS + 1 +#define TMSG_CECACTIVATESOURCE TMSG_MASK_PERIPHERALS + 2 +#define TMSG_CECSTANDBY TMSG_MASK_PERIPHERALS + 3 -#define TMSG_GUI_DIALOG_OPEN TMSG_MASK_WINDOWMANAGER + 1 -#define TMSG_GUI_ACTIVATE_WINDOW TMSG_MASK_WINDOWMANAGER + 2 -#define TMSG_GUI_PYTHON_DIALOG TMSG_MASK_WINDOWMANAGER + 3 -#define TMSG_GUI_WINDOW_CLOSE TMSG_MASK_WINDOWMANAGER + 4 -#define TMSG_GUI_ACTION TMSG_MASK_WINDOWMANAGER + 5 -#define TMSG_GUI_ADDON_DIALOG TMSG_MASK_WINDOWMANAGER + 6 -#define TMSG_GUI_MESSAGE TMSG_MASK_WINDOWMANAGER + 7 +#define TMSG_GUI_DIALOG_OPEN TMSG_MASK_WINDOWMANAGER + 1 +#define TMSG_GUI_ACTIVATE_WINDOW TMSG_MASK_WINDOWMANAGER + 2 +#define TMSG_GUI_PYTHON_DIALOG TMSG_MASK_WINDOWMANAGER + 3 +#define TMSG_GUI_WINDOW_CLOSE TMSG_MASK_WINDOWMANAGER + 4 +#define TMSG_GUI_ACTION TMSG_MASK_WINDOWMANAGER + 5 +#define TMSG_GUI_ADDON_DIALOG TMSG_MASK_WINDOWMANAGER + 6 +#define TMSG_GUI_MESSAGE TMSG_MASK_WINDOWMANAGER + 7 -#define TMSG_CALLBACK 800 +#define TMSG_CALLBACK 800 @@ -180,7 +180,7 @@ class CApplicationMessenger void RegisterReceiver(IMessageTarget* target); private: - // private construction, and no assignements; use the provided singleton methods + // private construction, and no assignments; use the provided singleton methods CApplicationMessenger(); CApplicationMessenger(const CApplicationMessenger&) = delete; CApplicationMessenger const& operator=(CApplicationMessenger const&) = delete;