Persist orientation settings.

[vlc-remote] / playlistmainwindow.cpp

diff --git a/playlistmainwindow.cpp b/playlistmainwindow.cpp
index fc43b99..62b8616 100644 (file)
--- a/playlistmainwindow.cpp
+++ b/playlistmainwindow.cpp
@@ -1,5 +1,5 @@
 /*   VLC-REMOTE for MAEMO 5
- *   Copyright (C) 2010 Schutz Sacha <istdasklar@gmail.com>
+ *   Copyright (C) 2010 Schutz Sacha <istdasklar@gmail.com>, Dru Moore <usr@dru-id.co.uk>, Yann Nave <yannux@onbebop.net>
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
  *   or (at your option) any later version, as published by the Free
@@ -21,7 +21,8 @@
 #include <QSettings>
 #include "configdialog.h"
 #include "aboutdialog.h"
-#include "accountdialog.h"
+#include "appsettings.h"
+#include "vlcstatus.h"
 
 PlayListMainWindow::PlayListMainWindow(QWidget *parent) :
         QMainWindow(parent),
@@ -70,7 +71,7 @@ PlayListMainWindow::PlayListMainWindow(QWidget *parent) :
 }
 void PlayListMainWindow::init()  // CALL WHEN CONFIG CHANGES
 {
-    mIp = AccountDialog::currentIp();
+    mIp = AppSettings::getCurrentIp(); // AccountDialog::currentIp();
 }
 void PlayListMainWindow::showPlayList()  // CALL WHEN SHOWN
 {
@@ -163,11 +164,15 @@ void PlayListMainWindow::parseXmlPlayList() {
   QDomNodeList nodes = docElem.elementsByTagName("node");
   int depth = 0;
 
+  int currentLeafId = 0;
+  bool hasArt = false;
+  QString extension = "";
+
   int ct = nodes.count();
   for (int idx = 0; idx < ct; ++idx) {
     QDomNode node = nodes.at(idx);
     QString current = "";
-    QString name = node.attributes().namedItem("name").nodeValue();
+    //QString name = node.attributes().namedItem("name").nodeValue().replace("\\\\", "\\");
     int id = node.attributes().namedItem("id").nodeValue().toInt();
     if (4 > id && 0 == QString::compare(node.attributes().namedItem("ro").nodeValue(), "ro")) {
       // got the main playlist, let's build it up
@@ -180,7 +185,7 @@ void PlayListMainWindow::parseXmlPlayList() {
             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();
+            el->name = leaf.attributes().namedItem("name").nodeValue().replace("\\\\", "\\");
             current = leaf.attributes().namedItem("current").nodeValue();
             el->playing = (0 < current.length());
             el->depth = 1;
@@ -198,12 +203,18 @@ void PlayListMainWindow::parseXmlPlayList() {
                     VlcPlayListElementSimple* it = new VlcPlayListElementSimple();
                     it->id = item.attributes().namedItem("id").nodeValue().toInt();
                     it->path = item.attributes().namedItem("uri").nodeValue();
-                    it->name = item.attributes().namedItem("name").nodeValue();
+                    it->name = item.attributes().namedItem("name").nodeValue().replace("\\\\", "\\");
                     it->extension = getExtension(it->path, NULL);
                     it->depth = 2;
                     it->type = "leaf";
                     current = item.attributes().namedItem("current").nodeValue();
                     it->playing = (0 < current.length());
+                    if (it->playing) {
+                        currentLeafId = it->id;
+                        QString art = item.toElement().namedItem("art_url").toElement().text();
+                        hasArt = (!art.isNull() && !art.isEmpty());
+                        extension = getExtension(it->path, NULL);
+                    }
                     this->mContents->append(*it);
                     delete it;
                   }
@@ -225,8 +236,10 @@ void PlayListMainWindow::parseXmlPlayList() {
 
   mResponse.clear();
 
+  emit this->idUpdated(currentLeafId, hasArt, extension);
   this->updateList();
 
+
 }
 
 QString PlayListMainWindow::getExtension(QString path, QString extension) {
@@ -315,3 +328,8 @@ void PlayListMainWindow::updateList() {
     }
   }
 }
+void PlayListMainWindow::updateUiWithCurrentStatus(VlcStatus * status) {
+    ui->loopButton->setChecked(status->loop);
+    ui->repeatButton->setChecked(status->repeat);
+    ui->shuffleButton->setChecked(status->random);
+}