From 8d0920073b9853345dc866d49fcaad350f5bc8e9 Mon Sep 17 00:00:00 2001 From: Arnaud Bienner Date: Tue, 1 Nov 2011 02:04:42 +0100 Subject: [PATCH] Revert "Prevent block analyzer to be initialized in very high framerate mode. This is strangely slowing it" This reverts commit 6098e298fda8887d51d005d4677abfb5ff7bb9f2. --- src/analyzers/analyzercontainer.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/analyzers/analyzercontainer.cpp b/src/analyzers/analyzercontainer.cpp index aa60dc31e..54c4d9221 100644 --- a/src/analyzers/analyzercontainer.cpp +++ b/src/analyzers/analyzercontainer.cpp @@ -149,20 +149,11 @@ void AnalyzerContainer::ChangeAnalyzer(int id) { current_analyzer_->set_engine(engine_); // Even if it is not supposed to happen, I don't want to get a dbz error current_framerate_ = current_framerate_ == 0 ? kMediumFramerate : current_framerate_; + current_analyzer_->changeTimeout(1000 / current_framerate_); layout()->addWidget(current_analyzer_); Save(); - // I can't figure out why, but BlockAnalyzer doesn't appreciate to be - // initialized with very high framerate: if we try to, all framerates are - // unusually slow - // TODO: this is just a work around, it would be nicer to find where this bug - // came from and to correct it in a better way - if (dynamic_cast(current_analyzer_) && current_framerate_ == kVeryHighFramerate) { - current_framerate_ = kHighFramerate; - } - - ChangeFramerate(current_framerate_); } void AnalyzerContainer::ChangeFramerate(int new_framerate) { @@ -177,7 +168,6 @@ void AnalyzerContainer::ChangeFramerate(int new_framerate) { void AnalyzerContainer::Load() { QSettings s; s.beginGroup(kSettingsGroup); - current_framerate_ = s.value(kSettingsFramerate, kMediumFramerate).toInt(); // Analyzer QString type = s.value("type", "BlockAnalyzer").toString(); @@ -195,6 +185,7 @@ void AnalyzerContainer::Load() { } // Framerate + current_framerate_ = s.value(kSettingsFramerate, kMediumFramerate).toInt(); for (int i=0 ; i