diff --git a/mediaportal/Core/Core.csproj b/mediaportal/Core/Core.csproj index 79d07cee68a..8aa69d20004 100644 --- a/mediaportal/Core/Core.csproj +++ b/mediaportal/Core/Core.csproj @@ -276,9 +276,9 @@ System.XML - + False - ..\MediaPortal.Base\taglib-sharp.dll + ..\..\Packages\MediaPortal.TagLib.2.0.3.8\lib\taglib-sharp.dll @@ -1682,6 +1682,7 @@ + @@ -1705,4 +1706,5 @@ + \ No newline at end of file diff --git a/mediaportal/Core/TagReader/TagReader.cs b/mediaportal/Core/TagReader/TagReader.cs index 2e23ca029a2..c50de34f321 100644 --- 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 index 81404fd29e9..ac045738bd6 100644 --- 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 index 658f0a93c13..dd8beca5a9c 100644 --- a/mediaportal/Core/packages.config +++ b/mediaportal/Core/packages.config @@ -7,6 +7,7 @@ + @@ -24,4 +25,5 @@ + \ No newline at end of file diff --git a/mediaportal/MediaPortal.Application/PostBuild.bat b/mediaportal/MediaPortal.Application/PostBuild.bat index 231f0eb8f2a..ce370987160 100644 --- 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 deleted file mode 100644 index d3c8d4fb7ff..00000000000 Binary files a/mediaportal/MediaPortal.Base/taglib-sharp.dll and /dev/null differ diff --git a/mediaportal/Setup/setup.nsi b/mediaportal/Setup/setup.nsi index f365a07f3dc..f862c9432cb 100644 --- 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"