Ticket #8006: 8006-dbg-v1.patch
File 8006-dbg-v1.patch, 2.7 KB (added by , 13 years ago) |
---|
-
libs/libmythtv/previewgenerator.cpp
70 70 timeInSeconds(true), captureTime(-1), outFileName(QString::null), 71 71 outSize(0,0) 72 72 { 73 VERBOSE(VB_IMPORTANT, LOC + QString("ctor 0x%1").arg((uint64_t)this,0,16)); 74 73 75 if (!pathname.contains("/")) 74 76 pathname = programInfo.GetPlaybackURL(false, true); 75 77 … … 100 102 101 103 PreviewGenerator::~PreviewGenerator() 102 104 { 105 VERBOSE(VB_IMPORTANT, LOC + QString("dtor 0x%1").arg((uint64_t)this,0,16)); 106 103 107 TeardownAll(); 104 108 } 105 109 … … 110 114 111 115 void PreviewGenerator::TeardownAll(void) 112 116 { 117 VERBOSE(VB_IMPORTANT, LOC + 118 QString("TeardownAll 0x%1").arg((uint64_t)this,0,16)); 119 113 120 if (!isConnected) 114 121 return; 115 122 … … 140 147 void PreviewGenerator::AttachSignals(QObject *obj) 141 148 { 142 149 QMutexLocker locker(&previewLock); 143 qRegisterMetaType<bool>("bool &");144 150 connect(this, SIGNAL(previewThreadDone(const QString&,bool&)), 145 151 obj, SLOT( previewThreadDone(const QString&,bool&)), 146 152 Qt::DirectConnection); … … 156 162 */ 157 163 void PreviewGenerator::disconnectSafe(void) 158 164 { 165 VERBOSE(VB_IMPORTANT, LOC + 166 QString("disconnectSafe 0x%1").arg((uint64_t)this,0,16)); 159 167 QMutexLocker locker(&previewLock); 160 168 QObject::disconnect(this, NULL, NULL, NULL); 161 169 isConnected = false; -
programs/mythfrontend/playbackboxhelper.cpp
1 #include <cassert> 2 1 3 #include <algorithm> 2 4 using namespace std; 3 5 … … 494 496 QString fn = xfn.mid(max(xfn.lastIndexOf('/') + 1,0)); 495 497 QMutexLocker locker(&m_previewGeneratorLock); 496 498 499 VERBOSE(VB_IMPORTANT, QString("SetPreviewGenerator('%1':'%2', 0x%3)") 500 .arg(xfn).arg(fn).arg((uint64_t)g)); 501 497 502 if (!g) 498 503 { 499 504 m_previewGeneratorRunning = max(0, (int)m_previewGeneratorRunning - 1); 500 505 PreviewMap::iterator it = m_previewGenerator.find(fn); 501 506 if (it == m_previewGenerator.end()) 507 { 508 assert(0); 502 509 return false; 510 } 503 511 504 512 (*it).gen = NULL; 505 513 (*it).genStarted = false; … … 573 581 574 582 void PlaybackBoxHelper::previewThreadDone(const QString &fn, bool &success) 575 583 { 584 VERBOSE(VB_IMPORTANT, LOC + QString("previewThreadDone '%1'").arg(fn)); 576 585 success = SetPreviewGenerator(fn, NULL); 577 586 UpdatePreviewGeneratorThreads(); 578 587 }