From 2b17a8ee1f549e7120ab3bc2356d8be1c2c79de5 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Fri, 25 Jun 2010 22:04:24 +0000 Subject: [PATCH] Revert r1344 (the timer tracing), it didn't help --- src/analyzers/analyzerbase.cpp | 1 - src/analyzers/analyzercontainer.cpp | 1 - src/core/albumcoverfetcher.cpp | 1 - src/core/organise.cpp | 3 --- src/core/songloader.cpp | 1 - src/engines/gstengine.cpp | 4 ---- src/engines/gstenginepipeline.cpp | 2 -- src/library/librarywatcher.cpp | 2 -- src/playlist/playlistview.cpp | 4 ---- src/ui/mainwindow.cpp | 2 -- src/visualisations/projectmvisualisation.cpp | 1 + src/visualisations/visualisationcontainer.cpp | 2 -- src/visualisations/visualisationoverlay.cpp | 2 -- src/widgets/sliderwidget.cpp | 3 --- 14 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/analyzers/analyzerbase.cpp b/src/analyzers/analyzerbase.cpp index a60c09a6c..2ad9a620b 100644 --- a/src/analyzers/analyzerbase.cpp +++ b/src/analyzers/analyzerbase.cpp @@ -218,7 +218,6 @@ Analyzer::initSin( Scope &v, const uint size ) //static } void Analyzer::Base::timerEvent(QTimerEvent* e) { - qDebug() << __PRETTY_FUNCTION__; QWidget::timerEvent(e); if (e->timerId() != m_timer.timerId()) return; diff --git a/src/analyzers/analyzercontainer.cpp b/src/analyzers/analyzercontainer.cpp index 81c98a402..e4f42616e 100644 --- a/src/analyzers/analyzercontainer.cpp +++ b/src/analyzers/analyzercontainer.cpp @@ -86,7 +86,6 @@ void AnalyzerContainer::mouseReleaseEvent(QMouseEvent* e) { } void AnalyzerContainer::ShowPopupMenu() { - qDebug() << __PRETTY_FUNCTION__; context_menu_->popup(last_click_pos_); } diff --git a/src/core/albumcoverfetcher.cpp b/src/core/albumcoverfetcher.cpp index 1c3c3fad8..07eaf72d9 100644 --- a/src/core/albumcoverfetcher.cpp +++ b/src/core/albumcoverfetcher.cpp @@ -72,7 +72,6 @@ void AlbumCoverFetcher::Clear() { } void AlbumCoverFetcher::StartRequests() { - qDebug() << __PRETTY_FUNCTION__; if (queued_requests_.isEmpty()) { request_starter_->stop(); return; diff --git a/src/core/organise.cpp b/src/core/organise.cpp index b9c57445d..61e89db0a 100644 --- a/src/core/organise.cpp +++ b/src/core/organise.cpp @@ -21,7 +21,6 @@ #include #include #include -#include const int Organise::kBatchSize = 10; @@ -56,8 +55,6 @@ void Organise::Start() { } void Organise::ProcessSomeFiles() { - qDebug() << __PRETTY_FUNCTION__; - // None left? if (progress_ >= files_.count()) { task_manager_->SetTaskFinished(task_id_); diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp index 84e3bb172..c7a6bdc62 100644 --- a/src/core/songloader.cpp +++ b/src/core/songloader.cpp @@ -357,7 +357,6 @@ void SongLoader::AddAsRawStream() { } void SongLoader::Timeout() { - qDebug() << __PRETTY_FUNCTION__; state_ = Finished; success_ = false; StopTypefind(); diff --git a/src/engines/gstengine.cpp b/src/engines/gstengine.cpp index f07c3264a..6d1e9d817 100644 --- a/src/engines/gstengine.cpp +++ b/src/engines/gstengine.cpp @@ -561,8 +561,6 @@ void GstEngine::Seek(uint ms) { } void GstEngine::SeekNow() { - qDebug() << __PRETTY_FUNCTION__; - if (!waiting_to_seek_) return; waiting_to_seek_ = false; @@ -598,8 +596,6 @@ void GstEngine::SetVolumeSW( uint percent ) { void GstEngine::timerEvent( QTimerEvent* ) { - qDebug() << __PRETTY_FUNCTION__; - // keep the scope from building while we are not visible // this is why the timer must run as long as we are playing, and not just when // we are fading diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp index aefb6006b..1ee36fdd9 100644 --- a/src/engines/gstenginepipeline.cpp +++ b/src/engines/gstenginepipeline.cpp @@ -437,8 +437,6 @@ void GstEnginePipeline::FaderTimelineFinished() { } void GstEnginePipeline::timerEvent(QTimerEvent* e) { - qDebug() << __PRETTY_FUNCTION__; - if (e->timerId() == fader_fudge_timer_.timerId()) { fader_fudge_timer_.stop(); emit FaderFinished(); diff --git a/src/library/librarywatcher.cpp b/src/library/librarywatcher.cpp index 56d33fb8b..622742ddc 100644 --- a/src/library/librarywatcher.cpp +++ b/src/library/librarywatcher.cpp @@ -396,8 +396,6 @@ void LibraryWatcher::DirectoryChanged(const QString &subdir) { } void LibraryWatcher::RescanPathsNow() { - qDebug() << __PRETTY_FUNCTION__; - foreach (int dir, rescan_queue_.keys()) { if (stop_requested_) return; ScanTransaction transaction(this, dir, false); diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp index 453f72bda..d9dcc0ad0 100644 --- a/src/playlist/playlistview.cpp +++ b/src/playlist/playlistview.cpp @@ -260,8 +260,6 @@ void PlaylistView::InvalidateCachedCurrentPixmap() { } void PlaylistView::timerEvent(QTimerEvent* event) { - qDebug() << __PRETTY_FUNCTION__; - QTreeView::timerEvent(event); if (event->timerId() == glow_timer_.timerId()) GlowIntensityChanged(); @@ -425,8 +423,6 @@ void PlaylistView::scrollContentsBy(int dx, int dy) { } void PlaylistView::InhibitAutoscrollTimeout() { - qDebug() << __PRETTY_FUNCTION__; - // For 1 minute after the user clicks on or scrolls the playlist we promise // not to automatically scroll the view to keep up with a track change. inhibit_autoscroll_ = false; diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 0e597dc86..fceb7316f 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -785,8 +785,6 @@ void MainWindow::FilePathChanged(const QString& path) { } void MainWindow::UpdateTrackPosition() { - qDebug() << __PRETTY_FUNCTION__; - // Track position in seconds const int position = std::floor(float(player_->GetEngine()->position()) / 1000.0 + 0.5); const int length = player_->GetCurrentItem()->Metadata().length(); diff --git a/src/visualisations/projectmvisualisation.cpp b/src/visualisations/projectmvisualisation.cpp index 4f7a58238..a06013171 100644 --- a/src/visualisations/projectmvisualisation.cpp +++ b/src/visualisations/projectmvisualisation.cpp @@ -19,6 +19,7 @@ #include "projectmvisualisation.h" #include "visualisationcontainer.h" +#include #include #include #include diff --git a/src/visualisations/visualisationcontainer.cpp b/src/visualisations/visualisationcontainer.cpp index 75e521e86..4620c94c8 100644 --- a/src/visualisations/visualisationcontainer.cpp +++ b/src/visualisations/visualisationcontainer.cpp @@ -169,8 +169,6 @@ void VisualisationContainer::SizeChanged() { } void VisualisationContainer::timerEvent(QTimerEvent* e) { - qDebug() << __PRETTY_FUNCTION__; - QGraphicsView::timerEvent(e); if (e->timerId() == update_timer_.timerId()) scene()->update(); diff --git a/src/visualisations/visualisationoverlay.cpp b/src/visualisations/visualisationoverlay.cpp index 2785e6915..3b4baeb0e 100644 --- a/src/visualisations/visualisationoverlay.cpp +++ b/src/visualisations/visualisationoverlay.cpp @@ -65,8 +65,6 @@ void VisualisationOverlay::ShowSettingsMenu() { } void VisualisationOverlay::timerEvent(QTimerEvent* e) { - qDebug() << __PRETTY_FUNCTION__; - QWidget::timerEvent(e); if (e->timerId() == fade_out_timeout_.timerId()) { diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp index b81761576..1ca80ad90 100644 --- a/src/widgets/sliderwidget.cpp +++ b/src/widgets/sliderwidget.cpp @@ -31,7 +31,6 @@ #include #include #include -#include Amarok::Slider::Slider( Qt::Orientation orientation, QWidget *parent, uint max ) @@ -264,8 +263,6 @@ Amarok::VolumeSlider::generateGradient() void Amarok::VolumeSlider::slotAnimTimer() //SLOT { - qDebug() << __PRETTY_FUNCTION__; - if ( m_animEnter ) { m_animCount++; update();