Changeset 17 for gui/main_window.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:

• gui/main_window.cpp (modified) (8 diffs)

gui/main_window.cpp

@@ -7 +7 @@
     setupUi(this);
 
-    mpd_status = NULL;
+    //mpd_status = NULL;
     slidingVolume = false;
 
@@ -18 +18 @@
     }
 
+    libraryTreeView->setModel(&musicLibraryModel);
+
     playlistTableView->setModel(&playlistModel);
     playlistTableView->verticalHeader()->hide();
@@ -23 +25 @@
 
     // MPD
-    connect(&mpd, SIGNAL(statusUpdated(MPDStatus *)), this, SLOT(updateStatus(MPDStatus *)));
+    connect(&mpd, SIGNAL(statusUpdated(const MPDStatus &)), this, SLOT(updateStatus(const MPDStatus &)));
     connect(&mpd, SIGNAL(playlistUpdated(QList<Song *> *)), &playlistModel, SLOT(updateSongs(QList<Song *> *)));
     connect(&mpd, SIGNAL(currentSongUpdated(Song *)), this, SLOT(updateCurrentSong(Song *)));
+    connect(&mpd, SIGNAL(musicLibraryUpdated(QList<MusicLibraryItem *> *)), &musicLibraryModel, SLOT(updateLibrary(QList<MusicLibraryItem *> *)));
 
     // GUI
@@ -42 +45 @@
 
     mpd.getStatus();
+    mpd.listAllInfo();
 
     statusTimer.start(1000);
@@ -73 +77 @@
 void MainWindow::playPauseTrack()
 {
-    if(mpd_status->state == MPDStatus::State_Playing) {
+    if(mpd_status.state == MPDStatus::State_Playing) {
         mpd.setPause(true);
-    } else if(mpd_status->state == MPDStatus::State_Paused) {
+    } else if(mpd_status.state == MPDStatus::State_Paused) {
         mpd.setPause(false);
     } else {
@@ -103 +107 @@
 }
 
-void MainWindow::updateStatus(MPDStatus *status)
+void MainWindow::updateStatus(const MPDStatus &status)
 {
     QString timeElapsedFormattedString;
 
-    positionSlider->setMaximum(status->time_total);
-    positionSlider->setValue(status->time_elapsed);
+    positionSlider->setMaximum(status.time_total);
+    positionSlider->setValue(status.time_elapsed);
 
     if(!slidingVolume)
-        volumeSlider->setValue(status->volume);
-
-    // Time elapsed
-    timeElapsedFormattedString += QString::number(floor(status->time_elapsed / 60.0));
-    timeElapsedFormattedString += ":";
-    if(status->time_elapsed % 60 < 10) {
-        timeElapsedFormattedString += "0";
-    }
-    timeElapsedFormattedString += QString::number(status->time_elapsed % 60);
-
-    timeElapsedFormattedString += " / ";
-
-    // Time total
-    timeElapsedFormattedString += QString::number(floor(status->time_total / 60.0));
-    timeElapsedFormattedString += ":";
-    if(status->time_total % 60 < 10) {
-        timeElapsedFormattedString += "0";
-    }
-    timeElapsedFormattedString += QString::number(status->time_total % 60);
+        volumeSlider->setValue(status.volume);
+
+    if(status.time_total == -1) {
+        timeElapsedFormattedString = "00:00 / 00:00";
+    } else {
+        // Time elapsed
+        timeElapsedFormattedString += QString::number(floor(status.time_elapsed / 60.0));
+        timeElapsedFormattedString += ":";
+        if(status.time_elapsed % 60 < 10) {
+            timeElapsedFormattedString += "0";
+        }
+        timeElapsedFormattedString += QString::number(status.time_elapsed % 60);
+
+        timeElapsedFormattedString += " / ";
+
+        // Time total
+        timeElapsedFormattedString += QString::number(floor(status.time_total / 60.0));
+        timeElapsedFormattedString += ":";
+        if(status.time_total % 60 < 10) {
+            timeElapsedFormattedString += "0";
+        }
+        timeElapsedFormattedString += QString::number(status.time_total % 60);
+    }
 
     songTimeElapsedLabel->setText(timeElapsedFormattedString);
 
-    switch(status->state) {
+    switch(status.state) {
         case MPDStatus::State_Playing:
             playPauseTrackButton->setText("Pause");
@@ -140 +148 @@
             stopTrackButton->setEnabled(true);
             break;
+        case MPDStatus::State_Inactive:
         case MPDStatus::State_Stopped:
             playPauseTrackButton->setText("Play");
@@ -157 +166 @@
 
     // Check if song has changed and update if needed
-    if(mpd_status == NULL || mpd_status->song_id != status->song_id) {
+    if(mpd_status.state == MPDStatus::State_Inactive || mpd_status.song_id != status.song_id) {
         mpd.currentSong();
     }
 
     // Check if playlist has changed and update if needed
-    if(mpd_status == NULL || mpd_status->playlist < status->playlist) {
+    if(mpd_status.state == MPDStatus::State_Inactive || mpd_status.playlist < status.playlist) {
         mpd.playListInfo();
     }
 
     // Update status info
-    if(mpd_status != NULL) {
-        delete mpd_status;
-    }
     mpd_status = status;
 }