From 2a29e1ae948429d62e9ca381b9fc7fffeecaf603 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sun, 17 Aug 2014 16:35:29 +0200 Subject: [PATCH] Make sure the "queued" slots in the FileAnalyzer thread are really executed in the context of the proper thread. --- src/Config.h | 4 ++-- src/Thread_FileAnalyzer.cpp | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Config.h b/src/Config.h index 29235134..45636f81 100644 --- a/src/Config.h +++ b/src/Config.h @@ -34,8 +34,8 @@ #define VER_LAMEXP_MINOR_HI 1 #define VER_LAMEXP_MINOR_LO 1 #define VER_LAMEXP_TYPE Alpha -#define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 1567 +#define VER_LAMEXP_PATCH 2 +#define VER_LAMEXP_BUILD 1570 #define VER_LAMEXP_CONFG 1558 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Thread_FileAnalyzer.cpp b/src/Thread_FileAnalyzer.cpp index dd536fa2..d3071c0d 100644 --- a/src/Thread_FileAnalyzer.cpp +++ b/src/Thread_FileAnalyzer.cpp @@ -71,6 +71,8 @@ FileAnalyzer::FileAnalyzer(const QStringList &inputFiles) m_filesDummyCDDA = 0; m_filesCueSheet = 0; + moveToThread(this); /*makes sure queued slots are executed in the proper thread context*/ + m_timer = new QElapsedTimer; } @@ -154,10 +156,6 @@ void FileAnalyzer::run() m_timer->invalidate(); - //Update progress - //emit progressMaxChanged(m_inputFiles.count()); - //emit progressValChanged(0); - //Create MediaInfo template file if(!m_templateFile) { @@ -240,7 +238,7 @@ bool FileAnalyzer::analyzeNextFile(void) const unsigned int taskId = m_tasksCounterNext++; const QString currentFile = QDir::fromNativeSeparators(m_inputFiles.takeFirst()); - if((!m_timer->isValid()) || (m_timer->elapsed() >= 250)) + if((!m_timer->isValid()) || (m_timer->elapsed() >= 333)) { emit fileSelected(QFileInfo(currentFile).fileName()); m_timer->restart();