Permalink
Browse files

allow fullscreen actions such as next subtitle, audio stream, audio/s…

…ubs delay etc. to be handled in other places
  • Loading branch information...
Jonathan Marshall
Jonathan Marshall committed Oct 15, 2012
1 parent ed0775a commit 8fcb671e0d253f8d85bd8eaa66a0f84e554c3117
@@ -41,6 +41,7 @@
7C6EB586155E3EC80080368A /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C6EB584155E3EC80080368A /* ImageFile.cpp */; };
7C6EB708155F3B160080368A /* HTTPImageHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C6EB706155F3B160080368A /* HTTPImageHandler.cpp */; };
7C7CEB4B165629BF0059C9EB /* AELimiter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7CEB49165629BF0059C9EB /* AELimiter.cpp */; };
+ 7C87B2EE162CE3F400EF897D /* PlayerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C87B2EC162CE3F400EF897D /* PlayerController.cpp */; };
7C89627013B702F3003631FE /* GUIWindowScreensaverDim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C89626E13B702F3003631FE /* GUIWindowScreensaverDim.cpp */; };
7C99B7AA134072CD00FC2B16 /* GUIDialogPlayEject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B7A8134072CD00FC2B16 /* GUIDialogPlayEject.cpp */; };
7CC30DF2162925BE003E7579 /* MusicThumbLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC30DF0162925BE003E7579 /* MusicThumbLoader.cpp */; };
@@ -1107,6 +1108,8 @@
7C6EB707155F3B160080368A /* HTTPImageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPImageHandler.h; sourceTree = "<group>"; };
7C7CEB49165629BF0059C9EB /* AELimiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AELimiter.cpp; sourceTree = "<group>"; };
7C7CEB4A165629BF0059C9EB /* AELimiter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AELimiter.h; sourceTree = "<group>"; };
+ 7C87B2EC162CE3F400EF897D /* PlayerController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerController.cpp; sourceTree = "<group>"; };
+ 7C87B2ED162CE3F400EF897D /* PlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerController.h; sourceTree = "<group>"; };
7C89626E13B702F3003631FE /* GUIWindowScreensaverDim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowScreensaverDim.cpp; sourceTree = "<group>"; };
7C89626F13B702F3003631FE /* GUIWindowScreensaverDim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowScreensaverDim.h; sourceTree = "<group>"; };
7C99B7A8134072CD00FC2B16 /* GUIDialogPlayEject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPlayEject.cpp; sourceTree = "<group>"; };
@@ -5934,6 +5937,8 @@
DF07255416873565008DCAAD /* FFmpegVideoDecoder.h */,
F56C779C131EC154000AD0F6 /* GUIViewStateVideo.cpp */,
F56C779D131EC154000AD0F6 /* GUIViewStateVideo.h */,
+ 7C87B2EC162CE3F400EF897D /* PlayerController.cpp */,
+ 7C87B2ED162CE3F400EF897D /* PlayerController.h */,
F56C779E131EC154000AD0F6 /* Teletext.cpp */,
F56C779F131EC154000AD0F6 /* Teletext.h */,
F56C77A0131EC154000AD0F6 /* TeletextDefines.h */,
@@ -7733,6 +7738,7 @@
DF28EDEB170E1ACF005FA9D2 /* ProfilesManager.cpp in Sources */,
DF28EDEC170E1ACF005FA9D2 /* GUIWindowSettingsProfile.cpp in Sources */,
DF28EE16170E1E8D005FA9D2 /* DisplaySettings.cpp in Sources */,
+ 7C87B2EE162CE3F400EF897D /* PlayerController.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -45,6 +45,7 @@
7C6EB570155E3E680080368A /* ImageFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C6EB56E155E3E680080368A /* ImageFile.cpp */; };
7C6EB71A155F3B330080368A /* HTTPImageHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C6EB718155F3B330080368A /* HTTPImageHandler.cpp */; };
7C7CEB5F165629F90059C9EB /* AELimiter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7CEB5D165629F90059C9EB /* AELimiter.cpp */; };
+ 7C87B2DA162CE3C300EF897D /* PlayerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C87B2D8162CE3C300EF897D /* PlayerController.cpp */; };
7C89628013B7031E003631FE /* GUIWindowScreensaverDim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C89627E13B7031E003631FE /* GUIWindowScreensaverDim.cpp */; };
7C99B7BE1340730000FC2B16 /* GUIDialogPlayEject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B7BC1340730000FC2B16 /* GUIDialogPlayEject.cpp */; };
7CC30E04162925E6003E7579 /* MusicThumbLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC30E02162925E6003E7579 /* MusicThumbLoader.cpp */; };
@@ -1124,6 +1125,8 @@
7C6EB719155F3B330080368A /* HTTPImageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPImageHandler.h; sourceTree = "<group>"; };
7C7CEB5D165629F90059C9EB /* AELimiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AELimiter.cpp; sourceTree = "<group>"; };
7C7CEB5E165629F90059C9EB /* AELimiter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AELimiter.h; sourceTree = "<group>"; };
+ 7C87B2D8162CE3C300EF897D /* PlayerController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerController.cpp; sourceTree = "<group>"; };
+ 7C87B2D9162CE3C300EF897D /* PlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerController.h; sourceTree = "<group>"; };
7C89627E13B7031E003631FE /* GUIWindowScreensaverDim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowScreensaverDim.cpp; sourceTree = "<group>"; };
7C89627F13B7031E003631FE /* GUIWindowScreensaverDim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowScreensaverDim.h; sourceTree = "<group>"; };
7C99B7BC1340730000FC2B16 /* GUIDialogPlayEject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPlayEject.cpp; sourceTree = "<group>"; };
@@ -6347,6 +6350,8 @@
DF0725431687352C008DCAAD /* FFmpegVideoDecoder.h */,
F56C878B131F42EC000AD0F6 /* GUIViewStateVideo.cpp */,
F56C878C131F42EC000AD0F6 /* GUIViewStateVideo.h */,
+ 7C87B2D8162CE3C300EF897D /* PlayerController.cpp */,
+ 7C87B2D9162CE3C300EF897D /* PlayerController.h */,
F56C878D131F42EC000AD0F6 /* Teletext.cpp */,
F56C878E131F42EC000AD0F6 /* Teletext.h */,
F56C878F131F42EC000AD0F6 /* TeletextDefines.h */,
@@ -7804,6 +7809,7 @@
DF28EDC8170E1A92005FA9D2 /* ProfilesManager.cpp in Sources */,
DF28EDC9170E1A92005FA9D2 /* GUIWindowSettingsProfile.cpp in Sources */,
DF28EE0C170E1E78005FA9D2 /* DisplaySettings.cpp in Sources */,
+ 7C87B2DA162CE3C300EF897D /* PlayerController.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -268,6 +268,7 @@
7C7B2B301134F36400713D6D /* mysqldataset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7B2B2E1134F36400713D6D /* mysqldataset.cpp */; };
7C7CEAF1165629530059C9EB /* AELimiter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7CEAEF165629530059C9EB /* AELimiter.cpp */; };
7C84A59E12FA3C1600CD1714 /* SourcesDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */; };
+ 7C87B2CE162CE39600EF897D /* PlayerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C87B2CC162CE39600EF897D /* PlayerController.cpp */; };
7C89619213B6A16F003631FE /* GUIWindowScreensaverDim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C89619013B6A16F003631FE /* GUIWindowScreensaverDim.cpp */; };
7C89674613C03B22003631FE /* InfoBool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C89674313C03B22003631FE /* InfoBool.cpp */; };
7C8A14571154CB2600E5FCFA /* TextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C8A14541154CB2600E5FCFA /* TextureCache.cpp */; };
@@ -1608,6 +1609,8 @@
7C7CEAF0165629530059C9EB /* AELimiter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AELimiter.h; sourceTree = "<group>"; };
7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesDirectory.cpp; path = xbmc/filesystem/SourcesDirectory.cpp; sourceTree = SOURCE_ROOT; };
7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourcesDirectory.h; path = xbmc/filesystem/SourcesDirectory.h; sourceTree = SOURCE_ROOT; };
+ 7C87B2CC162CE39600EF897D /* PlayerController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerController.cpp; sourceTree = "<group>"; };
+ 7C87B2CD162CE39600EF897D /* PlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerController.h; sourceTree = "<group>"; };
7C89619013B6A16F003631FE /* GUIWindowScreensaverDim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowScreensaverDim.cpp; sourceTree = "<group>"; };
7C89619113B6A16F003631FE /* GUIWindowScreensaverDim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowScreensaverDim.h; sourceTree = "<group>"; };
7C89674313C03B22003631FE /* InfoBool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InfoBool.cpp; sourceTree = "<group>"; };
@@ -4163,6 +4166,8 @@
DF072533168734ED008DCAAD /* FFmpegVideoDecoder.h */,
E38E17FF0D25F9FA00618676 /* GUIViewStateVideo.cpp */,
E38E18000D25F9FA00618676 /* GUIViewStateVideo.h */,
+ 7C87B2CC162CE39600EF897D /* PlayerController.cpp */,
+ 7C87B2CD162CE39600EF897D /* PlayerController.h */,
F5E55B6E10741340006E788A /* Teletext.cpp */,
F5E55B6D10741340006E788A /* Teletext.h */,
F5E55B6F10741340006E788A /* TeletextDefines.h */,
@@ -7804,6 +7809,7 @@
DF28EDA7170E1A11005FA9D2 /* ProfilesManager.cpp in Sources */,
DF28EDA8170E1A11005FA9D2 /* GUIWindowSettingsProfile.cpp in Sources */,
DF28EE03170E1E51005FA9D2 /* DisplaySettings.cpp in Sources */,
+ 7C87B2CE162CE39600EF897D /* PlayerController.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1269,6 +1269,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\xbmc\utils\Vector.cpp" />
+ <ClCompile Include="..\..\xbmc\video\PlayerController.cpp" />
<ClCompile Include="..\..\xbmc\video\VideoThumbLoader.cpp" />
<ClCompile Include="..\..\xbmc\music\MusicThumbLoader.cpp" />
<ClCompile Include="..\..\xbmc\ThumbnailCache.cpp" />
@@ -2406,6 +2407,7 @@
<ClInclude Include="..\..\xbmc\TextureDatabase.h" />
<ClInclude Include="..\..\xbmc\DatabaseManager.h" />
<ClInclude Include="..\..\xbmc\ThumbLoader.h" />
+ <ClInclude Include="..\..\xbmc\video\PlayerController.h" />
<ClInclude Include="..\..\xbmc\video\VideoThumbLoader.h" />
<ClInclude Include="..\..\xbmc\music\MusicThumbLoader.h" />
<ClInclude Include="..\..\xbmc\ThumbnailCache.h" />
@@ -3018,6 +3018,9 @@
<ClCompile Include="..\..\xbmc\utils\Vector.cpp">
<Filter>utils</Filter>
</ClCompile>
+ <ClCompile Include="..\..\xbmc\video\PlayerController.cpp">
+ <Filter>video</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\xbmc\win32\pch.h">
@@ -5900,6 +5903,9 @@
<ClInclude Include="..\..\xbmc\utils\Vector.h">
<Filter>utils</Filter>
</ClInclude>
+ <ClInclude Include="..\..\xbmc\video\PlayerController.h">
+ <Filter>video</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
View
@@ -214,6 +214,7 @@
#include "music/dialogs/GUIDialogMusicOverlay.h"
#include "video/dialogs/GUIDialogVideoOverlay.h"
#include "video/VideoInfoScanner.h"
+#include "video/PlayerController.h"
// Dialog includes
#include "music/dialogs/GUIDialogMusicOSD.h"
@@ -393,6 +394,7 @@ CApplication::CApplication(void)
, m_videoInfoScanner(new CVideoInfoScanner)
, m_musicInfoScanner(new CMusicInfoScanner)
, m_seekHandler(new CSeekHandler)
+ , m_playerController(new CPlayerController)
{
m_network = NULL;
TiXmlBase::SetCondenseWhiteSpace(false);
@@ -474,6 +476,7 @@ CApplication::~CApplication(void)
delete m_dpms;
delete m_seekHandler;
+ delete m_playerController;
delete m_pInertialScrollingHandler;
}
@@ -2878,6 +2881,9 @@ bool CApplication::OnAction(const CAction &action)
return true;
}
}
+
+ if (m_playerController->OnAction(action))
+ return true;
}
View
@@ -44,6 +44,7 @@ namespace MEDIA_DETECT
{
class CAutorun;
}
+class CPlayerController;
#include "cores/IPlayerCallback.h"
#include "cores/playercorefactory/PlayerCoreFactory.h"
@@ -468,6 +469,7 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs
void CreateUserDirs();
CSeekHandler *m_seekHandler;
+ CPlayerController *m_playerController;
CInertialScrollingHandler *m_pInertialScrollingHandler;
CNetwork *m_network;
#ifdef HAS_PERFORMANCE_SAMPLE
View
@@ -1,6 +1,7 @@
SRCS=Bookmark.cpp \
FFmpegVideoDecoder.cpp \
GUIViewStateVideo.cpp \
+ PlayerController.cpp \
Teletext.cpp \
VideoDatabase.cpp \
VideoDbUrl.cpp \
Oops, something went wrong.

0 comments on commit 8fcb671

Please sign in to comment.