Ticket #3837: mythgallery-mount-fail.patch
File mythgallery-mount-fail.patch, 3.4 KB (added by , 17 years ago) |
---|
-
configure
18 18 news="yes" 19 19 phone="yes" 20 20 browser="yes" 21 books="yes" 21 22 controls="yes" 22 23 flix="yes" 23 24 archive="yes" … … 72 73 MythBrowser related options: 73 74 --enable-mythbrowser build the mythbrowser plugin [$browser] 74 75 76 MythBooks related options: 77 --enable-mythbooks build the mythbooks plugin [$books] 78 75 79 MythControls related options: 76 80 --enable-mythcontrols build the mythcontrols plugin [$controls] 77 81 … … 200 204 ;; 201 205 --disable-mythbrowser) browser="no" 202 206 ;; 207 --enable-mythbooks) books="yes" 208 ;; 209 --disable-mythbooks) books="no" 210 ;; 203 211 --enable-mythzoneminder) zoneminder="yes" 204 212 ;; 205 213 --disable-mythzoneminder) zoneminder="no" … … 259 267 news="yes"; 260 268 phone="yes"; 261 269 browser="yes"; 270 books="yes"; 262 271 zoneminder="yes"; 263 272 controls="yes"; 264 273 flix="yes"; … … 283 292 news="no"; 284 293 phone="no"; 285 294 browser="no"; 295 books="no"; 286 296 zoneminder="no"; 287 297 controls="no"; 288 298 flix="no"; … … 607 617 echo " MythBrowser plugin will not be built" 608 618 fi 609 619 620 if test "$books" = "yes" ; then 621 echo " MythBooks plugin will be built" 622 echo "SUBDIRS += mythbooks" >> ./config.pro 623 else 624 echo " MythBooks plugin will not be built" 625 fi 626 610 627 if test "$controls" = "yes" ; then 611 628 echo " MythControls plugin will be built" 612 629 echo "SUBDIRS += mythcontrols" >> ./config.pro -
settings.pro
37 37 38 38 QMAKE_CFLAGS += $$ARCHFLAGS 39 39 QMAKE_CFLAGS_SHLIB = -DPIC -fPIC 40 QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}40 QMAKE_CFLAGS_RELEASE = -O2 -pipe -fomit-frame-pointer -march=athlon64 -msse3 41 41 QMAKE_CFLAGS += $$ECFLAGS 42 42 43 43 # figure out defines -
mythgallery/mythgallery/iconview.cpp
138 138 MediaMonitor *mon = MediaMonitor::GetMediaMonitor(); 139 139 if (m_currDevice && mon && mon->ValidateAndLock(m_currDevice)) 140 140 { 141 if (!m_currDevice->isMounted(true))142 141 bool mounted = m_currDevice->isMounted(true); 142 if (!mounted) mounted = m_currDevice->mount(); 143 143 144 connect(m_currDevice, 144 if(mounted) { 145 connect(m_currDevice, 145 146 SIGNAL(statusChanged(MediaStatus, MythMediaDevice*)), 146 147 SLOT(mediaStatusChanged(MediaStatus, MythMediaDevice*))); 147 148 148 LoadDirectory(m_currDevice->getMountPath(), true);149 LoadDirectory(m_currDevice->getMountPath(), true); 149 150 150 mon->Unlock(m_currDevice); 151 mon->Unlock(m_currDevice); 152 return; 153 } else { 154 mon->Unlock(m_currDevice); 155 } 151 156 } 152 else 153 { 154 m_currDevice = NULL; 155 LoadDirectory(m_galleryDir, true); 156 } 157 m_currDevice = NULL; 158 LoadDirectory(m_galleryDir, true); 157 159 #endif // _WIN32 158 160 } 159 161