Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #2452 from cptspiff/various_small_fixes

Various small fixes
  • Loading branch information...
commit 586e0c93e042788183910eb9e84935bab0942b22 2 parents 3822e03 + 26fcb3b
Arne Morten Kvarving authored
Showing with 361 additions and 210 deletions.
  1. +1 −0  xbmc/Application.cpp
  2. +4 −2 xbmc/Application.h
  3. +18 −16 xbmc/ApplicationMessenger.cpp
  4. +7 −8 xbmc/ApplicationMessenger.h
  5. +1 −1  xbmc/AutoSwitch.cpp
  6. +1 −0  xbmc/GUIInfoManager.cpp
  7. +1 −0  xbmc/addons/AddonCallbacksGUI.cpp
  8. +1 −0  xbmc/addons/AddonCallbacksGUI.h
  9. +1 −0  xbmc/addons/GUIDialogAddonInfo.cpp
  10. +1 −0  xbmc/addons/GUIDialogAddonSettings.cpp
  11. +1 −1  xbmc/addons/GUIViewStateAddonBrowser.cpp
  12. +1 −0  xbmc/addons/GUIWindowAddonBrowser.cpp
  13. +1 −1  xbmc/addons/Repository.cpp
  14. +1 −1  xbmc/addons/Skin.cpp
  15. +1 −0  xbmc/addons/Visualisation.cpp
  16. +0 −1  xbmc/addons/Visualisation.h
  17. +1 −1  xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
  18. +1 −15 xbmc/cores/IPlayer.h
  19. +36 −0 xbmc/cores/IPlayerCallback.h
  20. +1 −0  xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
  21. +1 −1  xbmc/cores/dvdplayer/DVDFileInfo.cpp
  22. +1 −0  xbmc/cores/dvdplayer/DVDPlayer.cpp
  23. +6 −1 xbmc/cores/playercorefactory/PlayerCoreFactory.h
  24. +1 −0  xbmc/dialogs/GUIDialogContextMenu.cpp
  25. +1 −0  xbmc/dialogs/GUIDialogFavourites.cpp
  26. +1 −0  xbmc/dialogs/GUIDialogFileBrowser.cpp
  27. +1 −0  xbmc/dialogs/GUIDialogGamepad.cpp
  28. +1 −0  xbmc/dialogs/GUIDialogKeyboardGeneric.cpp
  29. +1 −0  xbmc/dialogs/GUIDialogMediaSource.cpp
  30. +1 −0  xbmc/dialogs/GUIDialogNumeric.cpp
  31. +1 −0  xbmc/dialogs/GUIDialogSelect.cpp
  32. +1 −0  xbmc/dialogs/GUIDialogSlider.cpp
  33. +1 −0  xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
  34. +1 −0  xbmc/dialogs/GUIDialogVolumeBar.cpp
  35. +1 −0  xbmc/dialogs/GUIDialogYesNo.cpp
  36. +1 −1  xbmc/filesystem/CircularCache.cpp
  37. +1 −1  xbmc/filesystem/CurlFile.cpp
  38. +1 −0  xbmc/guilib/GUIButtonControl.cpp
  39. +1 −0  xbmc/guilib/GUIDialog.cpp
  40. +1 −1  xbmc/guilib/GUIDialog.h
  41. +1 −0  xbmc/guilib/GUIEditControl.cpp
  42. +1 −0  xbmc/guilib/GUIMultiImage.cpp
  43. +1 −0  xbmc/guilib/GUIToggleButtonControl.cpp
  44. +3 −0  xbmc/guilib/GUIVideoControl.cpp
  45. +1 −0  xbmc/guilib/GUIVisualisationControl.cpp
  46. +1 −0  xbmc/guilib/GUIWindowManager.cpp
  47. +1 −0  xbmc/guilib/GraphicContext.cpp
  48. +0 −140 xbmc/guilib/Key.h
  49. +162 −0 xbmc/guilib/WindowIDs.h
  50. +2 −1  xbmc/input/ButtonTranslator.cpp
  51. +2 −0  xbmc/interfaces/Builtins.cpp
  52. +1 −0  xbmc/interfaces/json-rpc/GUIOperations.cpp
  53. +2 −0  xbmc/interfaces/json-rpc/PlayerOperations.cpp
  54. +1 −0  xbmc/interfaces/json-rpc/PlaylistOperations.cpp
  55. +1 −1  xbmc/interfaces/legacy/Player.cpp
  56. +0 −2  xbmc/interfaces/python/Makefile.in
  57. +2 −2 xbmc/interfaces/python/XBPython.h
  58. +1 −1  xbmc/music/GUIViewStateMusic.cpp
  59. +1 −0  xbmc/music/dialogs/GUIDialogMusicInfo.cpp
  60. +1 −0  xbmc/music/dialogs/GUIDialogMusicOSD.cpp
  61. +1 −0  xbmc/music/dialogs/GUIDialogMusicOverlay.cpp
  62. +1 −0  xbmc/music/dialogs/GUIDialogSongInfo.cpp
  63. +1 −0  xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp
  64. +1 −0  xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp
  65. +1 −0  xbmc/music/karaoke/GUIWindowKaraokeLyrics.cpp
  66. +1 −1  xbmc/music/karaoke/karaokewindowbackground.h
  67. +2 −0  xbmc/music/windows/GUIWindowMusicBase.cpp
  68. +1 −0  xbmc/music/windows/GUIWindowMusicNav.cpp
  69. +1 −0  xbmc/music/windows/GUIWindowMusicPlaylist.cpp
  70. +1 −0  xbmc/music/windows/GUIWindowMusicPlaylistEditor.cpp
  71. +2 −0  xbmc/music/windows/GUIWindowMusicSongs.cpp
  72. +1 −0  xbmc/music/windows/GUIWindowVisualisation.cpp
  73. +1 −0  xbmc/network/AirPlayServer.cpp
  74. +1 −0  xbmc/network/EventClient.cpp
  75. +1 −0  xbmc/network/EventServer.cpp
  76. +1 −0  xbmc/network/GUIDialogAccessPoints.cpp
  77. +1 −0  xbmc/network/upnp/UPnPRenderer.cpp
  78. +1 −1  xbmc/network/upnp/UPnPServer.cpp
  79. +1 −0  xbmc/pictures/GUIDialogPictureInfo.cpp
  80. +1 −1  xbmc/pictures/GUIViewStatePictures.cpp
  81. +1 −0  xbmc/pictures/GUIWindowPictures.cpp
  82. +1 −0  xbmc/pictures/GUIWindowSlideShow.cpp
  83. +1 −1  xbmc/programs/GUIViewStatePrograms.cpp
  84. +1 −0  xbmc/programs/GUIWindowPrograms.cpp
  85. +1 −0  xbmc/pvr/addons/PVRClients.cpp
  86. +1 −0  xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
  87. +2 −0  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
  88. +1 −0  xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
  89. +1 −0  xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
  90. +1 −0  xbmc/pvr/windows/GUIWindowPVRChannels.cpp
  91. +2 −0  xbmc/pvr/windows/GUIWindowPVRCommon.cpp
  92. +1 −0  xbmc/pvr/windows/GUIWindowPVRGuide.cpp
  93. +1 −0  xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
  94. +1 −0  xbmc/pvr/windows/GUIWindowPVRSearch.cpp
  95. +1 −0  xbmc/pvr/windows/GUIWindowPVRTimers.cpp
  96. +1 −0  xbmc/settings/dialogs/GUIDialogContentSettings.cpp
  97. +1 −1  xbmc/settings/windows/GUIWindowSettings.cpp
  98. +1 −0  xbmc/settings/windows/GUIWindowSettingsProfile.cpp
  99. +1 −0  xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
  100. +1 −0  xbmc/settings/windows/GUIWindowTestPattern.cpp
  101. +1 −1  xbmc/utils/RecentlyAddedJob.cpp
  102. +1 −0  xbmc/utils/Weather.cpp
  103. +1 −1  xbmc/video/FFmpegVideoDecoder.cpp
  104. +1 −1  xbmc/video/GUIViewStateVideo.cpp
  105. +1 −0  xbmc/video/Teletext.cpp
  106. +1 −0  xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
  107. +2 −1  xbmc/video/dialogs/GUIDialogFileStacking.cpp
  108. +1 −0  xbmc/video/dialogs/GUIDialogFullScreenInfo.cpp
  109. +1 −0  xbmc/video/dialogs/GUIDialogTeletext.cpp
  110. +2 −0  xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
  111. +1 −0  xbmc/video/dialogs/GUIDialogVideoInfo.cpp
  112. +2 −0  xbmc/video/dialogs/GUIDialogVideoOSD.cpp
  113. +2 −0  xbmc/video/windows/GUIWindowFullScreen.cpp
  114. +1 −0  xbmc/video/windows/GUIWindowVideoBase.cpp
  115. +1 −0  xbmc/video/windows/GUIWindowVideoNav.cpp
  116. +1 −0  xbmc/video/windows/GUIWindowVideoPlaylist.cpp
  117. +1 −1  xbmc/view/GUIViewControl.cpp
  118. +1 −0  xbmc/windows/GUIMediaWindow.cpp
  119. +1 −0  xbmc/windows/GUIWindowFileManager.cpp
  120. +1 −0  xbmc/windows/GUIWindowHome.cpp
  121. +1 −0  xbmc/windows/GUIWindowLoginScreen.cpp
  122. +1 −0  xbmc/windows/GUIWindowStartup.cpp
  123. +1 −1  xbmc/windows/GUIWindowSystemInfo.cpp
View
1  xbmc/Application.cpp
@@ -30,6 +30,7 @@
#include "Util.h"
#include "URL.h"
#include "guilib/TextureManager.h"
+#include "cores/IPlayer.h"
#include "cores/dvdplayer/DVDFileInfo.h"
#include "cores/AudioEngine/AEFactory.h"
#include "cores/AudioEngine/Utils/AEUtil.h"
View
6 xbmc/Application.h
@@ -24,14 +24,15 @@
#include "XBApplicationEx.h"
#include "guilib/IMsgTargetCallback.h"
-#include "guilib/Key.h"
#include "threads/Condition.h"
#include "utils/GlobalsHandling.h"
#include <map>
+class CAction;
class CFileItem;
class CFileItemList;
+class CKey;
namespace ADDON
{
class CSkinInfo;
@@ -44,7 +45,7 @@ namespace MEDIA_DETECT
class CAutorun;
}
-#include "cores/IPlayer.h"
+#include "cores/IPlayerCallback.h"
#include "cores/playercorefactory/PlayerCoreFactory.h"
#include "PlayListPlayer.h"
#if !defined(_WIN32) && defined(HAS_DVD_DRIVE)
@@ -68,6 +69,7 @@ class DPMSSupport;
class CSplash;
class CBookmark;
class CWebServer;
+class IPlayer;
#ifdef HAS_WEB_SERVER
class CWebServer;
class CHTTPImageHandler;
View
34 xbmc/ApplicationMessenger.cpp
@@ -34,12 +34,14 @@
#include "utils/URIUtils.h"
#include "utils/Variant.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "settings/Settings.h"
#include "settings/GUISettings.h"
#include "FileItem.h"
#include "guilib/GUIDialog.h"
#include "GUIInfoManager.h"
#include "utils/Splash.h"
+#include "cores/IPlayer.h"
#include "cores/VideoRenderers/RenderManager.h"
#include "cores/AudioEngine/AEFactory.h"
#include "music/tags/MusicInfoTag.h"
@@ -566,14 +568,14 @@ void CApplicationMessenger::ProcessMessage(ThreadMessage *pMsg)
break;
case TMSG_PLAYLISTPLAYER_PLAY:
- if (pMsg->dwParam1 != (DWORD) -1)
+ if (pMsg->dwParam1 != (unsigned int) -1)
g_playlistPlayer.Play(pMsg->dwParam1);
else
g_playlistPlayer.Play();
break;
case TMSG_PLAYLISTPLAYER_PLAY_SONG_ID:
- if (pMsg->dwParam1 != (DWORD) -1)
+ if (pMsg->dwParam1 != (unsigned int) -1)
{
bool *result = (bool*)pMsg->lpVoid;
*result = g_playlistPlayer.PlaySongId(pMsg->dwParam1);
@@ -610,7 +612,7 @@ void CApplicationMessenger::ProcessMessage(ThreadMessage *pMsg)
break;
case TMSG_PLAYLISTPLAYER_REMOVE:
- if (pMsg->dwParam1 != (DWORD) -1)
+ if (pMsg->dwParam1 != (unsigned int) -1)
g_playlistPlayer.Remove(pMsg->dwParam1,pMsg->dwParam2);
break;
@@ -958,20 +960,20 @@ void CApplicationMessenger::MediaRestart(bool bWait)
void CApplicationMessenger::PlayListPlayerPlay()
{
- ThreadMessage tMsg = {TMSG_PLAYLISTPLAYER_PLAY, (DWORD) -1};
+ ThreadMessage tMsg = {TMSG_PLAYLISTPLAYER_PLAY, (unsigned int) -1};
SendMessage(tMsg, true);
}
void CApplicationMessenger::PlayListPlayerPlay(int iSong)
{
- ThreadMessage tMsg = {TMSG_PLAYLISTPLAYER_PLAY, (DWORD)iSong};
+ ThreadMessage tMsg = {TMSG_PLAYLISTPLAYER_PLAY, (unsigned int)iSong};
SendMessage(tMsg, true);
}
bool CApplicationMessenger::PlayListPlayerPlaySongId(int songId)
{
bool returnState;
- ThreadMessage tMsg = {TMSG_PLAYLISTPLAYER_PLAY_SONG_ID, (DWORD)songId};
+ ThreadMessage tMsg = {TMSG_PLAYLISTPLAYER_PLAY_SONG_ID, (unsigned int)songId};
tMsg.lpVoid = (void *)&returnState;
SendMessage(tMsg, true);
return returnState;
@@ -1027,7 +1029,7 @@ void CApplicationMessenger::PlayListPlayerInsert(int playlist, const CFileItemLi
void CApplicationMessenger::PlayListPlayerRemove(int playlist, int position)
{
- ThreadMessage tMsg = {TMSG_PLAYLISTPLAYER_REMOVE, (DWORD)playlist, (DWORD)position};
+ ThreadMessage tMsg = {TMSG_PLAYLISTPLAYER_REMOVE, (unsigned int)playlist, (unsigned int)position};
SendMessage(tMsg, true);
}
@@ -1082,7 +1084,7 @@ void CApplicationMessenger::PictureShow(string filename)
void CApplicationMessenger::PictureSlideShow(string pathname, bool addTBN /* = false */)
{
- DWORD dwMessage = TMSG_PICTURE_SLIDESHOW;
+ unsigned int dwMessage = TMSG_PICTURE_SLIDESHOW;
ThreadMessage tMsg = {dwMessage};
tMsg.strParam = pathname;
tMsg.dwParam1 = addTBN ? 1 : 0;
@@ -1146,11 +1148,11 @@ void CApplicationMessenger::RestartApp()
void CApplicationMessenger::InhibitIdleShutdown(bool inhibit)
{
- ThreadMessage tMsg = {TMSG_INHIBITIDLESHUTDOWN, (DWORD)inhibit};
+ ThreadMessage tMsg = {TMSG_INHIBITIDLESHUTDOWN, (unsigned int)inhibit};
SendMessage(tMsg);
}
-void CApplicationMessenger::NetworkMessage(DWORD dwMessage, DWORD dwParam)
+void CApplicationMessenger::NetworkMessage(unsigned int dwMessage, unsigned int dwParam)
{
ThreadMessage tMsg = {TMSG_NETWORKMESSAGE, dwMessage, dwParam};
SendMessage(tMsg);
@@ -1175,7 +1177,7 @@ void CApplicationMessenger::DoModal(CGUIDialog *pDialog, int iWindowID, const CS
{
ThreadMessage tMsg = {TMSG_GUI_DO_MODAL};
tMsg.lpVoid = pDialog;
- tMsg.dwParam1 = (DWORD)iWindowID;
+ tMsg.dwParam1 = (unsigned int)iWindowID;
tMsg.strParam = param;
SendMessage(tMsg, true);
}
@@ -1184,13 +1186,13 @@ void CApplicationMessenger::ExecOS(const CStdString command, bool waitExit)
{
ThreadMessage tMsg = {TMSG_EXECUTE_OS};
tMsg.strParam = command;
- tMsg.dwParam1 = (DWORD)waitExit;
+ tMsg.dwParam1 = (unsigned int)waitExit;
SendMessage(tMsg, false);
}
void CApplicationMessenger::UserEvent(int code)
{
- ThreadMessage tMsg = {(DWORD)code};
+ ThreadMessage tMsg = {(unsigned int)code};
SendMessage(tMsg, false);
}
@@ -1203,15 +1205,15 @@ void CApplicationMessenger::Show(CGUIDialog *pDialog)
void CApplicationMessenger::Close(CGUIWindow *window, bool forceClose, bool waitResult /*= true*/, int nextWindowID /*= 0*/, bool enableSound /*= true*/)
{
- ThreadMessage tMsg = {TMSG_GUI_WINDOW_CLOSE, (DWORD)nextWindowID};
- tMsg.dwParam2 = (DWORD)((forceClose ? 0x01 : 0) | (enableSound ? 0x02 : 0));
+ ThreadMessage tMsg = {TMSG_GUI_WINDOW_CLOSE, (unsigned int)nextWindowID};
+ tMsg.dwParam2 = (unsigned int)((forceClose ? 0x01 : 0) | (enableSound ? 0x02 : 0));
tMsg.lpVoid = window;
SendMessage(tMsg, waitResult);
}
void CApplicationMessenger::ActivateWindow(int windowID, const vector<CStdString> &params, bool swappingWindows)
{
- ThreadMessage tMsg = {TMSG_GUI_ACTIVATE_WINDOW, (DWORD)windowID, swappingWindows ? 1u : 0u};
+ ThreadMessage tMsg = {TMSG_GUI_ACTIVATE_WINDOW, (unsigned int)windowID, swappingWindows ? 1u : 0u};
tMsg.params = params;
SendMessage(tMsg, true);
}
View
15 xbmc/ApplicationMessenger.h
@@ -22,13 +22,11 @@
#include "threads/CriticalSection.h"
#include "utils/StdString.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#include "threads/Thread.h"
#include "threads/Event.h"
#include <boost/shared_ptr.hpp>
-#include "PlatformDefs.h"
-
#include <queue>
#include "utils/GlobalsHandling.h"
@@ -38,6 +36,7 @@ class CGUIDialog;
class CGUIWindow;
class CGUIMessage;
class CVideoInfoTag;
+class CAction;
namespace MUSIC_INFO
{
@@ -115,13 +114,13 @@ namespace MUSIC_INFO
typedef struct
{
- DWORD dwMessage;
- DWORD dwParam1;
- DWORD dwParam2;
+ unsigned int dwMessage;
+ unsigned int dwParam1;
+ unsigned int dwParam2;
CStdString strParam;
std::vector<CStdString> params;
boost::shared_ptr<CEvent> waitEvent;
- LPVOID lpVoid;
+ void* lpVoid;
}
ThreadMessage;
@@ -220,7 +219,7 @@ class CApplicationMessenger
int SetResponse(CStdString response);
void ExecBuiltIn(const CStdString &command, bool wait = false);
- void NetworkMessage(DWORD dwMessage, DWORD dwParam = 0);
+ void NetworkMessage(unsigned int dwMessage, unsigned int dwParam = 0);
void DoModal(CGUIDialog *pDialog, int iWindowID, const CStdString &param = "");
void Show(CGUIDialog *pDialog);
View
2  xbmc/AutoSwitch.cpp
@@ -23,7 +23,7 @@
#include "settings/GUISettings.h"
#include "guilib/GUIWindowManager.h"
#include "FileItem.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#define METHOD_BYFOLDERS 0
#define METHOD_BYFILES 1
View
1  xbmc/GUIInfoManager.cpp
@@ -74,6 +74,7 @@
#include "video/VideoThumbLoader.h"
#include "music/MusicThumbLoader.h"
#include "video/VideoDatabase.h"
+#include "cores/IPlayer.h"
#include "cores/AudioEngine/Utils/AEUtil.h"
#define SYSHEATUPDATEINTERVAL 60000
View
1  xbmc/addons/AddonCallbacksGUI.cpp
@@ -29,6 +29,7 @@
#include "utils/URIUtils.h"
#include "utils/TimeUtils.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "guilib/TextureManager.h"
#include "settings/GUISettings.h"
#include "guilib/GUISpinControlEx.h"
View
1  xbmc/addons/AddonCallbacksGUI.h
@@ -190,6 +190,7 @@ class CGUIAddonRenderingControl : public IRenderingCallback
friend class CAddonCallbacksGUI;
public:
CGUIAddonRenderingControl(CGUIRenderingControl *pControl);
+ virtual ~CGUIAddonRenderingControl() {}
virtual bool Create(int x, int y, int w, int h, void *device);
virtual void Render();
virtual void Stop();
View
1  xbmc/addons/GUIDialogAddonInfo.cpp
@@ -31,6 +31,7 @@
#include "dialogs/GUIDialogTextViewer.h"
#include "GUIUserMessages.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "utils/JobManager.h"
#include "utils/FileOperationJob.h"
#include "utils/StringUtils.h"
View
1  xbmc/addons/GUIDialogAddonSettings.cpp
@@ -34,6 +34,7 @@
#include "guilib/GUIRadioButtonControl.h"
#include "guilib/GUISpinControlEx.h"
#include "guilib/GUIImage.h"
+#include "guilib/Key.h"
#include "filesystem/Directory.h"
#include "video/VideoInfoScanner.h"
#include "addons/Scraper.h"
View
2  xbmc/addons/GUIViewStateAddonBrowser.cpp
@@ -20,7 +20,7 @@
#include "GUIViewStateAddonBrowser.h"
#include "FileItem.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#include "view/ViewState.h"
#include "settings/Settings.h"
#include "addons/Addon.h"
View
1  xbmc/addons/GUIWindowAddonBrowser.cpp
@@ -46,6 +46,7 @@
#include "storage/MediaManager.h"
#include "settings/GUISettings.h"
#include "LangInfo.h"
+#include "guilib/Key.h"
#define CONTROL_AUTOUPDATE 5
#define CONTROL_SHUTUP 6
View
2  xbmc/addons/Repository.cpp
@@ -263,7 +263,7 @@ VECADDONS CRepositoryUpdateJob::GrabAddons(RepositoryPtr& repo)
CAddonDatabase database;
database.Open();
CStdString checksum;
- int idRepo = database.GetRepoChecksum(repo->ID(),checksum);
+ database.GetRepoChecksum(repo->ID(),checksum);
CStdString reposum = repo->Checksum();
VECADDONS addons;
if (!checksum.Equals(reposum) || checksum.empty())
View
2  xbmc/addons/Skin.cpp
@@ -22,7 +22,7 @@
#include "AddonManager.h"
#include "filesystem/File.h"
#include "filesystem/SpecialProtocol.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#include "utils/URIUtils.h"
#include "settings/Settings.h"
#include "utils/log.h"
View
1  xbmc/addons/Visualisation.cpp
@@ -28,6 +28,7 @@
#include "windowing/WindowingFactory.h"
#include "utils/URIUtils.h"
#include "utils/StringUtils.h"
+#include "cores/IPlayer.h"
#include "cores/AudioEngine/AEFactory.h"
#include "cores/AudioEngine/Utils/AEConvert.h"
#ifdef _LINUX
View
1  xbmc/addons/Visualisation.h
@@ -19,7 +19,6 @@
*/
#pragma once
-#include "guilib/Key.h"
#include "AddonDll.h"
#include "cores/IAudioCallback.h"
#include "include/xbmc_vis_types.h"
View
2  xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -66,10 +66,10 @@ static unsigned int ALSASampleRateList[] =
};
CAESinkALSA::CAESinkALSA() :
- m_pcm(NULL),
m_bufferSize(0),
m_formatSampleRateMul(0.0),
m_passthrough(false),
+ m_pcm(NULL),
m_timeout(0)
{
/* ensure that ALSA has been initialized */
View
16 xbmc/cores/IPlayer.h
@@ -22,6 +22,7 @@
#include "system.h" // until we get sane int types used here
#include "IAudioCallback.h"
+#include "IPlayerCallback.h"
#include "utils/StdString.h"
#include "guilib/Geometry.h"
@@ -35,21 +36,6 @@ namespace PVR
class CPVRChannel;
}
-class IPlayerCallback
-{
-public:
- virtual ~IPlayerCallback() {}
- virtual void OnPlayBackEnded() = 0;
- virtual void OnPlayBackStarted() = 0;
- virtual void OnPlayBackPaused() {};
- virtual void OnPlayBackResumed() {};
- virtual void OnPlayBackStopped() = 0;
- virtual void OnQueueNextItem() = 0;
- virtual void OnPlayBackSeek(int iTime, int seekOffset) {};
- virtual void OnPlayBackSeekChapter(int iChapter) {};
- virtual void OnPlayBackSpeedChanged(int iSpeed) {};
-};
-
class CPlayerOptions
{
public:
View
36 xbmc/cores/IPlayerCallback.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * http://www.xbmc.org
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * 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
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+class IPlayerCallback
+{
+public:
+ virtual ~IPlayerCallback() {}
+ virtual void OnPlayBackEnded() = 0;
+ virtual void OnPlayBackStarted() = 0;
+ virtual void OnPlayBackPaused() {};
+ virtual void OnPlayBackResumed() {};
+ virtual void OnPlayBackStopped() = 0;
+ virtual void OnQueueNextItem() = 0;
+ virtual void OnPlayBackSeek(int iTime, int seekOffset) {};
+ virtual void OnPlayBackSeekChapter(int iChapter) {};
+ virtual void OnPlayBackSpeedChanged(int iSpeed) {};
+};
View
1  xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
@@ -45,6 +45,7 @@
#include "utils/GLUtils.h"
#include "RenderCapture.h"
#include "RenderFormats.h"
+#include "cores/IPlayer.h"
#ifdef HAVE_LIBVDPAU
#include "cores/dvdplayer/DVDCodecs/Video/VDPAU.h"
View
2  xbmc/cores/dvdplayer/DVDFileInfo.cpp
@@ -239,7 +239,7 @@ bool CDVDFileInfo::ExtractThumb(const CStdString &strPath, CTextureDetails &deta
uint8_t *src[] = { picture.data[0], picture.data[1], picture.data[2], 0 };
int srcStride[] = { picture.iLineSize[0], picture.iLineSize[1], picture.iLineSize[2], 0 };
uint8_t *dst[] = { pOutBuf, 0, 0, 0 };
- int dstStride[] = { nWidth*4, 0, 0, 0 };
+ int dstStride[] = { (int)nWidth*4, 0, 0, 0 };
if (context)
{
View
1  xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -41,6 +41,7 @@
#include "DVDFileInfo.h"
#include "utils/LangCodeExpander.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "utils/URIUtils.h"
View
7 xbmc/cores/playercorefactory/PlayerCoreFactory.h
@@ -20,15 +20,20 @@
*
*/
-#include "cores/IPlayer.h"
+#include "cores/IPlayerCallback.h"
#include "threads/CriticalSection.h"
+#include "utils/StdString.h"
+
+#include <vector>
/*----------------------------------------------------------------------
| forward references
+---------------------------------------------------------------------*/
class TiXmlElement;
+class CFileItem;
class CPlayerCoreConfig;
class CPlayerSelectionRule;
+class IPlayer;
// do not remove mplayer - will break scripts
enum EPLAYERCORES
View
1  xbmc/dialogs/GUIDialogContextMenu.cpp
@@ -33,6 +33,7 @@
#include "settings/dialogs/GUIDialogLockSettings.h"
#include "storage/MediaManager.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "GUIDialogYesNo.h"
#include "addons/AddonManager.h"
#include "FileItem.h"
View
1  xbmc/dialogs/GUIDialogFavourites.cpp
@@ -24,6 +24,7 @@
#include "Favourites.h"
#include "guilib/GUIWindowManager.h"
#include "guilib/GUIKeyboardFactory.h"
+#include "guilib/Key.h"
#include "filesystem/File.h"
#include "FileItem.h"
#include "guilib/LocalizeStrings.h"
View
1  xbmc/dialogs/GUIDialogFileBrowser.cpp
@@ -41,6 +41,7 @@
#include "settings/AdvancedSettings.h"
#include "settings/Settings.h"
#include "settings/GUISettings.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
#include "URL.h"
View
1  xbmc/dialogs/GUIDialogGamepad.cpp
@@ -24,6 +24,7 @@
#include "guilib/GUIWindowManager.h"
#include "GUIDialogOK.h"
#include "utils/StringUtils.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
CGUIDialogGamepad::CGUIDialogGamepad(void)
View
1  xbmc/dialogs/GUIDialogKeyboardGeneric.cpp
@@ -22,6 +22,7 @@
#include "input/XBMC_vkeys.h"
#include "guilib/GUILabelControl.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "GUIUserMessages.h"
#include "GUIDialogNumeric.h"
View
1  xbmc/dialogs/GUIDialogMediaSource.cpp
@@ -23,6 +23,7 @@
#include "GUIDialogFileBrowser.h"
#include "video/windows/GUIWindowVideoBase.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "Util.h"
#include "utils/URIUtils.h"
#include "filesystem/Directory.h"
View
1  xbmc/dialogs/GUIDialogNumeric.cpp
@@ -25,6 +25,7 @@
#include "GUIDialogOK.h"
#include "input/XBMC_vkeys.h"
#include "utils/StringUtils.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "interfaces/AnnouncementManager.h"
View
1  xbmc/dialogs/GUIDialogSelect.cpp
@@ -21,6 +21,7 @@
#include "GUIDialogSelect.h"
#include "guilib/GUIWindowManager.h"
#include "FileItem.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#define CONTROL_HEADING 1
View
1  xbmc/dialogs/GUIDialogSlider.cpp
@@ -21,6 +21,7 @@
#include "GUIDialogSlider.h"
#include "guilib/GUISliderControl.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#define CONTROL_HEADING 10
View
1  xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
@@ -28,6 +28,7 @@
#include "settings/GUISettings.h"
#include "settings/Settings.h"
#include "FileItem.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
using namespace std;
View
1  xbmc/dialogs/GUIDialogVolumeBar.cpp
@@ -19,6 +19,7 @@
*/
#include "GUIDialogVolumeBar.h"
+#include "guilib/Key.h"
#include "utils/TimeUtils.h"
#define VOLUME_BAR_DISPLAY_TIME 1000L
View
1  xbmc/dialogs/GUIDialogYesNo.cpp
@@ -20,6 +20,7 @@
#include "GUIDialogYesNo.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#define CONTROL_NO_BUTTON 10
#define CONTROL_YES_BUTTON 11
View
2  xbmc/filesystem/CircularCache.cpp
@@ -123,7 +123,7 @@ int CCircularCache::WriteToCache(const char *buf, size_t len)
m_end += len;
// drop history that was overwritten
- if(m_end - m_beg > m_size)
+ if(m_end - m_beg > (int64_t)m_size)
m_beg = m_end - m_size;
m_written.Set();
View
2  xbmc/filesystem/CurlFile.cpp
@@ -168,7 +168,7 @@ size_t CCurlFile::CReadState::ReadCallback(char *buffer, size_t size, size_t nit
return CURL_READFUNC_PAUSE;
}
- int64_t retSize = XMIN(m_fileSize - m_filePos, nitems * size);
+ int64_t retSize = XMIN(m_fileSize - m_filePos, int64_t(nitems * size));
memcpy(buffer, m_readBuffer + m_filePos, retSize);
m_filePos += retSize;
View
1  xbmc/guilib/GUIButtonControl.cpp
@@ -23,6 +23,7 @@
#include "GUIDialog.h"
#include "utils/CharsetConverter.h"
#include "GUIFontManager.h"
+#include "Key.h"
using namespace std;
View
1  xbmc/guilib/GUIDialog.cpp
@@ -27,6 +27,7 @@
#include "utils/TimeUtils.h"
#include "Application.h"
#include "ApplicationMessenger.h"
+#include "Key.h"
CGUIDialog::CGUIDialog(int id, const CStdString &xmlFile)
: CGUIWindow(id, xmlFile)
View
2  xbmc/guilib/GUIDialog.h
@@ -26,7 +26,7 @@
*/
#include "GUIWindow.h"
-#include "Key.h"
+#include "WindowIDs.h"
/*!
\ingroup winmsg
View
1  xbmc/guilib/GUIEditControl.cpp
@@ -24,6 +24,7 @@
#include "GUIKeyboardFactory.h"
#include "dialogs/GUIDialogNumeric.h"
#include "input/XBMC_vkeys.h"
+#include "Key.h"
#include "LocalizeStrings.h"
#include "XBDateTime.h"
#include "utils/md5.h"
View
1  xbmc/guilib/GUIMultiImage.cpp
@@ -27,6 +27,7 @@
#include "settings/Settings.h"
#include "Key.h"
#include "TextureCache.h"
+#include "WindowIDs.h"
using namespace std;
using namespace XFILE;
View
1  xbmc/guilib/GUIToggleButtonControl.cpp
@@ -23,6 +23,7 @@
#include "GUIDialog.h"
#include "utils/CharsetConverter.h"
#include "GUIInfoManager.h"
+#include "Key.h"
using namespace std;
View
3  xbmc/guilib/GUIVideoControl.cpp
@@ -22,6 +22,9 @@
#include "GUIVideoControl.h"
#include "GUIWindowManager.h"
#include "Application.h"
+#include "Key.h"
+#include "WindowIDs.h"
+#include "cores/IPlayer.h"
#ifdef HAS_VIDEO_PLAYBACK
#include "cores/VideoRenderers/RenderManager.h"
#else
View
1  xbmc/guilib/GUIVisualisationControl.cpp
@@ -26,6 +26,7 @@
#include "addons/Visualisation.h"
#include "utils/log.h"
#include "guilib/IRenderingCallback.h"
+#include "Key.h"
using namespace std;
using namespace ADDON;
View
1  xbmc/guilib/GUIWindowManager.cpp
@@ -34,6 +34,7 @@
#include "GUITexture.h"
#include "windowing/WindowingFactory.h"
#include "utils/Variant.h"
+#include "Key.h"
using namespace std;
View
1  xbmc/guilib/GraphicContext.cpp
@@ -33,6 +33,7 @@
#include "GUIWindowManager.h"
#include "utils/JobManager.h"
#include "video/VideoReferenceClock.h"
+#include "cores/IPlayer.h"
using namespace std;
View
140 xbmc/guilib/Key.h
@@ -340,146 +340,6 @@
// system mappings.
#define ACTION_NOOP 999
-// Window ID defines to make the code a bit more readable
-#define WINDOW_INVALID 9999
-#define WINDOW_HOME 10000
-#define WINDOW_PROGRAMS 10001
-#define WINDOW_PICTURES 10002
-#define WINDOW_FILES 10003
-#define WINDOW_SETTINGS_MENU 10004
-#define WINDOW_MUSIC 10005 // virtual window to return the music start window.
-#define WINDOW_VIDEOS 10006
-#define WINDOW_SYSTEM_INFORMATION 10007
-#define WINDOW_TEST_PATTERN 10008
-#define WINDOW_SCREEN_CALIBRATION 10011
-
-#define WINDOW_SETTINGS_START 10012
-#define WINDOW_SETTINGS_MYPICTURES 10012
-#define WINDOW_SETTINGS_MYPROGRAMS 10013
-#define WINDOW_SETTINGS_MYWEATHER 10014
-#define WINDOW_SETTINGS_MYMUSIC 10015
-#define WINDOW_SETTINGS_SYSTEM 10016
-#define WINDOW_SETTINGS_MYVIDEOS 10017
-#define WINDOW_SETTINGS_SERVICE 10018 // former (Eden) WINDOW_SETTINGS_NETWORK
-#define WINDOW_SETTINGS_APPEARANCE 10019
-
-#define WINDOW_SCRIPTS 10020 // virtual window for backward compatibility
-#define WINDOW_SETTINGS_MYPVR 10021
-
-#define WINDOW_VIDEO_FILES 10024
-#define WINDOW_VIDEO_NAV 10025
-#define WINDOW_VIDEO_PLAYLIST 10028
-
-#define WINDOW_LOGIN_SCREEN 10029
-#define WINDOW_SETTINGS_PROFILES 10034
-#define WINDOW_SKIN_SETTINGS 10035
-
-#define WINDOW_ADDON_BROWSER 10040
-
-#define WINDOW_SCREENSAVER_DIM 97
-#define WINDOW_DEBUG_INFO 98
-#define WINDOW_DIALOG_POINTER 10099
-#define WINDOW_DIALOG_YES_NO 10100
-#define WINDOW_DIALOG_PROGRESS 10101
-#define WINDOW_DIALOG_KEYBOARD 10103
-#define WINDOW_DIALOG_VOLUME_BAR 10104
-#define WINDOW_DIALOG_SUB_MENU 10105
-#define WINDOW_DIALOG_CONTEXT_MENU 10106
-#define WINDOW_DIALOG_KAI_TOAST 10107
-#define WINDOW_DIALOG_NUMERIC 10109
-#define WINDOW_DIALOG_GAMEPAD 10110
-#define WINDOW_DIALOG_BUTTON_MENU 10111
-#define WINDOW_DIALOG_MUTE_BUG 10113
-#define WINDOW_DIALOG_PLAYER_CONTROLS 10114
-#define WINDOW_DIALOG_SEEK_BAR 10115
-#define WINDOW_DIALOG_MUSIC_OSD 10120
-#define WINDOW_DIALOG_VIS_SETTINGS 10121
-#define WINDOW_DIALOG_VIS_PRESET_LIST 10122
-#define WINDOW_DIALOG_VIDEO_OSD_SETTINGS 10123
-#define WINDOW_DIALOG_AUDIO_OSD_SETTINGS 10124
-#define WINDOW_DIALOG_VIDEO_BOOKMARKS 10125
-#define WINDOW_DIALOG_FILE_BROWSER 10126
-#define WINDOW_DIALOG_NETWORK_SETUP 10128
-#define WINDOW_DIALOG_MEDIA_SOURCE 10129
-#define WINDOW_DIALOG_PROFILE_SETTINGS 10130
-#define WINDOW_DIALOG_LOCK_SETTINGS 10131
-#define WINDOW_DIALOG_CONTENT_SETTINGS 10132
-#define WINDOW_DIALOG_FAVOURITES 10134
-#define WINDOW_DIALOG_SONG_INFO 10135
-#define WINDOW_DIALOG_SMART_PLAYLIST_EDITOR 10136
-#define WINDOW_DIALOG_SMART_PLAYLIST_RULE 10137
-#define WINDOW_DIALOG_BUSY 10138
-#define WINDOW_DIALOG_PICTURE_INFO 10139
-#define WINDOW_DIALOG_ADDON_SETTINGS 10140
-#define WINDOW_DIALOG_ACCESS_POINTS 10141
-#define WINDOW_DIALOG_FULLSCREEN_INFO 10142
-#define WINDOW_DIALOG_KARAOKE_SONGSELECT 10143
-#define WINDOW_DIALOG_KARAOKE_SELECTOR 10144
-#define WINDOW_DIALOG_SLIDER 10145
-#define WINDOW_DIALOG_ADDON_INFO 10146
-#define WINDOW_DIALOG_TEXT_VIEWER 10147
-#define WINDOW_DIALOG_PLAY_EJECT 10148
-#define WINDOW_DIALOG_PERIPHERAL_MANAGER 10149
-#define WINDOW_DIALOG_PERIPHERAL_SETTINGS 10150
-#define WINDOW_DIALOG_EXT_PROGRESS 10151
-#define WINDOW_DIALOG_MEDIA_FILTER 10152
-
-#define WINDOW_MUSIC_PLAYLIST 10500
-#define WINDOW_MUSIC_FILES 10501
-#define WINDOW_MUSIC_NAV 10502
-#define WINDOW_MUSIC_PLAYLIST_EDITOR 10503
-
-#define WINDOW_DIALOG_OSD_TELETEXT 10600
-
-// PVR related Window and Dialog ID's
-#define WINDOW_PVR 10601
-#define WINDOW_DIALOG_PVR_GUIDE_INFO 10602
-#define WINDOW_DIALOG_PVR_RECORDING_INFO 10603
-#define WINDOW_DIALOG_PVR_TIMER_SETTING 10604
-#define WINDOW_DIALOG_PVR_GROUP_MANAGER 10605
-#define WINDOW_DIALOG_PVR_CHANNEL_MANAGER 10606
-#define WINDOW_DIALOG_PVR_GUIDE_SEARCH 10607
-#define WINDOW_DIALOG_PVR_CHANNEL_SCAN 10608
-#define WINDOW_DIALOG_PVR_UPDATE_PROGRESS 10609
-#define WINDOW_DIALOG_PVR_OSD_CHANNELS 10610
-#define WINDOW_DIALOG_PVR_OSD_GUIDE 10611
-#define WINDOW_DIALOG_PVR_OSD_DIRECTOR 10612
-#define WINDOW_DIALOG_PVR_OSD_CUTTER 10613
-#define WINDOW_FULLSCREEN_LIVETV 10614 // virtual window for PVR specific keymap bindings in fullscreen playback (which internally uses WINDOW_FULLSCREEN_VIDEO)
-// PVR_WINDOW VIEWS = 10694-10699
-
-//#define WINDOW_VIRTUAL_KEYBOARD 11000
-#define WINDOW_DIALOG_SELECT 12000
-#define WINDOW_DIALOG_MUSIC_INFO 12001
-#define WINDOW_DIALOG_OK 12002
-#define WINDOW_DIALOG_VIDEO_INFO 12003
-#define WINDOW_FULLSCREEN_VIDEO 12005
-#define WINDOW_VISUALISATION 12006
-#define WINDOW_SLIDESHOW 12007
-#define WINDOW_DIALOG_FILESTACKING 12008
-#define WINDOW_KARAOKELYRICS 12009
-#define WINDOW_WEATHER 12600
-#define WINDOW_SCREENSAVER 12900
-#define WINDOW_DIALOG_VIDEO_OSD 12901
-
-#define WINDOW_VIDEO_MENU 12902
-#define WINDOW_DIALOG_MUSIC_OVERLAY 12903
-#define WINDOW_DIALOG_VIDEO_OVERLAY 12904
-#define WINDOW_VIDEO_TIME_SEEK 12905 // virtual window for time seeking during fullscreen video
-
-#define WINDOW_START 12998 // first window to load
-#define WINDOW_STARTUP_ANIM 12999 // for startup animations
-
-// WINDOW_ID's from 13000 to 13099 reserved for Python
-
-#define WINDOW_PYTHON_START 13000
-#define WINDOW_PYTHON_END 13099
-
-// WINDOW_ID's from 14000 to 14099 reserved for Addons
-
-#define WINDOW_ADDON_START 14000
-#define WINDOW_ADDON_END 14099
-
#define ICON_TYPE_NONE 101
#define ICON_TYPE_PROGRAMS 102
#define ICON_TYPE_MUSIC 103
View
162 xbmc/guilib/WindowIDs.h
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * http://www.xbmc.org
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * 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
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+// Window ID defines to make the code a bit more readable
+#define WINDOW_INVALID 9999 // do not change. value is used to avoid include in headers.
+#define WINDOW_HOME 10000
+#define WINDOW_PROGRAMS 10001
+#define WINDOW_PICTURES 10002
+#define WINDOW_FILES 10003
+#define WINDOW_SETTINGS_MENU 10004
+#define WINDOW_MUSIC 10005 // virtual window to return the music start window.
+#define WINDOW_VIDEOS 10006
+#define WINDOW_SYSTEM_INFORMATION 10007
+#define WINDOW_TEST_PATTERN 10008
+#define WINDOW_SCREEN_CALIBRATION 10011
+
+#define WINDOW_SETTINGS_START 10012
+#define WINDOW_SETTINGS_MYPICTURES 10012
+#define WINDOW_SETTINGS_MYPROGRAMS 10013
+#define WINDOW_SETTINGS_MYWEATHER 10014
+#define WINDOW_SETTINGS_MYMUSIC 10015
+#define WINDOW_SETTINGS_SYSTEM 10016
+#define WINDOW_SETTINGS_MYVIDEOS 10017
+#define WINDOW_SETTINGS_SERVICE 10018 // former (Eden) WINDOW_SETTINGS_NETWORK
+#define WINDOW_SETTINGS_APPEARANCE 10019
+
+#define WINDOW_SCRIPTS 10020 // virtual window for backward compatibility
+#define WINDOW_SETTINGS_MYPVR 10021
+
+#define WINDOW_VIDEO_FILES 10024
+#define WINDOW_VIDEO_NAV 10025
+#define WINDOW_VIDEO_PLAYLIST 10028
+
+#define WINDOW_LOGIN_SCREEN 10029
+#define WINDOW_SETTINGS_PROFILES 10034
+#define WINDOW_SKIN_SETTINGS 10035
+
+#define WINDOW_ADDON_BROWSER 10040
+
+#define WINDOW_SCREENSAVER_DIM 97
+#define WINDOW_DEBUG_INFO 98
+#define WINDOW_DIALOG_POINTER 10099
+#define WINDOW_DIALOG_YES_NO 10100
+#define WINDOW_DIALOG_PROGRESS 10101
+#define WINDOW_DIALOG_KEYBOARD 10103
+#define WINDOW_DIALOG_VOLUME_BAR 10104
+#define WINDOW_DIALOG_SUB_MENU 10105
+#define WINDOW_DIALOG_CONTEXT_MENU 10106
+#define WINDOW_DIALOG_KAI_TOAST 10107
+#define WINDOW_DIALOG_NUMERIC 10109
+#define WINDOW_DIALOG_GAMEPAD 10110
+#define WINDOW_DIALOG_BUTTON_MENU 10111
+#define WINDOW_DIALOG_MUTE_BUG 10113
+#define WINDOW_DIALOG_PLAYER_CONTROLS 10114
+#define WINDOW_DIALOG_SEEK_BAR 10115
+#define WINDOW_DIALOG_MUSIC_OSD 10120
+#define WINDOW_DIALOG_VIS_SETTINGS 10121
+#define WINDOW_DIALOG_VIS_PRESET_LIST 10122
+#define WINDOW_DIALOG_VIDEO_OSD_SETTINGS 10123
+#define WINDOW_DIALOG_AUDIO_OSD_SETTINGS 10124
+#define WINDOW_DIALOG_VIDEO_BOOKMARKS 10125
+#define WINDOW_DIALOG_FILE_BROWSER 10126
+#define WINDOW_DIALOG_NETWORK_SETUP 10128
+#define WINDOW_DIALOG_MEDIA_SOURCE 10129
+#define WINDOW_DIALOG_PROFILE_SETTINGS 10130
+#define WINDOW_DIALOG_LOCK_SETTINGS 10131
+#define WINDOW_DIALOG_CONTENT_SETTINGS 10132
+#define WINDOW_DIALOG_FAVOURITES 10134
+#define WINDOW_DIALOG_SONG_INFO 10135
+#define WINDOW_DIALOG_SMART_PLAYLIST_EDITOR 10136
+#define WINDOW_DIALOG_SMART_PLAYLIST_RULE 10137
+#define WINDOW_DIALOG_BUSY 10138
+#define WINDOW_DIALOG_PICTURE_INFO 10139
+#define WINDOW_DIALOG_ADDON_SETTINGS 10140
+#define WINDOW_DIALOG_ACCESS_POINTS 10141
+#define WINDOW_DIALOG_FULLSCREEN_INFO 10142
+#define WINDOW_DIALOG_KARAOKE_SONGSELECT 10143
+#define WINDOW_DIALOG_KARAOKE_SELECTOR 10144
+#define WINDOW_DIALOG_SLIDER 10145
+#define WINDOW_DIALOG_ADDON_INFO 10146
+#define WINDOW_DIALOG_TEXT_VIEWER 10147
+#define WINDOW_DIALOG_PLAY_EJECT 10148
+#define WINDOW_DIALOG_PERIPHERAL_MANAGER 10149
+#define WINDOW_DIALOG_PERIPHERAL_SETTINGS 10150
+#define WINDOW_DIALOG_EXT_PROGRESS 10151
+#define WINDOW_DIALOG_MEDIA_FILTER 10152
+
+#define WINDOW_MUSIC_PLAYLIST 10500
+#define WINDOW_MUSIC_FILES 10501
+#define WINDOW_MUSIC_NAV 10502
+#define WINDOW_MUSIC_PLAYLIST_EDITOR 10503
+
+#define WINDOW_DIALOG_OSD_TELETEXT 10600
+
+// PVR related Window and Dialog ID's
+#define WINDOW_PVR 10601
+#define WINDOW_DIALOG_PVR_GUIDE_INFO 10602
+#define WINDOW_DIALOG_PVR_RECORDING_INFO 10603
+#define WINDOW_DIALOG_PVR_TIMER_SETTING 10604
+#define WINDOW_DIALOG_PVR_GROUP_MANAGER 10605
+#define WINDOW_DIALOG_PVR_CHANNEL_MANAGER 10606
+#define WINDOW_DIALOG_PVR_GUIDE_SEARCH 10607
+#define WINDOW_DIALOG_PVR_CHANNEL_SCAN 10608
+#define WINDOW_DIALOG_PVR_UPDATE_PROGRESS 10609
+#define WINDOW_DIALOG_PVR_OSD_CHANNELS 10610
+#define WINDOW_DIALOG_PVR_OSD_GUIDE 10611
+#define WINDOW_DIALOG_PVR_OSD_DIRECTOR 10612
+#define WINDOW_DIALOG_PVR_OSD_CUTTER 10613
+#define WINDOW_FULLSCREEN_LIVETV 10614 // virtual window for PVR specific keymap bindings in fullscreen playback (which internally uses WINDOW_FULLSCREEN_VIDEO)
+// PVR_WINDOW VIEWS = 10694-10699
+
+//#define WINDOW_VIRTUAL_KEYBOARD 11000
+#define WINDOW_DIALOG_SELECT 12000
+#define WINDOW_DIALOG_MUSIC_INFO 12001
+#define WINDOW_DIALOG_OK 12002
+#define WINDOW_DIALOG_VIDEO_INFO 12003
+#define WINDOW_FULLSCREEN_VIDEO 12005
+#define WINDOW_VISUALISATION 12006
+#define WINDOW_SLIDESHOW 12007
+#define WINDOW_DIALOG_FILESTACKING 12008
+#define WINDOW_KARAOKELYRICS 12009
+#define WINDOW_WEATHER 12600
+#define WINDOW_SCREENSAVER 12900
+#define WINDOW_DIALOG_VIDEO_OSD 12901
+
+#define WINDOW_VIDEO_MENU 12902
+#define WINDOW_DIALOG_MUSIC_OVERLAY 12903
+#define WINDOW_DIALOG_VIDEO_OVERLAY 12904
+#define WINDOW_VIDEO_TIME_SEEK 12905 // virtual window for time seeking during fullscreen video
+
+#define WINDOW_START 12998 // first window to load
+#define WINDOW_STARTUP_ANIM 12999 // for startup animations
+
+// WINDOW_ID's from 13000 to 13099 reserved for Python
+
+#define WINDOW_PYTHON_START 13000
+#define WINDOW_PYTHON_END 13099
+
+// WINDOW_ID's from 14000 to 14099 reserved for Addons
+
+#define WINDOW_ADDON_START 14000
+#define WINDOW_ADDON_END 14099
+
View
3  xbmc/input/ButtonTranslator.cpp
@@ -24,6 +24,7 @@
#include "utils/URIUtils.h"
#include "settings/Settings.h"
#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#include "input/XBMC_keysym.h"
#include "input/XBMC_keytable.h"
#include "filesystem/File.h"
@@ -1360,7 +1361,7 @@ uint32_t CButtonTranslator::TranslateKeyboardButton(TiXmlElement *pButton)
const char *str = strID.c_str();
char *endptr;
long int id = strtol(str, &endptr, 0);
- if (endptr - str != strlen(str) || id <= 0 || id > 0x00FFFFFF)
+ if (endptr - str != (int)strlen(str) || id <= 0 || id > 0x00FFFFFF)
CLog::Log(LOGDEBUG, "%s - invalid key id %s", __FUNCTION__, strID.c_str());
else
button_id = (uint32_t) id;
View
2  xbmc/interfaces/Builtins.cpp
@@ -31,6 +31,7 @@
#include "addons/GUIDialogAddonSettings.h"
#include "dialogs/GUIDialogFileBrowser.h"
#include "guilib/GUIKeyboardFactory.h"
+#include "guilib/Key.h"
#include "dialogs/GUIDialogKaiToast.h"
#include "dialogs/GUIDialogNumeric.h"
#include "dialogs/GUIDialogProgress.h"
@@ -53,6 +54,7 @@
#include "Util.h"
#include "URL.h"
#include "music/MusicDatabase.h"
+#include "cores/IPlayer.h"
#include "filesystem/PluginDirectory.h"
#ifdef HAS_FILESYSTEM_RAR
View
1  xbmc/interfaces/json-rpc/GUIOperations.cpp
@@ -23,6 +23,7 @@
#include "ApplicationMessenger.h"
#include "GUIInfoManager.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "interfaces/Builtins.h"
#include "dialogs/GUIDialogKaiToast.h"
#include "addons/AddonManager.h"
View
2  xbmc/interfaces/json-rpc/PlayerOperations.cpp
@@ -24,6 +24,7 @@
#include "PlayListPlayer.h"
#include "playlists/PlayList.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "GUIUserMessages.h"
#include "pictures/GUIWindowSlideShow.h"
#include "interfaces/Builtins.h"
@@ -41,6 +42,7 @@
#include "pvr/PVRManager.h"
#include "pvr/channels/PVRChannel.h"
#include "pvr/channels/PVRChannelGroupsContainer.h"
+#include "cores/IPlayer.h"
using namespace JSONRPC;
using namespace PLAYLIST;
View
1  xbmc/interfaces/json-rpc/PlaylistOperations.cpp
@@ -23,6 +23,7 @@
#include "PlayListPlayer.h"
#include "Util.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "GUIUserMessages.h"
#include "ApplicationMessenger.h"
#include "pictures/GUIWindowSlideShow.h"
View
2  xbmc/interfaces/legacy/Player.cpp
@@ -30,6 +30,7 @@
#include "AddonUtils.h"
#include "utils/LangCodeExpander.h"
#include "utils/log.h"
+#include "cores/IPlayer.h"
namespace XBMCAddon
{
@@ -395,7 +396,6 @@ namespace XBMCAddon
{
SPlayerSubtitleStreamInfo info;
g_application.m_pPlayer->GetSubtitleStreamInfo(g_application.m_pPlayer->GetSubtitle(), info);
- int i = g_application.m_pPlayer->GetSubtitle();
CStdString strName = info.name;
if (strName == "Unknown(Invalid)")
View
2  xbmc/interfaces/python/Makefile.in
@@ -1,5 +1,3 @@
-INCLUDES=-I../../.. -I. -I../../ -I../../linux -I../../../guilib -I.
-
ifeq (@USE_DOXYGEN@,1)
DOXYGEN=@DOXYGEN_EXE@
endif
View
4 xbmc/interfaces/python/XBPython.h
@@ -22,7 +22,7 @@
*/
#include "XBPyThread.h"
-#include "cores/IPlayer.h"
+#include "cores/IPlayerCallback.h"
#include "threads/CriticalSection.h"
#include "interfaces/IAnnouncer.h"
#include "addons/IAddon.h"
@@ -50,7 +50,7 @@ namespace XBMCAddon
template <class T> struct LockableType : public T, public CCriticalSection
{ bool hadSomethingRemoved; };
-typedef LockableType<std::vector<PVOID> > PlayerCallbackList;
+typedef LockableType<std::vector<void*> > PlayerCallbackList;
typedef LockableType<std::vector<XBMCAddon::xbmc::Monitor*> > MonitorCallbackList;
typedef LockableType<std::vector<PyElem> > PyList;
typedef std::vector<LibraryLoader*> PythonExtensionLibraries;
View
2  xbmc/music/GUIViewStateMusic.cpp
@@ -25,7 +25,7 @@
#include "settings/AdvancedSettings.h"
#include "settings/Settings.h"
#include "FileItem.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#include "Util.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
View
1  xbmc/music/dialogs/GUIDialogMusicInfo.cpp
@@ -33,6 +33,7 @@
#include "settings/Settings.h"
#include "settings/AdvancedSettings.h"
#include "settings/GUISettings.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
#include "utils/URIUtils.h"
View
1  xbmc/music/dialogs/GUIDialogMusicOSD.cpp
@@ -20,6 +20,7 @@
#include "GUIDialogMusicOSD.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "input/MouseStat.h"
#include "GUIUserMessages.h"
#include "settings/Settings.h"
View
1  xbmc/music/dialogs/GUIDialogMusicOverlay.cpp
@@ -20,6 +20,7 @@
#include "GUIDialogMusicOverlay.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "input/MouseStat.h"
#define CONTROL_LOGO_PIC 1
View
1  xbmc/music/dialogs/GUIDialogSongInfo.cpp
@@ -28,6 +28,7 @@
#include "music/windows/GUIWindowMusicBase.h"
#include "music/tags/MusicInfoTag.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "filesystem/File.h"
#include "filesystem/CurlFile.h"
#include "FileItem.h"
View
1  xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp
@@ -24,6 +24,7 @@
#include "guilib/GUIListContainer.h"
#include "GUIUserMessages.h"
#include "FileItem.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#define CONTROL_LIST 2
View
1  xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp
@@ -21,6 +21,7 @@
#include "GUIDialogKaraokeSongSelector.h"
#include "PlayListPlayer.h"
#include "playlists/PlayList.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
View
1  xbmc/music/karaoke/GUIWindowKaraokeLyrics.cpp
@@ -20,6 +20,7 @@
#include "Application.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "settings/AdvancedSettings.h"
#include "GUIDialogKaraokeSongSelector.h"
View
2  xbmc/music/karaoke/karaokewindowbackground.h
@@ -23,7 +23,7 @@
// C++ Interface: karaokewindowbackground
-#include "cores/IPlayer.h"
+#include "cores/IPlayerCallback.h"
class CGUIWindow;
class CGUIImage;
View
2  xbmc/music/windows/GUIWindowMusicBase.cpp
@@ -46,6 +46,7 @@
#include "dialogs/GUIDialogSmartPlaylistEditor.h"
#include "music/tags/MusicInfoTag.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "dialogs/GUIDialogOK.h"
#include "dialogs/GUIDialogYesNo.h"
#include "guilib/GUIKeyboardFactory.h"
@@ -64,6 +65,7 @@
#include "utils/StringUtils.h"
#include "URL.h"
#include "music/infoscanner/MusicInfoScanner.h"
+#include "cores/IPlayer.h"
using namespace std;
using namespace XFILE;
View
1  xbmc/music/windows/GUIWindowMusicNav.cpp
@@ -35,6 +35,7 @@
#include "guilib/GUIWindowManager.h"
#include "dialogs/GUIDialogOK.h"
#include "guilib/GUIKeyboardFactory.h"
+#include "guilib/Key.h"
#include "dialogs/GUIDialogYesNo.h"
#include "guilib/GUIEditControl.h"
#include "GUIUserMessages.h"
View
1  xbmc/music/windows/GUIWindowMusicPlaylist.cpp
@@ -29,6 +29,7 @@
#include "music/tags/MusicInfoTag.h"
#include "guilib/GUIWindowManager.h"
#include "guilib/GUIKeyboardFactory.h"
+#include "guilib/Key.h"
#include "GUIUserMessages.h"
#include "Favourites.h"
#include "settings/Settings.h"
View
1  xbmc/music/windows/GUIWindowMusicPlaylistEditor.cpp
@@ -34,6 +34,7 @@
#include "FileItem.h"
#include "settings/GUISettings.h"
#include "GUIUserMessages.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#define CONTROL_LABELFILES 12
View
2  xbmc/music/windows/GUIWindowMusicSongs.cpp
@@ -32,11 +32,13 @@
#include "storage/MediaManager.h"
#include "settings/Settings.h"
#include "settings/GUISettings.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
#include "utils/URIUtils.h"
#include "Autorun.h"
#include "cdrip/CDDARipper.h"
+#include "cores/IPlayer.h"
#define CONTROL_BTNVIEWASICONS 2
#define CONTROL_BTNSORTBY 3
View
1  xbmc/music/windows/GUIWindowVisualisation.cpp
@@ -25,6 +25,7 @@
#include "GUIInfoManager.h"
#include "music/dialogs/GUIDialogVisualisationPresetList.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "settings/Settings.h"
#include "settings/AdvancedSettings.h"
View
1  xbmc/network/AirPlayServer.cpp
@@ -37,6 +37,7 @@
#include "utils/Variant.h"
#include "guilib/GUIWindowManager.h"
#include "URL.h"
+#include "cores/IPlayer.h"
#ifdef TARGET_WINDOWS
#define close closesocket
View
1  xbmc/network/EventClient.cpp
@@ -34,6 +34,7 @@
#include "utils/TimeUtils.h"
#include "dialogs/GUIDialogKaiToast.h"
#include "guilib/GraphicContext.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
using namespace EVENTCLIENT;
View
1  xbmc/network/EventServer.cpp
@@ -34,6 +34,7 @@
#include "threads/SingleLock.h"
#include "Zeroconf.h"
#include "guilib/GUIAudioManager.h"
+#include "guilib/Key.h"
#include <map>
#include <queue>
View
1  xbmc/network/GUIDialogAccessPoints.cpp
@@ -25,6 +25,7 @@
#endif
#include "Application.h"
#include "FileItem.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#define CONTROL_ACCESS_POINTS 3
View
1  xbmc/network/upnp/UPnPRenderer.cpp
@@ -9,6 +9,7 @@
#include "filesystem/SpecialProtocol.h"
#include "GUIInfoManager.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "pictures/GUIWindowSlideShow.h"
#include "pictures/PictureInfoTag.h"
#include "interfaces/AnnouncementManager.h"
View
2  xbmc/network/upnp/UPnPServer.cpp
@@ -11,7 +11,7 @@
#include "filesystem/MusicDatabaseDirectory.h"
#include "filesystem/SpecialProtocol.h"
#include "filesystem/VideoDatabaseDirectory.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#include "music/tags/MusicInfoTag.h"
#include "settings/GUISettings.h"
#include "utils/log.h"
View
1  xbmc/pictures/GUIDialogPictureInfo.cpp
@@ -22,6 +22,7 @@
#include "GUIInfoManager.h"
#include "guilib/GUIWindowManager.h"
#include "FileItem.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "PictureInfoTag.h"
View
2  xbmc/pictures/GUIViewStatePictures.cpp
@@ -27,7 +27,7 @@
#include "filesystem/Directory.h"
#include "filesystem/PluginDirectory.h"
#include "guilib/LocalizeStrings.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
using namespace XFILE;
using namespace ADDON;
View
1  xbmc/pictures/GUIWindowPictures.cpp
@@ -32,6 +32,7 @@
#include "playlists/PlayListFactory.h"
#include "PictureInfoLoader.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "dialogs/GUIDialogOK.h"
#include "dialogs/GUIDialogYesNo.h"
#include "playlists/PlayList.h"
View
1  xbmc/pictures/GUIWindowSlideShow.cpp
@@ -27,6 +27,7 @@
#include "URL.h"
#include "guilib/TextureManager.h"
#include "guilib/GUILabelControl.h"
+#include "guilib/Key.h"
#include "GUIInfoManager.h"
#include "filesystem/Directory.h"
#include "GUIDialogPictureInfo.h"
View
2  xbmc/programs/GUIViewStatePrograms.cpp
@@ -25,7 +25,7 @@
#include "settings/Settings.h"
#include "filesystem/Directory.h"
#include "guilib/LocalizeStrings.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
using namespace XFILE;
using namespace ADDON;
View
1  xbmc/programs/GUIWindowPrograms.cpp
@@ -26,6 +26,7 @@
#include "guilib/GUIWindowManager.h"
#include "FileItem.h"
#include "settings/Settings.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
View
1  xbmc/pvr/addons/PVRClients.cpp
@@ -34,6 +34,7 @@
#include "pvr/channels/PVRChannelGroupInternal.h"
#include "pvr/recordings/PVRRecordings.h"
#include "pvr/timers/PVRTimers.h"
+#include "cores/IPlayer.h"
#ifdef HAS_VIDEO_PLAYBACK
#include "cores/VideoRenderers/RenderManager.h"
View
1  xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
@@ -32,6 +32,7 @@
#include "guilib/GUIRadioButtonControl.h"
#include "guilib/GUISpinControlEx.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "pvr/PVRManager.h"
#include "pvr/channels/PVRChannelGroupsContainer.h"
View
2  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
@@ -23,6 +23,7 @@
#include "ApplicationMessenger.h"
#include "FileItem.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "dialogs/GUIDialogKaiToast.h"
#include "dialogs/GUIDialogOK.h"
@@ -30,6 +31,7 @@
#include "view/ViewState.h"
#include "settings/GUISettings.h"
#include "GUIInfoManager.h"
+#include "cores/IPlayer.h"
#include "pvr/PVRManager.h"
#include "pvr/channels/PVRChannelGroupsContainer.h"
View
1  xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
@@ -25,6 +25,7 @@
#include "dialogs/GUIDialogOK.h"
#include "dialogs/GUIDialogYesNo.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "pvr/PVRManager.h"
View
1  xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
@@ -23,6 +23,7 @@
#include "FileItem.h"
#include "GUIDialogPVRGuideInfo.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "view/ViewState.h"
#include "epg/Epg.h"
View
1  xbmc/pvr/windows/GUIWindowPVRChannels.cpp
@@ -27,6 +27,7 @@
#include "dialogs/GUIDialogYesNo.h"
#include "guilib/GUIKeyboardFactory.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "GUIInfoManager.h"
#include "pvr/PVRManager.h"
#include "pvr/channels/PVRChannelGroupsContainer.h"
View
2  xbmc/pvr/windows/GUIWindowPVRCommon.cpp
@@ -28,6 +28,7 @@
#include "filesystem/StackDirectory.h"
#include "guilib/GUIMessage.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "pvr/PVRManager.h"
#include "pvr/channels/PVRChannelGroupsContainer.h"
@@ -45,6 +46,7 @@
#include "utils/log.h"
#include "utils/URIUtils.h"
#include "GUIUserMessages.h"
+#include "cores/IPlayer.h"
using namespace std;
using namespace PVR;
View
1  xbmc/pvr/windows/GUIWindowPVRGuide.cpp
@@ -23,6 +23,7 @@
#include "Application.h"
#include "dialogs/GUIDialogOK.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "pvr/PVRManager.h"
#include "pvr/channels/PVRChannelGroupsContainer.h"
#include "epg/EpgContainer.h"
View
1  xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
@@ -23,6 +23,7 @@
#include "guilib/GUIKeyboardFactory.h"
#include "dialogs/GUIDialogYesNo.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "GUIInfoManager.h"
#include "pvr/PVRManager.h"
View
1  xbmc/pvr/windows/GUIWindowPVRSearch.cpp
@@ -23,6 +23,7 @@
#include "dialogs/GUIDialogOK.h"
#include "dialogs/GUIDialogProgress.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "pvr/PVRManager.h"
#include "pvr/channels/PVRChannelGroupsContainer.h"
#include "pvr/dialogs/GUIDialogPVRGuideSearch.h"
View
1  xbmc/pvr/windows/GUIWindowPVRTimers.cpp
@@ -24,6 +24,7 @@
#include "dialogs/GUIDialogOK.h"
#include "dialogs/GUIDialogYesNo.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "pvr/PVRManager.h"
#include "pvr/timers/PVRTimers.h"
#include "pvr/addons/PVRClients.h"
View
1  xbmc/settings/dialogs/GUIDialogContentSettings.cpp
@@ -22,6 +22,7 @@
#include "addons/GUIDialogAddonSettings.h"
#include "settings/GUISettings.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "addons/IAddon.h"
#include "FileItem.h"
#include "video/VideoDatabase.h"
View
2  xbmc/settings/windows/GUIWindowSettings.cpp
@@ -20,7 +20,7 @@
#include "system.h"
#include "GUIWindowSettings.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
CGUIWindowSettings::CGUIWindowSettings(void)
: CGUIWindow(WINDOW_SETTINGS_MENU, "Settings.xml")
View
1  xbmc/settings/windows/GUIWindowSettingsProfile.cpp
@@ -33,6 +33,7 @@
#include "filesystem/Directory.h"
#include "FileItem.h"
#include "settings/Settings.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
using namespace XFILE;
View
1  xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
@@ -30,6 +30,7 @@
#include "settings/GUISettings.h"
#include "guilib/GUIWindowManager.h"
#include "dialogs/GUIDialogYesNo.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
#include "windowing/WindowingFactory.h"
View
1  xbmc/settings/windows/GUIWindowTestPattern.cpp
@@ -24,6 +24,7 @@
#include "settings/Settings.h"
#include "guilib/GUIWindowManager.h"
#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
CGUIWindowTestPattern::CGUIWindowTestPattern(void)
: CGUIWindow(WINDOW_TEST_PATTERN, "")
View
2  xbmc/utils/RecentlyAddedJob.cpp
@@ -25,7 +25,7 @@
#include "RecentlyAddedJob.h"
#include "guilib/GUIWindow.h"
#include "guilib/GUIWindowManager.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#include "music/MusicDatabase.h"
#include "music/tags/MusicInfoTag.h"
#include "settings/Settings.h"
View
1  xbmc/utils/Weather.cpp
@@ -34,6 +34,7 @@
#include "GUIUserMessages.h"
#include "XBDateTime.h"
#include "LangInfo.h"
+#include "guilib/WindowIDs.h"
#include "guilib/LocalizeStrings.h"
#include "filesystem/Directory.h"
#include "StringUtils.h"