aboutsummaryrefslogtreecommitdiff
path: root/src/qmmpui
diff options
context:
space:
mode:
Diffstat (limited to 'src/qmmpui')
-rw-r--r--src/qmmpui/detailsdialog.cpp21
-rw-r--r--src/qmmpui/fileloader.cpp12
-rw-r--r--src/qmmpui/mediaplayer.cpp1
-rw-r--r--src/qmmpui/playlistitem.cpp4
-rw-r--r--src/qmmpui/playlistmodel.cpp7
5 files changed, 28 insertions, 17 deletions
diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp
index e5b0e0fc5..6b5aa7032 100644
--- a/src/qmmpui/detailsdialog.cpp
+++ b/src/qmmpui/detailsdialog.cpp
@@ -23,10 +23,12 @@
#include <QFile>
#include <QFileInfo>
+#include <qmmp/metadatamanager.h>
#include <qmmp/decoder.h>
#include <qmmp/decoderfactory.h>
#include <qmmp/metadatamodel.h>
#include <qmmp/tagmodel.h>
+#include <qmmp/abstractengine.h>
#include "abstractplaylistitem.h"
#include "tageditor.h"
#include "detailsdialog.h"
@@ -46,9 +48,13 @@ DetailsDialog::DetailsDialog(AbstractPlaylistItem *item, QWidget *parent)
if(QFile::exists(item->url()))
{
+ //TODO implement this inside MetaDataManager
DecoderFactory *fact = Decoder::findByPath(item->url());
+ EngineFactory *fact2 = AbstractEngine::findByPath(item->url());
if(fact)
m_metaDataModel = fact->createMetaDataModel(item->url(), this);
+ else if (fact2)
+ m_metaDataModel = fact2->createMetaDataModel(item->url(), this);
else
return;
@@ -75,7 +81,7 @@ DetailsDialog::~DetailsDialog()
void DetailsDialog::printInfo()
{
- QList <FileInfo *> flist = Decoder::createPlayList(m_path, TRUE);
+ QList <FileInfo *> flist = MetaDataManager::instance()->createPlayList(m_path, TRUE);
QMap <Qmmp::MetaData, QString> metaData;
if(!flist.isEmpty() && QFile::exists(m_item->url()))
metaData = flist.at(0)->metaData();
@@ -105,11 +111,14 @@ void DetailsDialog::printInfo()
}
QHash <QString, QString> ap = m_metaDataModel->audioProperties();
//line
- formattedText.append("<tr>");
- formattedText.append("<td colspan=2>");
- formattedText.append("<hr>");
- formattedText.append("</td>");
- formattedText.append("</tr>");
+ if(formattedText.trimmed() != "<TABLE>")
+ {
+ formattedText.append("<tr>");
+ formattedText.append("<td colspan=2>");
+ formattedText.append("<hr>");
+ formattedText.append("</td>");
+ formattedText.append("</tr>");
+ }
foreach(QString key, ap.keys())
formattedText += formatRow(key, ap.value(key));
diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index ee300e2c4..74c4edc1f 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include <qmmp/decoder.h>
+#include <qmmp/metadatamanager.h>
#include "fileloader.h"
#include "playlistsettings.h"
#include "playlistitem.h"
@@ -26,7 +26,7 @@
FileLoader::FileLoader(QObject *parent)
: QThread(parent),m_files_to_load(),m_directory()
{
- m_filters = Decoder::nameFilters();
+ m_filters = MetaDataManager::instance()->nameFilters();
m_finished = false;
}
@@ -41,10 +41,10 @@ void FileLoader::addFiles(const QStringList &files)
{
if (files.isEmpty ())
return;
-
+ bool use_meta = PlaylistSettings::instance()->useMetadata();
foreach(QString s, files)
{
- QList <FileInfo *> playList = Decoder::createPlayList(s, PlaylistSettings::instance()->useMetadata());
+ QList <FileInfo *> playList = MetaDataManager::instance()->createPlayList(s, use_meta);
foreach(FileInfo *info, playList)
emit newPlayListItem(new PlayListItem(info));
if (m_finished) return;
@@ -59,11 +59,11 @@ void FileLoader::addDirectory(const QString& s)
dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
dir.setSorting(QDir::Name);
QFileInfoList l = dir.entryInfoList(m_filters);
+ bool use_meta = PlaylistSettings::instance()->useMetadata();
for (int i = 0; i < l.size(); ++i)
{
QFileInfo fileInfo = l.at(i);
- playList = Decoder::createPlayList(fileInfo.absoluteFilePath (),
- PlaylistSettings::instance()->useMetadata());
+ playList = MetaDataManager::instance()->createPlayList(fileInfo.absoluteFilePath (), use_meta);
foreach(FileInfo *info, playList)
emit newPlayListItem(new PlayListItem(info));
if (m_finished) return;
diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp
index 43038724e..0170fc650 100644
--- a/src/qmmpui/mediaplayer.cpp
+++ b/src/qmmpui/mediaplayer.cpp
@@ -204,6 +204,7 @@ void MediaPlayer::updateNextUrl()
{
m_core->play(m_model->nextItem()->url(), TRUE);
m_nextUrl = m_model->nextItem()->url();
+ qDebug("next url");
}
else
m_nextUrl.clear();
diff --git a/src/qmmpui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp
index d76ba16cc..21bc2fc1a 100644
--- a/src/qmmpui/playlistitem.cpp
+++ b/src/qmmpui/playlistitem.cpp
@@ -20,7 +20,7 @@
#include <QSettings>
#include <QDir>
-#include <qmmp/decoder.h>
+#include <qmmp/metadatamanager.h>
#include "playlistsettings.h"
#include "playlistitem.h"
@@ -90,7 +90,7 @@ void PlayListItem::updateTags()
delete m_info;
m_info = 0;
}
- QList <FileInfo *> list = Decoder::createPlayList(url());
+ QList <FileInfo *> list = MetaDataManager::instance()->createPlayList(url());
if(!list.isEmpty() && !list.at(0)->path().contains("://"))
{
m_info = list.at(0);
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 3428c0390..cdc407174 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -32,7 +32,7 @@
#include <time.h>
-#include <qmmp/decoder.h>
+#include <qmmp/metadatamanager.h>
#include <qmmp/decoderfactory.h>
#include "playlistparser.h"
@@ -453,7 +453,8 @@ void PlayListModel::addFile(const QString& path)
{
if (path.isEmpty())
return;
- QList <FileInfo *> playList = Decoder::createPlayList(path, PlaylistSettings::instance()->useMetadata());
+ QList <FileInfo *> playList =
+ MetaDataManager::instance()->createPlayList(path, PlaylistSettings::instance()->useMetadata());
foreach(FileInfo *info, playList)
emit load(new PlayListItem(info));
@@ -997,7 +998,7 @@ void PlayListModel::clearInvalidItems()
foreach(PlayListItem *item, m_items)
{
if(!item->url().contains("://") &&
- !(QFile::exists(item->url()) && Decoder::supports(item->url())))
+ !(QFile::exists(item->url())))// && Decoder::supports(item->url())))
removeItem(item);
}
}
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-16 21:43:23 +0000