Changeset 17

Timestamp:

12/30/07 20:55:36 (4 years ago)

Author:

sander

Message:

Lots of updates, the music library is now being showed in the tree view. Though it doesn't actually do anything yet.

Files:

• QtMPC.pro (modified) (2 diffs)
• gui/main_window.cpp (modified) (8 diffs)
• gui/main_window.h (modified) (3 diffs)
• gui/musiclibraryitem.cpp (added)
• gui/musiclibraryitem.h (added)
• gui/musiclibrarymodel.cpp (added)
• gui/musiclibrarymodel.h (added)
• lib/mpdconnection.cpp (modified) (5 diffs)
• lib/mpdconnection.h (modified) (6 diffs)
• lib/mpdparseutils.cpp (modified) (4 diffs)
• lib/mpdparseutils.h (modified) (1 diff)
• lib/mpdstatus.cpp (modified) (1 diff)
• lib/mpdstatus.h (modified) (1 diff)
• lib/song.cpp (modified) (1 diff)
• lib/song.h (modified) (1 diff)

QtMPC.pro

@@ -4 +4 @@
 
 TEMPLATE = app
-TARGET = 
+TARGET =
 DEPENDPATH += . gui lib
 INCLUDEPATH += . lib
 CONFIG += qt debug
 QT += network
+#DEFINES += QT_NO_DEBUG_OUTPUT
 
 # Input
 HEADERS += gui/main_window.h \
+        gui/musiclibraryitem.h \
+        gui/musiclibrarymodel.h \
         gui/playlisttablemodel.h \
         lib/mpdconnection.h \
@@ -22 +25 @@
 SOURCES += main.cpp \
         gui/main_window.cpp \
+        gui/musiclibraryitem.cpp \
+        gui/musiclibrarymodel.cpp \
         gui/playlisttablemodel.cpp \
         lib/mpdconnection.cpp \

gui/main_window.cpp

@@ -7 +7 @@
     setupUi(this);
 
-    mpd_status = NULL;
+    //mpd_status = NULL;
     slidingVolume = false;
 
@@ -18 +18 @@
     }
 
+    libraryTreeView->setModel(&musicLibraryModel);
+
     playlistTableView->setModel(&playlistModel);
     playlistTableView->verticalHeader()->hide();
@@ -23 +25 @@
 
     // MPD
-    connect(&mpd, SIGNAL(statusUpdated(MPDStatus *)), this, SLOT(updateStatus(MPDStatus *)));
+    connect(&mpd, SIGNAL(statusUpdated(const MPDStatus &)), this, SLOT(updateStatus(const MPDStatus &)));
     connect(&mpd, SIGNAL(playlistUpdated(QList<Song *> *)), &playlistModel, SLOT(updateSongs(QList<Song *> *)));
     connect(&mpd, SIGNAL(currentSongUpdated(Song *)), this, SLOT(updateCurrentSong(Song *)));
+    connect(&mpd, SIGNAL(musicLibraryUpdated(QList<MusicLibraryItem *> *)), &musicLibraryModel, SLOT(updateLibrary(QList<MusicLibraryItem *> *)));
 
     // GUI
@@ -42 +45 @@
 
     mpd.getStatus();
+    mpd.listAllInfo();
 
     statusTimer.start(1000);
@@ -73 +77 @@
 void MainWindow::playPauseTrack()
 {
-    if(mpd_status->state == MPDStatus::State_Playing) {
+    if(mpd_status.state == MPDStatus::State_Playing) {
         mpd.setPause(true);
-    } else if(mpd_status->state == MPDStatus::State_Paused) {
+    } else if(mpd_status.state == MPDStatus::State_Paused) {
         mpd.setPause(false);
     } else {
@@ -103 +107 @@
 }
 
-void MainWindow::updateStatus(MPDStatus *status)
+void MainWindow::updateStatus(const MPDStatus &status)
 {
     QString timeElapsedFormattedString;
 
-    positionSlider->setMaximum(status->time_total);
-    positionSlider->setValue(status->time_elapsed);
+    positionSlider->setMaximum(status.time_total);
+    positionSlider->setValue(status.time_elapsed);
 
     if(!slidingVolume)
-        volumeSlider->setValue(status->volume);
-
-    // Time elapsed
-    timeElapsedFormattedString += QString::number(floor(status->time_elapsed / 60.0));
-    timeElapsedFormattedString += ":";
-    if(status->time_elapsed % 60 < 10) {
-        timeElapsedFormattedString += "0";
-    }
-    timeElapsedFormattedString += QString::number(status->time_elapsed % 60);
-
-    timeElapsedFormattedString += " / ";
-
-    // Time total
-    timeElapsedFormattedString += QString::number(floor(status->time_total / 60.0));
-    timeElapsedFormattedString += ":";
-    if(status->time_total % 60 < 10) {
-        timeElapsedFormattedString += "0";
-    }
-    timeElapsedFormattedString += QString::number(status->time_total % 60);
+        volumeSlider->setValue(status.volume);
+
+    if(status.time_total == -1) {
+        timeElapsedFormattedString = "00:00 / 00:00";
+    } else {
+        // Time elapsed
+        timeElapsedFormattedString += QString::number(floor(status.time_elapsed / 60.0));
+        timeElapsedFormattedString += ":";
+        if(status.time_elapsed % 60 < 10) {
+            timeElapsedFormattedString += "0";
+        }
+        timeElapsedFormattedString += QString::number(status.time_elapsed % 60);
+
+        timeElapsedFormattedString += " / ";
+
+        // Time total
+        timeElapsedFormattedString += QString::number(floor(status.time_total / 60.0));
+        timeElapsedFormattedString += ":";
+        if(status.time_total % 60 < 10) {
+            timeElapsedFormattedString += "0";
+        }
+        timeElapsedFormattedString += QString::number(status.time_total % 60);
+    }
 
     songTimeElapsedLabel->setText(timeElapsedFormattedString);
 
-    switch(status->state) {
+    switch(status.state) {
         case MPDStatus::State_Playing:
             playPauseTrackButton->setText("Pause");
@@ -140 +148 @@
             stopTrackButton->setEnabled(true);
             break;
+        case MPDStatus::State_Inactive:
         case MPDStatus::State_Stopped:
             playPauseTrackButton->setText("Play");
@@ -157 +166 @@
 
     // Check if song has changed and update if needed
-    if(mpd_status == NULL || mpd_status->song_id != status->song_id) {
+    if(mpd_status.state == MPDStatus::State_Inactive || mpd_status.song_id != status.song_id) {
         mpd.currentSong();
     }
 
     // Check if playlist has changed and update if needed
-    if(mpd_status == NULL || mpd_status->playlist < status->playlist) {
+    if(mpd_status.state == MPDStatus::State_Inactive || mpd_status.playlist < status.playlist) {
         mpd.playListInfo();
     }
 
     // Update status info
-    if(mpd_status != NULL) {
-        delete mpd_status;
-    }
     mpd_status = status;
 }

gui/main_window.h

@@ -6 +6 @@
 
 #include "ui_main_window.h"
+#include "gui/musiclibrarymodel.h"
 #include "gui/playlisttablemodel.h"
 #include "lib/mpdconnection.h"
@@ -20 +21 @@
     private:
         MPDConnection mpd;
-        MPDStatus *mpd_status;
+        MPDStatus mpd_status;
         QTimer statusTimer;
         PlaylistTableModel playlistModel;
+        MusicLibraryModel musicLibraryModel;
         bool slidingVolume;
 
@@ -34 +36 @@
         void setVolume();
         void updateCurrentSong(Song *song);
-        void updateStatus(MPDStatus *status);
+        void updateStatus(const MPDStatus &status);
         void playlistItemActivated(const QModelIndex &);
         void removeFromPlaylist();

lib/mpdconnection.cpp

@@ -17 +17 @@
 }
 
-/*MPDConnection::~MPDConnection()
-{
-    qDebug("Closing MPDConnection...");
-}*/
+MPDConnection::~MPDConnection()
+{
+    sock.disconnectFromHost();
+    quit();
+
+    while(isRunning())
+        msleep(100);
+}
 
 void MPDConnection::run()
@@ -69 +73 @@
 
     if(hostname.isEmpty() || port == 0) {
-        qDebug("MPDConnection: no hostname and/or port supplied.");
+        qWarning("MPDConnection: no hostname and/or port supplied.");
         return false;
     }
@@ -104 +108 @@
             return true;
         } else {
-            qDebug("Couldn't connect");
+            qWarning("Couldn't connect");
             return false;
         }
@@ -152 +156 @@
  */
 
+void MPDConnection::listAllInfo()
+{
+    QByteArray *data;
+
+    sendCommand("listallinfo");
+    data = readFromSocket();
+
+    emit musicLibraryUpdated(MPDParseUtils::parseLibraryItems(data));
+
+    delete data;
+}
+
+void MPDConnection::lsInfo()
+{
+    QByteArray *data;
+
+    sendCommand("lsinfo");
+    data = readFromSocket();
+
+    emit musicLibraryUpdated(MPDParseUtils::parseLibraryItems(data));
+
+    delete data;
+}
+
+
 /*
  * Playlist commands
@@ -369 +398 @@
 {
     QByteArray *data;
+    MPDStatus status;
 
     sendCommand("status");
     data = readFromSocket();
-
-    emit statusUpdated(MPDParseUtils::parseStatus(data));
+    MPDParseUtils::parseStatus(data, status);
+
+    emit statusUpdated(status);
 
     delete data;

lib/mpdconnection.h

@@ -6 +6 @@
 #include <QTcpSocket>
 
+#include "gui/musiclibraryitem.h"
 #include "mpdstatus.h"
 #include "song.h"
@@ -16 +17 @@
         MPDConnection(QObject *parent = 0);
         MPDConnection(const QString &host, const quint16 port, QObject *parent = 0);
-        //~MPDConnection();
+        ~MPDConnection();
         void run();
         bool connectToMPD();
@@ -26 +27 @@
 
         // Database
+        void listAllInfo();
+        void lsInfo();
         // TODO
 
         // Playlist
+        void currentSong();
+        void playListInfo();
         void removeSongs(const QList<qint32> &items);
         // TODO
@@ -56 +61 @@
 
     public slots:
-        // Playlist
-        void currentSong();
-        void playListInfo();
-
         // Miscellaneous
         void getStatus();
 
-    protected:
+    private:
         QString hostname;
         quint16 port;
@@ -69 +70 @@
         QTcpSocket sock;
         bool connected;
+        QMutex mutex;
 
         bool commandOk();
         void sendCommand(const QByteArray &command);
-
-    private:
-        QMutex mutex;
 
     private slots:
@@ -80 +79 @@
 
     signals:
+        void musicLibraryUpdated(QList<MusicLibraryItem *> *items);
         void currentSongUpdated(Song *song);
         void playlistUpdated(QList<Song *> *songs);
-        void statusUpdated(MPDStatus *status);
+        void statusUpdated(const MPDStatus &status);
 };
 

lib/mpdparseutils.cpp

@@ -4 +4 @@
 
 
-MPDStatus * MPDParseUtils::parseStatus(const QByteArray * const data)
+void MPDParseUtils::parseStatus(const QByteArray * const data, MPDStatus &destStatus)
 {
-    MPDStatus *status = new MPDStatus;
-
     QList<QByteArray> lines = data->split('\n');
     QList<QByteArray> tokens;
@@ -15 +13 @@
 
         if(tokens.at(0) == "volume") {
-            status->volume = tokens.at(1).toUInt();
+            destStatus.volume = tokens.at(1).toUInt();
         } else if(tokens.at(0) == "repeat") {
             if(tokens.at(1) == "1") {
-                status->repeat = true;
+                destStatus.repeat = true;
             } else {
-                status->repeat = false;
+                destStatus.repeat = false;
             }
         } else if(tokens.at(0) == "random") {
             if(tokens.at(1) == "1") {
-                status->random = "1";
+                destStatus.random = "1";
             } else {
-                status->random = "0";
+                destStatus.random = "0";
             }
         } else if(tokens.at(0) == "playlist") {
-            status->playlist = tokens.at(1).toUInt();
+            destStatus.playlist = tokens.at(1).toUInt();
         } else if(tokens.at(0) == "playlistlength") {
-            status->playlistlength = tokens.at(1).toInt();
+            destStatus.playlistlength = tokens.at(1).toInt();
         } else if(tokens.at(0) == "playlistqueue") {
-            status->playlistqueue = tokens.at(1).toInt();
+            destStatus.playlistqueue = tokens.at(1).toInt();
         } else if(tokens.at(0) == "xfade") {
-            status->xfade = tokens.at(1).toInt();
+            destStatus.xfade = tokens.at(1).toInt();
         } else if(tokens.at(0) == "state") {
             if(tokens.at(1).contains("play")) {
-                status->state = MPDStatus::State_Playing;
+                destStatus.state = MPDStatus::State_Playing;
             } else if(tokens.at(1).contains("stop")) {
-                status->state = MPDStatus::State_Stopped;
+                destStatus.state = MPDStatus::State_Stopped;
             } else {
-                status->state = MPDStatus::State_Paused;
+                destStatus.state = MPDStatus::State_Paused;
             }
         } else if(tokens.at(0) == "song") {
-            status->song = tokens.at(1).toInt();
+            destStatus.song = tokens.at(1).toInt();
         } else if(tokens.at(0) == "songid") {
-            status->song_id = tokens.at(1).toInt();
+            destStatus.song_id = tokens.at(1).toInt();
         } else if(tokens.at(0) == "time") {
-            status->time_elapsed = tokens.at(1).toInt();
-            status->time_total = tokens.at(2).toInt();
+            destStatus.time_elapsed = tokens.at(1).toInt();
+            destStatus.time_total = tokens.at(2).toInt();
         } else if(tokens.at(0) == "bitrate") {
-            status->bitrate = tokens.at(1).toUInt();
+            destStatus.bitrate = tokens.at(1).toUInt();
         } else if(tokens.at(0) == "audio") {
         } else if(tokens.at(0) == "updating_db") {
-            status->updating_db = tokens.at(1).toInt();
+            destStatus.updating_db = tokens.at(1).toInt();
         } else if(tokens.at(0) == "error") {
-            status->error = tokens.at(1);
+            destStatus.error = tokens.at(1);
         }
     }
-
-    return status;
 }
 
@@ -77 +73 @@
             song->file = tokens.at(1);
         } else if(tokens.at(0) == "Time") {
+            song->time = tokens.at(1).toUInt();
         } else if(tokens.at(0) == "Album") {
-            song->album = tokens.at(1);
+            for(qint32 j = 1; j < tokens.size(); j++) {
+                if(j != 1 && j != tokens.size() - 1)
+                    song->album += ":";
+                song->album += tokens.at(j);
+            }
         } else if(tokens.at(0) == "Artist") {
-            song->artist = tokens.at(1);
+            for(qint32 j = 1; j < tokens.size(); j++) {
+                if(j != 1 && j != tokens.size() - 1)
+                    song->artist += ":";
+                song->artist += tokens.at(j);
+            }
         } else if(tokens.at(0) == "Title") {
-            song->title = tokens.at(1);
+            for(qint32 j = 1; j < tokens.size(); j++) {
+                if(j != 1 && j != tokens.size() - 1)
+                    song->title += ":";
+                song->title += tokens.at(j);
+            }
         } else if(tokens.at(0) == "Track") {
+            song->track = tokens.at(1).toInt();
         } else if(tokens.at(0) == "Pos") {
         } else if(tokens.at(0) == "Id") {
@@ -111 +121 @@
     return songs;
 }
+
+QList<MusicLibraryItem *> * MPDParseUtils::parseLibraryItems(const QByteArray * const data)
+{
+    QList<MusicLibraryItem *> *artists = new QList<MusicLibraryItem *>;
+    QByteArray currentItem;
+    MusicLibraryItem *artistItem, *albumItem, *songItem;
+    Song *currentSong;
+    bool found = false;
+
+    QList<QByteArray> lines = data->split('\n');
+
+    for(qint32 i = 0; i < lines.size(); i++) {
+        currentItem += lines.at(i);
+        currentItem += "\n";
+        if(i == lines.size() - 1 || lines.at(i + 1).startsWith("file:")) {
+            currentSong = parseSong(&currentItem);
+            currentItem.clear();
+
+            if(currentSong->isEmpty()) {
+                delete currentSong;
+                continue;
+            }
+
+            currentSong->fillEmptyFields();
+
+            // Check if artist already exists
+            for(qint32 i = 0; i < artists->size(); i++) {
+                if(artists->at(i)->data(0) == currentSong->artist) {
+                    artistItem = artists->at(i);
+                    found = true;
+                }
+            }
+
+            if(!found) {
+                artistItem = new MusicLibraryItem(currentSong->artist, MusicLibraryItem::Type_Artist);
+                artists->append(artistItem);
+            }
+
+            found = false;
+
+            // Check if album already exists
+            for(qint32 i = 0; i < artistItem->childCount(); i++) {
+                if(artistItem->child(i)->data(0) == currentSong->album) {
+                    albumItem = artistItem->child(i);
+                    found = true;
+                }
+            }
+
+            if(!found) {
+                albumItem = new MusicLibraryItem(currentSong->album, MusicLibraryItem::Type_Album, artistItem);
+                artistItem->appendChild(albumItem);
+            }
+
+            found = false;
+
+            // Add song to album (possibly in track order)
+            songItem = new MusicLibraryItem(currentSong->title, MusicLibraryItem::Type_Song, albumItem);
+            songItem->setFile(currentSong->file);
+            albumItem->appendChild(songItem);
+
+            delete currentSong;
+        }
+    }
+
+    return artists;
+}

lib/mpdparseutils.h

@@ -4 +4 @@
 #include "mpdstatus.h"
 #include "song.h"
+#include "gui/musiclibraryitem.h"
 
 class MPDParseUtils
 {
     public:
-        static MPDStatus * parseStatus(const QByteArray * const data);
+        static void parseStatus(const QByteArray * const data, MPDStatus &destStatus);
         static Song * parseSong(const QByteArray * const data);
         static QList<Song *> * parseSongs(const QByteArray * const data);
+        static QList<MusicLibraryItem *> * parseLibraryItems(const QByteArray * const data);
 };
 

lib/mpdstatus.cpp

@@ -10 +10 @@
     playlistqueue = -1;
     xfade = 0;
-    state = MPDStatus::State_Stopped;
+    state = MPDStatus::State_Inactive;
     song = -1;
     song_id = -1;

lib/mpdstatus.h

@@ -10 +10 @@
     public:
         enum State {
+            State_Inactive,
             State_Playing,
             State_Stopped,

lib/song.cpp

@@ -5 +5 @@
     id = -1;
     time = 0;
-    track = 0;
+    track = -1;
     pos = 0;
 }
+
+bool Song::isEmpty() const
+{
+    return (artist.isEmpty() && album.isEmpty() && title.isEmpty());
+}
+
+void Song::fillEmptyFields()
+{
+    if(artist.isEmpty())
+        artist = "<Unknown>";
+
+    if(album.isEmpty())
+        album = "<Unknown>";
+
+    if(title.isEmpty())
+        title = "<Unknown>";
+}

lib/song.h

@@ -14 +14 @@
         QString artist;
         QString title;
-        quint32 track;
+        qint32 track;
         quint32 pos;
 
         Song();
+        bool isEmpty() const;
+        void fillEmptyFields();
 };