Ticket #9522: 70-gallery-mediamon.diff

mythplugins/mythgallery/mythgallery/iconview.cpp

@@ -204 +204 @@
         m_thumbGen->setSize(thumbWidth, thumbHeight);
 
     SetupMediaMonitor();
-    LoadDirectory(m_galleryDir);
+    if (!m_currDevice)
+        LoadDirectory(m_galleryDir);
 
     return true;
 }
@@ -339 +340 @@
 
 void IconView::SetupMediaMonitor(void)
 {
-#ifndef _WIN32
+#ifdef _WIN32
+    if (m_currDevice)
+        LoadDirectory(m_currDevice->getDevicePath());
+#else
     MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
     if (m_currDevice && mon && mon->ValidateAndLock(m_currDevice))
     {
@@ -370 +374 @@
             mon->Unlock(m_currDevice);
         }
     }
-    m_currDevice = NULL;
 #endif // _WIN32
 }
 
@@ -530 +533 @@
     {
         m_currDevice = item->GetMediaDevice();
 
+#ifdef _WIN32
+        LoadDirectory(m_currDevice->getDevicePath());
+#else
         if (!m_currDevice->isMounted(false))
             m_currDevice->mount();
 
@@ -542 +548 @@
                                         MythMediaDevice*)));
 
         LoadDirectory(m_currDevice->getMountPath());
+#endif
 
         mon->Unlock(m_currDevice);
     }
@@ -1036 +1043 @@
     MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
     if (m_currDevice && mon && mon->ValidateAndLock(m_currDevice))
     {
+#ifdef _WIN32
+        LoadDirectory(m_currDevice->getDevicePath());
+#else
         LoadDirectory(m_currDevice->getMountPath());
+#endif
         mon->Unlock(m_currDevice);
     }
     else
@@ -1116 +1127 @@
 
 void IconView::HandleShowDevices(void)
 {
-#ifndef _WIN32
     MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
+#ifndef _WIN32
     if (m_currDevice && mon && mon->ValidateAndLock(m_currDevice))
     {
         m_currDevice->disconnect(this);
@@ -1145 +1156 @@
     m_itemList.append(item);
     m_itemHash.insert(item->GetName(), item);
 
-#ifndef _WIN32
     if (mon)
     {
-        QList<MythMediaDevice*> removables = mon->GetMedias(MEDIATYPE_DATA);
+        QList<MythMediaDevice*> removables = mon->GetMedias(MEDIATYPE_DATA|MEDIATYPE_MGALLERY);
         QList<MythMediaDevice*>::Iterator it = removables.begin();
         for (; it != removables.end(); it++)
         {
@@ -1166 +1176 @@
             }
         }
     }
-#endif
 
     ThumbItem *thumbitem;
     for (int x = 0; x < m_itemList.size(); x++)