Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[typos] fix typos RegisterReceveiver -> RegisterReceiver #7584

Merged
merged 1 commit into from
Jul 22, 2015
Merged

[typos] fix typos RegisterReceveiver -> RegisterReceiver #7584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions xbmc/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2005-2013 Team XBMC
* http://xbmc.org
* Copyright (C) 2005-2015 Team XBMC
* http://kodi.tv
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -13,7 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with XBMC; see the file COPYING. If not, see
* along with Kodi; see the file COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
*/
Expand Down Expand Up @@ -448,11 +448,11 @@ bool CApplication::Create()
Preflight();

// here we register all global classes for the CApplicationMessenger,
// after that we can send messages to the correspnding modules
CApplicationMessenger::Get().RegisterReceveiver(this);
CApplicationMessenger::Get().RegisterReceveiver(&g_playlistPlayer);
CApplicationMessenger::Get().RegisterReceveiver(&g_infoManager);
CApplicationMessenger::Get().RegisterReceveiver(&g_AEDSPManager);
// after that we can send messages to the corresponding modules
CApplicationMessenger::Get().RegisterReceiver(this);
CApplicationMessenger::Get().RegisterReceiver(&g_playlistPlayer);
CApplicationMessenger::Get().RegisterReceiver(&g_infoManager);
CApplicationMessenger::Get().RegisterReceiver(&g_AEDSPManager);

for (int i = RES_HDTV_1080i; i <= RES_PAL60_16x9; i++)
{
Expand Down
8 changes: 4 additions & 4 deletions xbmc/guilib/GUIWindowManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2005-2013 Team XBMC
* http://xbmc.org
* Copyright (C) 2005-2015 Team XBMC
* http://kodi.tv
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -13,7 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with XBMC; see the file COPYING. If not, see
* along with Kodi; see the file COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
*/
Expand Down Expand Up @@ -172,7 +172,7 @@ void CGUIWindowManager::Initialize()

LoadNotOnDemandWindows();

CApplicationMessenger::Get().RegisterReceveiver(this);
CApplicationMessenger::Get().RegisterReceiver(this);
}

void CGUIWindowManager::CreateWindows()
Expand Down
8 changes: 4 additions & 4 deletions xbmc/messaging/ApplicationMessenger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2005-2013 Team XBMC
* http://xbmc.org
* Copyright (C) 2005-2015 Team XBMC
* http://kodi.tv
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -13,7 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with XBMC; see the file COPYING. If not, see
* along with Kodi; see the file COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
*/
Expand Down Expand Up @@ -253,7 +253,7 @@ void CApplicationMessenger::SendGUIMessage(const CGUIMessage &message, int windo
SendMsg(std::move(tMsg), waitResult);
}

void CApplicationMessenger::RegisterReceveiver(IMessageTarget* target)
void CApplicationMessenger::RegisterReceiver(IMessageTarget* target)
{
CSingleLock lock(m_critSection);
m_mapTargets.insert(std::make_pair(target->GetMessageMask(), target));
Expand Down
114 changes: 57 additions & 57 deletions xbmc/messaging/ApplicationMessenger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

/*
* Copyright (C) 2005-2013 Team XBMC
* http://xbmc.org
* Copyright (C) 2005-2015 Team XBMC
* http://kodi.tv
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -15,7 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with XBMC; see the file COPYING. If not, see
* along with Kodi; see the file COPYING. If not, see
* <http://www.gnu.org/licenses/>.
*
*/
Expand All @@ -30,13 +30,13 @@
#include <string>
#include <vector>

#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
Expand All @@ -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



Expand Down Expand Up @@ -177,10 +177,10 @@ class CApplicationMessenger
*/
void SendGUIMessage(const CGUIMessage &msg, int windowID = WINDOW_INVALID, bool waitResult=false);

void RegisterReceveiver(IMessageTarget* target);
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;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/peripherals/Peripherals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void CPeripherals::Initialise(void)
}

m_bInitialised = true;
KODI::MESSAGING::CApplicationMessenger::Get().RegisterReceveiver(this);
KODI::MESSAGING::CApplicationMessenger::Get().RegisterReceiver(this);
}
}

Expand Down