--- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,7 +1,7 @@ SET(USE_ENCA TRUE CACHE BOOL "enable/disable libenca support") include(FindPkgConfig) pkg_search_module(ENCA enca>=1.9) -pkg_search_module(TAGLIB taglib>=1.10) +pkg_search_module(TAGLIB taglib>=1.9) add_subdirectory(Input) add_subdirectory(Output) add_subdirectory(Visual) --- a/src/plugins/General/converter/converter.cpp +++ b/src/plugins/General/converter/converter.cpp @@ -33,6 +33,11 @@ #include #include "converter.h" +#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9)) +#undef QStringToTString +#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) +#endif + Converter::Converter(QObject *parent) : QObject(parent), QRunnable() { m_user_stop = false; --- a/src/plugins/General/rgscan/rgscandialog.cpp +++ b/src/plugins/General/rgscan/rgscandialog.cpp @@ -42,6 +42,11 @@ #define FILE_SKIPPED (Qt::UserRole + 1) +#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9)) +#undef QStringToTString +#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) +#endif + struct ReplayGainInfoItem { QMap info; @@ -75,8 +80,12 @@ RGScanDialog::RGScanDialog(QList url()); QString name = formatter.format(track); @@ -368,6 +377,7 @@ void RGScanDialog::writeVorbisComment(Ta } } +#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9)) void RGScanDialog::writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item) { if(m_ui.trackCheckBox->isChecked()) @@ -385,6 +395,7 @@ void RGScanDialog::writeMP4Tag(TagLib::M gainToStringList(item->info[Qmmp::REPLAYGAIN_ALBUM_PEAK])); } } +#endif void RGScanDialog::on_writeButton_clicked() { @@ -428,11 +439,13 @@ void RGScanDialog::on_writeButton_clicke writeAPETag(file.APETag(true), item); file.save(); } +#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9)) else if(ext == "m4a") //MPEG-4 Part 14 { TagLib::MP4::File file(qPrintable(item->url)); writeMP4Tag(file.tag(), item); file.save(); } +#endif } } --- a/src/plugins/General/rgscan/rgscandialog.h +++ b/src/plugins/General/rgscan/rgscandialog.h @@ -48,10 +48,12 @@ namespace TagLib { class XiphComment; } +#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9)) namespace MP4 { class Tag; } +#endif } /** @@ -81,7 +83,9 @@ private: void writeAPETag(TagLib::APE::Tag *tag, ReplayGainInfoItem *item); void writeID3v2Tag(TagLib::ID3v2::Tag *tag, ReplayGainInfoItem *item); void writeVorbisComment(TagLib::Ogg::XiphComment *tag, ReplayGainInfoItem *item); +#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9)) void writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item); +#endif Ui::RGScanDialog m_ui; QList m_scanners; QList m_replayGainItemList; --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.cpp @@ -26,6 +26,11 @@ #include #include "flacmetadatamodel.h" +#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9)) +#undef QStringToTString +#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) +#endif + FLACMetaDataModel::FLACMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { m_file = 0; --- a/src/plugins/Input/opus/opusmetadatamodel.cpp +++ b/src/plugins/Input/opus/opusmetadatamodel.cpp @@ -26,6 +26,11 @@ #include #include "opusmetadatamodel.h" +#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9)) +#undef QStringToTString +#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) +#endif + OpusMetaDataModel::OpusMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { m_path = path; --- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp @@ -26,6 +26,11 @@ #include #include "vorbismetadatamodel.h" +#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9)) +#undef QStringToTString +#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) +#endif + VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { m_path = path;