From aec5e972e8968255e8843eb22314b96a8f23b041 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Tue, 10 Sep 2019 23:55:48 +0800 Subject: We refactorin', eh? Hell yeah. (Almost) Completely rewritten qmpChannelsWindow, one of the oldest component, now with a dedicated data model. Removed dumb design (CMidiPlayer::getChstates). Now QMidiPlayer requires C++14 to build. More refactoring like this coming up soon. --- qmidiplayer-desktop/qmpmainwindow.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'qmidiplayer-desktop/qmpmainwindow.cpp') diff --git a/qmidiplayer-desktop/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp index e037c45..95b2da3 100644 --- a/qmidiplayer-desktop/qmpmainwindow.cpp +++ b/qmidiplayer-desktop/qmpmainwindow.cpp @@ -219,7 +219,6 @@ void qmpMainWindow::updateWidgets() timer->stop();stopped=true;playing=false; invokeCallback("main.stop",nullptr); setFuncEnabled("Render",stopped);setFuncEnabled("ReloadSynth",stopped); - chnlw->resetAcitivity(); player->playerDeinit();playerTh->join(); delete playerTh;playerTh=nullptr; player->playerPanic(true); @@ -408,7 +407,7 @@ void qmpMainWindow::on_pbPlayPause_clicked() { if(!playing) { - player->playerPanic();chnlw->resetAcitivity(); + player->playerPanic(); offset=ui->hsTimer->value()/100.*player->getFtime(); } else @@ -487,7 +486,7 @@ void qmpMainWindow::on_pbStop_clicked() invokeCallback("main.stop",nullptr); player->playerDeinit(); setFuncEnabled("Render",stopped);setFuncEnabled("ReloadSynth",stopped); - player->playerPanic(true);chnlw->resetAcitivity(); + player->playerPanic(true); if(playerTh){playerTh->join();delete playerTh;playerTh=nullptr;} chnlw->on_pbUnmute_clicked();chnlw->on_pbUnsolo_clicked(); ui->pbPlayPause->setIcon(QIcon(getThemedIcon(":/img/play.svg"))); -- cgit v1.2.3