aboutsummaryrefslogtreecommitdiff
path: root/src/qmmpui
diff options
context:
space:
mode:
Diffstat (limited to 'src/qmmpui')
-rw-r--r--src/qmmpui/playlistmodel.cpp6
-rw-r--r--src/qmmpui/playlistmodel.h7
2 files changed, 6 insertions, 7 deletions
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index ffde91ac8..97d18e156 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -34,9 +34,9 @@
#include <qmmp/decoder.h>
#include <qmmp/decoderfactory.h>
-#include <qmmpui/playlistparser.h>
-#include <qmmpui/playlistformat.h>
+#include "playlistparser.h"
+#include "playlistformat.h"
#include "fileloader.h"
#include "playlistmodel.h"
#include "playlistitem.h"
@@ -77,7 +77,7 @@ PlayListModel::PlayListModel(QObject *parent)
m_block_update_signals = false;
is_repeatable_list = false;
m_play_state = new NormalPlayState(this);
- //readSettings();
+ readSettings();
}
PlayListModel::~PlayListModel()
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index a5231b44f..04665b88c 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -27,7 +27,6 @@
#include <QPointer>
#include <QVector>
-//#include "fileloader.h"
class FileLoader;
/**
@@ -72,8 +71,10 @@ class TagUpdater : public QObject
Q_OBJECT
QObject* m_observable;
PlayListItem* m_item;
+
public:
TagUpdater(QObject* o, PlayListItem* item);
+
protected slots:
void updateTag();
};
@@ -324,7 +325,7 @@ private:
/*!
* Songs in play queue.
*/
- QList<PlayListItem*>m_queued_songs;
+ QList<PlayListItem*> m_queued_songs;
/*!
* Is playlist repeatable?
@@ -345,8 +346,6 @@ private:
* when finished.
*/
QVector<GuardedFileLoader> m_running_loaders;
-
- friend class MainWindow;
};