diff --git a/src/analyzers/analyzerbase.cpp b/src/analyzers/analyzerbase.cpp index 2ad9a620b..8c5d2626e 100644 --- a/src/analyzers/analyzerbase.cpp +++ b/src/analyzers/analyzerbase.cpp @@ -48,6 +48,7 @@ Analyzer::Base::Base( QWidget *parent, uint scopeSize ) , m_fht( new FHT(scopeSize) ) , m_engine(NULL) , m_lastScope(512) + , new_frame_(false) { } @@ -100,19 +101,21 @@ void Analyzer::Base::paintEvent(QPaintEvent * e) } transform( m_lastScope ); - analyze( p, m_lastScope ); + analyze( p, m_lastScope, new_frame_ ); //scope.resize( m_fht->size() ); break; } case Engine::Paused: - analyze(p, m_lastScope); + analyze(p, m_lastScope, new_frame_); break; default: demo(p); } + + new_frame_ = false; } int Analyzer::Base::resizeExponent( int exp ) @@ -165,9 +168,9 @@ void Analyzer::Base::demo(QPainter& p) //virtual for( uint i = 0; i < s.size(); ++i ) s[i] = dt * (sin( M_PI + (i * M_PI) / s.size() ) + 1.0); - analyze( p, s ); + analyze( p, s, new_frame_ ); } - else analyze( p, Scope( 32, 0 ) ); + else analyze( p, Scope( 32, 0 ), new_frame_ ); ++t; } @@ -222,5 +225,6 @@ void Analyzer::Base::timerEvent(QTimerEvent* e) { if (e->timerId() != m_timer.timerId()) return; + new_frame_ = true; update(); } diff --git a/src/analyzers/analyzerbase.h b/src/analyzers/analyzerbase.h index 70cd78503..b7f751280 100644 --- a/src/analyzers/analyzerbase.h +++ b/src/analyzers/analyzerbase.h @@ -67,7 +67,7 @@ protected: int resizeForBands( int ); virtual void init() {} virtual void transform( Scope& ); - virtual void analyze( QPainter& p, const Scope& ) = 0; + virtual void analyze( QPainter& p, const Scope&, bool new_frame) = 0; virtual void paused(QPainter& p); virtual void demo(QPainter& p); @@ -77,6 +77,8 @@ protected: FHT *m_fht; EngineBase* m_engine; Scope m_lastScope; + + bool new_frame_; }; diff --git a/src/analyzers/baranalyzer.cpp b/src/analyzers/baranalyzer.cpp index c13f018c5..1e9844289 100644 --- a/src/analyzers/baranalyzer.cpp +++ b/src/analyzers/baranalyzer.cpp @@ -94,7 +94,7 @@ void BarAnalyzer::init() } -void BarAnalyzer::analyze( QPainter& p, const Scope &s ) +void BarAnalyzer::analyze( QPainter& p, const Scope &s, bool new_frame) { //Analyzer::interpolate( s, m_bands ); diff --git a/src/analyzers/baranalyzer.h b/src/analyzers/baranalyzer.h index b51c7275c..e3d8fdc75 100644 --- a/src/analyzers/baranalyzer.h +++ b/src/analyzers/baranalyzer.h @@ -18,7 +18,7 @@ class BarAnalyzer : public Analyzer::Base Q_INVOKABLE BarAnalyzer( QWidget* ); void init(); - virtual void analyze( QPainter& p, const Scope& ); + virtual void analyze( QPainter& p, const Scope&, bool new_frame); //virtual void transform( Scope& ); /** diff --git a/src/analyzers/blockanalyzer.cpp b/src/analyzers/blockanalyzer.cpp index 419a8a6a6..eac19e6fc 100644 --- a/src/analyzers/blockanalyzer.cpp +++ b/src/analyzers/blockanalyzer.cpp @@ -117,7 +117,7 @@ BlockAnalyzer::transform( Analyzer::Scope &s ) //pure virtual } void -BlockAnalyzer::analyze( QPainter& p, const Analyzer::Scope &s ) +BlockAnalyzer::analyze( QPainter& p, const Analyzer::Scope &s, bool new_frame) { // y = 2 3 2 1 0 2 // . . . . # . diff --git a/src/analyzers/blockanalyzer.h b/src/analyzers/blockanalyzer.h index 7f4e06205..5894844f3 100644 --- a/src/analyzers/blockanalyzer.h +++ b/src/analyzers/blockanalyzer.h @@ -35,7 +35,7 @@ public: protected: virtual void transform( Scope& ); - virtual void analyze( QPainter& p, const Scope& ); + virtual void analyze( QPainter& p, const Scope&, bool new_frame); virtual void resizeEvent( QResizeEvent* ); virtual void paletteChange( const QPalette& ); diff --git a/src/analyzers/boomanalyzer.cpp b/src/analyzers/boomanalyzer.cpp index 77dfec185..6a8455312 100644 --- a/src/analyzers/boomanalyzer.cpp +++ b/src/analyzers/boomanalyzer.cpp @@ -79,7 +79,7 @@ BoomAnalyzer::transform( Scope &s ) } void -BoomAnalyzer::analyze( QPainter& p, const Scope& scope ) +BoomAnalyzer::analyze( QPainter& p, const Scope& scope, bool new_frame) { float h; const uint MAX_HEIGHT = height() - 1; diff --git a/src/analyzers/boomanalyzer.h b/src/analyzers/boomanalyzer.h index 5709d1283..a45007a75 100644 --- a/src/analyzers/boomanalyzer.h +++ b/src/analyzers/boomanalyzer.h @@ -21,7 +21,7 @@ public: virtual void init(); virtual void transform( Scope &s ); - virtual void analyze( QPainter& p, const Scope& ); + virtual void analyze( QPainter& p, const Scope&, bool new_frame); public slots: void changeK_barHeight( int ); diff --git a/src/analyzers/nyancatanalyzer.cpp b/src/analyzers/nyancatanalyzer.cpp index fac02d753..1c9951057 100644 --- a/src/analyzers/nyancatanalyzer.cpp +++ b/src/analyzers/nyancatanalyzer.cpp @@ -53,30 +53,32 @@ void NyanCatAnalyzer::timerEvent(QTimerEvent* e) { } } -void NyanCatAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s) { +void NyanCatAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s, bool new_frame) { // Discard the second half of the transform const int scope_size = s.size() / 2; - // Transform the music into rainbows! - for (int band=0 ; bandsize(), 0)); + analyze(p, Scope(m_fht->size(), 0), new_frame_); } diff --git a/src/analyzers/sonogram.h b/src/analyzers/sonogram.h index 8a4b08aca..dbd2a984a 100644 --- a/src/analyzers/sonogram.h +++ b/src/analyzers/sonogram.h @@ -30,7 +30,7 @@ public: static const char* kName; protected: - void analyze(QPainter& p, const Scope&); + void analyze(QPainter& p, const Scope&, bool new_frame); void transform(Scope&); void demo(QPainter& p); void resizeEvent(QResizeEvent*); diff --git a/src/analyzers/turbine.cpp b/src/analyzers/turbine.cpp index 63c49ac9e..ea45de137 100644 --- a/src/analyzers/turbine.cpp +++ b/src/analyzers/turbine.cpp @@ -14,7 +14,7 @@ const char* TurbineAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Turbine"); -void TurbineAnalyzer::analyze( QPainter& p, const Scope &scope ) +void TurbineAnalyzer::analyze( QPainter& p, const Scope &scope, bool new_frame) { float h; const uint hd2 = height() / 2; diff --git a/src/analyzers/turbine.h b/src/analyzers/turbine.h index 8b4e2b2d7..819f1dd54 100644 --- a/src/analyzers/turbine.h +++ b/src/analyzers/turbine.h @@ -17,7 +17,7 @@ class TurbineAnalyzer : public BoomAnalyzer public: Q_INVOKABLE TurbineAnalyzer( QWidget *parent ) : BoomAnalyzer( parent ) {} - void analyze( QPainter& p, const Scope& ); + void analyze( QPainter& p, const Scope&, bool new_frame); static const char* kName; }; diff --git a/src/translations/en.po b/src/translations/en.po index 8664f226f..070ed616d 100644 --- a/src/translations/en.po +++ b/src/translations/en.po @@ -1748,6 +1748,9 @@ msgstr "" msgid "Most played" msgstr "" +msgid "Mount point" +msgstr "" + msgid "Mount points" msgstr "" @@ -2859,6 +2862,9 @@ msgstr "" msgid "Turn off" msgstr "" +msgid "URI" +msgstr "" + msgid "URL(s)" msgstr "" diff --git a/src/translations/translations.pot b/src/translations/translations.pot index d7aecbce2..2ae7adf23 100644 --- a/src/translations/translations.pot +++ b/src/translations/translations.pot @@ -1738,6 +1738,9 @@ msgstr "" msgid "Most played" msgstr "" +msgid "Mount point" +msgstr "" + msgid "Mount points" msgstr "" @@ -2849,6 +2852,9 @@ msgstr "" msgid "Turn off" msgstr "" +msgid "URI" +msgstr "" + msgid "URL(s)" msgstr ""