Support controlling external xbmc/upnp instance over UPnP #1597

Merged
merged 14 commits into from Feb 3, 2013
Jump to file
+2,284 −1,251
Split
@@ -28,6 +28,7 @@
36A9468E15CF217400727135 /* MusicDbUrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9468C15CF217400727135 /* MusicDbUrl.cpp */; };
36A95DB41624898700727135 /* GUIDialogMediaFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A95DB21624898700727135 /* GUIDialogMediaFilter.cpp */; };
4D5D2E131301753F006ABC13 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5D2E121301753F006ABC13 /* CFNetwork.framework */; };
+ 5500731516A75A2700097786 /* UPnPPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5500731316A75A2700097786 /* UPnPPlayer.cpp */; };
7C0A7ECD13A5DBF900AFC2BD /* AppParamParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7ECB13A5DBF900AFC2BD /* AppParamParser.cpp */; };
7C0A7FC813A9E75400AFC2BD /* DirtyRegionSolvers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FC413A9E75400AFC2BD /* DirtyRegionSolvers.cpp */; };
7C0A7FC913A9E75400AFC2BD /* DirtyRegionTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FC613A9E75400AFC2BD /* DirtyRegionTracker.cpp */; };
@@ -1078,6 +1079,8 @@
36A95DB21624898700727135 /* GUIDialogMediaFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMediaFilter.cpp; sourceTree = "<group>"; };
36A95DB31624898700727135 /* GUIDialogMediaFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMediaFilter.h; sourceTree = "<group>"; };
4D5D2E121301753F006ABC13 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+ 5500731316A75A2700097786 /* UPnPPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnPPlayer.cpp; sourceTree = "<group>"; };
+ 5500731416A75A2700097786 /* UPnPPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPPlayer.h; sourceTree = "<group>"; };
7C0A7ECB13A5DBF900AFC2BD /* AppParamParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppParamParser.cpp; sourceTree = "<group>"; };
7C0A7ECC13A5DBF900AFC2BD /* AppParamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppParamParser.h; sourceTree = "<group>"; };
7C0A7FC313A9E75400AFC2BD /* DirtyRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirtyRegion.h; sourceTree = "<group>"; };
@@ -3556,6 +3559,8 @@
DF23460815FA671900A934F6 /* UPnP.h */,
DF23460915FA671900A934F6 /* UPnPInternal.cpp */,
DF23460A15FA671900A934F6 /* UPnPInternal.h */,
+ 5500731316A75A2700097786 /* UPnPPlayer.cpp */,
+ 5500731416A75A2700097786 /* UPnPPlayer.h */,
DF23460B15FA671900A934F6 /* UPnPRenderer.cpp */,
DF23460C15FA671900A934F6 /* UPnPRenderer.h */,
DF23460D15FA671900A934F6 /* UPnPServer.cpp */,
@@ -7667,6 +7672,7 @@
DFB02E0816629E1900F37752 /* PyContext.cpp in Sources */,
DF07255216873553008DCAAD /* karaokevideobackground.cpp in Sources */,
DF07255516873565008DCAAD /* FFmpegVideoDecoder.cpp in Sources */,
+ 5500731516A75A2700097786 /* UPnPPlayer.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -29,6 +29,7 @@
36A9467E15CF20E100727135 /* DbUrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9467C15CF20E100727135 /* DbUrl.cpp */; };
36A95DAD1624896C00727135 /* GUIDialogMediaFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A95DAB1624896C00727135 /* GUIDialogMediaFilter.cpp */; };
4D5D2E1E1301758F006ABC13 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */; };
+ 5500730E16A759D800097786 /* UPnPPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5500730C16A759D800097786 /* UPnPPlayer.cpp */; };
7C0A7EDE13A5DC2800AFC2BD /* AppParamParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7EDC13A5DC2800AFC2BD /* AppParamParser.cpp */; };
7C0A7F9D13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7F9B13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp */; };
7C0A7FB213A9E72E00AFC2BD /* DirtyRegionSolvers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FAE13A9E72E00AFC2BD /* DirtyRegionSolvers.cpp */; };
@@ -1080,6 +1081,8 @@
36A95DAB1624896C00727135 /* GUIDialogMediaFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMediaFilter.cpp; sourceTree = "<group>"; };
36A95DAC1624896C00727135 /* GUIDialogMediaFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMediaFilter.h; sourceTree = "<group>"; };
4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+ 5500730C16A759D800097786 /* UPnPPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnPPlayer.cpp; sourceTree = "<group>"; };
+ 5500730D16A759D800097786 /* UPnPPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPPlayer.h; sourceTree = "<group>"; };
7C0A7EDC13A5DC2800AFC2BD /* AppParamParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppParamParser.cpp; sourceTree = "<group>"; };
7C0A7EDD13A5DC2800AFC2BD /* AppParamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppParamParser.h; sourceTree = "<group>"; };
7C0A7F9B13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowDebugInfo.cpp; sourceTree = "<group>"; };
@@ -3560,6 +3563,8 @@
DF23461A15FA675200A934F6 /* UPnP.h */,
DF23461B15FA675200A934F6 /* UPnPInternal.cpp */,
DF23461C15FA675200A934F6 /* UPnPInternal.h */,
+ 5500730C16A759D800097786 /* UPnPPlayer.cpp */,
+ 5500730D16A759D800097786 /* UPnPPlayer.h */,
DF23461D15FA675200A934F6 /* UPnPRenderer.cpp */,
DF23461E15FA675200A934F6 /* UPnPRenderer.h */,
DF23461F15FA675200A934F6 /* UPnPServer.cpp */,
@@ -7692,6 +7697,7 @@
DFB02DFB16629DF200F37752 /* PyContext.cpp in Sources */,
DF07254116873517008DCAAD /* karaokevideobackground.cpp in Sources */,
DF0725441687352C008DCAAD /* FFmpegVideoDecoder.cpp in Sources */,
+ 5500730E16A759D800097786 /* UPnPPlayer.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -241,6 +241,7 @@
43BF09A21080D1E900E25290 /* AVTransportSCPD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF099E1080D1E900E25290 /* AVTransportSCPD.cpp */; settings = {COMPILER_FLAGS = "-I$SRCROOT/lib/libUPnP/Platinum/Source/Core -I$SRCROOT/lib/libUPnP/Platinum/Source/Platinum -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaConnect -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaRenderer -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaServer -I$SRCROOT/lib/libUPnP/Platinum/Source/Extras -I$SRCROOT/lib/libUPnP/Neptune/Source/System/Posix -I$SRCROOT/lib/libUPnP/Neptune/Source/Core"; }; };
43BF09A31080D1E900E25290 /* RenderingControlSCPD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF099F1080D1E900E25290 /* RenderingControlSCPD.cpp */; settings = {COMPILER_FLAGS = "-I$SRCROOT/lib/libUPnP/Platinum/Source/Core -I$SRCROOT/lib/libUPnP/Platinum/Source/Platinum -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaConnect -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaRenderer -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaServer -I$SRCROOT/lib/libUPnP/Platinum/Source/Extras -I$SRCROOT/lib/libUPnP/Neptune/Source/System/Posix -I$SRCROOT/lib/libUPnP/Neptune/Source/Core"; }; };
43BF09AB1080D2ED00E25290 /* RdrConnectionManagerSCPD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF09A81080D2ED00E25290 /* RdrConnectionManagerSCPD.cpp */; settings = {COMPILER_FLAGS = "-I$SRCROOT/lib/libUPnP/Platinum/Source/Core -I$SRCROOT/lib/libUPnP/Platinum/Source/Platinum -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaConnect -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaRenderer -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaServer -I$SRCROOT/lib/libUPnP/Platinum/Source/Extras -I$SRCROOT/lib/libUPnP/Neptune/Source/System/Posix -I$SRCROOT/lib/libUPnP/Neptune/Source/Core"; }; };
+ 552840CC1626163B00ED1333 /* UPnPPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 552840CA1626163B00ED1333 /* UPnPPlayer.cpp */; settings = {COMPILER_FLAGS = "-I$SRCROOT/lib/libUPnP/Platinum/Source/Core -I$SRCROOT/lib/libUPnP/Platinum/Source/Platinum -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaConnect -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaRenderer -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaServer -I$SRCROOT/lib/libUPnP/Platinum/Source/Extras -I$SRCROOT/lib/libUPnP/Neptune/Source/System/Posix -I$SRCROOT/lib/libUPnP/Neptune/Source/Core"; }; };
552A226915F7E14B0015C0D0 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 552A226815F7E14B0015C0D0 /* main.cpp */; };
553840F215F360B400CE061B /* PltMimeType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 553840ED15F360B400CE061B /* PltMimeType.cpp */; settings = {COMPILER_FLAGS = "-I$SRCROOT/lib/libUPnP/Platinum/Source/Core -I$SRCROOT/lib/libUPnP/Platinum/Source/Platinum -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaConnect -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaRenderer -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaServer -I$SRCROOT/lib/libUPnP/Platinum/Source/Extras -I$SRCROOT/lib/libUPnP/Neptune/Source/System/Posix -I$SRCROOT/lib/libUPnP/Neptune/Source/Core"; }; };
553840F315F360B400CE061B /* PltProtocolInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 553840EF15F360B400CE061B /* PltProtocolInfo.cpp */; settings = {COMPILER_FLAGS = "-I$SRCROOT/lib/libUPnP/Platinum/Source/Core -I$SRCROOT/lib/libUPnP/Platinum/Source/Platinum -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaConnect -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaRenderer -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaServer -I$SRCROOT/lib/libUPnP/Platinum/Source/Extras -I$SRCROOT/lib/libUPnP/Neptune/Source/System/Posix -I$SRCROOT/lib/libUPnP/Neptune/Source/Core"; }; };
@@ -1539,6 +1540,8 @@
43BF09A91080D2ED00E25290 /* RenderingControlSCPD_Full.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = RenderingControlSCPD_Full.xml; sourceTree = "<group>"; };
43BF09DD1080D39300E25290 /* fastmemcpy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fastmemcpy.h; sourceTree = "<group>"; };
43FAC87112D6349400F67914 /* IStorageProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IStorageProvider.h; sourceTree = "<group>"; };
+ 552840CA1626163B00ED1333 /* UPnPPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnPPlayer.cpp; sourceTree = "<group>"; };
+ 552840CB1626163B00ED1333 /* UPnPPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPPlayer.h; sourceTree = "<group>"; };
552A226815F7E14B0015C0D0 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = main/main.cpp; sourceTree = "<group>"; };
553840ED15F360B400CE061B /* PltMimeType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PltMimeType.cpp; sourceTree = "<group>"; };
553840EE15F360B400CE061B /* PltMimeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PltMimeType.h; sourceTree = "<group>"; };
@@ -4566,6 +4569,8 @@
DF2345D715FA639500A934F6 /* upnp */ = {
isa = PBXGroup;
children = (
+ 552840CA1626163B00ED1333 /* UPnPPlayer.cpp */,
+ 552840CB1626163B00ED1333 /* UPnPPlayer.h */,
DF2345D915FA639500A934F6 /* UPnP.cpp */,
DF2345DA15FA639500A934F6 /* UPnP.h */,
DF2345DB15FA639500A934F6 /* UPnPInternal.cpp */,
@@ -7665,6 +7670,7 @@
DFB15B2215F8FB8100CDF0DE /* SDLMain.mm in Sources */,
DF2345E115FA639500A934F6 /* UPnP.cpp in Sources */,
DF2345E215FA639500A934F6 /* UPnPInternal.cpp in Sources */,
+ 552840CC1626163B00ED1333 /* UPnPPlayer.cpp in Sources */,
DF2345E315FA639500A934F6 /* UPnPRenderer.cpp in Sources */,
DF2345E415FA639500A934F6 /* UPnPServer.cpp in Sources */,
AE84CB5A15A5B8A600A3810E /* TagLibVFSStream.cpp in Sources */,
@@ -63,7 +63,7 @@
<posy>285</posy>
<height>30</height>
<width>1000</width>
- <label>$INFO[MusicPlayer.Title]</label>
+ <label>$INFO[Player.Title]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13_title</font>
@@ -254,7 +254,7 @@
<posy>285</posy>
<height>30</height>
<width>1000</width>
- <label>$INFO[VideoPlayer.Title]</label>
+ <label>$INFO[Player.Title]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13_title</font>
@@ -307,7 +307,7 @@
<posy>285</posy>
<height>30</height>
<width>1000</width>
- <label>$INFO[VideoPlayer.Title]</label>
+ <label>$INFO[Player.Title]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13_title</font>
@@ -360,7 +360,7 @@
<posy>285</posy>
<height>30</height>
<width>1000</width>
- <label>$INFO[VideoPlayer.Title]$INFO[VideoPlayer.Year,[COLOR=grey] (,)[/COLOR]]</label>
+ <label>$INFO[Player.Title]$INFO[VideoPlayer.Year,[COLOR=grey] (,)[/COLOR]]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13_title</font>
@@ -413,7 +413,7 @@
<posy>285</posy>
<height>30</height>
<width>1000</width>
- <label>$INFO[VideoPlayer.Title]</label>
+ <label>$INFO[Player.Title]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13_title</font>
@@ -133,7 +133,7 @@
<font>font30</font>
<align>left</align>
<aligny>center</aligny>
- <label>$INFO[MusicPlayer.Title]</label>
+ <label>$INFO[Player.Title]</label>
<textcolor>orange</textcolor>
<scroll>true</scroll>
</control>
@@ -93,7 +93,7 @@
<textcolor>grey2</textcolor>
<align>center</align>
<aligny>center</aligny>
- <label>$INFO[VideoPlayer.Title]</label>
+ <label>$INFO[Player.Title]</label>
<visible>Player.HasVideo</visible>
</control>
<!-- control type="visualisation">
@@ -190,7 +190,7 @@
<font>font30</font>
<align>left</align>
<aligny>center</aligny>
- <label>$INFO[VideoPlayer.Title]</label>
+ <label>$INFO[Player.Title]</label>
<textcolor>orange</textcolor>
<scroll>true</scroll>
</control>
@@ -253,7 +253,7 @@
<posy>53r</posy>
<width>700</width>
<height>20</height>
- <label>$INFO[MusicPlayer.Title]$INFO[VideoPlayer.Title] - ([COLOR=blue]$INFO[Player.Time] / $INFO[Player.Duration,][/COLOR])</label>
+ <label>$INFO[Player.Title] - ([COLOR=blue]$INFO[Player.Time] / $INFO[Player.Duration,][/COLOR])</label>
<align>left</align>
<aligny>center</aligny>
<font>font12</font>
@@ -397,7 +397,7 @@
<posy>43</posy>
<height>30</height>
<width>325</width>
- <label>$INFO[MusicPlayer.Title]</label>
+ <label>$INFO[Player.Title]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13_title</font>
@@ -515,7 +515,7 @@
<posy>43</posy>
<height>30</height>
<width>325</width>
- <label>$INFO[VideoPlayer.Title]</label>
+ <label>$INFO[Player.Title]</label>
<align>left</align>
<aligny>center</aligny>
<font>font13_title</font>
@@ -588,7 +588,7 @@
<textcolor>blue</textcolor>
<align>center</align>
<aligny>center</aligny>
- <visible>[Player.HasAudio | Player.HasVideo]</visible>
+ <visible>Player.HasMedia</visible>
<include>VisibleFadeEffect</include>
</control>
<control type="button" id="610">
@@ -681,7 +681,7 @@
</control>
</control>
<control type="group" id="9005">
- <visible>[Player.HasAudio | Player.HasVideo]</visible>
+ <visible>Player.HasMedia</visible>
<visible>!VideoPlayer.Content(LiveTV)</visible>
<include>VisibleFadeEffect</include>
<width>250</width>
@@ -9350,7 +9350,11 @@ msgctxt "#21360"
msgid "Share video and music libraries through UPnP"
msgstr ""
-#empty strings from id 21361 to 21363
+msgctxt "#21361"
+msgid "Look for remote UPnP players"
+msgstr ""
+
+#empty strings from id 21362 to 21363
msgctxt "#21364"
msgid "Edit media share"
Oops, something went wrong.