aboutsummaryrefslogtreecommitdiff
path: root/qmidiplayer-desktop
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2017-06-22 11:26:48 +0800
committerGravatar Chris Xiong <chirs241097@gmail.com> 2017-06-22 11:26:48 +0800
commitb03133b80b268c74d1dd5c92e2af6907b51c91b2 (patch)
tree2700bf29cecd5ae89fd7d99e3d6acb88ebb44e61 /qmidiplayer-desktop
parenta97307ba6e625468a1d8ad1049e6d9db0ad42d4d (diff)
downloadQMidiPlayer-b03133b80b268c74d1dd5c92e2af6907b51c91b2.tar.xz
Minor bug fixes.
SMF reader finally takes chunk length into account. Do not prepend sysex header to F0h sysex. Let the readers do it. File readers code cleanups and refined error messages.
Diffstat (limited to 'qmidiplayer-desktop')
-rw-r--r--qmidiplayer-desktop/qmpmainwindow.cpp2
-rw-r--r--qmidiplayer-desktop/qmpplistwindow.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/qmidiplayer-desktop/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp
index 6e10389..e5ad102 100644
--- a/qmidiplayer-desktop/qmpmainwindow.cpp
+++ b/qmidiplayer-desktop/qmpmainwindow.cpp
@@ -579,7 +579,7 @@ void qmpMainWindow::startRender()
char* ifstr=wcsto8bit(plistw->getSelectedItem().toStdWString().c_str());
fluidrenderer=new qmpFileRendererFluid(ifstr,ofstr);
playerSetup(fluidrenderer);
- fluidrenderer->rendererInit();
+ fluidrenderer->renderInit();
free(ofstr);free(ifstr);
#else
fluidrenderer=new qmpFileRendererFluid(
diff --git a/qmidiplayer-desktop/qmpplistwindow.cpp b/qmidiplayer-desktop/qmpplistwindow.cpp
index 7185e5e..4fa9f50 100644
--- a/qmidiplayer-desktop/qmpplistwindow.cpp
+++ b/qmidiplayer-desktop/qmpplistwindow.cpp
@@ -210,15 +210,15 @@ void qmpPlistWindow::on_pbRepeat_clicked()
switch(repeat)
{
case 0:
- ui->pbRepeat->setIcon(QIcon(":/img/repeat-non.svg"));
+ ui->pbRepeat->setIcon(QIcon(getThemedIcon(":/img/repeat-non.svg")));
ui->pbRepeat->setText(tr("Repeat Off"));
break;
case 1:
- ui->pbRepeat->setIcon(QIcon(":/img/repeat-one.svg"));
+ ui->pbRepeat->setIcon(QIcon(getThemedIcon(":/img/repeat-one.svg")));
ui->pbRepeat->setText(tr("Repeat One"));
break;
case 2:
- ui->pbRepeat->setIcon(QIcon(":/img/repeat-all.svg"));
+ ui->pbRepeat->setIcon(QIcon(getThemedIcon(":/img/repeat-all.svg")));
ui->pbRepeat->setText(tr("Repeat All"));
break;
}
@@ -230,12 +230,12 @@ void qmpPlistWindow::on_pbShuffle_clicked()
switch(shuffle)
{
case 1:
- ui->pbShuffle->setIcon(QIcon(":/img/shuffle.svg"));
+ ui->pbShuffle->setIcon(QIcon(getThemedIcon(":/img/shuffle.svg")));
ui->pbShuffle->setText(tr("Shuffle On"));
break;
case 0:
default:
- ui->pbShuffle->setIcon(QIcon(":/img/shuffle-off.svg"));
+ ui->pbShuffle->setIcon(QIcon(getThemedIcon(":/img/shuffle-off.svg")));
ui->pbShuffle->setText(tr("Shuffle Off"));
break;
}