From 446263beafeafa831530a6f9711aa891955b7db3 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Fri, 22 Apr 2016 21:06:51 +0800 Subject: First stable version! Remove visualization stub. Complain explicitly if an invalid file is loaded. Remove fluidsynth warnings from stderr. --- qmidiplayer-desktop/qmpmainwindow.cpp | 5 +- qmidiplayer-desktop/qmpsettingswindow.ui | 161 -------------------------- qmidiplayer-desktop/translations/qmp_zh_CN.ts | 126 +++++++++----------- 3 files changed, 56 insertions(+), 236 deletions(-) (limited to 'qmidiplayer-desktop') diff --git a/qmidiplayer-desktop/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp index c04bc93..73c2895 100644 --- a/qmidiplayer-desktop/qmpmainwindow.cpp +++ b/qmidiplayer-desktop/qmpmainwindow.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include "qmpmainwindow.hpp" #include "ui_qmpmainwindow.h" #include "../core/qmpmidiplay.hpp" @@ -27,14 +28,14 @@ char* wcsto8bit(const wchar_t* s) #define LOAD_FILE \ {\ char* c=wcsto8bit(fns.toStdWString().c_str());\ - if(!player->playerLoadFile(c)){free(c);return;}\ + if(!player->playerLoadFile(c)){free(c);QMessageBox::critical(this,tr("Error"),tr("%1 is not a valid midi file.").arg(fns));return;}\ free(c);\ } #else #define LOAD_SOUNDFONT \ player->pushSoundFont(settingsw->getSFWidget()->item(i)->text().toStdString().c_str()) #define LOAD_FILE \ - if(!player->playerLoadFile(fns.toStdString().c_str()))return + if(!player->playerLoadFile(fns.toStdString().c_str())){QMessageBox::critical(this,tr("Error"),tr("%1 is not a valid midi file.").arg(fns));return;} #endif #define UPDATE_INTERVAL 66 diff --git a/qmidiplayer-desktop/qmpsettingswindow.ui b/qmidiplayer-desktop/qmpsettingswindow.ui index 0baa694..96d0a43 100644 --- a/qmidiplayer-desktop/qmpsettingswindow.ui +++ b/qmidiplayer-desktop/qmpsettingswindow.ui @@ -562,167 +562,6 @@ - - - - - - Visualization Mode - - - - - - - - - - - - - - View distance - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 50 - 20 - - - - - - - - - 60 - 0 - - - - - 250 - 16777215 - - - - Qt::Horizontal - - - - - - - - - - - - - - Note stretch - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 60 - 20 - - - - - - - - - 60 - 0 - - - - - 250 - 16777215 - - - - Qt::Horizontal - - - - - - - - - - - - - - Fog Start - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 82 - 20 - - - - - - - - - 60 - 0 - - - - - 250 - 16777215 - - - - Qt::Horizontal - - - - - - - - diff --git a/qmidiplayer-desktop/translations/qmp_zh_CN.ts b/qmidiplayer-desktop/translations/qmp_zh_CN.ts index d834231..8d313d2 100644 --- a/qmidiplayer-desktop/translations/qmp_zh_CN.ts +++ b/qmidiplayer-desktop/translations/qmp_zh_CN.ts @@ -1,6 +1,6 @@ - + qmpChannelEditor @@ -9,117 +9,117 @@ - + < - + 1 - + > - + Yamaha Grand Piano - + BK: 0 - + PC: 0 - + Filters - + Res. 64 - + Cut. 64 - + Effects 效果 - + Chr. 64 - + Rev. 64 - + Envelope - + Dec. 64 - + Atk. 64 - + Rel. 64 - + Vibrato - + Dep. 64 - + Rate 64 - + Del. 64 - + Mixer - + Pan. C - + Vol. 127 @@ -320,63 +320,63 @@ - + somefile.mid - + + <html><head/><body><p>Poly</p></body></html> + <html><head/><body><p>复音</p></body></html> + + + Channels 通道 - + Playlist 播放列表 - + Effects 效果 - + Visualization 可视化 - - <html><head/><body><p>Poly: 0/0</p></body></html> - - - - + Master 主音量 - - + + 00:00 - + ? - + File Information 文件信息 - + Render to Wave 输出到wav文件 - + Panic 关闭所有音符 @@ -389,46 +389,46 @@ 播放列表 - + Add 添加 - + Add Folder 添加文件夹 - + Repeat Off 循环关 - + Shuffle Off 随机关 - + Save 保存列表 - + Load 加载列表 - + Remove 移除 - + Clear 清空 @@ -469,22 +469,22 @@ 乐器选择 - + Bank 乐器库 - + Preset 乐器 - + OK 确定 - + Cancel 取消 @@ -787,25 +787,5 @@ Persistent fluidsynth instance 单一fluidsynth实例 - - - Visualization Mode - - - - - View distance - - - - - Note stretch - - - - - Fog Start - - -- cgit v1.2.3