From eee7a6e13ec8cfcb70e3777d83a3a11b3cd30ac6 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Thu, 14 Apr 2016 23:28:30 +0800 Subject: History of the Moon. --- ChangeLog | 4 +++ core/qmpmidimapperrtmidi.cpp | 5 +++ core/qmpmidimappers.hpp | 1 + core/qmpmidiplay.cpp | 10 +++++- core/qmpmidiplay.hpp | 1 + qmidiplayer-desktop/translations/qmp_zh_CN.ts | 44 +++++++++++++-------------- 6 files changed, 42 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 726db06..0c8142c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-04-14 0.7.2 beta +Also reset mapped midi devices. +Translation work... + 2016-04-13 0.7.2 beta Reset channel activity indicators properly. Windows version now has an icon. diff --git a/core/qmpmidimapperrtmidi.cpp b/core/qmpmidimapperrtmidi.cpp index f28bb9d..845f24b 100644 --- a/core/qmpmidimapperrtmidi.cpp +++ b/core/qmpmidimapperrtmidi.cpp @@ -91,3 +91,8 @@ void qmpMidiMapperRtMidi::panic(int iid,int ch) ctrlChange(iid,ch,120,0); //ctrlChange(iid,ch,123,0); } +void qmpMidiMapperRtMidi::reset(int iid,int ch) +{ + ctrlChange(iid,ch,120,0); + ctrlChange(iid,ch,121,0); +} diff --git a/core/qmpmidimappers.hpp b/core/qmpmidimappers.hpp index 334a2d2..ae4fa3f 100644 --- a/core/qmpmidimappers.hpp +++ b/core/qmpmidimappers.hpp @@ -18,6 +18,7 @@ public: void pitchBend(int iid,int ch,int val); void sysEx(int iid,int length,const char* data); void panic(int iid,int ch); + void reset(int iid,int ch); int enumDevices(); std::string deviceName(int id); }; diff --git a/core/qmpmidiplay.cpp b/core/qmpmidiplay.cpp index 6af7722..780b8f7 100644 --- a/core/qmpmidiplay.cpp +++ b/core/qmpmidiplay.cpp @@ -181,6 +181,12 @@ void w32usleep(uint64_t t) timeEndPeriod(1); } #endif +void CMidiPlayer::prePlayInit() +{ + playerPanic(true); + for(int i=0;i<16;++i)if(deviceusage[i]) + for(int j=0;j<16;++j)mapper->reset(i,j); +} void CMidiPlayer::playEvents() { for(uint32_t ct=midiFile->getEvent(0)->time;tceptrgetEventCount();) @@ -287,6 +293,7 @@ void CMidiPlayer::playerPanic(bool reset) fluid_synth_cc(synth,i,7,100); fluid_synth_cc(synth,i,10,64); fluid_synth_cc(synth,i,11,127); + if(deviceusage[i])for(int j=0;j<16;++j)mapper->reset(i,j); } //all sounds off causes the minus polyphone bug... for(int i=0;i<16;++i)fluid_synth_all_notes_off(synth,i); @@ -320,6 +327,7 @@ void CMidiPlayer::playerDeinit() } void CMidiPlayer::playerThread() { + prePlayInit(); playEvents(); } @@ -376,7 +384,7 @@ uint32_t CMidiPlayer::getFileNoteCount(){return midiFile?midiFile->getNoteCount( uint32_t CMidiPlayer::getFileStandard(){return midiFile?midiFile->getStandard():0;} const char* CMidiPlayer::getTitle(){return midiFile?midiFile->getTitle():"";} const char* CMidiPlayer::getCopyright(){return midiFile?midiFile->getCopyright():"";} -double CMidiPlayer::getTempo(){return 60./(ctempo/1e6)/**ctsd/4.*/;} +double CMidiPlayer::getTempo(){return 60./(ctempo/1e6);} uint32_t CMidiPlayer::getTCpaused(){return tcpaused;} void CMidiPlayer::setTCpaused(uint32_t ps){tcpaused=ps;} uint32_t CMidiPlayer::isFinished(){return finished;} diff --git a/core/qmpmidiplay.hpp b/core/qmpmidiplay.hpp index 15fcd89..b0fb387 100644 --- a/core/qmpmidiplay.hpp +++ b/core/qmpmidiplay.hpp @@ -86,6 +86,7 @@ class CMidiPlayer void setBit(uint16_t &n,uint16_t bn,uint16_t b); void processEvent(const SEvent *e); void processEventStub(const SEvent *e); + void prePlayInit(); void playEvents(); void fileTimer1Pass(); void fileTimer2Pass(); diff --git a/qmidiplayer-desktop/translations/qmp_zh_CN.ts b/qmidiplayer-desktop/translations/qmp_zh_CN.ts index 4b95192..4810b05 100644 --- a/qmidiplayer-desktop/translations/qmp_zh_CN.ts +++ b/qmidiplayer-desktop/translations/qmp_zh_CN.ts @@ -1,6 +1,6 @@ - + qmpChannelEditor @@ -159,7 +159,7 @@ Preset - + 乐器 @@ -179,12 +179,12 @@ Unmute All - + 取消全部静音 Unsolo All - + 取消全部独奏 @@ -248,7 +248,7 @@ Sine - + 正弦 @@ -261,7 +261,7 @@ Help - + 帮助 @@ -388,24 +388,24 @@ Repeat Off - + 循环关 Shuffle Off - + 随机关 Save - 保存播放列表 + 保存列表 Load - 打开播放列表 + 加载列表 @@ -421,29 +421,29 @@ Repeat One - + 循环当前 Repeat All - + 循环全部 Shuffle On - + 随机开 Save playlist - + 保存播放列表 Load playlist - + 加载播放列表 @@ -451,27 +451,27 @@ Preset Selection - + 乐器选择 Bank - + 乐器库 Preset - + 乐器 OK - + 确定 Cancel - + 取消 @@ -499,7 +499,7 @@ Disable Midi Mapping - 禁用MIDI输出分配 + 只使用默认输出设备 @@ -740,7 +740,7 @@ Soundfonts - + 音源 -- cgit v1.2.3