[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-11 16:41:51
Message-ID: 20100711164151.5FB11AC85F () svn ! kde ! org
[Download RAW message or body]

SVN commit 1148702 by pedrol:

* Fixed updating the tool-tips of the volume, pitch and tempo sliders.
* Store song properties for the next/prev song actions.

CCBUG: 241884


 M  +24 -17    kmid2.cpp  


--- trunk/extragear/multimedia/kmid/src/kmid2.cpp #1148701:1148702
@@ -668,8 +668,16 @@
     m_midiobj->setTimeSkew( tempoFactor(value)/100.0 );
     if (m_midiobj->state() != PlayingState)
         updateTempoLabel();
+    slotTempoSliderMoved(value);
 }
 
+void KMid2::slotTempoSliderMoved(int value)
+{
+    QString tip = QString::number(tempoFactor(value), 'f', 0) + '%';
+    m_tempoSlider->setToolTip(tip);
+    QToolTip::showText(QCursor::pos(), tip, this);
+}
+
 void KMid2::slotTimeSlider(int value)
 {
     m_midiobj->seek(value);
@@ -680,25 +688,19 @@
     m_seeking = false;
 }
 
+void KMid2::slotTimeSliderPressed()
+{
+    m_seeking = true;
+}
+
 void KMid2::slotVolumeSlider(int value)
 {
     m_midiout->setVolume( -1, value*0.01 );
     if (m_channels != NULL)
         m_channels->setVolumeFactor( value*0.01 );
+    slotVolumeSliderMoved(value);
 }
 
-void KMid2::slotPitchSlider(int value)
-{
-    m_midiout->setPitchShift( value );
-}
-
-void KMid2::slotTempoSliderMoved(int value)
-{
-    QString tip = QString::number(tempoFactor(value), 'f', 0) + '%';
-    m_tempoSlider->setToolTip(tip);
-    QToolTip::showText(QCursor::pos(), tip, this);
-}
-
 void KMid2::slotVolumeSliderMoved(int value)
 {
     QString tip = QString::number(value*1.0, 'f', 0) + '%';
@@ -706,6 +708,12 @@
     QToolTip::showText(QCursor::pos(), tip, this);
 }
 
+void KMid2::slotPitchSlider(int value)
+{
+    m_midiout->setPitchShift( value );
+    slotPitchSliderMoved(value);
+}
+
 void KMid2::slotPitchSliderMoved(int value)
 {
     QString tip = QString::number(value);
@@ -721,11 +729,6 @@
     }
 }
 
-void KMid2::slotTimeSliderPressed()
-{
-    m_seeking = true;
-}
-
 void KMid2::slotEditSettings()
 {
     if (KConfigDialog::exists("settings")) {
@@ -967,6 +970,8 @@
     int i = queue.indexOf(m_midiobj->currentSource());
     if (i > 0) {
         stop();
+        if (m_autoSongSettings->isChecked())
+            slotSaveSongSettings();
         m_midiobj->setCurrentSource(queue.at(i-1));
     }
 }
@@ -977,6 +982,8 @@
     int i = queue.indexOf(m_midiobj->currentSource());
     if (i < queue.count()-1) {
         stop();
+        if (m_autoSongSettings->isChecked())
+            slotSaveSongSettings();
         m_midiobj->setCurrentSource(queue.at(i+1));
     }
 }
[prev in list] [next in list] [prev in thread] [next in thread]