Ticket #9362: 99-mythmusic-cdio-playbackbox.diff

mythplugins/mythmusic/mythmusic/playbackbox.cpp

@@ -33 +33 @@
 #include "playlistcontainer.h"
 #include "search.h"
 
-#ifndef USING_MINGW
-#include "cddecoder.h"
-#endif // USING_MINGW
-
 PlaybackBoxMusic::PlaybackBoxMusic(MythMainWindow *parent, QString window_name,
                                    QString theme_filename, const QString &dev, const char *name)
 
@@ -468 +464 @@
                                             160, 160);
                 mainvisual->setVisual(visual_modes[current_visual]);
                 bannerDisable();
-                updateTrackInfo(curMeta);
+                if (curMeta)
+                    updateTrackInfo(curMeta);
 
                 if (!m_parent->IsExitingToMain())
                     handled = true;
@@ -970 +967 @@
 
 void PlaybackBoxMusic::occasionallyCheckCD()
 {
-    if (!cd_reader_thread->getLock()->tryLock())
+    if (!cd_reader_thread || !cd_reader_thread->getLock()->tryLock())
         return;
     cd_reader_thread->getLock()->unlock();
 
@@ -1068 +1065 @@
 
         GenericTree *node = music_tree_list->getCurrentNode();
         curMeta = gMusicData->all_music->getMetadata(node->getInt());
-        updateTrackInfo(curMeta);
+        if (curMeta)
+            updateTrackInfo(curMeta);
 
         setShuffleMode(gPlayer->getShuffleMode());
 
@@ -1106 +1104 @@
                 if (scan_for_cd)
                     updatePlaylistFromCD();
 
+                bool bLocked = cd_reader_thread ?
+                    cd_reader_thread->getLock()->lock(), true : false;
+
                 music_tree_list->showWholeTree(show_whole_tree);
                 Q3ValueList <int> branches_to_current_node;
                 branches_to_current_node.append(0); //  Root node
@@ -1135 +1136 @@
                 if (curMeta)
                     updateTrackInfo(curMeta);
 
+                if (bLocked && cd_reader_thread)
+                    cd_reader_thread->getLock()->unlock();
                 return;     // Do not restart Timer
             }
             else
@@ -1357 +1360 @@
             gPlayer->getOutput()->SetTimecode(0);
     }
 
-    bannerEnable(curMeta, show_album_art);
+    if (curMeta)
+        bannerEnable(curMeta, show_album_art);
 }
 
 void PlaybackBoxMusic::visEnable()
@@ -1388 +1392 @@
 {
     if (mainvisual->bannerIsShowing())
         bannerDisable();
-    else
+    else if (mdata)
         bannerEnable(mdata, false);
 }
 
@@ -1801 +1805 @@
                         if (node)
                         {
                             curMeta = gMusicData->all_music->getMetadata(node->getInt());
-                            updateTrackInfo(curMeta);
+                            if (curMeta)
+                                updateTrackInfo(curMeta);
 
                             maxTime = curMeta->Length() / 1000;
 
@@ -1827 +1832 @@
                     if (node)
                     {
                         curMeta = gMusicData->all_music->getMetadata(node->getInt());
-                        updateTrackInfo(curMeta);
+                        if (curMeta)
+                            updateTrackInfo(curMeta);
 
                         maxTime = curMeta->Length() / 1000;
 
@@ -2069 +2075 @@
 
 void PlaybackBoxMusic::updateTrackInfo(Metadata *mdata)
 {
-    if (visualizer_status != 2)
+    if (mdata)
     {
-        if (title_text)
-            title_text->SetText(mdata->FormatTitle());
-        if (artist_text)
-            artist_text->SetText(mdata->FormatArtist());
-        if (album_text)
-            album_text->SetText(mdata->Album());
-        if (albumart_image)
-            showAlbumArtImage(mdata);
+        if (visualizer_status != 2)
+        {
+            if (title_text)
+                title_text->SetText(mdata->FormatTitle());
+            if (artist_text)
+                artist_text->SetText(mdata->FormatArtist());
+            if (album_text)
+                album_text->SetText(mdata->Album());
+            if (albumart_image)
+                showAlbumArtImage(mdata);
 
-        if (showrating)
-        {
-            if (ratings_image)
-                ratings_image->setRepeat(mdata->Rating());
+            if (showrating)
+            {
+                if (ratings_image)
+                    ratings_image->setRepeat(mdata->Rating());
+            }
         }
+        setTrackOnLCD(mdata);
     }
-    setTrackOnLCD(mdata);
 }
 
 void PlaybackBoxMusic::showAlbumArtImage(Metadata *mdata)
@@ -2164 +2173 @@
         }
 
         curMeta = gMusicData->all_music->getMetadata(node_int);
+        if (curMeta)
+            updateTrackInfo(curMeta);
 
-        updateTrackInfo(curMeta);
-
         maxTime = curMeta->Length() / 1000;
 
         QString time_string = getTimeString(maxTime, 0);