Mercurial > hg > sonic-visualiser
diff main/MainWindow.cpp @ 1055:40ff7c801fc2 3.0-integration
Check for audioIO as well as play target; + deployment bits
author | Chris Cannam |
---|---|
date | Thu, 20 Aug 2015 16:41:51 +0100 |
parents | 2f8018eb1573 |
children | 1f92fc7a6b05 |
line wrap: on
line diff
--- a/main/MainWindow.cpp Thu Aug 20 13:34:20 2015 +0100 +++ b/main/MainWindow.cpp Thu Aug 20 16:41:51 2015 +0100 @@ -93,6 +93,7 @@ #include "plugin/api/dssi.h" #include <bqaudioio/SystemPlaybackTarget.h> +#include <bqaudioio/SystemAudioIO.h> #include <QApplication> #include <QMessageBox> @@ -2043,6 +2044,7 @@ } m_keyReference->registerShortcut(m_playAction); + m_keyReference->registerShortcut(m_recordAction); m_keyReference->registerShortcut(m_playSelectionAction); m_keyReference->registerShortcut(m_playLoopAction); m_keyReference->registerShortcut(m_soloAction); @@ -2069,6 +2071,8 @@ menu->addAction(m_rwdStartAction); menu->addAction(m_ffwdEndAction); menu->addSeparator(); + menu->addAction(m_recordAction); + menu->addSeparator(); m_rightButtonPlaybackMenu->addAction(m_playAction); m_rightButtonPlaybackMenu->addAction(m_playSelectionAction); @@ -2082,6 +2086,8 @@ m_rightButtonPlaybackMenu->addAction(m_rwdStartAction); m_rightButtonPlaybackMenu->addAction(m_ffwdEndAction); m_rightButtonPlaybackMenu->addSeparator(); + m_rightButtonPlaybackMenu->addAction(m_recordAction); + m_rightButtonPlaybackMenu->addSeparator(); QAction *fastAction = menu->addAction(tr("Speed Up")); fastAction->setShortcut(tr("Ctrl+PgUp")); @@ -2288,7 +2294,7 @@ (haveCurrentPane && (currentLayer != 0)); bool havePlayTarget = - (m_playTarget != 0); + (m_playTarget != 0 || m_audioIO != 0); bool haveSelection = (m_viewManager && !m_viewManager->getSelections().empty()); @@ -4245,7 +4251,7 @@ MainWindowBase::mainModelChanged(model); - if (m_playTarget) { + if (m_playTarget || m_audioIO) { connect(m_fader, SIGNAL(valueChanged(float)), this, SLOT(mainModelGainChanged(float))); } @@ -4256,6 +4262,8 @@ { if (m_playTarget) { m_playTarget->setOutputGain(gain); + } else if (m_audioIO) { + m_audioIO->setOutputGain(gain); } }