From 1cabb60b318fd831458f937b240b207c21a28ceb Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Tue, 15 Apr 2014 14:14:52 +0200 Subject: Make CanvasToolListen work again with offsets using the mouse. Clean up Player code some more. --- dgedit/mainwindow.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'dgedit/mainwindow.cc') diff --git a/dgedit/mainwindow.cc b/dgedit/mainwindow.cc index 82eaaa6..70b6f78 100644 --- a/dgedit/mainwindow.cc +++ b/dgedit/mainwindow.cc @@ -73,11 +73,10 @@ MainWindow::MainWindow() extractor = new AudioExtractor(session, this); canvas = new Canvas(this); - player = new Player(canvas); - player->start(); + player.start(); QToolBar *toolbar = addToolBar("Tools"); - g_listen = new CanvasToolListen(canvas, *player); + g_listen = new CanvasToolListen(canvas, player); CanvasTool *listen = g_listen; addTool(toolbar, canvas, listen); CanvasTool *threshold = new CanvasToolThreshold(canvas); @@ -303,7 +302,6 @@ MainWindow::MainWindow() MainWindow::~MainWindow() { - delete player; } void MainWindow::setAttackLengthLineEd(int value) @@ -437,9 +435,15 @@ void MainWindow::loadFile(QString filename) setCursor(Qt::WaitCursor); statusBar()->showMessage("Loading..."); qApp->processEvents(); + sorter->setWavData(NULL, 0); + player.setPcmData(NULL, 0); + canvas->load(filename); + sorter->setWavData(canvas->data, canvas->size); + player.setPcmData(canvas->data, canvas->size); + statusBar()->showMessage("Ready"); setCursor(Qt::ArrowCursor); } @@ -458,6 +462,7 @@ void MainWindow::setPreset(int index) } void MainWindow::browse() { - QString path = QFileDialog::getExistingDirectory(this, "Select export path", lineed_exportp->text()); + QString path = QFileDialog::getExistingDirectory(this, "Select export path", + lineed_exportp->text()); lineed_exportp->setText(path); } -- cgit v1.2.3