aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-08-05 11:28:36 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-08-05 11:28:36 +0000
commit6d81a69beab381aad2a380e0af361a45a9021242 (patch)
treea74c6c1f4c9d969d39612b1c44de94069e4435d0
parentd77f90c588d04aed902e67a259e65017bfe1fd10 (diff)
downloadqmmp-6d81a69beab381aad2a380e0af361a45a9021242.tar.gz
qmmp-6d81a69beab381aad2a380e0af361a45a9021242.tar.bz2
qmmp-6d81a69beab381aad2a380e0af361a45a9021242.zip
changed MetaDataManager api
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8232 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/plugins/Engines/mplayer/mplayerenginefactory.h2
-rw-r--r--src/plugins/Input/aac/decoderaacfactory.h2
-rw-r--r--src/plugins/Input/archive/decoderarchivefactory.h2
-rw-r--r--src/plugins/Input/cdaudio/decodercdaudiofactory.h2
-rw-r--r--src/plugins/Input/cue/cuemetadatamodel.cpp2
-rw-r--r--src/plugins/Input/cue/decodercuefactory.h2
-rw-r--r--src/plugins/Input/ffmpeg/decoderffmpegfactory.h2
-rw-r--r--src/plugins/Input/flac/decoderflacfactory.h2
-rw-r--r--src/plugins/Input/gme/decodergmefactory.h2
-rw-r--r--src/plugins/Input/mpc/decodermpcfactory.h2
-rw-r--r--src/plugins/Input/mpeg/decodermpegfactory.h2
-rw-r--r--src/plugins/Input/opus/decoderopusfactory.h2
-rw-r--r--src/plugins/Input/sndfile/decodersndfilefactory.h2
-rw-r--r--src/plugins/Input/vorbis/decodervorbisfactory.h2
-rw-r--r--src/plugins/Input/wavpack/decoderwavpackfactory.h2
-rw-r--r--src/qmmp/decoderfactory.h2
-rw-r--r--src/qmmp/enginefactory.h2
-rw-r--r--src/qmmp/metadatamanager.cpp12
-rw-r--r--src/qmmp/metadatamanager.h2
-rw-r--r--src/qmmp/metadatamodel.h2
-rw-r--r--src/qmmpui/detailsdialog.cpp2
21 files changed, 26 insertions, 26 deletions
diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.h b/src/plugins/Engines/mplayer/mplayerenginefactory.h
index 6be4a33c7..597b1cffb 100644
--- a/src/plugins/Engines/mplayer/mplayerenginefactory.h
+++ b/src/plugins/Engines/mplayer/mplayerenginefactory.h
@@ -33,7 +33,7 @@ public:
bool supports(const QString &source) const;
AbstractEngine *create(QObject *parent = 0);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Input/aac/decoderaacfactory.h b/src/plugins/Input/aac/decoderaacfactory.h
index 59afe89b2..adf84d3c2 100644
--- a/src/plugins/Input/aac/decoderaacfactory.h
+++ b/src/plugins/Input/aac/decoderaacfactory.h
@@ -33,7 +33,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString&, QIODevice *);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Input/archive/decoderarchivefactory.h b/src/plugins/Input/archive/decoderarchivefactory.h
index 554186fc6..cd7a1e862 100644
--- a/src/plugins/Input/archive/decoderarchivefactory.h
+++ b/src/plugins/Input/archive/decoderarchivefactory.h
@@ -34,7 +34,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString &url, QIODevice *);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.h b/src/plugins/Input/cdaudio/decodercdaudiofactory.h
index 5ebec04e7..437d6ad24 100644
--- a/src/plugins/Input/cdaudio/decodercdaudiofactory.h
+++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.h
@@ -33,7 +33,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString &, QIODevice *);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Input/cue/cuemetadatamodel.cpp b/src/plugins/Input/cue/cuemetadatamodel.cpp
index 366df20af..4f68ade0a 100644
--- a/src/plugins/Input/cue/cuemetadatamodel.cpp
+++ b/src/plugins/Input/cue/cuemetadatamodel.cpp
@@ -42,7 +42,7 @@ CUEMetaDataModel::~CUEMetaDataModel()
QList<MetaDataItem> CUEMetaDataModel::extraProperties() const
{
QList<MetaDataItem> ep;
- MetaDataModel *model = MetaDataManager::instance()->createMetaDataModel(m_path);
+ MetaDataModel *model = MetaDataManager::instance()->createMetaDataModel(m_path, true, nullptr);
if(model)
{
ep = model->extraProperties();
diff --git a/src/plugins/Input/cue/decodercuefactory.h b/src/plugins/Input/cue/decodercuefactory.h
index 2610bfd99..b134b5eaf 100644
--- a/src/plugins/Input/cue/decodercuefactory.h
+++ b/src/plugins/Input/cue/decodercuefactory.h
@@ -35,7 +35,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString &, QIODevice *);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredPaths);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
index 605e26725..3a77deefa 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
@@ -35,7 +35,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString &, QIODevice *);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Input/flac/decoderflacfactory.h b/src/plugins/Input/flac/decoderflacfactory.h
index 623fa4d33..9ac70b3f7 100644
--- a/src/plugins/Input/flac/decoderflacfactory.h
+++ b/src/plugins/Input/flac/decoderflacfactory.h
@@ -34,7 +34,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString &, QIODevice *);
QList<TrackInfo*> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Input/gme/decodergmefactory.h b/src/plugins/Input/gme/decodergmefactory.h
index 73e4b718c..02e872b06 100644
--- a/src/plugins/Input/gme/decodergmefactory.h
+++ b/src/plugins/Input/gme/decodergmefactory.h
@@ -36,7 +36,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString &path, QIODevice *input);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Input/mpc/decodermpcfactory.h b/src/plugins/Input/mpc/decodermpcfactory.h
index facaa4a9d..8dcf3e95b 100644
--- a/src/plugins/Input/mpc/decodermpcfactory.h
+++ b/src/plugins/Input/mpc/decodermpcfactory.h
@@ -33,7 +33,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString &url, QIODevice *i);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Input/mpeg/decodermpegfactory.h b/src/plugins/Input/mpeg/decodermpegfactory.h
index 2d8b3f383..58a3487ff 100644
--- a/src/plugins/Input/mpeg/decodermpegfactory.h
+++ b/src/plugins/Input/mpeg/decodermpegfactory.h
@@ -34,7 +34,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString &, QIODevice *input);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Input/opus/decoderopusfactory.h b/src/plugins/Input/opus/decoderopusfactory.h
index ea41d3dd8..f5b40162e 100644
--- a/src/plugins/Input/opus/decoderopusfactory.h
+++ b/src/plugins/Input/opus/decoderopusfactory.h
@@ -36,7 +36,7 @@ public:
bool canDecode(QIODevice *input) const;
DecoderProperties properties() const;
Decoder *create(const QString &path, QIODevice *input);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
QObject* showDetails(QWidget *parent, const QString &path);
void showSettings(QWidget *parent);
diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.h b/src/plugins/Input/sndfile/decodersndfilefactory.h
index 3da0b57dc..85d2445c0 100644
--- a/src/plugins/Input/sndfile/decodersndfilefactory.h
+++ b/src/plugins/Input/sndfile/decodersndfilefactory.h
@@ -34,7 +34,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString &, QIODevice *);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.h b/src/plugins/Input/vorbis/decodervorbisfactory.h
index e75198a08..93f998e8e 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.h
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.h
@@ -36,7 +36,7 @@ public:
bool canDecode(QIODevice *input) const;
DecoderProperties properties() const;
Decoder *create(const QString &, QIODevice *input);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
QObject* showDetails(QWidget *parent, const QString &path);
void showSettings(QWidget *parent);
diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.h b/src/plugins/Input/wavpack/decoderwavpackfactory.h
index b7b6f226b..ba8e52b6b 100644
--- a/src/plugins/Input/wavpack/decoderwavpackfactory.h
+++ b/src/plugins/Input/wavpack/decoderwavpackfactory.h
@@ -34,7 +34,7 @@ public:
DecoderProperties properties() const;
Decoder *create(const QString &p, QIODevice *i);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/qmmp/decoderfactory.h b/src/qmmp/decoderfactory.h
index 50b7d3318..25bca6823 100644
--- a/src/qmmp/decoderfactory.h
+++ b/src/qmmp/decoderfactory.h
@@ -97,7 +97,7 @@ public:
* @param parent Parent object.
* @return MetaDataModel pointer.
*/
- virtual MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0) = 0;
+ virtual MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent) = 0;
/*!
* Shows settings dialog.
* @param parent Parent widget.
diff --git a/src/qmmp/enginefactory.h b/src/qmmp/enginefactory.h
index a3bc441fa..11a5a666d 100644
--- a/src/qmmp/enginefactory.h
+++ b/src/qmmp/enginefactory.h
@@ -93,7 +93,7 @@ public:
* @param parent Parent object.
* @return MetaDataModel pointer.
*/
- virtual MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0) = 0;
+ virtual MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0) = 0;
/*!
* Shows settings dialog.
* @param parent Parent widget.
diff --git a/src/qmmp/metadatamanager.cpp b/src/qmmp/metadatamanager.cpp
index c14da951e..707234911 100644
--- a/src/qmmp/metadatamanager.cpp
+++ b/src/qmmp/metadatamanager.cpp
@@ -96,7 +96,7 @@ QList<TrackInfo *> MetaDataManager::createPlayList(const QString &path, TrackInf
return list;
}
-MetaDataModel* MetaDataManager::createMetaDataModel(const QString &path, QObject *parent) const
+MetaDataModel* MetaDataManager::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) const
{
DecoderFactory *fact = 0;
EngineFactory *efact = 0;
@@ -106,9 +106,9 @@ MetaDataModel* MetaDataManager::createMetaDataModel(const QString &path, QObject
if(!QFile::exists(path))
return 0;
else if((fact = Decoder::findByFilePath(path, m_settings->determineFileTypeByContent())))
- return fact->createMetaDataModel(path, parent);
+ return fact->createMetaDataModel(path, readOnly, parent);
else if((efact = AbstractEngine::findByFilePath(path)))
- return efact->createMetaDataModel(path, parent);
+ return efact->createMetaDataModel(path, readOnly, parent);
return 0;
}
else
@@ -117,12 +117,12 @@ MetaDataModel* MetaDataManager::createMetaDataModel(const QString &path, QObject
MetaDataModel *model = 0;
if((fact = Decoder::findByProtocol(scheme)))
{
- return fact->createMetaDataModel(path, parent);
+ return fact->createMetaDataModel(path, readOnly, parent);
}
foreach(efact, AbstractEngine::enabledFactories())
{
if(efact->properties().protocols.contains(scheme))
- model = efact->createMetaDataModel(path, parent);
+ model = efact->createMetaDataModel(path, readOnly, parent);
if(model)
return model;
}
@@ -273,7 +273,7 @@ MetaDataManager::CoverCacheItem *MetaDataManager::createCoverCacheItem(const QSt
{
CoverCacheItem *item = new CoverCacheItem;
item->url = url;
- MetaDataModel *model = createMetaDataModel(url);
+ MetaDataModel *model = createMetaDataModel(url, true, nullptr);
if(model)
{
item->coverPath = model->coverPath();
diff --git a/src/qmmp/metadatamanager.h b/src/qmmp/metadatamanager.h
index 6baa72e14..9e72c7393 100644
--- a/src/qmmp/metadatamanager.h
+++ b/src/qmmp/metadatamanager.h
@@ -63,7 +63,7 @@ public:
* @param parent Parent object.
* @return MetaDataModel pointer or null pointer.
*/
- MetaDataModel* createMetaDataModel(const QString &url, QObject *parent = 0) const;
+ MetaDataModel* createMetaDataModel(const QString &url, bool readOnly, QObject *parent) const;
/*!
* Returns a list of file name filters with description, i.e. "MPEG Files (*.mp3 *.mpg)"
*/
diff --git a/src/qmmp/metadatamodel.h b/src/qmmp/metadatamodel.h
index 46851d03f..5f7d37442 100644
--- a/src/qmmp/metadatamodel.h
+++ b/src/qmmp/metadatamodel.h
@@ -66,7 +66,7 @@ public:
* Constructor.
* @param parent Parent Object.
*/
- MetaDataModel(bool readOnly = true, QObject *parent = 0);
+ MetaDataModel(bool readOnly, QObject *parent = 0);
/*!
* Destructor.
*/
diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp
index ed2fdc4de..295f3b631 100644
--- a/src/qmmpui/detailsdialog.cpp
+++ b/src/qmmpui/detailsdialog.cpp
@@ -167,7 +167,7 @@ void DetailsDialog::updatePage()
m_ui->tabWidget->addTab(coverViewer, tr("Cover"));
}
- m_metaDataModel = MetaDataManager::instance()->createMetaDataModel(m_path, this);
+ m_metaDataModel = MetaDataManager::instance()->createMetaDataModel(m_path, false, this);
if(m_metaDataModel)
{