Merge remote-tracking branch 'remotes/origin/MP1-4587-FEAT-Add_Suppor…

…t_DSF_Music_Format' Conflicts: mediaportal/Core/Core.csproj
MediaPortal · Feb 2, 2015 · 8a415c3 · 8a415c3
2 parents 852fc32 + 56c67f0
commit 8a415c3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 5 deletions.
diff --git a/mediaportal/Core/Core.csproj b/mediaportal/Core/Core.csproj
@@ -276,9 +276,9 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
-    <Reference Include="taglib-sharp, Version=2.0.2.10, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=MSIL">
+    <Reference Include="taglib-sharp, Version=2.0.3.8, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\MediaPortal.Base\taglib-sharp.dll</HintPath>
+      <HintPath>..\..\Packages\MediaPortal.TagLib.2.0.3.8\lib\taglib-sharp.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
@@ -1682,6 +1682,7 @@
     <Error Condition="!Exists('..\..\Packages\bass.wasapi.2.4.0.2\build\bass.wasapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\bass.wasapi.2.4.0.2\build\bass.wasapi.targets'))" />
     <Error Condition="!Exists('..\..\Packages\bass.wma.2.4.4\build\bass.wma.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\bass.wma.2.4.4\build\bass.wma.targets'))" />
     <Error Condition="!Exists('..\..\Packages\bass.wv.2.4.4\build\bass.wv.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\bass.wv.2.4.4\build\bass.wv.targets'))" />
+    <Error Condition="!Exists('..\..\Packages\bass.dsd.0.0.1\build\bass.dsd.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\bass.dsd.0.0.1\build\bass.dsd.targets'))" />
   </Target>
   <Import Project="..\..\Packages\BASS.2.4.10\build\bass.targets" Condition="Exists('..\..\Packages\BASS.2.4.10\build\bass.targets')" />
   <Import Project="..\..\Packages\bass.aac.2.4.4.4\build\bass.aac.targets" Condition="Exists('..\..\Packages\bass.aac.2.4.4.4\build\bass.aac.targets')" />
@@ -1705,4 +1706,5 @@
   <Import Project="..\..\Packages\bass.wma.2.4.4\build\bass.wma.targets" Condition="Exists('..\..\Packages\bass.wma.2.4.4\build\bass.wma.targets')" />
   <Import Project="..\..\Packages\bass.wv.2.4.4\build\bass.wv.targets" Condition="Exists('..\..\Packages\bass.wv.2.4.4\build\bass.wv.targets')" />
   <Import Project="..\..\Packages\MediaInfo.0.7.69\build\MediaInfo.targets" Condition="Exists('..\..\Packages\MediaInfo.0.7.69\build\MediaInfo.targets')" />
+  <Import Project="..\..\Packages\bass.dsd.0.0.1\build\bass.dsd.targets" Condition="Exists('..\..\Packages\bass.dsd.0.0.1\build\bass.dsd.targets')" />
 </Project>
diff --git a/mediaportal/Core/TagReader/TagReader.cs b/mediaportal/Core/TagReader/TagReader.cs
@@ -343,7 +343,8 @@ private static bool IsAudio(string fileName)
         case ".aif":
         case ".aac":
         case ".aiff":
-        case ".ape":
+        case ".ape":
+        case ".dsf":
         case ".flac":
         case ".mp3":
         case ".ogg":

diff --git a/mediaportal/Core/Util/Util.cs b/mediaportal/Core/Util/Util.cs
@@ -177,10 +177,10 @@ private Utils() {}
         ".aac,.mp4,.m4a,.m4b,.m4p," +
         // BassAc3
         ".ac3," +
-        // BassAlac
-        //".m4a,.aac,.mp4," +
         // BassApe
         ".ape,.apl," +
+        // BassDSD
+        ".dsf," +
         // BassFlac
         ".flac," +
         // BassMidi

diff --git a/mediaportal/Core/packages.config b/mediaportal/Core/packages.config
@@ -7,6 +7,7 @@
   <package id="bass.ape" version="2.4.1" targetFramework="net40" />
   <package id="bass.asio" version="1.3.0.2" targetFramework="net40" />
   <package id="bass.cd" version="2.4.5" targetFramework="net40" />
+  <package id="bass.dsd" version="0.0.1" targetFramework="net40" />
   <package id="bass.flac" version="2.4.1" targetFramework="net40" />
   <package id="bass.fx" version="2.4.10.1" targetFramework="net40" />
   <package id="bass.midi" version="2.4.8" targetFramework="net40" />
@@ -24,4 +25,5 @@
   <package id="bass.wv" version="2.4.4" targetFramework="net40" />
   <package id="ffmpeg" version="2.1.1" targetFramework="net40" />
   <package id="MediaInfo" version="0.7.69" targetFramework="net40" />
+  <package id="MediaPortal.TagLib" version="2.0.3.8" targetFramework="net40" />
 </packages>
diff --git a/mediaportal/MediaPortal.Application/PostBuild.bat b/mediaportal/MediaPortal.Application/PostBuild.bat
@@ -162,6 +162,7 @@ xcopy %1\..\Packages\bass.aac.2.4.4.4\bass_aac.dll "MusicPlayer\plugins\audio de
 xcopy %1\..\Packages\bass.ac3.2.4.0.3\bass_ac3.dll "MusicPlayer\plugins\audio decoders\" /Y /D
 xcopy %1\..\Packages\bass.alac.2.4.3\bass_alac.dll "MusicPlayer\plugins\audio decoders\" /Y /D
 xcopy %1\..\Packages\bass.ape.2.4.1\bass_ape.dll "MusicPlayer\plugins\audio decoders\" /Y /D
+xcopy %1\..\Packages\bass.dsd.0.0.1\bassdsd.dll "MusicPlayer\plugins\audio decoders\" /Y /D
 xcopy %1\..\Packages\bass.mpc.2.4.1.1\bass_mpc.dll "MusicPlayer\plugins\audio decoders\" /Y /D
 xcopy %1\..\Packages\bass.ofr.2.4.0.2\bass_ofr.dll "MusicPlayer\plugins\audio decoders\" /Y /D
 xcopy %1\..\Packages\bass.spx.2.4.2\bass_spx.dll "MusicPlayer\plugins\audio decoders\" /Y /D
@@ -176,3 +177,7 @@ xcopy %1\..\Packages\bass.wv.2.4.4\basswv.dll "MusicPlayer\plugins\audio decoder
 REM iMON Display 
 xcopy %1\..\Packages\MediaPortal-iMON-Display.1.1.0\lib\iMONDisplay.dll . /Y /D
 xcopy %1\..\Packages\MediaPortal-iMON-Display.1.1.0\lib\iMONDisplayWrapper.dll . /Y /D
+
+REM taglib-sharp
+xcopy %1\..\Packages\MediaPortal.TagLib.2.0.3.8\lib\taglib-sharp.dll ./Y /D
+
diff --git a/mediaportal/MediaPortal.Base/taglib-sharp.dll b/mediaportal/MediaPortal.Base/taglib-sharp.dll
diff --git a/mediaportal/Setup/setup.nsi b/mediaportal/Setup/setup.nsi
@@ -532,6 +532,10 @@ Section "MediaPortal core files (required)" SecCore
   File "${git_ROOT}\Packages\bass.opus.2.4.1.3\bassopus.dll"
   File "${git_ROOT}\Packages\bass.wma.2.4.4\basswma.dll"
   File "${git_ROOT}\Packages\bass.wv.2.4.4\basswv.dll"
+  File "${git_ROOT}\Packages\bass.dsd.0.0.1\bassdsd.dll"
+  ; taglib-sharp
+  SetOutPath "$MPdir.Base\"
+  File "${git_ROOT}\Packages\MediaPortal.TagLib.2.0.3.8\lib\taglib-sharp.dll"
   ; Doc
   SetOutPath "$MPdir.Base\Docs"
   File "${git_MP}\Docs\BASS License.txt"