Commit 44d0cd9d authored by Scott Wheeler's avatar Scott Wheeler
Browse files

Having these ifdef's still here is silly.

svn path=/trunk/KDE/kdemultimedia/juk/; revision=732802
parent cd7b9128
......@@ -87,11 +87,7 @@ bool MediaFiles::isMediaFile(const QString &fileName)
{
KMimeType::Ptr result = KMimeType::findByPath(fileName, 0, true);
return result->is(mp3Type) || result->is(oggType) || result->is(flacType)
#ifdef TAGLIB_1_3
|| result->is(mpcType)
#endif
;
return result->is(mp3Type) || result->is(oggType) || result->is(flacType) || result->is(mpcType);
}
bool MediaFiles::isPlaylistFile(const QString &fileName)
......@@ -140,14 +136,8 @@ QStringList MediaFiles::mimeTypes()
{
QStringList l;
l << mp3Type << oggType << flacType << m3uType << vorbisType
#ifdef TAGLIB_1_2
<< oggflacType
#endif
#ifdef TAGLIB_1_3
<< mpcType
#endif
;
l << mp3Type << oggType << flacType << m3uType << vorbisType << oggflacType << mpcType;
return l;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment