Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[add] - integrate the new python modules into the buildsys and hook i…

…nto our xbmc python module
  • Loading branch information...
commit 8035742adcb1c62451c77849bab6b1a173edbb9f 1 parent 25b1400
@Memphiz authored
View
12 XBMC-ATV2.xcodeproj/project.pbxproj
@@ -36,6 +36,7 @@
DF4485341400651B0069344B /* FilePipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4485301400651B0069344B /* FilePipe.cpp */; };
DF4485351400651B0069344B /* PipesManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4485321400651B0069344B /* PipesManager.cpp */; };
DF4485381400654A0069344B /* AirTunesServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4485361400654A0069344B /* AirTunesServer.cpp */; };
+ DF4A2EF514E2E84800E2A981 /* pyzeroconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4A2EF314E2E84800E2A981 /* pyzeroconf.cpp */; };
DF673A251443769300A5A509 /* FileUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF673A231443769300A5A509 /* FileUPnP.cpp */; };
DF98D9A81434F4B400A6EBE1 /* SkinVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF98D9A61434F4B400A6EBE1 /* SkinVariable.cpp */; };
DFA6BE8713FED2A10048CC11 /* AirPlayServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE8513FED2A10048CC11 /* AirPlayServer.cpp */; };
@@ -46,6 +47,7 @@
DFD4D22013D7286E00A47C47 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D21413D7286E00A47C47 /* Implementation.cpp */; };
DFD4D22113D7286E00A47C47 /* README.platform in Resources */ = {isa = PBXBuildFile; fileRef = DFD4D21613D7286E00A47C47 /* README.platform */; };
DFD4D22213D7286E00A47C47 /* SystemClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D21C13D7286E00A47C47 /* SystemClock.cpp */; };
+ DFED3C2014E4843300CE6232 /* pypipesmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFED3C1E14E4843300CE6232 /* pypipesmanager.cpp */; };
F54D9E8E12B71457006870F9 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F54D9E8D12B71457006870F9 /* CoreAudio.framework */; };
F56B15FB12CD6922009B4C96 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15FA12CD6922009B4C96 /* CoreVideo.framework */; };
F56B15FD12CD6930009B4C96 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15FC12CD6930009B4C96 /* AudioToolbox.framework */; };
@@ -1008,6 +1010,8 @@
DF4485331400651B0069344B /* PipesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipesManager.h; sourceTree = "<group>"; };
DF4485361400654A0069344B /* AirTunesServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirTunesServer.cpp; sourceTree = "<group>"; };
DF4485371400654A0069344B /* AirTunesServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AirTunesServer.h; sourceTree = "<group>"; };
+ DF4A2EF314E2E84800E2A981 /* pyzeroconf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pyzeroconf.cpp; sourceTree = "<group>"; };
+ DF4A2EF414E2E84800E2A981 /* pyzeroconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pyzeroconf.h; sourceTree = "<group>"; };
DF673A231443769300A5A509 /* FileUPnP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUPnP.cpp; sourceTree = "<group>"; };
DF673A241443769300A5A509 /* FileUPnP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUPnP.h; sourceTree = "<group>"; };
DF98D9A61434F4B400A6EBE1 /* SkinVariable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkinVariable.cpp; sourceTree = "<group>"; };
@@ -1032,6 +1036,8 @@
DFD4D21713D7286E00A47C47 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
DFD4D21C13D7286E00A47C47 /* SystemClock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemClock.cpp; sourceTree = "<group>"; };
DFD4D21D13D7286E00A47C47 /* SystemClock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemClock.h; sourceTree = "<group>"; };
+ DFED3C1E14E4843300CE6232 /* pypipesmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pypipesmanager.cpp; sourceTree = "<group>"; };
+ DFED3C1F14E4843300CE6232 /* pypipesmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pypipesmanager.h; sourceTree = "<group>"; };
F54D9E8D12B71457006870F9 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
F558F66813AFE7F300631E12 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
F558F66E13AFE81500631E12 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
@@ -4613,6 +4619,8 @@
F56C758C131EC152000AD0F6 /* listitem.h */,
F56C758D131EC152000AD0F6 /* player.cpp */,
F56C758E131EC152000AD0F6 /* player.h */,
+ DFED3C1E14E4843300CE6232 /* pypipesmanager.cpp */,
+ DFED3C1F14E4843300CE6232 /* pypipesmanager.h */,
F56C758F131EC152000AD0F6 /* pyplaylist.cpp */,
F56C7590131EC152000AD0F6 /* pyplaylist.h */,
F5E113AC1435882400175026 /* pyrendercapture.cpp */,
@@ -4623,6 +4631,8 @@
F56C7592131EC152000AD0F6 /* PythonPlayer.h */,
F56C7593131EC152000AD0F6 /* pyutil.cpp */,
F56C7594131EC152000AD0F6 /* pyutil.h */,
+ DF4A2EF314E2E84800E2A981 /* pyzeroconf.cpp */,
+ DF4A2EF414E2E84800E2A981 /* pyzeroconf.h */,
F56C7595131EC152000AD0F6 /* window.cpp */,
F56C7596131EC152000AD0F6 /* window.h */,
F56C7597131EC152000AD0F6 /* winxml.cpp */,
@@ -6940,6 +6950,8 @@
DF673A251443769300A5A509 /* FileUPnP.cpp in Sources */,
F5BD033A148D4923001B5583 /* CryptThreading.cpp in Sources */,
7CCFD9AA1514952700211D82 /* PCMCodec.cpp in Sources */,
+ DF4A2EF514E2E84800E2A981 /* pyzeroconf.cpp in Sources */,
+ DFED3C2014E4843300CE6232 /* pypipesmanager.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
12 XBMC-IOS.xcodeproj/project.pbxproj
@@ -47,6 +47,8 @@
DFD4D1E213D725ED00A47C47 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D1D813D725ED00A47C47 /* Implementation.cpp */; };
DFD4D1E713D7263000A47C47 /* README.platform in Resources */ = {isa = PBXBuildFile; fileRef = DFD4D1E613D7263000A47C47 /* README.platform */; };
DFD4D1FE13D7283500A47C47 /* SystemClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D1FC13D7283500A47C47 /* SystemClock.cpp */; };
+ DFDFB4C614E2E8280012E41F /* pyzeroconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDFB4C414E2E8280012E41F /* pyzeroconf.cpp */; };
+ DFED3C1114E4842200CE6232 /* pypipesmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFED3C0F14E4842200CE6232 /* pypipesmanager.cpp */; };
F56B143412CAF279009B4C96 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B143312CAF279009B4C96 /* CoreVideo.framework */; };
F56B14A512CAF523009B4C96 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B14A412CAF523009B4C96 /* AudioToolbox.framework */; };
F56B15D512CD67A9009B4C96 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15D412CD67A9009B4C96 /* CoreGraphics.framework */; };
@@ -1032,6 +1034,10 @@
DFD4D1E613D7263000A47C47 /* README.platform */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.platform; sourceTree = "<group>"; };
DFD4D1FC13D7283500A47C47 /* SystemClock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemClock.cpp; sourceTree = "<group>"; };
DFD4D1FD13D7283500A47C47 /* SystemClock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemClock.h; sourceTree = "<group>"; };
+ DFDFB4C414E2E8280012E41F /* pyzeroconf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pyzeroconf.cpp; sourceTree = "<group>"; };
+ DFDFB4C514E2E8280012E41F /* pyzeroconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pyzeroconf.h; sourceTree = "<group>"; };
+ DFED3C0F14E4842200CE6232 /* pypipesmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pypipesmanager.cpp; sourceTree = "<group>"; };
+ DFED3C1014E4842200CE6232 /* pypipesmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pypipesmanager.h; sourceTree = "<group>"; };
F558F60613AFDC1700631E12 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
F558F61013AFDC3000631E12 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
F56B143312CAF279009B4C96 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
@@ -4972,6 +4978,8 @@
F56C856F131F42EA000AD0F6 /* listitem.h */,
F56C8570131F42EA000AD0F6 /* player.cpp */,
F56C8571131F42EA000AD0F6 /* player.h */,
+ DFED3C0F14E4842200CE6232 /* pypipesmanager.cpp */,
+ DFED3C1014E4842200CE6232 /* pypipesmanager.h */,
F56C8572131F42EA000AD0F6 /* pyplaylist.cpp */,
F56C8573131F42EA000AD0F6 /* pyplaylist.h */,
F5E1127A14356C4600175026 /* pyrendercapture.cpp */,
@@ -4982,6 +4990,8 @@
F56C8575131F42EA000AD0F6 /* PythonPlayer.h */,
F56C8576131F42EA000AD0F6 /* pyutil.cpp */,
F56C8577131F42EA000AD0F6 /* pyutil.h */,
+ DFDFB4C414E2E8280012E41F /* pyzeroconf.cpp */,
+ DFDFB4C514E2E8280012E41F /* pyzeroconf.h */,
F56C8578131F42EA000AD0F6 /* window.cpp */,
F56C8579131F42EA000AD0F6 /* window.h */,
F56C857A131F42EA000AD0F6 /* winxml.cpp */,
@@ -6955,6 +6965,8 @@
DF6739E21443765F00A5A509 /* FileUPnP.cpp in Sources */,
F5BD034F148D496A001B5583 /* CryptThreading.cpp in Sources */,
7CCFD9991514950700211D82 /* PCMCodec.cpp in Sources */,
+ DFDFB4C614E2E8280012E41F /* pyzeroconf.cpp in Sources */,
+ DFED3C1114E4842200CE6232 /* pypipesmanager.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
16 XBMC.xcodeproj/project.pbxproj
@@ -637,6 +637,8 @@
DF448460140048C80069344B /* PipesManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF44845B140048C80069344B /* PipesManager.cpp */; };
DF4484EE140054530069344B /* BXAcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4484EC140054530069344B /* BXAcodec.cpp */; };
DF4484EF140054530069344B /* BXAcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4484EC140054530069344B /* BXAcodec.cpp */; };
+ DF4B7B2614E1908D000E8004 /* pyzeroconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4B7B2414E1908D000E8004 /* pyzeroconf.cpp */; };
+ DF4B7B2714E1908D000E8004 /* pyzeroconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4B7B2414E1908D000E8004 /* pyzeroconf.cpp */; };
DF673AA51443819600A5A509 /* AddonManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF41152BFA5001AF8A6 /* AddonManager.cpp */; };
DF85BAB51443669A000686BE /* FileUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF85BAB41443669A000686BE /* FileUPnP.cpp */; };
DF85BAB61443669A000686BE /* FileUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF85BAB41443669A000686BE /* FileUPnP.cpp */; };
@@ -644,6 +646,8 @@
DF98D98D1434F47D00A6EBE1 /* SkinVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF98D98A1434F47D00A6EBE1 /* SkinVariable.cpp */; };
DFAB049813F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */; };
DFAB049913F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */; };
+ DFED3A1B14E436D400CE6232 /* pypipesmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFED3A1914E436D400CE6232 /* pypipesmanager.cpp */; };
+ DFED3A1C14E436D400CE6232 /* pypipesmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFED3A1914E436D400CE6232 /* pypipesmanager.cpp */; };
E306D12E0DDF7B590052C2AD /* XBMCHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */; };
E33206380D5070AA00435CE3 /* DVDDemuxVobsub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E33206370D5070AA00435CE3 /* DVDDemuxVobsub.cpp */; };
E33466A60D2E5103005A65EC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E33466A50D2E5103005A65EC /* IOKit.framework */; };
@@ -2613,12 +2617,16 @@
DF44845C140048C80069344B /* PipesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipesManager.h; sourceTree = "<group>"; };
DF4484EC140054530069344B /* BXAcodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BXAcodec.cpp; sourceTree = "<group>"; };
DF4484ED140054530069344B /* BXAcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BXAcodec.h; sourceTree = "<group>"; };
+ DF4B7B2414E1908D000E8004 /* pyzeroconf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pyzeroconf.cpp; sourceTree = "<group>"; };
+ DF4B7B2514E1908D000E8004 /* pyzeroconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pyzeroconf.h; sourceTree = "<group>"; };
DF85BAB31443669A000686BE /* FileUPnP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUPnP.h; sourceTree = "<group>"; };
DF85BAB41443669A000686BE /* FileUPnP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUPnP.cpp; sourceTree = "<group>"; };
DF98D98A1434F47D00A6EBE1 /* SkinVariable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkinVariable.cpp; sourceTree = "<group>"; };
DF98D98B1434F47D00A6EBE1 /* SkinVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkinVariable.h; sourceTree = "<group>"; };
DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
DFAB049713F8376700B70BFB /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = "<group>"; };
+ DFED3A1914E436D400CE6232 /* pypipesmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pypipesmanager.cpp; sourceTree = "<group>"; };
+ DFED3A1A14E436D400CE6232 /* pypipesmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pypipesmanager.h; sourceTree = "<group>"; };
E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCHelper.cpp; sourceTree = "<group>"; };
E306D12D0DDF7B590052C2AD /* XBMCHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMCHelper.h; sourceTree = "<group>"; };
E33206370D5070AA00435CE3 /* DVDDemuxVobsub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDDemuxVobsub.cpp; sourceTree = "<group>"; };
@@ -6048,6 +6056,8 @@
E38E19FA0D25F9FB00618676 /* listitem.h */,
E38E25930D263CE000618676 /* player.cpp */,
E38E19FE0D25F9FB00618676 /* player.h */,
+ DFED3A1914E436D400CE6232 /* pypipesmanager.cpp */,
+ DFED3A1A14E436D400CE6232 /* pypipesmanager.h */,
E38E25940D263CE000618676 /* pyplaylist.cpp */,
E38E1A000D25F9FB00618676 /* pyplaylist.h */,
F5E1125C14356B2400175026 /* pyrendercapture.cpp */,
@@ -6058,6 +6068,8 @@
E38E1A020D25F9FB00618676 /* PythonPlayer.h */,
E38E25960D263CE000618676 /* pyutil.cpp */,
E38E1A040D25F9FB00618676 /* pyutil.h */,
+ DF4B7B2414E1908D000E8004 /* pyzeroconf.cpp */,
+ DF4B7B2514E1908D000E8004 /* pyzeroconf.h */,
E38E25970D263CE000618676 /* window.cpp */,
E38E1A060D25F9FB00618676 /* window.h */,
E38E25980D263CE000618676 /* winxml.cpp */,
@@ -8050,6 +8062,8 @@
DF673AA51443819600A5A509 /* AddonManager.cpp in Sources */,
F5BD02F6148D3A7E001B5583 /* CryptThreading.cpp in Sources */,
7CCFD98D151494E100211D82 /* PCMCodec.cpp in Sources */,
+ DF4B7B2614E1908D000E8004 /* pyzeroconf.cpp in Sources */,
+ DFED3A1B14E436D400CE6232 /* pypipesmanager.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -8971,6 +8985,8 @@
DF85BAB61443669A000686BE /* FileUPnP.cpp in Sources */,
F5BD02F7148D3A7E001B5583 /* CryptThreading.cpp in Sources */,
7CCFD98C151494E100211D82 /* PCMCodec.cpp in Sources */,
+ DF4B7B2714E1908D000E8004 /* pyzeroconf.cpp in Sources */,
+ DFED3A1C14E436D400CE6232 /* pypipesmanager.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
6 configure.in
@@ -900,6 +900,7 @@ else
fi
# avahi
+USE_AVAHI=0
if test "$host_vendor" = "apple" ; then
use_avahi="no"
AC_MSG_RESULT($avahi_disabled)
@@ -912,6 +913,9 @@ else
AC_CHECK_LIB([avahi-client], [main],,
use_avahi=no;AC_MSG_RESULT($avahi_not_found))
fi
+ if test "$use_avahi" = "yes"; then
+ USE_AVAHI=1
+ fi
else
AC_MSG_RESULT($avahi_disabled)
fi
@@ -1959,7 +1963,7 @@ AC_SUBST(USE_AIRTUNES)
AC_SUBST(USE_LIBUDEV)
AC_SUBST(USE_LIBUSB)
AC_SUBST(USE_LIBCEC)
-
+AC_SUBST(USE_AVAHI)
# pushd and popd are not available in other shells besides bash, so implement
# our own pushd/popd functions
View
6 project/VS2010Express/XBMC.vcxproj
@@ -551,6 +551,7 @@
<ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\player.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
+ <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\pypipesmanager.cpp" />
<ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\pyplaylist.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
@@ -564,6 +565,7 @@
<ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\pyutil.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
+ <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\pyzeroconf.cpp" />
<ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\window.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">..\..\project\BuildDependencies\include\python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
@@ -759,6 +761,8 @@
<ClInclude Include="..\..\xbmc\cores\paplayer\PCMCodec.h" />
<ClInclude Include="..\..\xbmc\filesystem\FileUPnP.h" />
<ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\pythreadstate.h" />
+ <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\pypipesmanager.h" />
+ <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\pyzeroconf.h" />
<ClInclude Include="..\..\xbmc\threads\platform\win\Implementation.cpp" />
<ClCompile Include="..\..\xbmc\threads\SystemClock.cpp" />
<ClCompile Include="..\..\xbmc\threads\Thread.cpp" />
@@ -2123,4 +2127,4 @@
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
-</Project>
+</Project>
View
12 project/VS2010Express/XBMC.vcxproj.filters
@@ -2567,6 +2567,11 @@
</ClCompile>
<ClCompile Include="..\..\xbmc\cores\paplayer\PCMCodec.cpp">
<Filter>cores\paplayer</Filter>
+ <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\pyzeroconf.cpp">
+ <Filter>interfaces\python\xbmcmodule</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\pypipesmanager.cpp">
+ <Filter>interfaces\python\xbmcmodule</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
@@ -5159,6 +5164,11 @@
</ClInclude>
<ClInclude Include="..\..\xbmc\cores\paplayer\PCMCodec.h">
<Filter>cores\paplayer</Filter>
+ <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\pypipesmanager.h">
+ <Filter>interfaces\python\xbmcmodule</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\pyzeroconf.h">
+ <Filter>interfaces\python\xbmcmodule</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -5171,4 +5181,4 @@
<Filter>win32</Filter>
</CustomBuild>
</ItemGroup>
-</Project>
+</Project>
View
6 xbmc/interfaces/python/xbmcmodule/Makefile.in
@@ -25,6 +25,7 @@ SRCS=action.cpp \
player.cpp \
pyplaylist.cpp \
pyrendercapture.cpp \
+ pypipesmanager.cpp \
PythonAddon.cpp \
PythonPlayer.cpp \
pyutil.cpp \
@@ -37,6 +38,11 @@ SRCS=action.cpp \
xbmcplugin.cpp \
xbmcvfsmodule.cpp \
+ifeq (@USE_AVAHI@, 1)
+SRCS+=pyzeroconf.cpp
+endif
+
+
LIB=xbmcmodule.a
INCLUDES+= @PYTHON_CPPFLAGS@
View
28 xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp
@@ -54,6 +54,10 @@
#include "pythreadstate.h"
#include "utils/log.h"
#include "pyrendercapture.h"
+#include "pypipesmanager.h"
+#ifdef HAS_ZEROCONF
+#include "pyzeroconf.h"
+#endif//HAS_ZEROCONF
// include for constants
#include "pyutil.h"
@@ -1025,6 +1029,11 @@ namespace PYXBMC
initPlayListItem_Type();
initInfoTagMusic_Type();
initInfoTagVideo_Type();
+ initPipesManager_Type();
+
+ #ifdef HAS_ZEROCONF
+ initZeroconf_Type();
+ #endif//HAS_ZEROCONF
#ifdef HAS_PYRENDERCAPTURE
initRenderCapture_Type();
@@ -1035,8 +1044,14 @@ namespace PYXBMC
PyType_Ready(&PlayList_Type) < 0 ||
PyType_Ready(&PlayListItem_Type) < 0 ||
PyType_Ready(&InfoTagMusic_Type) < 0 ||
- PyType_Ready(&InfoTagVideo_Type) < 0) return;
+ PyType_Ready(&InfoTagVideo_Type) < 0 ||
+ PyType_Ready(&PipesManager_Type) < 0) return;
+#ifdef HAS_ZEROCONF
+ if (PyType_Ready(&Zeroconf_Type) < 0)
+ return;
+#endif//HAS_ZEROCONF
+
#ifdef HAS_PYRENDERCAPTURE
if (PyType_Ready(&RenderCapture_Type) < 0)
return;
@@ -1062,6 +1077,11 @@ namespace PYXBMC
Py_INCREF(&PlayListItem_Type);
Py_INCREF(&InfoTagMusic_Type);
Py_INCREF(&InfoTagVideo_Type);
+ Py_INCREF(&PipesManager_Type);
+
+#ifdef HAS_ZEROCONF
+ Py_INCREF(&Zeroconf_Type);
+#endif//HAS_ZEROCONF
#ifdef HAS_PYRENDERCAPTURE
Py_INCREF(&RenderCapture_Type);
@@ -1076,6 +1096,11 @@ namespace PYXBMC
PyModule_AddObject(pXbmcModule, (char*)"PlayListItem", (PyObject*)&PlayListItem_Type);
PyModule_AddObject(pXbmcModule, (char*)"InfoTagMusic", (PyObject*)&InfoTagMusic_Type);
PyModule_AddObject(pXbmcModule, (char*)"InfoTagVideo", (PyObject*)&InfoTagVideo_Type);
+ PyModule_AddObject(pXbmcModule, (char*)"PipesManager", (PyObject*)&PipesManager_Type);
+
+#ifdef HAS_ZEROCONF
+ PyModule_AddObject(pXbmcModule, (char*)"Zeroconf", (PyObject*)&Zeroconf_Type);
+#endif//HAS_ZEROCONF
// constants
PyModule_AddStringConstant(pXbmcModule, (char*)"__author__", (char*)PY_XBMC_AUTHOR);
@@ -1131,3 +1156,4 @@ namespace PYXBMC
#ifdef __cplusplus
}
#endif
+
Please sign in to comment.
Something went wrong with that request. Please try again.