comparison main/MainWindow.cpp @ 59:1016a8ceceda

* Introduce PlaySpeedRangeMapper for playback speed dial

 #include "widgets/ListInputDialog.h"
 #include "widgets/SubdividingMenu.h"
 #include "audioio/AudioCallbackPlaySource.h"
 #include "audioio/AudioCallbackPlayTarget.h"
 #include "audioio/AudioTargetFactory.h"
+#include "audioio/PlaySpeedRangeMapper.h"
 #include "data/fileio/AudioFileReaderFactory.h"
 #include "data/fileio/DataFileReaderFactory.h"
 #include "data/fileio/WavFileWriter.h"
 #include "data/fileio/CSVFileWriter.h"
 #include "data/fileio/BZipFileDevice.h"

     m_playSpeed->setFixedWidth(24);
     m_playSpeed->setFixedHeight(24);
     m_playSpeed->setNotchesVisible(true);
     m_playSpeed->setPageStep(10);
     m_playSpeed->setToolTip(tr("Playback speed: +0%"));
+    m_playSpeed->setObjectName(tr("Playback Speed"));
     m_playSpeed->setDefaultValue(100);
+    m_playSpeed->setRangeMapper(new PlaySpeedRangeMapper(0, 200));
     connect(m_playSpeed, SIGNAL(valueChanged(int)),
 	    this, SLOT(playSpeedChanged(int)));
 
     m_playSharpen = new QPushButton(frame);
     m_playSharpen->setToolTip(tr("Sharpen percussive transients"));

 	}
     }
 }
 
 void
-MainWindow::playSpeedChanged(int speed)
-{
-    bool slow = false;
-    bool something = false;
-    float factor;
-
-    if (speed < 100) {
-        slow = true;
-        speed = 100 - speed;
-    } else {
-        speed = speed - 100;
-    }
-
-    // speed is 0 -> 100
-
-    if (speed == 0) {
-        factor = 1.0;
-    } else {
-        factor = speed;
-        factor = 1.0 + (factor * factor) / 1000.f;
-        something = true;
-    }
-
-    int pc = lrintf((factor - 1.0) * 100);
-
-    if (!slow) factor = 1.0 / factor;
-
-    std::cerr << "speed = " << speed << " factor = " << factor << std::endl;
+MainWindow::playSpeedChanged(int position)
+{
+    PlaySpeedRangeMapper mapper(0, 200);
+    float factor = mapper.getFactorForPosition(position);
+    float percent = mapper.getValueForPosition(position);
+
+//    std::cerr << "speed = " << position << " factor = " << factor << std::endl;
+
+    bool slow = (position < 100);
+    bool something = (position != 100);
+
+    int pc = lrintf(percent);
 
     m_playSpeed->setToolTip(tr("Playback speed: %1%2%")
                             .arg(!slow ? "+" : "-")
 			    .arg(pc));