[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/kmid/src
From:       Pedro Lopez-Cabanillas <pedro.lopez.cabanillas () gmail ! com>
Date:       2010-07-31 9:42:11
Message-ID: 20100731094211.CA80AAC783 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1157497 by pedrol:

fix: dbus signals tick() and tempoEvent()

 M  +5 -6      kmid2.cpp  
 M  +3 -3      kmid2.h  


--- trunk/extragear/multimedia/kmid/src/kmid2.cpp #1157496:1157497
@@ -122,10 +122,9 @@
         connect(m_midiobj, SIGNAL(beat(int,int,int)),
                 SLOT(slotBeat(int,int,int)));
 
-        /* DBus signals */
+        /* DBus signals from MIDIObject ones */
         connect( m_midiobj, SIGNAL(midiText(int,const QString&)),
                  SIGNAL(midiTextEvent(int,const QString&)) );
-        connect( m_midiobj, SIGNAL(tick(qint64)), SIGNAL(tick(qint64)) );
         connect( m_midiobj, SIGNAL(finished()), SIGNAL(playerFinished()) );
         connect( m_midiobj, SIGNAL(currentSourceChanged(QString)),
                  SIGNAL(sourceChanged(QString)) );
@@ -133,8 +132,6 @@
                  SIGNAL(timeSignatureEvent(int,int)) );
         connect( m_midiobj, SIGNAL(beat(int,int,int)),
                  SIGNAL(beat(int,int,int)) );
-        connect( m_midiobj, SIGNAL(tempoChanged(qreal)),
-                 SIGNAL(tempoEvent(qreal)) );
         connect( m_midiobj, SIGNAL(midiNoteOn(int,int,int)),
                  SIGNAL(midiNoteOnEvent(int,int,int)) );
         connect( m_midiobj, SIGNAL(midiNoteOff(int,int,int)),
@@ -683,6 +680,7 @@
     if (rtempo != m_rtempo) {
         m_rtempo = rtempo;
         m_labelTempo->setText(QString("%1 bpm").arg(rtempo, 5, 'f', 1));
+        emit tempoEvent(rtempo);
     }
 }
 
@@ -756,12 +754,13 @@
     QToolTip::showText(QCursor::pos(), tip, this);
 }
 
-void KMid2::slotTick(qint64 tick)
+void KMid2::slotTick(qint64 time)
 {
     if (!m_seeking) {
-        m_timeSlider->setSliderPosition(tick);
+        m_timeSlider->setSliderPosition(time);
         updateTempoLabel();
     }
+    emit tick(time);
 }
 
 void KMid2::slotEditSettings()
--- trunk/extragear/multimedia/kmid/src/kmid2.h #1157496:1157497
@@ -167,7 +167,7 @@
 
 signals:
     void playerStateChanged(int state);
-    void tempoEvent(qreal tempo);
+    void tempoEvent(double tempo);
     void timeSignatureEvent(int num, int den);
     void midiTextEvent(int type, const QString& text);
     void midiNoteOnEvent(int channel, int note, int velocity);
@@ -178,9 +178,9 @@
     void midiChannelPressureEvent(int channel, int value);
     void midiPitchBendEvent(int channel, int value);
     void beat(int bar, int beat, int max);
-    void tick(qint64 time);
+    void tick(qlonglong time);
     void playerFinished();
-    void sourceChanged(QString source);
+    void sourceChanged(const QString& source);
 
 private:
     void setupDockWidgets();
[prev in list] [next in list] [prev in thread] [next in thread]