aboutsummaryrefslogtreecommitdiff
path: root/qmidiplayer-desktop/qmpsettingswindow.cpp
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2019-01-24 23:09:16 +0800
committerGravatar Chris Xiong <chirs241097@gmail.com> 2019-01-24 23:09:16 +0800
commit003c637ef40e1826b7c829afbfba82ea028e21a5 (patch)
treec897f130bd1641f7922c6a476953e7645d60d581 /qmidiplayer-desktop/qmpsettingswindow.cpp
parent11bda15b5ecb608686718a8180ff33ff37c673f3 (diff)
downloadQMidiPlayer-003c637ef40e1826b7c829afbfba82ea028e21a5.tar.xz
Migrated to fluidsynth 2.x.
Moved to mxe for Windows build. Fixed default value for CC#8.
Diffstat (limited to 'qmidiplayer-desktop/qmpsettingswindow.cpp')
-rw-r--r--qmidiplayer-desktop/qmpsettingswindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmidiplayer-desktop/qmpsettingswindow.cpp b/qmidiplayer-desktop/qmpsettingswindow.cpp
index 0f5b66a..613a5db 100644
--- a/qmidiplayer-desktop/qmpsettingswindow.cpp
+++ b/qmidiplayer-desktop/qmpsettingswindow.cpp
@@ -11,7 +11,7 @@
QSettings* qmpSettingsWindow::settings=NULL;
QComboBox* qmpSettingsWindow::outwidget=NULL;
-void qmpFluidForEachOpt(void* data,char*,char* option)
+void qmpFluidForEachOpt(void* data,const char*,const char* option)
{
QComboBox *pcb=(QComboBox*)data;
pcb->addItem(option);
@@ -388,7 +388,7 @@ void qmpSettingsWindow::verifySF()
if(QMessageBox::question(QDesktopWidget().screen(curMonitor),//this,
tr("No soundfont loaded"),
tr("Internal fluidsynth was chosen as the default output but it has no soundfont set. "
- "Would you like to setup soundfonts now? After that you may have to reload the internal synth."))==QMessageBox::Yes)
+ "Would you like to setup soundfonts now? You may have to reload the internal synth afterwards."))==QMessageBox::Yes)
{
show();
ui->tabWidget->setCurrentWidget(ui->tab_3);