comparison main/OSCHandler.cpp @ 1523:f73a4e8c7040

Merge from branch 3.0-integration
author Chris Cannam
date Tue, 10 Jan 2017 16:21:32 +0000
parents f013210eeceb
children afe620d017d7
comparison
equal deleted inserted replaced
1522:a0a37ed3c07a 1523:f73a4e8c7040
20 #include "view/ViewManager.h" 20 #include "view/ViewManager.h"
21 #include "view/Pane.h" 21 #include "view/Pane.h"
22 #include "view/PaneStack.h" 22 #include "view/PaneStack.h"
23 #include "data/model/WaveFileModel.h" 23 #include "data/model/WaveFileModel.h"
24 #include "widgets/CommandHistory.h" 24 #include "widgets/CommandHistory.h"
25 #include "audioio/AudioCallbackPlaySource.h" 25 #include "audio/AudioCallbackPlaySource.h"
26 #include "audioio/AudioCallbackPlayTarget.h"
27 #include "framework/Document.h" 26 #include "framework/Document.h"
28 #include "data/fileio/WavFileWriter.h" 27 #include "data/fileio/WavFileWriter.h"
29 #include "transform/TransformFactory.h" 28 #include "transform/TransformFactory.h"
30 #include "widgets/Fader.h" 29 #include "widgets/LevelPanWidget.h"
30 #include "widgets/LevelPanToolButton.h"
31 #include "widgets/AudioDial.h" 31 #include "widgets/AudioDial.h"
32
33 #include <bqaudioio/SystemPlaybackTarget.h>
32 34
33 #include <QFileInfo> 35 #include <QFileInfo>
34 36
35 void 37 void
36 MainWindow::handleOSCMessage(const OSCMessage &message) 38 MainWindow::handleOSCMessage(const OSCMessage &message)
339 QString property = message.getArg(0).toString(); 341 QString property = message.getArg(0).toString();
340 float value = (float)message.getArg(1).toDouble(); 342 float value = (float)message.getArg(1).toDouble();
341 343
342 if (property == "gain") { 344 if (property == "gain") {
343 if (value < 0.0) value = 0.0; 345 if (value < 0.0) value = 0.0;
344 m_fader->setValue(value); 346 m_mainLevelPan->setLevel(value);
345 if (m_playTarget) m_playTarget->setOutputGain(value); 347 if (m_playTarget) m_playTarget->setOutputGain(value);
346 } else if (property == "speedup") { 348 } else if (property == "speedup") {
347 m_playSpeed->setMappedValue(value); 349 m_playSpeed->setMappedValue(value);
348 } else if (property == "overlays") { 350 } else if (property == "overlays") {
349 if (value < 0.5) { 351 if (value < 0.5) {