[library.kodi.audioengine] Adapt project files

diff --git a/.gitignore b/.gitignore
index 5afd7ff..425a541 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -145,6 +145,8 @@ config.log
 /lib/addons/library.xbmc.codec/project/VS2010Express/Debug
 /lib/addons/library.xbmc.pvr/project/VS2010Express/Release
 /lib/addons/library.xbmc.pvr/project/VS2010Express/Debug
+/lib/addons/library.kodi.audioengine/project/VS2010Express/Release/
+/lib/addons/library.kodi.audioengine/project/VS2010Express/Debug/
 
 # /lib/cpluff/
 /lib/cpluff/ABOUT-NLS
@@ -827,6 +829,8 @@ xbmc/main/posix/Makefile
 /addons/library.kodi.guilib/libKODI_guilib.lib
 /addons/library.xbmc.pvr/libXBMC_pvr.dll
 /addons/library.xbmc.pvr/libXBMC_pvr.lib
+/addons/library.kodi.audioengine/libKODI_audioengine.dll
+/addons/library.kodi.audioengine/libKODI_audioengine.lib
 
 /pvr-addons
 /adsp-addons

diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj
index 4a6268b..eb4584a 100644 (file)
--- a/Kodi.xcodeproj/project.pbxproj
+++ b/Kodi.xcodeproj/project.pbxproj
@@ -327,6 +327,9 @@
                7C1A85661520522500C63311 /* TextureCacheJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C1A85631520522500C63311 /* TextureCacheJob.cpp */; };
                7C1D682915A7D2FD00658B65 /* DatabaseManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C1D682715A7D2FD00658B65 /* DatabaseManager.cpp */; };
                7C1F6EBB13ECCFA7001726AB /* LibraryDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C1F6EB913ECCFA7001726AB /* LibraryDirectory.cpp */; };
+               7C226E3E1BA5F61C00185CE0 /* AddonCallbacksAudioEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C226E3C1BA5F61C00185CE0 /* AddonCallbacksAudioEngine.cpp */; };
+               7C226E3F1BA5F61D00185CE0 /* AddonCallbacksAudioEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C226E3C1BA5F61C00185CE0 /* AddonCallbacksAudioEngine.cpp */; };
+               7C226E401BA5F61D00185CE0 /* AddonCallbacksAudioEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C226E3C1BA5F61C00185CE0 /* AddonCallbacksAudioEngine.cpp */; };
                7C26126C182068660086E04D /* SettingsOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C26126A182068660086E04D /* SettingsOperations.cpp */; };
                7C26126D182068660086E04D /* SettingsOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C26126A182068660086E04D /* SettingsOperations.cpp */; };
                7C26126E182068660086E04D /* SettingsOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C26126A182068660086E04D /* SettingsOperations.cpp */; };
@@ -3804,6 +3807,8 @@
                7C1D682815A7D2FD00658B65 /* DatabaseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseManager.h; sourceTree = "<group>"; };
                7C1F6EB913ECCFA7001726AB /* LibraryDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LibraryDirectory.cpp; sourceTree = "<group>"; };
                7C1F6EBA13ECCFA7001726AB /* LibraryDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LibraryDirectory.h; sourceTree = "<group>"; };
+               7C226E3C1BA5F61C00185CE0 /* AddonCallbacksAudioEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallbacksAudioEngine.cpp; sourceTree = "<group>"; };
+               7C226E3D1BA5F61C00185CE0 /* AddonCallbacksAudioEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallbacksAudioEngine.h; sourceTree = "<group>"; };
                7C26126A182068660086E04D /* SettingsOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SettingsOperations.cpp; sourceTree = "<group>"; };
                7C26126B182068660086E04D /* SettingsOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsOperations.h; sourceTree = "<group>"; };
                7C26126F1825B6340086E04D /* DatabaseQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseQuery.cpp; sourceTree = "<group>"; };
@@ -6064,6 +6069,8 @@
                18B49FF01152BEEB001AF8A6 /* addons */ = {
                        isa = PBXGroup;
                        children = (
+                               7C226E3C1BA5F61C00185CE0 /* AddonCallbacksAudioEngine.cpp */,
+                               7C226E3D1BA5F61C00185CE0 /* AddonCallbacksAudioEngine.h */,
                                7C973CE31B50378E0002A874 /* AddonCallbacksAudioDSP.cpp */,
                                7C973CE41B50378E0002A874 /* AddonCallbacksAudioDSP.h */,
                                18B49FF11152BFA5001AF8A6 /* Addon.cpp */,
@@ -11293,6 +11300,7 @@
                                F56352AA16E5402100D21BAD /* GUIDialogContentSettings.cpp in Sources */,
                                F56352BB16E5403400D21BAD /* GUIWindowSettings.cpp in Sources */,
                                F56352BC16E5403400D21BAD /* GUIWindowSettingsCategory.cpp in Sources */,
+                               7C226E3E1BA5F61C00185CE0 /* AddonCallbacksAudioEngine.cpp in Sources */,
                                F56352BE16E5403400D21BAD /* GUIWindowSettingsScreenCalibration.cpp in Sources */,
                                F56352BF16E5403400D21BAD /* GUIWindowTestPattern.cpp in Sources */,
                                F56352C816E5436900D21BAD /* AppParamParser.cpp in Sources */,
@@ -11874,6 +11882,7 @@
                                DF0E4AD11AD5984600A75430 /* PVRRadioRDSInfoTag.cpp in Sources */,
                                DFF0F26D17528350002DA3A4 /* ZeroconfDirectory.cpp in Sources */,
                                DFF0F26E17528350002DA3A4 /* ZipDirectory.cpp in Sources */,
+                               7C226E401BA5F61D00185CE0 /* AddonCallbacksAudioEngine.cpp in Sources */,
                                DFF0F26F17528350002DA3A4 /* ZipFile.cpp in Sources */,
                                DFF0F27017528350002DA3A4 /* ZipManager.cpp in Sources */,
                                DFF0F27217528350002DA3A4 /* cximage.cpp in Sources */,
@@ -13627,6 +13636,7 @@
                                7CCDA819192756250074CF51 /* NptSockets.cpp in Sources */,
                                7CCDA822192756250074CF51 /* NptStreams.cpp in Sources */,
                                7CCDA82B192756250074CF51 /* NptStrings.cpp in Sources */,
+                               7C226E3F1BA5F61D00185CE0 /* AddonCallbacksAudioEngine.cpp in Sources */,
                                7CCDA834192756250074CF51 /* NptSystem.cpp in Sources */,
                                7CCDA83D192756250074CF51 /* NptThreads.cpp in Sources */,
                                7CCDA846192756250074CF51 /* NptTime.cpp in Sources */,

diff --git a/Makefile.in b/Makefile.in
index 1ef3862..e7276bf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -194,6 +194,7 @@ LIB_DIRS=\
 LIBADDON_DIRS=\
        lib/addons/library.xbmc.addon \
        lib/addons/library.kodi.adsp \
+       lib/addons/library.kodi.audioengine \
        lib/addons/library.xbmc.codec \
        lib/addons/library.xbmc.pvr \
        lib/addons/library.kodi.guilib \
@@ -331,6 +332,7 @@ dllloader: exports xbmc/cores/DllLoader/dllloader.a
 libaddon: exports
        $(MAKE) -C lib/addons/library.xbmc.addon
        $(MAKE) -C lib/addons/library.kodi.adsp
+       $(MAKE) -C lib/addons/library.kodi.audioengine
        $(MAKE) -C lib/addons/library.xbmc.codec
        $(MAKE) -C lib/addons/library.kodi.guilib
        $(MAKE) -C lib/addons/library.xbmc.pvr

diff --git a/Makefile.include.in b/Makefile.include.in
index e54672c..4719339 100644 (file)
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -43,6 +43,7 @@ INCLUDES+=-I@abs_top_srcdir@/xbmc/addons/include
 INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.guilib
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon
 INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.adsp
+INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.audioengine
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
 INCLUDES+=$(sort @INCLUDES@)

diff --git a/configure.ac b/configure.ac
index a861ce9..eb558a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2395,6 +2395,7 @@ OUTPUT_FILES="Makefile \
     xbmc/windowing/egl/Makefile \
     lib/addons/library.xbmc.addon/Makefile \
     lib/addons/library.kodi.adsp/Makefile \
+    lib/addons/library.kodi.audioengine/Makefile \
     lib/addons/library.xbmc.codec/Makefile \
     lib/addons/library.kodi.guilib/Makefile \
     lib/addons/library.xbmc.pvr/Makefile \

diff --git a/project/VS2010Express/XBMC for Windows.sln b/project/VS2010Express/XBMC for Windows.sln
index b18090c..6e09d41 100644 (file)
--- a/project/VS2010Express/XBMC for Windows.sln
+++ b/project/VS2010Express/XBMC for Windows.sln
@@ -57,6 +57,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "..\..\lib\win3
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libKODI_adsp", "..\..\lib\addons\library.kodi.adsp\project\VS2010Express\libKODI_adsp.vcxproj", "{44F93C4D-85DD-4452-99BB-F1D196174024}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libKODI_audioengine", "..\..\lib\addons\library.kodi.audioengine\project\VS2010Express\libKODI_audioengine.vcxproj", "{6B96FD7D-26EE-415B-8858-27757A0B1273}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug Testsuite|Win32 = Debug Testsuite|Win32
@@ -203,6 +205,12 @@ Global
                {44F93C4D-85DD-4452-99BB-F1D196174024}.Debug|Win32.Build.0 = Debug|Win32
                {44F93C4D-85DD-4452-99BB-F1D196174024}.Release|Win32.ActiveCfg = Release|Win32
                {44F93C4D-85DD-4452-99BB-F1D196174024}.Release|Win32.Build.0 = Release|Win32
+               {6B96FD7D-26EE-415B-8858-27757A0B1273}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32
+               {6B96FD7D-26EE-415B-8858-27757A0B1273}.Debug Testsuite|Win32.Build.0 = Debug|Win32
+               {6B96FD7D-26EE-415B-8858-27757A0B1273}.Debug|Win32.ActiveCfg = Debug|Win32
+               {6B96FD7D-26EE-415B-8858-27757A0B1273}.Debug|Win32.Build.0 = Debug|Win32
+               {6B96FD7D-26EE-415B-8858-27757A0B1273}.Release|Win32.ActiveCfg = Release|Win32
+               {6B96FD7D-26EE-415B-8858-27757A0B1273}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 25f7419..8592fba 100644 (file)
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -184,6 +184,7 @@
     <ClCompile Include="..\..\xbmc\addons\AddonCallbacks.cpp" />
     <ClCompile Include="..\..\xbmc\addons\AddonCallbacksAddon.cpp" />
     <ClCompile Include="..\..\xbmc\addons\AddonCallbacksAudioDSP.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\AddonCallbacksAudioEngine.cpp" />
     <ClCompile Include="..\..\xbmc\addons\AddonCallbacksCodec.cpp" />
     <ClCompile Include="..\..\xbmc\addons\AddonCallbacksGUI.cpp" />
     <ClCompile Include="..\..\xbmc\addons\AddonCallbacksPVR.cpp" />
@@ -888,6 +889,7 @@
     <ClCompile Include="..\..\xbmc\TextureDatabase.cpp" />
     <ClCompile Include="..\..\xbmc\DatabaseManager.cpp" />
     <ClInclude Include="..\..\xbmc\addons\AddonCallbacksAudioDSP.h" />
+    <ClInclude Include="..\..\xbmc\addons\AddonCallbacksAudioEngine.h" />
     <ClInclude Include="..\..\xbmc\addons\AddonCallbacksCodec.h" />
     <ClInclude Include="..\..\xbmc\addons\AudioDecoder.h" />
     <ClInclude Include="..\..\xbmc\addons\ContextMenuAddon.h" />
@@ -908,6 +910,7 @@
     <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPDatabase.h" />
     <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPMode.h" />
     <ClInclude Include="..\..\xbmc\cores\AudioEngine\DSPAddons\ActiveAEDSPProcess.h" />
+    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamData.h" />
     <ClInclude Include="..\..\xbmc\cores\DataCacheCore.h" />
     <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEFactory.h" />
     <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEResampleFactory.h" />
@@ -3007,4 +3010,4 @@
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
-</Project>
\ No newline at end of file
+</Project>

diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index ba7cb91..9947ec4 100644 (file)
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -3258,6 +3258,9 @@
     <ClCompile Include="..\..\xbmc\interfaces\builtins\WeatherBuiltins.cpp">
       <Filter>interfaces\builtins</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\xbmc\addons\AddonCallbacksAudioEngine.cpp">
+      <Filter>addons</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\xbmc\win32\pch.h">
@@ -6316,6 +6319,12 @@
     <ClInclude Include="..\..\xbmc\interfaces\builtins\WeatherBuiltins.h">
       <Filter>interfaces\builtins</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\AddonCallbacksAudioEngine.h">
+      <Filter>addons</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\cores\AudioEngine\Utils\AEStreamData.h">
+      <Filter>cores\AudioEngine\Utils</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
@@ -6402,4 +6411,4 @@
       <Filter>shaders</Filter>
     </FxCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/xbmc/addons/Makefile b/xbmc/addons/Makefile
index 7934e23..b0b7132 100644 (file)
--- a/xbmc/addons/Makefile
+++ b/xbmc/addons/Makefile
@@ -2,6 +2,7 @@ SRCS=Addon.cpp \
      AddonCallbacks.cpp \
      AddonCallbacksAddon.cpp \
      AddonCallbacksAudioDSP.cpp \
+     AddonCallbacksAudioEngine.cpp \
      AddonCallbacksCodec.cpp \
      AddonCallbacksGUI.cpp \
      AddonCallbacksPVR.cpp \

diff --git a/xbmc/addons/addon-bindings.mk b/xbmc/addons/addon-bindings.mk
index e94975b..8b67d40 100644 (file)
--- a/xbmc/addons/addon-bindings.mk
+++ b/xbmc/addons/addon-bindings.mk
@@ -3,6 +3,7 @@ BINDINGS+=xbmc/addons/include/xbmc_addon_dll.h
 BINDINGS+=xbmc/addons/include/xbmc_addon_types.h
 BINDINGS+=xbmc/addons/include/kodi_adsp_dll.h
 BINDINGS+=xbmc/addons/include/kodi_adsp_types.h
+BINDINGS+=xbmc/addons/include/kodi_audioengine_types.h
 BINDINGS+=xbmc/addons/include/xbmc_audioenc_dll.h
 BINDINGS+=xbmc/addons/include/xbmc_audioenc_types.h
 BINDINGS+=xbmc/addons/include/kodi_audiodec_dll.h
@@ -18,6 +19,7 @@ BINDINGS+=xbmc/addons/include/xbmc_vis_types.h
 BINDINGS+=xbmc/addons/include/xbmc_stream_utils.hpp
 BINDINGS+=addons/library.xbmc.addon/libXBMC_addon.h
 BINDINGS+=addons/library.kodi.adsp/libKODI_adsp.h
+BINDINGS+=addons/library.kodi.audioengine/libKODI_audioengine.h
 BINDINGS+=addons/library.kodi.guilib/libKODI_guilib.h
 BINDINGS+=addons/library.xbmc.pvr/libXBMC_pvr.h
 BINDINGS+=addons/library.xbmc.codec/libXBMC_codec.h