From 646e72f41adb1916f1c24f057b39bed4d7b949c6 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 25 Apr 2018 19:02:17 +0000 Subject: prepare for new metadata api iplementation (compilation is broken, latest working revision: 7935) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7936 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/detailsdialog.cpp | 2 +- src/qmmpui/fileloader.cpp | 17 +++++++++-------- src/qmmpui/metadataformatter.cpp | 4 ++-- src/qmmpui/metadataformatter.h | 7 +++---- src/qmmpui/playlistitem.h | 1 - src/qmmpui/playlistmanager.cpp | 4 ++-- src/qmmpui/playlistmodel.h | 1 + src/qmmpui/playlisttask.cpp | 4 ++-- src/qmmpui/playlisttrack.cpp | 12 ++++++------ src/qmmpui/playlisttrack.h | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/qmmpui') diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp index 91d5fa23b..386fd9676 100644 --- a/src/qmmpui/detailsdialog.cpp +++ b/src/qmmpui/detailsdialog.cpp @@ -137,7 +137,7 @@ void DetailsDialog::updatePage() m_ui->pathEdit->setText(m_path); //load metadata and create metadata model - QList flist = MetaDataManager::instance()->createPlayList(m_path, true); + QList flist = MetaDataManager::instance()->createPlayList(m_path, TrackInfo::MetaData); if(!flist.isEmpty() && QFile::exists(m_track->url())) m_metaData = flist.at(0)->metaData(); else diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp index 5ff69f583..c9c13da68 100644 --- a/src/qmmpui/fileloader.cpp +++ b/src/qmmpui/fileloader.cpp @@ -44,9 +44,9 @@ FileLoader::~FileLoader() QList FileLoader::processFile(const QString &path, QStringList *ignoredPaths) { QList tracks; - QList infoList = MetaDataManager::instance()->createPlayList(path, m_use_meta, ignoredPaths); + QList infoList = MetaDataManager::instance()->createPlayList(path, TrackInfo::MetaData, ignoredPaths); - foreach (FileInfo *info, infoList) + foreach (TrackInfo *info, infoList) { tracks.append(new PlayListTrack(info)); } @@ -61,7 +61,8 @@ void FileLoader::insertPlayList(const QString &fmt, const QByteArray &contents, while (!tracks.isEmpty() && !m_finished) { PlayListTrack *t = tracks.takeFirst(); - QList infoList = MetaDataManager::instance()->createPlayList(t->url(), m_use_meta); + QList infoList = MetaDataManager::instance()->createPlayList(t->url(), + m_use_meta ? TrackInfo::MetaData : TrackInfo::NoParts); if(infoList.count() != 1) //invalid or unsupported track { qDeleteAll(infoList); @@ -70,8 +71,8 @@ void FileLoader::insertPlayList(const QString &fmt, const QByteArray &contents, continue; } - FileInfo *info = infoList.first(); - if(!info->metaData(Qmmp::ALBUM).isEmpty() && !info->metaData(Qmmp::ARTIST).isEmpty()) + TrackInfo *info = infoList.first(); + if(!info->value(Qmmp::ALBUM).isEmpty() && !info->value(Qmmp::ARTIST).isEmpty()) t->updateMetaData(infoList.first()); emit newTracksToInsert(before, QList() << t); @@ -89,7 +90,7 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before) while (!tracks.isEmpty() && !m_finished) { PlayListTrack *t = tracks.takeFirst(); - QList infoList = MetaDataManager::instance()->createPlayList(t->url(), m_use_meta); + QList infoList = MetaDataManager::instance()->createPlayList(t->url(), m_use_meta ? TrackInfo::MetaData : TrackInfo::NoParts); if(infoList.count() != 1) //invalid or unsupported track { qDeleteAll(infoList); @@ -98,8 +99,8 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before) continue; } - FileInfo *info = infoList.first(); - if(!info->metaData(Qmmp::ALBUM).isEmpty() && !info->metaData(Qmmp::ARTIST).isEmpty()) + TrackInfo *info = infoList.first(); + if(!info->value(Qmmp::ALBUM).isEmpty() && !info->value(Qmmp::ARTIST).isEmpty()) t->updateMetaData(infoList.first()); emit newTracksToInsert(before, QList() << t); diff --git a/src/qmmpui/metadataformatter.cpp b/src/qmmpui/metadataformatter.cpp index 812021720..cd030dfc1 100644 --- a/src/qmmpui/metadataformatter.cpp +++ b/src/qmmpui/metadataformatter.cpp @@ -106,9 +106,9 @@ QString MetaDataFormatter::format(const QMap &metaData, return evalute(&m_nodes, &metaData, length, track).trimmed(); } -QString MetaDataFormatter::format(const FileInfo *info, int track) const +QString MetaDataFormatter::format(const TrackInfo *info, int track) const { - return format(info->metaData(), info->length(), track); + return format(info->metaData(), info->duration(), track); } QString MetaDataFormatter::formatLength(qint64 length, bool hideZero) diff --git a/src/qmmpui/metadataformatter.h b/src/qmmpui/metadataformatter.h index 8bcfe72cb..9cbcf1de2 100644 --- a/src/qmmpui/metadataformatter.h +++ b/src/qmmpui/metadataformatter.h @@ -26,7 +26,6 @@ #include #include #include -#include #include "qmmpui_export.h" /*! @brief The MetaDataFormatter formats metadata using templates. @@ -79,11 +78,11 @@ public: */ QString format(const QMap &metaData, qint64 length = 0, int track = 0) const; /*! - * Converts metadata of \b FileInfo pointer \b info to one string using template. - * \param info pointer to \b FileInfo object. + * Converts metadata of \b TrackInfo pointer \b info to one string using template. + * \param info pointer to \b TrackInfo object. * \param track Index of track. */ - QString format(const FileInfo *info, int track = 0) const; + QString format(const TrackInfo *info, int track = 0) const; /*! * Returns formatted length (example: 05:02:03). * \param length Length in seconds. diff --git a/src/qmmpui/playlistitem.h b/src/qmmpui/playlistitem.h index 92e30bfe6..3599c6269 100644 --- a/src/qmmpui/playlistitem.h +++ b/src/qmmpui/playlistitem.h @@ -21,7 +21,6 @@ #define PLAYLISTITEM_H #include -#include #include #include "qmmpui_export.h" diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp index 2f24b709f..f18322b93 100644 --- a/src/qmmpui/playlistmanager.cpp +++ b/src/qmmpui/playlistmanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 by Ilya Kotov * + * Copyright (C) 2009-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "qmmpuisettings.h" #include "playlistmanager.h" diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h index 734b0de18..73f49ec1f 100644 --- a/src/qmmpui/playlistmodel.h +++ b/src/qmmpui/playlistmodel.h @@ -27,6 +27,7 @@ #include #include #include +#include #include "playlistitem.h" #include "playlisttrack.h" #include "playlistgroup.h" diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp index 8ca027ade..482478b42 100644 --- a/src/qmmpui/playlisttask.cpp +++ b/src/qmmpui/playlisttask.cpp @@ -448,8 +448,8 @@ void PlayListTask::run() foreach (QFileInfo f, l) { QStringList ignored; - foreach (FileInfo *info, mm->createPlayList(f.canonicalFilePath(), - QmmpUiSettings::instance()->useMetadata(), + foreach (TrackInfo *info, mm->createPlayList(f.canonicalFilePath(), + QmmpUiSettings::instance()->useMetadata() ? TrackInfo::MetaData : TrackInfo::NoParts, &ignored)) { m_new_tracks << new PlayListTrack(info); diff --git a/src/qmmpui/playlisttrack.cpp b/src/qmmpui/playlisttrack.cpp index c9c838622..d182e9945 100644 --- a/src/qmmpui/playlisttrack.cpp +++ b/src/qmmpui/playlisttrack.cpp @@ -53,13 +53,13 @@ PlayListTrack::PlayListTrack(const PlayListTrack &other) : QMap(info->metaData()), +PlayListTrack::PlayListTrack(TrackInfo *info) : QMap(info->metaData()), PlayListItem() { m_track_index = -1; m_settings = QmmpUiSettings::instance(); m_helper = MetaDataHelper::instance(); - m_length = info->length(); + m_length = info->duration(); insert(Qmmp::URL, info->path()); m_refCount = 0; m_sheduledForDeletion = false; @@ -91,9 +91,9 @@ void PlayListTrack::updateMetaData(const QMap &metaDat formatGroup(); } -void PlayListTrack::updateMetaData(FileInfo *info) +void PlayListTrack::updateMetaData(TrackInfo *info) { - m_length = info->length(); + m_length = info->duration(); QMap ::operator =(info->metaData()); insert(Qmmp::URL, info->path()); m_formattedTitles.clear(); @@ -103,10 +103,10 @@ void PlayListTrack::updateMetaData(FileInfo *info) void PlayListTrack::updateMetaData() { - QList list = MetaDataManager::instance()->createPlayList(value(Qmmp::URL)); + QList list = MetaDataManager::instance()->createPlayList(value(Qmmp::URL)); if(!list.isEmpty() && !list.at(0)->path().contains("://")) { - FileInfo *info = list.at(0); + TrackInfo *info = list.at(0); updateMetaData(info); } qDeleteAll(list); diff --git a/src/qmmpui/playlisttrack.h b/src/qmmpui/playlisttrack.h index 57bbb58a1..d7dd90073 100644 --- a/src/qmmpui/playlisttrack.h +++ b/src/qmmpui/playlisttrack.h @@ -22,8 +22,8 @@ #include #include -#include #include +#include #include "playlistitem.h" #include "qmmpui_export.h" @@ -49,7 +49,7 @@ public: * Constructs plalist item with given metadata. * @param info Media file information. */ - PlayListTrack(FileInfo *info); + PlayListTrack(TrackInfo *info); /*! * Object destructor. */ @@ -90,9 +90,9 @@ public: void updateMetaData(const QMap &metaData); /*! * Updates current metadata. - * @param info Media file information. + * @param info Track information. */ - void updateMetaData(FileInfo *info); + void updateMetaData(TrackInfo *info); /*! * Gets new metadata from file (works for local files only). */ -- cgit v1.2.3-13-gbd6f