Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Prevent block analyzer to be initialized in very high framerate mode. This is strangely slowing it" 

This reverts commit 6098e298fd.
This commit is contained in:
Arnaud Bienner 2011-11-01 02:04:42 +01:00
parent 03f456376d
commit 8d0920073b
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/analyzers/analyzercontainer.cpp
View File

@ -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<BlockAnalyzer*>(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<framerate_list_.count() ; ++i) {
if(current_framerate_ == framerate_list_[i]) {
ChangeFramerate(current_framerate_);