comparison main/MainWindow.cpp @ 1053:2f8018eb1573 3.0-integration

Merge from branch recording
author Chris Cannam
date Thu, 20 Aug 2015 13:15:19 +0100
parents 1f4e40be5aa2 2aaeb77609cf
children 40ff7c801fc2
comparison
equal deleted inserted replaced
1042:100b3fd8e171 1053:2f8018eb1573
56 #include "widgets/TransformFinder.h" 56 #include "widgets/TransformFinder.h"
57 #include "widgets/LabelCounterInputDialog.h" 57 #include "widgets/LabelCounterInputDialog.h"
58 #include "widgets/ActivityLog.h" 58 #include "widgets/ActivityLog.h"
59 #include "widgets/UnitConverter.h" 59 #include "widgets/UnitConverter.h"
60 #include "audio/AudioCallbackPlaySource.h" 60 #include "audio/AudioCallbackPlaySource.h"
61 #include "audio/AudioRecordTarget.h"
61 #include "audio/PlaySpeedRangeMapper.h" 62 #include "audio/PlaySpeedRangeMapper.h"
62 #include "data/fileio/DataFileReaderFactory.h" 63 #include "data/fileio/DataFileReaderFactory.h"
63 #include "data/fileio/PlaylistFileReader.h" 64 #include "data/fileio/PlaylistFileReader.h"
64 #include "data/fileio/WavFileWriter.h" 65 #include "data/fileio/WavFileWriter.h"
65 #include "data/fileio/CSVFileWriter.h" 66 #include "data/fileio/CSVFileWriter.h"
127 using std::vector; 128 using std::vector;
128 using std::map; 129 using std::map;
129 using std::set; 130 using std::set;
130 131
131 132
132 MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) : 133 MainWindow::MainWindow(SoundOptions options, bool withOSCSupport) :
133 MainWindowBase(withAudioOutput, true), 134 MainWindowBase(options),
134 m_overview(0), 135 m_overview(0),
135 m_mainMenusCreated(false), 136 m_mainMenusCreated(false),
136 m_paneMenu(0), 137 m_paneMenu(0),
137 m_layerMenu(0), 138 m_layerMenu(0),
138 m_transformsMenu(0), 139 m_transformsMenu(0),
152 m_rwdAction(0), 153 m_rwdAction(0),
153 m_ffwdAction(0), 154 m_ffwdAction(0),
154 m_ffwdSimilarAction(0), 155 m_ffwdSimilarAction(0),
155 m_ffwdEndAction(0), 156 m_ffwdEndAction(0),
156 m_playAction(0), 157 m_playAction(0),
158 m_recordAction(0),
157 m_playSelectionAction(0), 159 m_playSelectionAction(0),
158 m_playLoopAction(0), 160 m_playLoopAction(0),
159 m_soloModified(false), 161 m_soloModified(false),
160 m_prevSolo(false), 162 m_prevSolo(false),
161 m_playControlsSpacer(0), 163 m_playControlsSpacer(0),
1977 tr("Fast Forward to End")); 1979 tr("Fast Forward to End"));
1978 m_ffwdEndAction->setShortcut(tr("End")); 1980 m_ffwdEndAction->setShortcut(tr("End"));
1979 m_ffwdEndAction->setStatusTip(tr("Fast-forward to the end")); 1981 m_ffwdEndAction->setStatusTip(tr("Fast-forward to the end"));
1980 connect(m_ffwdEndAction, SIGNAL(triggered()), this, SLOT(ffwdEnd())); 1982 connect(m_ffwdEndAction, SIGNAL(triggered()), this, SLOT(ffwdEnd()));
1981 connect(this, SIGNAL(canPlay(bool)), m_ffwdEndAction, SLOT(setEnabled(bool))); 1983 connect(this, SIGNAL(canPlay(bool)), m_ffwdEndAction, SLOT(setEnabled(bool)));
1984
1985 m_recordAction = toolbar->addAction(il.load("record"),
1986 tr("Record"));
1987 m_recordAction->setCheckable(true);
1988 m_recordAction->setShortcut(tr("Ctrl+Space"));
1989 m_recordAction->setStatusTip(tr("Record a new audio file"));
1990 connect(m_recordAction, SIGNAL(triggered()), this, SLOT(record()));
1991 connect(m_recordTarget, SIGNAL(recordStatusChanged(bool)),
1992 m_recordAction, SLOT(setChecked(bool)));
1993 connect(this, SIGNAL(canRecord(bool)),
1994 m_recordAction, SLOT(setEnabled(bool)));
1982 1995
1983 toolbar = addToolBar(tr("Play Mode Toolbar")); 1996 toolbar = addToolBar(tr("Play Mode Toolbar"));
1984 1997
1985 m_playSelectionAction = toolbar->addAction(il.load("playselection"), 1998 m_playSelectionAction = toolbar->addAction(il.load("playselection"),
1986 tr("Constrain Playback to Selection")); 1999 tr("Constrain Playback to Selection"));