From f7f2e9039cfd6c3d07a28137e321fa96b0267084 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sat, 11 Jan 2020 23:26:03 +0800 Subject: Code refactoring for qmpChannelEditor. Do not crash if preset selection dialog is closed with no preset selected. More translatable strings in qmpChannelEditor. --- core/qmpmidiplay.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/qmpmidiplay.cpp') diff --git a/core/qmpmidiplay.cpp b/core/qmpmidiplay.cpp index c24b0c9..4cb5430 100644 --- a/core/qmpmidiplay.cpp +++ b/core/qmpmidiplay.cpp @@ -450,7 +450,7 @@ void CMidiPlayer::setSolo(int ch,bool s) {setBit(solo,ch,s?1:0);} bool CMidiPlayer::getChannelMask(int ch) {return((mute>>ch)&1)||(solo&&!((solo>>ch)&1));} -int CMidiPlayer::getCC(int ch,int id) +uint16_t CMidiPlayer::getCC(int ch,int id) { if(chstatus[ch][id]==0xff) return getChannelOutputDevice(ch)->getInitialCCValue(uint8_t(id),uint8_t(ch)); -- cgit v1.2.3