Changeset 19

Timestamp:

12/31/07 11:58:35 (4 years ago)

Author:

sander

Message:

Adding songs to playlist works

Files:

• gui/main_window.cpp (modified) (2 diffs)
• gui/main_window.h (modified) (1 diff)
• gui/musiclibraryitem.cpp (modified) (1 diff)
• gui/musiclibraryitem.h (modified) (2 diffs)
• lib/mpdconnection.cpp (modified) (11 diffs)
• lib/mpdconnection.h (modified) (1 diff)
• lib/mpdparseutils.cpp (modified) (1 diff)

gui/main_window.cpp

@@ -42 +42 @@
     connect(playlistTableView, SIGNAL(activated(const QModelIndex &)), this, SLOT(playlistItemActivated(const QModelIndex &)));
     connect(removeFromPlaylistPushButton, SIGNAL(clicked(bool)), this, SLOT(removeFromPlaylist()));
+    connect(libraryTreeView, SIGNAL(activated(const QModelIndex &)), this, SLOT(libraryItemActivated(const QModelIndex &)));
 
     // Timer
@@ -202 +203 @@
     mpd.removeSongs(toBeRemoved);
 }
+
+void MainWindow::libraryItemActivated(const QModelIndex & index)
+{
+    QStringList files;
+    MusicLibraryItem *item;
+    QModelIndex mappedIndex = libraryProxyModel.mapToSource(index);
+    item = static_cast<MusicLibraryItem *>(mappedIndex.internalPointer());
+
+    switch(item->type()) {
+        case MusicLibraryItem::Type_Artist:
+            for(qint32 i = 0; i < item->childCount(); i++) {
+                for(qint32 j = 0; j < item->child(i)->childCount(); j++)
+                    files.append(item->child(i)->child(j)->file());
+            }
+            break;
+        case MusicLibraryItem::Type_Album:
+            for(qint32 i = 0; i < item->childCount(); i++)
+                files.append(item->child(i)->file());
+            break;
+        case MusicLibraryItem::Type_Song:
+            if(item->type() == MusicLibraryItem::Type_Song)
+                files.append(item->file());
+            break;
+        default:
+            break;
+    }
+
+    if(!files.isEmpty()) {
+        mpd.add(files);
+        mpd.startPlayingSong();
+    }
+}

gui/main_window.h

@@ -41 +41 @@
         void playlistItemActivated(const QModelIndex &);
         void removeFromPlaylist();
+        void libraryItemActivated(const QModelIndex &);
 };
 

gui/musiclibraryitem.cpp

@@ -64 +64 @@
 }
 
+QString & MusicLibraryItem::file() const
+{
+    return *_file;
+}
+
 void MusicLibraryItem::setFile(const QString &filename)
 {
-    file = new QString(filename);
+    _file = new QString(filename);
 }
 

gui/musiclibraryitem.h

@@ -27 +27 @@
         void setParent(MusicLibraryItem *parent);
         MusicLibraryItem::Type type() const;
+        QString & file() const;
         void setFile(const QString &filename);
         void clearChildren();
@@ -34 +35 @@
         QList<MusicLibraryItem *> childItems;
         QString itemData;
-        QString *file;
+        QString *_file;
         MusicLibraryItem *parentItem;
 };

lib/mpdconnection.cpp

@@ -185 +185 @@
  */
 
+void MPDConnection::add(const QStringList &files)
+{
+    QByteArray send = "command_list_begin\n";
+
+    for(qint32 i = 0; i < files.size(); i++) {
+        send += "add \"";
+        send += files.at(i);
+        send += "\"\n";
+    }
+
+    send += "command_list_end";
+
+    sendCommand(send);
+
+    if(!commandOk())
+        qDebug("Couldn't add song(s) to playlist");
+}
+
 void MPDConnection::removeSongs(const QList<qint32> &items)
 {
@@ -199 +217 @@
     sendCommand(send);
 
-    if(!commandOk()) {
+    if(!commandOk())
         qDebug("Couldn't remove songs from playlist");
-    }
 }
 
@@ -243 +260 @@
     sendCommand("next");
 
-    if(!commandOk()) {
+    if(!commandOk())
         qDebug("Couldn't go to next track");
-    }
 }
 
@@ -258 +274 @@
     sendCommand(data);
 
-    if(!commandOk()) {
+    if(!commandOk())
         qDebug("Couldn't set pause");
-    }
 }
 
@@ -269 +284 @@
     sendCommand(data);
 
-    if(!commandOk()) {
+    if(!commandOk())
         qDebug("Couldn't start playing song");
-    }
 }
 
@@ -280 +294 @@
     sendCommand(data);
 
-    if(!commandOk()) {
+    if(!commandOk())
         qDebug("Couldn't start playing song id");
-    }
 }
 
@@ -289 +302 @@
     sendCommand("previous");
 
-    if(!commandOk()) {
+    if(!commandOk())
         qDebug("Couldn't go to previous track");
-    }
 }
 
@@ -304 +316 @@
     sendCommand(data);
 
-    if(!commandOk()) {
+    if(!commandOk())
         qDebug("Couldn't toggle random");
-    }
 }
 
@@ -319 +330 @@
     sendCommand(data);
 
-    if(!commandOk()) {
+    if(!commandOk())
         qDebug("Couldn't toggle repeat");
-    }
 }
 
@@ -348 +358 @@
     sendCommand(data);
 
-    if(!commandOk()) {
+    if(!commandOk())
         qDebug("Couldn't set volume");
-    }
 }
 
@@ -357 +366 @@
     sendCommand("stop");
 
-    if(!commandOk()) {
+    if(!commandOk())
         qDebug("Couldn't stop playing");
-    }
 }
 

lib/mpdconnection.h

@@ -32 +32 @@
 
         // Playlist
+        void add(const QStringList &files);
         void currentSong();
         void playListInfo();

lib/mpdparseutils.cpp

@@ -72 +72 @@
         if(tokens.at(0) == "file") {
             song->file = tokens.at(1);
+            song->file = song->file.trimmed();
         } else if(tokens.at(0) == "Time") {
             song->time = tokens.at(1).toUInt();