Master WAV output

src/MainWindow.cpp

@@ -14,6 +14,7 @@
 #include "ExternalViewer.h"
 #include "ExternalViewerTools.h"
 #include "EditConfig.h"
+#include "MasterOutDialog.h"
 
 
 const char* MainWindow::SettingsGroup = "MainWindow";
@@ -66,6 +67,11 @@ MainWindow::MainWindow(QSettings *settings)
 	SharedUIHelper::RegisterGlobalShortcut(actionFileSaveAs);
 	QObject::connect(actionFileSaveAs, SIGNAL(triggered()), this, SLOT(FileSaveAs()));
 
+	actionFileMasterOut = new QAction(tr("Export WAV..."), this);
+	actionFileMasterOut->setShortcut(Qt::ShiftModifier + Qt::Key_F5);
+	SharedUIHelper::RegisterGlobalShortcut(actionFileMasterOut);
+	QObject::connect(actionFileMasterOut, SIGNAL(triggered(bool)), this, SLOT(MasterOut()));
+
 	actionFileQuit = new QAction(tr("Quit"), this);
 #ifdef Q_OS_WIN
 	actionFileQuit->setShortcut(Qt::ControlModifier + Qt::Key_Q);
@@ -242,6 +248,8 @@ MainWindow::MainWindow(QSettings *settings)
 	menuFile->addSeparator();
 	menuFile->addAction(actionFileSave);
 	menuFile->addAction(actionFileSaveAs);
+	menuFile->addSeparator();
+	menuFile->addAction(actionFileMasterOut);
 #ifdef Q_OS_WIN
 	menuFile->addSeparator();
 	menuFile->addAction(actionFileQuit);
@@ -569,6 +577,15 @@ void MainWindow::FileSaveAs()
 	}
 }
 
+void MainWindow::MasterOut()
+{
+	if (!document)
+		return;
+	auto dialog = new MasterOutDialog(document, this);
+	dialog->exec();
+	delete dialog;
+}
+
 void MainWindow::closeEvent(QCloseEvent *event)
 {
 	if (closing){

src/MainWindow.h

@@ -117,6 +117,7 @@ class MainWindow : public QMainWindow
 	QAction *actionFileOpen;
 	QAction *actionFileSave;
 	QAction *actionFileSaveAs;
+	QAction *actionFileMasterOut;
 	QAction *actionFileQuit;
 
 	QAction *actionEditUndo;
@@ -184,6 +185,7 @@ private slots:
 	void FileOpen(QString path);
 	void FileSave();
 	void FileSaveAs();
+	void MasterOut();
 	void EditUndo();
 	void EditRedo();
 	void EditPreferences();

src/MasterCache.cpp

@@ -143,6 +143,9 @@ void MasterCache::WorkerComplete(MasterCacheWorkerBase *worker)
 		workers.remove(worker);
 		workersMutex.unlock();
 		worker->deleteLater();
+		if (workers.isEmpty()){
+			emit Complete();
+		}
 	}
 }
 
@@ -170,6 +173,16 @@ QPair<int, QAudioBuffer::S32F> MasterCache::GetData(int position)
 	return QPair<int, QAudioBuffer::S32F>(i->first, f);
 }
 
+QVector<QAudioBuffer::S32F> MasterCache::GetAllData() const
+{
+	return data;
+}
+
+bool MasterCache::IsComplete() const
+{
+	return workers.isEmpty();
+}
+
 
 
 

src/MasterCache.h

@@ -150,11 +150,14 @@ private slots:
 
 	void GetData(int position, std::function<bool(int, QAudioBuffer::S32F)> f);
 	QPair<int, QAudioBuffer::S32F> GetData(int position);
+	QVector<QAudioBuffer::S32F> GetAllData() const;
+
+	bool IsComplete() const;
 
 signals:
 	void Cleared();
 	void RegionUpdated(int position, int length);
-
+	void Complete();
 };