Improved some memory handling.

[vlc-remote] / playermainwindow.cpp

diff --git a/playermainwindow.cpp b/playermainwindow.cpp
index 5f91727..5ffb274 100644 (file)
--- a/playermainwindow.cpp
+++ b/playermainwindow.cpp
@@ -23,6 +23,7 @@
   #include "configdialog.h"
   #include "aboutdialog.h"
   #include "accountdialog.h"
+  #include "appsettings.h"
   //#include "vlcstatus.h"
 
   PlayerMainWindow::PlayerMainWindow(QWidget *parent) :
@@ -86,6 +87,7 @@
       connect(ui->actionAbout,SIGNAL(triggered()),this,SLOT(showAbout()));
       connect(ui->actionPortrait,SIGNAL(triggered()),this,SLOT(setPortrait()));
       connect(ui->actionLandscape,SIGNAL(triggered()),this,SLOT(setLandscape()));
+      connect(ui->actionAutoRotate,SIGNAL(triggered()),this,SLOT(setAutoRotate()));
       connect(ui->playlistButton,SIGNAL(clicked()),mPlayListMainWindow,SLOT(show()));
       connect(ui->playlistButton,SIGNAL(clicked()),mPlayListMainWindow,SLOT(showPlayList()));
       connect(ui->browseButton,SIGNAL(clicked()),mBrowserMainWindow,SLOT(show()));
@@ -93,7 +95,6 @@
 
       connect(ui->playpauseButton,SIGNAL(clicked()),this,SLOT(playpause()));
       connect(ui->stopButton,SIGNAL(clicked()),this,SLOT(stop()));
-      //connect(ui->pauseButton,SIGNAL(clicked()),this,SLOT(playpause()));
       connect(ui->previousButton,SIGNAL(clicked()),this,SLOT(previous()));
       connect(ui->nextButton,SIGNAL(clicked()),this,SLOT(next()));
       connect(ui->fullscreenButton,SIGNAL(clicked()),this,SLOT(fullscreen()));
@@ -160,25 +161,26 @@
 
   void PlayerMainWindow::setPortrait()
   {
-     #if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
-     this->setAttribute(Qt::WA_Maemo5PortraitOrientation, true);
+    #if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+      AppSettings::setOrientation(PORTRAIT);
+    this->setAttribute(Qt::WA_Maemo5PortraitOrientation, true);
     #endif
-    
-      
   }
 
   void PlayerMainWindow::setLandscape()
   {
-      #if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
-      this->setAttribute(Qt::WA_Maemo5LandscapeOrientation, true);
-      #endif
+    #if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+      AppSettings::setOrientation(LANDSCAPE);
+    this->setAttribute(Qt::WA_Maemo5LandscapeOrientation, true);
+    #endif
   }
 
   void PlayerMainWindow::setAutoRotate()
   {
     #if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
-   this->setAttribute(Qt::WA_Maemo5AutoOrientation, true);
-   #endif
+      AppSettings::setOrientation(AUTO_ROTATE);
+    this->setAttribute(Qt::WA_Maemo5AutoOrientation, true);
+    #endif
   }
 
   void PlayerMainWindow::orientationChanged() {
@@ -294,7 +296,7 @@
 
   void PlayerMainWindow::askStatus()
   {
-
+      //qDebug() << "Status requested. at:" << QTime::currentTime().toString("hh::mm:ss");
       QNetworkReply * reply =  mNetManager->get(QNetworkRequest(QUrl("http://"+mIp+"/requests/status.xml")));
       connect(reply,SIGNAL(readyRead()),this,SLOT(parseXmlStatus()));
   }
@@ -331,6 +333,10 @@
       QString album = metaInfoNode.namedItem("album").toElement().text();
       QString now_playing = metaInfoNode.namedItem("now_playing").toElement().text();
       QString art_url = metaInfoNode.namedItem("art_url").toElement().text();
+      //metaInfoNode.clear();
+      //infoNode.clear();
+      //docElem.clear();
+      //doc.clear();
       // Populate the current status structure
       // now would be a good time to work out if we are a new track / file or not.
       // key if we are going to look for album art later
@@ -400,8 +406,11 @@
       }
 
 
-      if (mCurrentStatus.position >= 0 && mCurrentStatus.position <= 100)
+      if (mCurrentStatus.position >= 0 && mCurrentStatus.position <= 100) {
+          ui->slider->blockSignals(true);
           ui->slider->setValue(mCurrentStatus.position);
+          ui->slider->blockSignals(false);
+      }
 
       ui->labelTitle->setText(mCurrentStatus.title);
       ui->labelArtist->setText(mCurrentStatus.artist);
@@ -419,7 +428,7 @@
           //   rebuild display layout
           //   retrieve album art
           mHasImage = false;
-          mPlayListMainWindow->requestPlayList();
+          QTimer::singleShot(500, mPlayListMainWindow, SLOT(requestPlayList()));
       }
       // Update the buttons on the playlist window
       if (NULL != this->mPlayListMainWindow) {
@@ -438,6 +447,9 @@
           // setCoverArtFromPixmap();
       }
   }
+  void PlayerMainWindow::error(QNetworkReply::NetworkError code) {
+      qDebug() << "Error Code: " << code;
+  }
   void PlayerMainWindow::readReady() {
     QNetworkReply * reply = qobject_cast<QNetworkReply*>(sender());
     // append to buffer
@@ -448,11 +460,14 @@
     this->setCoverArt(mResponse);
     // only interested in finished signals
     disconnect(mNetManager,SIGNAL(finished(QNetworkReply *)),this,SLOT(finished(QNetworkReply *)));
+    delete reply;
   }
   void PlayerMainWindow::getCoverArt(int id) {
+      qDebug() << "getCoverArt id=!" << id;
     mResponse.clear();
     QNetworkReply * reply =  mNetManager->get(QNetworkRequest(QUrl("http://"+mIp+"/art?id=" + QString::number(id))));
     connect(reply,SIGNAL(readyRead()),this,SLOT(readReady()));
+    connect(reply,SIGNAL(error(QNetworkReply::NetworkError)),this,SLOT(error(QNetworkReply::NetworkError)));
     connect(mNetManager,SIGNAL(finished(QNetworkReply *)),this,SLOT(finished(QNetworkReply *)));
 
   }
@@ -472,14 +487,17 @@
         }
     }
     else {
+        qDebug() << "image load failed!";
+        qDebug() << "data.length" << data.length();
         ui->labelArtPortrait->setVisible(false);
         ui->labelArtLandscape->setVisible(false);
     }
+    delete image;
   }
   void PlayerMainWindow::setCoverArtFromPixmap(QPixmap image) {
     mHasImage = true;
     ui->labelArtLandscape->setPixmap(image.scaledToHeight(120, Qt::SmoothTransformation));
-    ui->labelArtPortrait->setPixmap(image.scaledToHeight(310, Qt::SmoothTransformation));
+    ui->labelArtPortrait->setPixmap(image.scaledToHeight(320, Qt::SmoothTransformation));
     if (mIsLandscape) {
         ui->labelArtPortrait->setVisible(false);
         ui->labelArtLandscape->setVisible(true);