aboutsummaryrefslogtreecommitdiff
path: root/simple-visualization/qmpkeyboardwindow.cpp
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2019-05-25 22:40:15 +0800
committerGravatar Chris Xiong <chirs241097@gmail.com> 2019-05-25 22:40:15 +0800
commit3f72121ac41741d53e4916f1275cbd4f93259c4d (patch)
tree15bba079c86de0e241812cd657ad190eb0c2c41a /simple-visualization/qmpkeyboardwindow.cpp
parenteba45fdf11a98113b439db0510b55f14845db8fb (diff)
downloadQMidiPlayer-3f72121ac41741d53e4916f1275cbd4f93259c4d.tar.xz
Massive code refactor en cours!
Less complain from compilers: - use nullptr instead of NULL - use types for event fields - explicit type casting added Stop saving parameters of meta events in p1/p2 fields of SEvent. callback_t now uses std::function, deprecating ICallback. Not recommended for daily usage, or even testing: the code refactor is still a work in progress.
Diffstat (limited to 'simple-visualization/qmpkeyboardwindow.cpp')
-rw-r--r--simple-visualization/qmpkeyboardwindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/simple-visualization/qmpkeyboardwindow.cpp b/simple-visualization/qmpkeyboardwindow.cpp
index a42a2e0..f2cc8b7 100644
--- a/simple-visualization/qmpkeyboardwindow.cpp
+++ b/simple-visualization/qmpkeyboardwindow.cpp
@@ -25,10 +25,10 @@ void qmpKeyboardWindow::onkeystatesupdate(int ch,int key,bool state)
void qmpKeyboardWindow::resetAll()
{for(int ch=0;ch<16;++ch)pw[ch]->reset();}
-void EventCallback::callBack(void* callerdata,void* userdata)
+void EventCallback::callBack(const void *callerdata,void* userdata)
{
- qmpKeyboardWindow *w=(qmpKeyboardWindow*)userdata;
- SEventCallBackData *cbd=(SEventCallBackData*)callerdata;
+ const qmpKeyboardWindow *w=(const qmpKeyboardWindow*)userdata;
+ const SEvent *cbd=(const SEvent*)callerdata;
if((cbd->type&0xF0)==0x80)
emit keystateupdated(cbd->type&0xF,cbd->p1,false);
if((cbd->type&0xF0)==0x90)