From 8cf35c5ceb10d5c54e933127fb60c5034ef8a149 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sat, 5 Oct 2019 23:04:53 +0800 Subject: Replaced the option "default output device" with a more powerful one. Old code for default output device completely removed. --- qmidiplayer-desktop/qmpmainwindow.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'qmidiplayer-desktop/qmpmainwindow.cpp') diff --git a/qmidiplayer-desktop/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp index 76cd221..0bcf070 100644 --- a/qmidiplayer-desktop/qmpmainwindow.cpp +++ b/qmidiplayer-desktop/qmpmainwindow.cpp @@ -52,9 +52,8 @@ qmpMainWindow::~qmpMainWindow() delete a[i]; } pmgr->deinitPlugins(); - std::vector> rtdev=rtmididev->getDevices(); + auto rtdev=qmpRtMidiManager::getDevices(); for(auto &i:rtdev)player->unregisterMidiOutDevice(i.second); - rtmididev->deleteDevices(); delete pmgr; if(timer)delete timer; delete helpw;helpw=nullptr; @@ -83,9 +82,7 @@ void qmpMainWindow::init() [this] { player=new CMidiPlayer(); - rtmididev=new qmpRtMidiManager(); - rtmididev->createDevices(); - std::vector> rtdev=rtmididev->getDevices(); + auto rtdev=qmpRtMidiManager::getDevices(); for(auto &i:rtdev) { player->registerMidiOutDevice(i.first,i.second); @@ -133,7 +130,7 @@ void qmpMainWindow::init() ui->pbSettings->setIcon(QIcon(getThemedIcon(":/img/settings.svg"))); ui->pbAdd->setIcon(QIcon(getThemedIcon(":/img/open.svg"))); if(argfiles.size())on_pbPlayPause_clicked(); - setupWidget();settingsw->verifySF(); + setupWidget();settingsw->postInit(); } int qmpMainWindow::parseArgs() -- cgit v1.2.3