Refactored PlayList handling to recursive function.

Added more supprted media types.
	modified:   browsemainwindow.cpp
	modified:   playlistmainwindow.cpp
	modified:   playlistmainwindow.h

diff --git a/browsemainwindow.cpp b/browsemainwindow.cpp
index d4c034f..27b84b2 100644 (file)
--- a/browsemainwindow.cpp
+++ b/browsemainwindow.cpp
@@ -280,6 +280,8 @@ void BrowseMainWindow::updateList() {
         QIcon icon_video  = QIcon::fromTheme("general_video_file");
         QIcon icon_image  = QIcon::fromTheme("general_image");
         QIcon icon_flash  = QIcon::fromTheme("filemanager_flash_file");
+        QIcon icon_real   = QIcon::fromTheme("filemanager_real_music");
+        QIcon icon_unknown= QIcon::fromTheme("filemanager_unknown_file");
         for (int idx = 0; idx < ct; ++idx) {
             VlcBrowseElement dir = mContents->at(idx);
             QListWidgetItem* item;
@@ -317,11 +319,17 @@ void BrowseMainWindow::updateList() {
                           0 == QString::compare(dir.extension, "mpg")  ||
                           0 == QString::compare(dir.extension, "mov")  ||
                           0 == QString::compare(dir.extension, "mp4")  ||
+                          0 == QString::compare(dir.extension, "m4v")  ||
                           0 == QString::compare(dir.extension, "wmv")  ||
                           0 == QString::compare(dir.extension, "mkv")  ||
                           0 == QString::compare(dir.extension, "ogv")  ) {
                     item_good = true;
-                    item = new QListWidgetItem(icon_video, dir.name, ui->listWidget, 0); // .avi, .mpg, .mpeg, .mov, .mp4, .wmv, .mkv, .ogv
+                    item = new QListWidgetItem(icon_video, dir.name, ui->listWidget, 0); // .avi, .mpg, .mpeg, .mov, .mp4, .m4v, .wmv, .mkv, .ogv
+                }
+                else if ( 0 == QString::compare(dir.extension, "rm")  ||
+                          0 == QString::compare(dir.extension, "ra")  ||
+                          0 == QString::compare(dir.extension, "ram")  ) {
+                    item = new QListWidgetItem(icon_real, dir.name, ui->listWidget, 0); // .ram, 'rm, 'ra
                 }
                 else if ( 0 == QString::compare(dir.extension, "flv")  ) {
                     item_good = true;
@@ -334,6 +342,7 @@ void BrowseMainWindow::updateList() {
                     }
                     else {
                         item_good = false;
+                        //item = new QListWidgetItem(icon_unknown, dir.name, ui->listWidget, 0);
                     }
                 }
             }

diff --git a/playlistmainwindow.cpp b/playlistmainwindow.cpp
index 62b8616..4d8f541 100644 (file)
--- a/playlistmainwindow.cpp
+++ b/playlistmainwindow.cpp
@@ -180,15 +180,18 @@ void PlayListMainWindow::parseXmlPlayList() {
         QDomNodeList leafs = node.childNodes();
         int leafct = leafs.count();
         if (0 < leafct) {
+          depth = 1;
           for (int jdx = 0; jdx < leafct; ++jdx) {
             QDomNode leaf = leafs.at(jdx);
+            parsePlayListItem(&leaf, &extension, &hasArt, &currentLeafId, 1);
+            /*
             VlcPlayListElementSimple* el = new VlcPlayListElementSimple();
             el->id = leaf.attributes().namedItem("id").nodeValue().toInt();
             el->path = leaf.attributes().namedItem("uri").nodeValue();
             el->name = leaf.attributes().namedItem("name").nodeValue().replace("\\\\", "\\");
             current = leaf.attributes().namedItem("current").nodeValue();
             el->playing = (0 < current.length());
-            el->depth = 1;
+            el->depth = depth;
             if (0 == QString::compare(leaf.nodeName(), "node")) {
               el->type = "node";
               el->extension = getExtension(el->path, NULL);
@@ -198,6 +201,7 @@ void PlayListMainWindow::parseXmlPlayList() {
                 QDomNodeList items = leaf.childNodes();
                 int itemct = items.count();
                 if (0 < itemct) {
+                  depth = 2;
                   for (int kdx = 0; kdx < itemct; ++kdx) {
                     QDomNode item = items.at(kdx);
                     VlcPlayListElementSimple* it = new VlcPlayListElementSimple();
@@ -224,9 +228,16 @@ void PlayListMainWindow::parseXmlPlayList() {
             else {
               el->type = "leaf";
               el->extension = getExtension(el->path, NULL);
+              if (el->playing) {
+                  currentLeafId = el->id;
+                  QString art = leaf.toElement().namedItem("art_url").toElement().text();
+                  hasArt = (!art.isNull() && !art.isEmpty());
+                  extension = getExtension(el->path, NULL);
+              }
               this->mContents->append(*el);
             }
             delete el;
+            */
           }
         }
       }
@@ -242,6 +253,50 @@ void PlayListMainWindow::parseXmlPlayList() {
 
 }
 
+
+void PlayListMainWindow::parsePlayListItem(QDomNode *node, QString *extension, bool *hasArt, int *currentLeafId, int depth) {
+    if (NULL != node) {
+        QString current;
+        VlcPlayListElementSimple* el = new VlcPlayListElementSimple();
+        el->id = node->attributes().namedItem("id").nodeValue().toInt();
+        el->path = node->attributes().namedItem("uri").nodeValue();
+        el->name = node->attributes().namedItem("name").nodeValue().replace("\\\\", "\\");
+        current = node->attributes().namedItem("current").nodeValue();
+        el->playing = (0 < current.length());
+        el->depth = depth;
+        if (0 != QString::compare(node->nodeName(), "node")) {
+            el->type = "leaf";
+            el->extension = getExtension(el->path, NULL);
+            if (el->playing) {
+                *currentLeafId = el->id;
+                QString art = node->toElement().namedItem("art_url").toElement().text();
+                *hasArt = (!art.isNull() && !art.isEmpty());
+                *extension = getExtension(el->path, NULL);
+            }
+            this->mContents->append(*el);
+            delete el;
+        }
+        else {
+            el->type = "node";
+            el->extension = getExtension(el->path, NULL);
+            this->mContents->append(*el);
+            delete el;
+            // now parse the child nodes as leaf.
+            if (node->hasChildNodes()) {
+                QDomNodeList items = node->childNodes();
+                int itemct = items.count();
+                if (0 < itemct) {
+                  ++depth;
+                  for (int kdx = 0; kdx < itemct; ++kdx) {
+                    QDomNode item = items.at(kdx);
+                    parsePlayListItem(&item, extension, hasArt, currentLeafId, depth);
+                  }
+                }
+            }
+        }
+    }
+}
+
 QString PlayListMainWindow::getExtension(QString path, QString extension) {
     // return extension if exists
     if (!extension.isNull() && !extension.isEmpty()) return extension;
@@ -276,6 +331,8 @@ void PlayListMainWindow::updateList() {
     QIcon icon_image  = QIcon::fromTheme("general_image");
     QIcon icon_flash  = QIcon::fromTheme("filemanager_flash_file");
     QIcon icon_media  = QIcon::fromTheme("filemanager_media_folder");
+    QIcon icon_real   = QIcon::fromTheme("filemanager_real_music");
+    QIcon icon_unknown= QIcon::fromTheme("filemanager_unknown_file");
     for (int idx = 0; idx < ct; ++idx) {
       VlcPlayListElementSimple el = mContents->at(idx);
       QListWidgetItem* item;
@@ -303,14 +360,23 @@ void PlayListMainWindow::updateList() {
                     0 == QString::compare(el.extension, "mpg")  ||
                     0 == QString::compare(el.extension, "mov")  ||
                     0 == QString::compare(el.extension, "mp4")  ||
+                    0 == QString::compare(el.extension, "m4v")  ||
                     0 == QString::compare(el.extension, "wmv")  ||
                     0 == QString::compare(el.extension, "mkv")  ||
                     0 == QString::compare(el.extension, "ogv")  ) {
-              item = new QListWidgetItem(icon_video, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .avi, .mpg, .mpeg, .mov, .mp4, .wmv, .mkv, .ogv
+              item = new QListWidgetItem(icon_video, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .avi, .mpg, .mpeg, .mov, .m4v, .mp4, .wmv, .mkv, .ogv
+          }
+          else if ( 0 == QString::compare(el.extension, "rm")  ||
+                    0 == QString::compare(el.extension, "ra")  ||
+                    0 == QString::compare(el.extension, "ram")  ) {
+              item = new QListWidgetItem(icon_real, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .ram, 'rm, 'ra
           }
           else if ( 0 == QString::compare(el.extension, "flv")  ) {
               item = new QListWidgetItem(icon_flash, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .flv
           }
+          else if ( 0 == QString::compare(el.extension, "")  ) {
+              item = new QListWidgetItem(icon_unknown, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .flv
+          }
           else {
               if (el.name.contains("Flash")) {
                   item = new QListWidgetItem(icon_flash, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id);

diff --git a/playlistmainwindow.h b/playlistmainwindow.h
index e6dee7b..55ecd06 100644 (file)
--- a/playlistmainwindow.h
+++ b/playlistmainwindow.h
@@ -56,6 +56,7 @@ public slots:
 protected slots:
     void parseXmlPlayList();
     void updateList();
+    void parsePlayListItem(QDomNode *node, QString *extension, bool *hasArt, int *currentLeafId, int depth);
 
 signals:
     void idUpdated(int id, bool hasArt, QString extension);