[amarok] /: Revert "tag reading/writing support for mod, s3m, it and xm files"

[Matěj Laitl]

Git commit 62c6a63dbe4fe3db72f52b15a46e0c1ffcee79cf by Matěj Laitl.
Committed on 15/12/2011 at 00:43.
Pushed by laitl into branch 'master'.

Revert "tag reading/writing support for mod, s3m, it and xm files"

This reverts commit 3cae9ba4758c43092cd942a504ea43f5873960f4.
This was an erroneous push, Mathias Panzenböck wanted to push to his
own github repo, see his message in amarok-devel. :-)

CCMAIL: amarok-devel at kde.org

M  +0    -13   CMakeLists.txt
M  +0    -3    config-amarok.h.cmake
M  +1    -5    shared/FileType.cpp
M  +1    -5    shared/FileType.h
M  +0    -35   shared/tag_helpers/TagHelper.cpp

http://commits.kde.org/amarok/62c6a63dbe4fe3db72f52b15a46e0c1ffcee79cf

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70fb13c..cba1387 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,19 +40,6 @@ if(TAGLIB_FOUND)
         message(FATAL_ERROR "TagLib does not have MP4 support compiled in.")
     endif( NOT TAGLIB_MP4_FOUND )
 
-    check_cxx_source_compiles("#include <modtag.h>
-    #include <modfile.h>
-    #include <s3mfile.h>
-    #include <itfile.h>
-    #include <xmfile.h>
-    int main() {
-        TagLib::Mod::Tag tag;
-        TagLib::Mod::File modfile(\"/dev/null\");
-        TagLib::S3M::File s3mfile(\"/dev/null\");
-        TagLib::IT::File itfile(\"/dev/null\");
-        TagLib::XM::File xmfile(\"/dev/null\");
-        return 0; }" TAGLIB_MOD_FOUND)
-
     set(CMAKE_REQUIRED_INCLUDES)
     set(CMAKE_REQUIRED_LIBRARIES)
 
diff --git a/config-amarok.h.cmake b/config-amarok.h.cmake
index 6caaf5c..2d25cc7 100644
--- a/config-amarok.h.cmake
+++ b/config-amarok.h.cmake
@@ -30,9 +30,6 @@
 /* have TagLib-Extras */
 #cmakedefine TAGLIB_EXTRAS_FOUND 1
 
-/* have module file format support in TagLib */
-#cmakedefine TAGLIB_MOD_FOUND 1
-
 /* have QtCrypto the Qt crypto architecture */
 #cmakedefine QCA2_FOUND 1
 
diff --git a/shared/FileType.cpp b/shared/FileType.cpp
index 11dd727..a6e25d5 100644
--- a/shared/FileType.cpp
+++ b/shared/FileType.cpp
@@ -38,11 +38,7 @@ QStringList FileTypeSupport::s_fileTypeStrings = QStringList()
         << QLatin1String( "mpc" )
         << QLatin1String( "tta" )
         << QLatin1String( "wav" )
-        << QLatin1String( "wv" )
-        << QLatin1String( "mod" )
-        << QLatin1String( "s3m" )
-        << QLatin1String( "it" )
-        << QLatin1String( "xm" );
+        << QLatin1String( "wv" );
 
 
 QString
diff --git a/shared/FileType.h b/shared/FileType.h
index 74e5417..5c8081f 100644
--- a/shared/FileType.h
+++ b/shared/FileType.h
@@ -38,11 +38,7 @@ enum FileType
     Mpc         =  7,
     TrueAudio   =  8,
     Wav         =  9,
-    WavPack     = 10,
-    Mod         = 11,
-    S3M         = 12,
-    IT          = 13,
-    XM          = 14
+    WavPack     = 10
 };
 
 
diff --git a/shared/tag_helpers/TagHelper.cpp b/shared/tag_helpers/TagHelper.cpp
index 5839c30..96f763e 100644
--- a/shared/tag_helpers/TagHelper.cpp
+++ b/shared/tag_helpers/TagHelper.cpp
@@ -16,8 +16,6 @@
 
 #include "TagHelper.h"
 
-#include <config-amarok.h>
-
 #include <QRegExp>
 #include <QStringList>
 
@@ -36,12 +34,6 @@
 #include <vorbisfile.h>
 #include <wavfile.h>
 #include <wavpackfile.h>
-#ifdef TAGLIB_MOD_FOUND
-#include <modfile.h>
-#include <s3mfile.h>
-#include <itfile.h>
-#include <xmfile.h>
-#endif
 
 #include "APETagHelper.h"
 #include "ASFTagHelper.h"
@@ -333,33 +325,6 @@ Meta::Tag::selectHelper( const TagLib::FileRef fileref, bool forceCreation )
         else if( file->ID3v1Tag() )
             tagHelper = new TagHelper( fileref.tag(), Amarok::WavPack );
     }
-#ifdef TAGLIB_MOD_FOUND
-    else if( TagLib::Mod::File *file = dynamic_cast< TagLib::Mod::File * >( fileref.file() ) )
-    {
-        if( file->tag() )
-            tagHelper = new TagHelper( fileref.tag(), Amarok::Mod );
-    }
-    else if( TagLib::S3M::File *file = dynamic_cast< TagLib::S3M::File * >( fileref.file() ) )
-    {
-        if( file->tag() )
-            tagHelper = new TagHelper( fileref.tag(), Amarok::S3M );
-    }
-    else if( TagLib::IT::File *file = dynamic_cast< TagLib::IT::File * >( fileref.file() ) )
-    {
-        if( file->tag() )
-            tagHelper = new TagHelper( fileref.tag(), Amarok::IT );
-    }
-    else if( TagLib::XM::File *file = dynamic_cast< TagLib::XM::File * >( fileref.file() ) )
-    {
-        if( file->tag() )
-            tagHelper = new TagHelper( fileref.tag(), Amarok::XM );
-    }
-#endif
-    else if( !fileref.isNull() )
-    {
-        if( fileref.tag() )
-            tagHelper = new TagHelper( fileref.tag(), Amarok::Unknown );
-    }
 
     return tagHelper;
 }