diff options
author | Jonathan Marshall <jmarshall@never.you.mind> | 2013-01-26 12:15:56 +1300 |
---|---|---|
committer | Jonathan Marshall <jmarshall@xbmc.org> | 2014-02-01 09:37:33 +1300 |
commit | 953e5047ff52d76dcb99589bd9792ce211b2b5a2 (patch) | |
tree | 5be88e64cfd932a3f66a4026e3a1d741b3fb0a50 | |
parent | fc541bd700940131584a85274723a465146203fc (diff) |
remove unused MusicInfoTagLoaderWav
-rw-r--r-- | XBMC.xcodeproj/project.pbxproj | 10 | ||||
-rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 2 | ||||
-rw-r--r-- | project/VS2010Express/XBMC.vcxproj.filters | 6 | ||||
-rw-r--r-- | xbmc/music/tags/Makefile | 1 | ||||
-rw-r--r-- | xbmc/music/tags/MusicInfoTagLoaderFactory.cpp | 1 | ||||
-rw-r--r-- | xbmc/music/tags/MusicInfoTagLoaderWav.cpp | 58 | ||||
-rw-r--r-- | xbmc/music/tags/MusicInfoTagLoaderWav.h | 35 |
7 files changed, 0 insertions, 113 deletions
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj index a8ea616a46..ae59e25a20 100644 --- a/XBMC.xcodeproj/project.pbxproj +++ b/XBMC.xcodeproj/project.pbxproj @@ -139,7 +139,6 @@ 18B7C89D129423A7009E7A26 /* MusicInfoTagLoaderNSF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C878129423A7009E7A26 /* MusicInfoTagLoaderNSF.cpp */; }; 18B7C89F129423A7009E7A26 /* MusicInfoTagLoaderShn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C87C129423A7009E7A26 /* MusicInfoTagLoaderShn.cpp */; }; 18B7C8A0129423A7009E7A26 /* MusicInfoTagLoaderSPC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C87E129423A7009E7A26 /* MusicInfoTagLoaderSPC.cpp */; }; - 18B7C8A1129423A7009E7A26 /* MusicInfoTagLoaderWav.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C880129423A7009E7A26 /* MusicInfoTagLoaderWav.cpp */; }; 18B7C8A4129423A7009E7A26 /* MusicInfoTagLoaderYM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C886129423A7009E7A26 /* MusicInfoTagLoaderYM.cpp */; }; 18B7C8D712942546009E7A26 /* ButtonTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8CB12942546009E7A26 /* ButtonTranslator.cpp */; }; 18B7C8D812942546009E7A26 /* KeyboardLayoutConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8CD12942546009E7A26 /* KeyboardLayoutConfiguration.cpp */; }; @@ -1265,7 +1264,6 @@ DFF0F30D17528350002DA3A4 /* MusicInfoTagLoaderNSF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C878129423A7009E7A26 /* MusicInfoTagLoaderNSF.cpp */; }; DFF0F30E17528350002DA3A4 /* MusicInfoTagLoaderShn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C87C129423A7009E7A26 /* MusicInfoTagLoaderShn.cpp */; }; DFF0F30F17528350002DA3A4 /* MusicInfoTagLoaderSPC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C87E129423A7009E7A26 /* MusicInfoTagLoaderSPC.cpp */; }; - DFF0F31017528350002DA3A4 /* MusicInfoTagLoaderWav.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C880129423A7009E7A26 /* MusicInfoTagLoaderWav.cpp */; }; DFF0F31117528350002DA3A4 /* MusicInfoTagLoaderYM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C886129423A7009E7A26 /* MusicInfoTagLoaderYM.cpp */; }; DFF0F31217528350002DA3A4 /* TagLibVFSStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE84CB5915A5B8A600A3810E /* TagLibVFSStream.cpp */; }; DFF0F31317528350002DA3A4 /* TagLoaderTagLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AEC0083015ACAC6E0099888C /* TagLoaderTagLib.cpp */; }; @@ -2680,7 +2678,6 @@ E499138E174E5F0E00741B6D /* MusicInfoTagLoaderNSF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C878129423A7009E7A26 /* MusicInfoTagLoaderNSF.cpp */; }; E499138F174E5F0E00741B6D /* MusicInfoTagLoaderShn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C87C129423A7009E7A26 /* MusicInfoTagLoaderShn.cpp */; }; E4991390174E5F0E00741B6D /* MusicInfoTagLoaderSPC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C87E129423A7009E7A26 /* MusicInfoTagLoaderSPC.cpp */; }; - E4991391174E5F0E00741B6D /* MusicInfoTagLoaderWav.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C880129423A7009E7A26 /* MusicInfoTagLoaderWav.cpp */; }; E4991392174E5F0E00741B6D /* MusicInfoTagLoaderYM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C886129423A7009E7A26 /* MusicInfoTagLoaderYM.cpp */; }; E4991393174E5F0E00741B6D /* TagLibVFSStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE84CB5915A5B8A600A3810E /* TagLibVFSStream.cpp */; }; E4991394174E5F0E00741B6D /* TagLoaderTagLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AEC0083015ACAC6E0099888C /* TagLoaderTagLib.cpp */; }; @@ -3465,8 +3462,6 @@ 18B7C87D129423A7009E7A26 /* MusicInfoTagLoaderShn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicInfoTagLoaderShn.h; sourceTree = "<group>"; }; 18B7C87E129423A7009E7A26 /* MusicInfoTagLoaderSPC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicInfoTagLoaderSPC.cpp; sourceTree = "<group>"; }; 18B7C87F129423A7009E7A26 /* MusicInfoTagLoaderSPC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicInfoTagLoaderSPC.h; sourceTree = "<group>"; }; - 18B7C880129423A7009E7A26 /* MusicInfoTagLoaderWav.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicInfoTagLoaderWav.cpp; sourceTree = "<group>"; }; - 18B7C881129423A7009E7A26 /* MusicInfoTagLoaderWav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicInfoTagLoaderWav.h; sourceTree = "<group>"; }; 18B7C886129423A7009E7A26 /* MusicInfoTagLoaderYM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicInfoTagLoaderYM.cpp; sourceTree = "<group>"; }; 18B7C887129423A7009E7A26 /* MusicInfoTagLoaderYM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicInfoTagLoaderYM.h; sourceTree = "<group>"; }; 18B7C8CB12942546009E7A26 /* ButtonTranslator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ButtonTranslator.cpp; sourceTree = "<group>"; }; @@ -6058,8 +6053,6 @@ 18B7C87D129423A7009E7A26 /* MusicInfoTagLoaderShn.h */, 18B7C87E129423A7009E7A26 /* MusicInfoTagLoaderSPC.cpp */, 18B7C87F129423A7009E7A26 /* MusicInfoTagLoaderSPC.h */, - 18B7C880129423A7009E7A26 /* MusicInfoTagLoaderWav.cpp */, - 18B7C881129423A7009E7A26 /* MusicInfoTagLoaderWav.h */, 18B7C886129423A7009E7A26 /* MusicInfoTagLoaderYM.cpp */, 18B7C887129423A7009E7A26 /* MusicInfoTagLoaderYM.h */, AE84CB5915A5B8A600A3810E /* TagLibVFSStream.cpp */, @@ -10376,7 +10369,6 @@ 18B7C89D129423A7009E7A26 /* MusicInfoTagLoaderNSF.cpp in Sources */, 18B7C89F129423A7009E7A26 /* MusicInfoTagLoaderShn.cpp in Sources */, 18B7C8A0129423A7009E7A26 /* MusicInfoTagLoaderSPC.cpp in Sources */, - 18B7C8A1129423A7009E7A26 /* MusicInfoTagLoaderWav.cpp in Sources */, 18B7C8A4129423A7009E7A26 /* MusicInfoTagLoaderYM.cpp in Sources */, 18B7C8D712942546009E7A26 /* ButtonTranslator.cpp in Sources */, 18B7C8D812942546009E7A26 /* KeyboardLayoutConfiguration.cpp in Sources */, @@ -11391,7 +11383,6 @@ DFF0F30D17528350002DA3A4 /* MusicInfoTagLoaderNSF.cpp in Sources */, DFF0F30E17528350002DA3A4 /* MusicInfoTagLoaderShn.cpp in Sources */, DFF0F30F17528350002DA3A4 /* MusicInfoTagLoaderSPC.cpp in Sources */, - DFF0F31017528350002DA3A4 /* MusicInfoTagLoaderWav.cpp in Sources */, DFF0F31117528350002DA3A4 /* MusicInfoTagLoaderYM.cpp in Sources */, DFF0F31217528350002DA3A4 /* TagLibVFSStream.cpp in Sources */, DFF0F31317528350002DA3A4 /* TagLoaderTagLib.cpp in Sources */, @@ -12442,7 +12433,6 @@ E499138E174E5F0E00741B6D /* MusicInfoTagLoaderNSF.cpp in Sources */, E499138F174E5F0E00741B6D /* MusicInfoTagLoaderShn.cpp in Sources */, E4991390174E5F0E00741B6D /* MusicInfoTagLoaderSPC.cpp in Sources */, - E4991391174E5F0E00741B6D /* MusicInfoTagLoaderWav.cpp in Sources */, E4991392174E5F0E00741B6D /* MusicInfoTagLoaderYM.cpp in Sources */, E4991393174E5F0E00741B6D /* TagLibVFSStream.cpp in Sources */, E4991394174E5F0E00741B6D /* TagLoaderTagLib.cpp in Sources */, diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index bfefc2b180..3d9875c479 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -748,7 +748,6 @@ <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderNSF.cpp" /> <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderShn.cpp" /> <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderSPC.cpp" /> - <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderWav.cpp" /> <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderYM.cpp" /> <ClCompile Include="..\..\xbmc\music\tags\TagLibVFSStream.cpp" /> <ClCompile Include="..\..\xbmc\music\tags\TagLoaderTagLib.cpp" /> @@ -1139,7 +1138,6 @@ <ClInclude Include="..\..\xbmc\interfaces\python\swig.h" /> <ClInclude Include="..\..\xbmc\interfaces\python\XBPython.h" /> <ClInclude Include="..\..\xbmc\music\MusicDbUrl.h" /> - <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderWav.h" /> <ClInclude Include="..\..\xbmc\music\tags\TagLibVFSStream.h" /> <ClInclude Include="..\..\xbmc\music\tags\TagLoaderTagLib.h" /> <ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPImageHandler.h" /> diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index 3e5fffd35f..b5e72d9719 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -2839,9 +2839,6 @@ <ClCompile Include="..\..\xbmc\music\tags\TagLoaderTagLib.cpp"> <Filter>music\tags</Filter> </ClCompile> - <ClCompile Include="..\..\xbmc\music\tags\MusicInfoTagLoaderWav.cpp"> - <Filter>music\tags</Filter> - </ClCompile> <ClCompile Include="..\..\xbmc\interfaces\python\test\TestSwig.cpp"> <Filter>interfaces\python\test</Filter> </ClCompile> @@ -5801,9 +5798,6 @@ <ClInclude Include="..\..\xbmc\music\tags\TagLoaderTagLib.h"> <Filter>music\tags</Filter> </ClInclude> - <ClInclude Include="..\..\xbmc\music\tags\MusicInfoTagLoaderWav.h"> - <Filter>music\tags</Filter> - </ClInclude> <ClInclude Include="..\..\xbmc\interfaces\json-rpc\AddonsOperations.h"> <Filter>interfaces\json-rpc</Filter> </ClInclude> diff --git a/xbmc/music/tags/Makefile b/xbmc/music/tags/Makefile index c144be7c78..ab3af2a180 100644 --- a/xbmc/music/tags/Makefile +++ b/xbmc/music/tags/Makefile @@ -8,7 +8,6 @@ SRCS=\ MusicInfoTagLoaderNSF.cpp \ MusicInfoTagLoaderShn.cpp \ MusicInfoTagLoaderSPC.cpp \ - MusicInfoTagLoaderWav.cpp \ MusicInfoTagLoaderYM.cpp \ TagLoaderTagLib.cpp \ TagLibVFSStream.cpp \ diff --git a/xbmc/music/tags/MusicInfoTagLoaderFactory.cpp b/xbmc/music/tags/MusicInfoTagLoaderFactory.cpp index 2a4d902644..2e53851f41 100644 --- a/xbmc/music/tags/MusicInfoTagLoaderFactory.cpp +++ b/xbmc/music/tags/MusicInfoTagLoaderFactory.cpp @@ -23,7 +23,6 @@ #include "TagLoaderTagLib.h" #include "MusicInfoTagLoaderCDDA.h" #include "MusicInfoTagLoaderShn.h" -#include "MusicInfoTagLoaderWav.h" #ifdef HAS_MOD_PLAYER #include "cores/ModPlayer.h" #endif diff --git a/xbmc/music/tags/MusicInfoTagLoaderWav.cpp b/xbmc/music/tags/MusicInfoTagLoaderWav.cpp deleted file mode 100644 index c80cb9e448..0000000000 --- a/xbmc/music/tags/MusicInfoTagLoaderWav.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2005-2013 Team XBMC - * http://xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, see - * <http://www.gnu.org/licenses/>. - * - */ - -#include "MusicInfoTagLoaderWav.h" -#include "cores/paplayer/WAVcodec.h" -#include "MusicInfoTag.h" -#include "utils/log.h" - -using namespace MUSIC_INFO; - -CMusicInfoTagLoaderWAV::CMusicInfoTagLoaderWAV(void) -{} - -CMusicInfoTagLoaderWAV::~CMusicInfoTagLoaderWAV() -{} - -bool CMusicInfoTagLoaderWAV::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art) -{ - try - { - // WAV has no tag information other than the duration. - - // Load our codec class - WAVCodec codec; - if (codec.Init(strFileName, 4096)) - { - tag.SetURL(strFileName); - tag.SetDuration((int)(codec.m_TotalTime/1000)); - tag.SetLoaded(false); - codec.DeInit(); - return true; - } - } - catch (...) - { - CLog::Log(LOGERROR, "Tag loader wav: exception in file %s", strFileName.c_str()); - } - - return false; -} - diff --git a/xbmc/music/tags/MusicInfoTagLoaderWav.h b/xbmc/music/tags/MusicInfoTagLoaderWav.h deleted file mode 100644 index 78425b2d85..0000000000 --- a/xbmc/music/tags/MusicInfoTagLoaderWav.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once -/* - * Copyright (C) 2005-2013 Team XBMC - * http://xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, see - * <http://www.gnu.org/licenses/>. - * - */ - -#include "ImusicInfoTagLoader.h" - -namespace MUSIC_INFO -{ - -class CMusicInfoTagLoaderWAV: public IMusicInfoTagLoader -{ -public: - CMusicInfoTagLoaderWAV(void); - virtual ~CMusicInfoTagLoaderWAV(); - - virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL); -}; -} |