Skip to content

Commit

Permalink
Merge pull request xbmc#6222 from xhaggi/action-listeners
Browse files Browse the repository at this point in the history
[pvr] separates/removes PVR specific stuff from CGUIWindowFullScreen
  • Loading branch information
xhaggi committed Jan 22, 2015
2 parents 776f07a + 613ac11 commit 40a8a90
Show file tree
Hide file tree
Showing 25 changed files with 368 additions and 335 deletions.
12 changes: 12 additions & 0 deletions Kodi.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@
3802709A13D5A653009493DD /* SystemClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3802709813D5A653009493DD /* SystemClock.cpp */; };
384718D81325BA04000486D6 /* XBDateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 384718D61325BA04000486D6 /* XBDateTime.cpp */; };
38F4E57013CCCB3B00664821 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38F4E56C13CCCB3B00664821 /* Implementation.cpp */; };
42DAC16E1A6E789E0066B4C8 /* PVRActionListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42DAC16C1A6E789E0066B4C8 /* PVRActionListener.cpp */; };
42DAC16F1A6E789E0066B4C8 /* PVRActionListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42DAC16C1A6E789E0066B4C8 /* PVRActionListener.cpp */; };
42DAC1701A6E789E0066B4C8 /* PVRActionListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42DAC16C1A6E789E0066B4C8 /* PVRActionListener.cpp */; };
431AE5DA109C1A63007428C3 /* OverlayRendererUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 431AE5D7109C1A63007428C3 /* OverlayRendererUtil.cpp */; };
432D7CE412D86DA500CE4C49 /* NetworkLinux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 432D7CE312D86DA500CE4C49 /* NetworkLinux.cpp */; };
432D7CF712D870E800CE4C49 /* TCPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 432D7CF612D870E800CE4C49 /* TCPServer.cpp */; };
Expand Down Expand Up @@ -4053,6 +4056,9 @@
38F4E56C13CCCB3B00664821 /* Implementation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Implementation.cpp; sourceTree = "<group>"; };
38F4E56D13CCCB3B00664821 /* README.platform */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.platform; sourceTree = "<group>"; };
38F4E56E13CCCB3B00664821 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
42DAC16B1A6E780C0066B4C8 /* IActionListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IActionListener.h; sourceTree = "<group>"; };
42DAC16C1A6E789E0066B4C8 /* PVRActionListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRActionListener.cpp; sourceTree = "<group>"; };
42DAC16D1A6E789E0066B4C8 /* PVRActionListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRActionListener.h; sourceTree = "<group>"; };
430C881312D64A730098821A /* IPowerSyscall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IPowerSyscall.h; sourceTree = "<group>"; };
431376FF12D6455C00680C15 /* GUIDialogCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogCache.h; sourceTree = "<group>"; };
431AE5D7109C1A63007428C3 /* OverlayRendererUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OverlayRendererUtil.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -7126,6 +7132,7 @@
4367217312D6640E002508E6 /* interfaces */ = {
isa = PBXGroup;
children = (
42DAC16B1A6E780C0066B4C8 /* IActionListener.h */,
DF40BC21178B4C07009DB567 /* generic */,
7C89674213C03B21003631FE /* info */,
F5AE407F13415D9E0004BD79 /* json-rpc */,
Expand Down Expand Up @@ -7981,6 +7988,8 @@
C8482871156CFCD8005A996F /* pvr */ = {
isa = PBXGroup;
children = (
42DAC16C1A6E789E0066B4C8 /* PVRActionListener.cpp */,
42DAC16D1A6E789E0066B4C8 /* PVRActionListener.h */,
C8482872156CFCD8005A996F /* addons */,
C8482878156CFCD8005A996F /* channels */,
C8482884156CFCD8005A996F /* dialogs */,
Expand Down Expand Up @@ -11871,6 +11880,7 @@
7CCDACC119275D790074CF51 /* NptAppleAutoreleasePool.mm in Sources */,
7CCDACCA19275D790074CF51 /* NptAppleLogConfig.mm in Sources */,
7CAA469019427AED00008885 /* PosixDirectory.cpp in Sources */,
42DAC16E1A6E789E0066B4C8 /* PVRActionListener.cpp in Sources */,
DF033D381946612400BFC82E /* AEDeviceEnumerationOSX.cpp in Sources */,
7C525DF5195E2D8100BE3482 /* SaveFileStateJob.cpp in Sources */,
7C908894196358A8003D0619 /* auto_buffer.cpp in Sources */,
Expand Down Expand Up @@ -11961,6 +11971,7 @@
DFF0F14417528350002DA3A4 /* AEPackIEC61937.cpp in Sources */,
DFF0F14617528350002DA3A4 /* AEStreamInfo.cpp in Sources */,
DFF0F14717528350002DA3A4 /* AEUtil.cpp in Sources */,
42DAC1701A6E789E0066B4C8 /* PVRActionListener.cpp in Sources */,
DFF0F14917528350002DA3A4 /* AEFactory.cpp in Sources */,
DFF0F14A17528350002DA3A4 /* EmuFileWrapper.cpp in Sources */,
DFF0F14B17528350002DA3A4 /* emu_dummy.cpp in Sources */,
Expand Down Expand Up @@ -13815,6 +13826,7 @@
E499146F174E605900741B6D /* ScraperUrl.cpp in Sources */,
E4991470174E605900741B6D /* Screenshot.cpp in Sources */,
E4991471174E605900741B6D /* SeekHandler.cpp in Sources */,
42DAC16F1A6E789E0066B4C8 /* PVRActionListener.cpp in Sources */,
E4991472174E605900741B6D /* SortUtils.cpp in Sources */,
E4991473174E605900741B6D /* Splash.cpp in Sources */,
E4991474174E605900741B6D /* Stopwatch.cpp in Sources */,
Expand Down
14 changes: 0 additions & 14 deletions addons/skin.confluence/720p/VideoFullScreen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -405,20 +405,6 @@
<label>-</label>
</control>
</control>
<control type="selectbutton" id="503">
<left>440</left>
<top>100</top>
<width>400</width>
<height>100</height>
<font>font13caps</font>
<description>TV Channel Group Select Button</description>
<texturebg border="20">OverlayDialogBackground.png</texturebg>
<onleft>503</onleft>
<onright>503</onright>
<onup>500</onup>
<ondown>500</ondown>
<include>VisibleFadeEffect</include>
</control>
<control type="group">
<visible>Player.ShowCodec + VideoPlayer.Content(LiveTV) + system.getbool(pvrplayback.signalquality)</visible>
<top>185</top>
Expand Down
3 changes: 3 additions & 0 deletions project/VS2010Express/XBMC.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,7 @@
<ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideSearch.cpp" />
<ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRRecordingInfo.cpp" />
<ClCompile Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRTimerSettings.cpp" />
<ClCompile Include="..\..\xbmc\pvr\PVRActionListener.cpp" />
<ClCompile Include="..\..\xbmc\pvr\PVRDatabase.cpp" />
<ClCompile Include="..\..\xbmc\pvr\PVRGUIInfo.cpp" />
<ClCompile Include="..\..\xbmc\pvr\PVRManager.cpp" />
Expand Down Expand Up @@ -1822,6 +1823,7 @@
<ClInclude Include="..\..\xbmc\input\XBMC_vkeys.h" />
<ClInclude Include="..\..\xbmc\interfaces\AnnouncementManager.h" />
<ClInclude Include="..\..\xbmc\interfaces\Builtins.h" />
<ClInclude Include="..\..\xbmc\interfaces\IActionListener.h" />
<ClInclude Include="..\..\xbmc\interfaces\IAnnouncer.h" />
<ClInclude Include="..\..\xbmc\interfaces\info\InfoBool.h" />
<ClInclude Include="..\..\xbmc\interfaces\info\InfoExpression.h" />
Expand Down Expand Up @@ -1970,6 +1972,7 @@
<ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRGuideSearch.h" />
<ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRRecordingInfo.h" />
<ClInclude Include="..\..\xbmc\pvr\dialogs\GUIDialogPVRTimerSettings.h" />
<ClInclude Include="..\..\xbmc\pvr\PVRActionListener.h" />
<ClInclude Include="..\..\xbmc\pvr\PVRDatabase.h" />
<ClInclude Include="..\..\xbmc\pvr\PVRGUIInfo.h" />
<ClInclude Include="..\..\xbmc\pvr\PVRManager.h" />
Expand Down
9 changes: 9 additions & 0 deletions project/VS2010Express/XBMC.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -1759,6 +1759,9 @@
<ClCompile Include="..\..\xbmc\dialogs\GUIDialogExtendedProgressBar.cpp">
<Filter>dialogs</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\pvr\PVRActionListener.cpp">
<Filter>pvr</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\pvr\PVRDatabase.cpp">
<Filter>pvr</Filter>
</ClCompile>
Expand Down Expand Up @@ -4569,6 +4572,9 @@
<ClInclude Include="..\..\xbmc\interfaces\Builtins.h">
<Filter>interfaces</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\interfaces\IActionListener.h">
<Filter>interfaces</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\interfaces\IAnnouncer.h">
<Filter>interfaces</Filter>
</ClInclude>
Expand Down Expand Up @@ -4719,6 +4725,9 @@
<ClInclude Include="..\..\xbmc\dialogs\GUIDialogExtendedProgressBar.h">
<Filter>dialogs</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\pvr\PVRActionListener.h">
<Filter>pvr</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\pvr\PVRDatabase.h">
<Filter>pvr</Filter>
</ClInclude>
Expand Down
8 changes: 4 additions & 4 deletions system/keymaps/gamepad.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,16 @@
</FullscreenVideo>
<FullscreenLiveTV>
<gamepad>
<dpadleft>PreviousChannelGroup</dpadleft>
<dpadright>NextChannelGroup</dpadright>
<dpadleft>StepBack</dpadleft>
<dpadright>StepForward</dpadright>
<dpadup>ChannelUp</dpadup>
<dpaddown>ChannelDown</dpaddown>
</gamepad>
</FullscreenLiveTV>
<FullscreenRadio>
<gamepad>
<dpadleft>PreviousChannelGroup</dpadleft>
<dpadright>NextChannelGroup</dpadright>
<dpadleft>StepBack</dpadleft>
<dpadright>StepForward</dpadright>
<dpadup>ChannelUp</dpadup>
<dpaddown>ChannelDown</dpaddown>
</gamepad>
Expand Down
8 changes: 4 additions & 4 deletions system/keymaps/joystick.Harmony.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,16 +177,16 @@
<joystick name="Harmony">
<!-- up --> <button id="1">ChannelUp</button>
<!-- down --> <button id="2">ChannelDown</button>
<!-- left --> <button id="3">PreviousChannelGroup</button>
<!-- right --> <button id="4">NextChannelGroup</button>
<!-- left --> <button id="3">StepBack</button>
<!-- right --> <button id="4">StepForward</button>
</joystick>
</FullscreenLiveTV>
<FullscreenRadio>
<joystick name="Harmony">
<!-- up --> <button id="1">ChannelUp</button>
<!-- down --> <button id="2">ChannelDown</button>
<!-- left --> <button id="3">PreviousChannelGroup</button>
<!-- right --> <button id="4">NextChannelGroup</button>
<!-- left --> <button id="3">StepBack</button>
<!-- right --> <button id="4">StepForward</button>
</joystick>
</FullscreenRadio>
<FullscreenInfo>
Expand Down
8 changes: 4 additions & 4 deletions system/keymaps/joystick.Logitech.RumblePad.2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
<joystick name="Logitech Logitech Cordless RumblePad 2">
<altname>Logitech Cordless RumblePad 2</altname>
<altname>Logitech RumblePad 2 USB</altname>
<hat id="1" position="left">PreviousChannelGroup</hat>
<hat id="1" position="right">NextChannelGroup</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
</joystick>
Expand All @@ -84,8 +84,8 @@
<joystick name="Logitech Logitech Cordless RumblePad 2">
<altname>Logitech Cordless RumblePad 2</altname>
<altname>Logitech RumblePad 2 USB</altname>
<hat id="1" position="left">PreviousChannelGroup</hat>
<hat id="1" position="right">NextChannelGroup</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
</joystick>
Expand Down
32 changes: 16 additions & 16 deletions system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
Original file line number Diff line number Diff line change
Expand Up @@ -389,12 +389,12 @@
<altname>Controller (XBOX One For Windows)</altname>
<button id="11">ChannelUp</button>
<button id="12">ChannelDown</button>
<button id="13">PreviousChannelGroup</button>
<button id="14">NextChannelGroup</button>
<button id="13">StepBack</button>
<button id="14">StepForward</button>
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
<hat id="1" position="left">PreviousChannelGroup</hat>
<hat id="1" position="right">NextChannelGroup</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
</joystick>
<joystick name="Microsoft X-Box 360 pad">
<altname>BigBen Interactive XBOX 360 Controller</altname>
Expand All @@ -407,14 +407,14 @@
<altname>Xbox 360 Wireless Receiver</altname>
<altname>Xbox 360 Wireless Receiver (XBOX)</altname>
<altname>Razer Sabertooth</altname>
<button id="12">PreviousChannelGroup</button>
<button id="13">NextChannelGroup</button>
<button id="12">StepBack</button>
<button id="13">StepForward</button>
<button id="14">ChannelUp</button>
<button id="15">ChannelDown</button>
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
<hat id="1" position="left">PreviousChannelGroup</hat>
<hat id="1" position="right">NextChannelGroup</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
</joystick>
</FullscreenLiveTV>
<FullscreenRadio>
Expand All @@ -439,12 +439,12 @@
<altname>Controller (XBOX One For Windows)</altname>
<button id="11">ChannelUp</button>
<button id="12">ChannelDown</button>
<button id="13">PreviousChannelGroup</button>
<button id="14">NextChannelGroup</button>
<button id="13">StepBack</button>
<button id="14">StepForward</button>
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
<hat id="1" position="left">PreviousChannelGroup</hat>
<hat id="1" position="right">NextChannelGroup</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
</joystick>
<joystick name="Microsoft X-Box 360 pad">
<altname>BigBen Interactive XBOX 360 Controller</altname>
Expand All @@ -456,14 +456,14 @@
<altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
<altname>Xbox 360 Wireless Receiver</altname>
<altname>Xbox 360 Wireless Receiver (XBOX)</altname>
<button id="12">PreviousChannelGroup</button>
<button id="13">NextChannelGroup</button>
<button id="12">StepBack</button>
<button id="13">StepForward</button>
<button id="14">ChannelUp</button>
<button id="15">ChannelDown</button>
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
<hat id="1" position="left">PreviousChannelGroup</hat>
<hat id="1" position="right">NextChannelGroup</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
</joystick>
</FullscreenRadio>
<FullscreenInfo>
Expand Down
8 changes: 4 additions & 4 deletions system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@
<altname>Logitech Xbox Cordless Controller</altname>
<altname>Microsoft X-Box pad (Japan)</altname>
<button id="13">ChannelUp</button>
<button id="14">NextChannelGroup</button>
<button id="14">StepForward</button>
<button id="15">ChannelDown</button>
<button id="16">PreviousChannelGroup</button>
<button id="16">StepBack</button>
</joystick>
</FullscreenLiveTV>
<FullscreenRadio>
Expand All @@ -146,9 +146,9 @@
<altname>Logitech Xbox Cordless Controller</altname>
<altname>Microsoft X-Box pad (Japan)</altname>
<button id="13">ChannelUp</button>
<button id="14">NextChannelGroup</button>
<button id="14">StepForward</button>
<button id="15">ChannelDown</button>
<button id="16">PreviousChannelGroup</button>
<button id="16">StepBack</button>
</joystick>
</FullscreenRadio>
<FullscreenInfo>
Expand Down
8 changes: 4 additions & 4 deletions system/keymaps/joystick.PS3.Remote.Keyboard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,17 @@

<FullscreenLiveTV>
<joystick name="PLAYSTATION(R)3 Remote Keyboard">
<hat id="1" position="left">PreviousChannelGroup</hat>
<hat id="1" position="right">NextChannelGroup</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
</joystick>
</FullscreenLiveTV>

<FullscreenRadio>
<joystick name="PLAYSTATION(R)3 Remote Keyboard">
<hat id="1" position="left">PreviousChannelGroup</hat>
<hat id="1" position="right">NextChannelGroup</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
</joystick>
Expand Down
8 changes: 4 additions & 4 deletions system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@
<altname>Sony Computer Entertainment Wireless Controller</altname>
<button id="5">ChannelUp</button>
<button id="7">ChannelDown</button>
<button id="8">PreviousChannelGroup</button>
<button id="6">NextChannelGroup</button>
<button id="8">StepBack</button>
<button id="6">StepForward</button>
</joystick>
</FullscreenLiveTV>
<FullscreenRadio>
Expand All @@ -188,8 +188,8 @@
<altname>Sony Computer Entertainment Wireless Controller</altname>
<button id="5">ChannelUp</button>
<button id="7">ChannelDown</button>
<button id="8">PreviousChannelGroup</button>
<button id="6">NextChannelGroup</button>
<button id="8">StepBack</button>
<button id="6">StepForward</button>
</joystick>
</FullscreenRadio>
<FullscreenInfo>
Expand Down
16 changes: 8 additions & 8 deletions system/keymaps/joystick.xml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -126,24 +126,24 @@
<joystick>
<button id="11">ChannelUp</button>
<button id="12">ChannelDown</button>
<button id="13">PreviousChannelGroup</button>
<button id="14">NextChannelGroup</button>
<button id="13">StepBack</button>
<button id="14">StepForward</button>
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
<hat id="1" position="left">PreviousChannelGroup</hat>
<hat id="1" position="right">NextChannelGroup</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
</joystick>
</FullscreenLiveTV>
<FullscreenRadio>
<joystick>
<button id="11">ChannelUp</button>
<button id="12">ChannelDown</button>
<button id="13">PreviousChannelGroup</button>
<button id="14">NextChannelGroup</button>
<button id="13">StepBack</button>
<button id="14">StepForward</button>
<hat id="1" position="up">ChannelUp</hat>
<hat id="1" position="down">ChannelDown</hat>
<hat id="1" position="left">PreviousChannelGroup</hat>
<hat id="1" position="right">NextChannelGroup</hat>
<hat id="1" position="left">StepBack</hat>
<hat id="1" position="right">StepForward</hat>
</joystick>
</FullscreenRadio>
<FullscreenInfo>
Expand Down
8 changes: 4 additions & 4 deletions system/keymaps/keyboard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,16 +523,16 @@
</NumericInput>
<FullscreenLiveTV>
<keyboard>
<left>PreviousChannelGroup</left>
<right>NextChannelGroup</right>
<left>StepBack</left>
<right>StepForward</right>
<up>ChannelUp</up>
<down>ChannelDown</down>
</keyboard>
</FullscreenLiveTV>
<FullscreenRadio>
<keyboard>
<left>PreviousChannelGroup</left>
<right>NextChannelGroup</right>
<left>StepBack</left>
<right>StepForward</right>
<up>ChannelUp</up>
<down>ChannelDown</down>
</keyboard>
Expand Down
Loading

0 comments on commit 40a8a90

Please sign in to comment.