Changeset 17 for lib/mpdconnection.cpp

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.

File:

• lib/mpdconnection.cpp (modified) (5 diffs)

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;