summaryrefslogtreecommitdiff
path: root/src/instrumentwidget.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/instrumentwidget.cc')
-rw-r--r--src/instrumentwidget.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/instrumentwidget.cc b/src/instrumentwidget.cc
index e3b3061..d081f6a 100644
--- a/src/instrumentwidget.cc
+++ b/src/instrumentwidget.cc
@@ -84,7 +84,7 @@ InstrumentWidget::InstrumentWidget(Settings& settings, Instrument& instrument)
central->setLayout(lv);
setCentralWidget(central);
- extractor = new AudioExtractor(selections, this);
+ extractor = new AudioExtractor(instrument, selections, this);
canvaswidget = new CanvasWidget(this);
QToolBar* toolbar = addToolBar(tr("Tools"));
@@ -133,7 +133,8 @@ InstrumentWidget::InstrumentWidget(Settings& settings, Instrument& instrument)
QDockWidget* dockWidget = new QDockWidget(tr("Dock Widget"), this);
- dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+ dockWidget->setAllowedAreas(Qt::RightDockWidgetArea);
+ dockWidget->setFeatures(QDockWidget::NoDockWidgetFeatures);
dockWidget->setWidget(new QWidget());
dockWidget->widget()->setLayout(new QVBoxLayout());
@@ -157,7 +158,7 @@ InstrumentWidget::InstrumentWidget(Settings& settings, Instrument& instrument)
vol->setVolumeDb(0);
dockWidget->widget()->layout()->addWidget(vol);
- addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
+ addDockWidget(Qt::RightDockWidgetArea, dockWidget);
canvaswidget->yscale->setValue(0.9);
canvaswidget->yoffset->setValue(MAXVAL/2);
@@ -436,6 +437,8 @@ void InstrumentWidget::loadFile(QString filename)
statusBar()->showMessage(tr("Ready"));
setCursor(Qt::ArrowCursor);
+
+ instrument.setMasterFile(filename);
}
void InstrumentWidget::browse()