aboutsummaryrefslogtreecommitdiff
path: root/qmidiplayer-desktop/qmpchannelswindow.hpp
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2019-05-26 15:55:28 +0800
committerGravatar Chris Xiong <chirs241097@gmail.com> 2019-05-26 15:55:28 +0800
commit7b03fd544837fbe0bc5a5373b60dfd5de50892e1 (patch)
treea343c4efea96295d60b6e4b7944b8fa23d118db0 /qmidiplayer-desktop/qmpchannelswindow.hpp
parent3f72121ac41741d53e4916f1275cbd4f93259c4d (diff)
downloadQMidiPlayer-7b03fd544837fbe0bc5a5373b60dfd5de50892e1.tar.xz
Major code refactor continued and (mostly) concluded.
Removed all references to ICallback in official plugins. New flag field in SEvent. Further type usage corrections.
Diffstat (limited to 'qmidiplayer-desktop/qmpchannelswindow.hpp')
-rw-r--r--qmidiplayer-desktop/qmpchannelswindow.hpp17
1 files changed, 5 insertions, 12 deletions
diff --git a/qmidiplayer-desktop/qmpchannelswindow.hpp b/qmidiplayer-desktop/qmpchannelswindow.hpp
index 36cba3c..207ee8d 100644
--- a/qmidiplayer-desktop/qmpchannelswindow.hpp
+++ b/qmidiplayer-desktop/qmpchannelswindow.hpp
@@ -48,16 +48,6 @@ class QDCComboBox:public QComboBox
void indexChangedSlot(int idx){emit(onChange(id,idx));}
};
-class qmpCWNoteOnCB:public QObject,public ICallBack
-{
- Q_OBJECT
- public:
- void callBack(const void* callerdata,void*)
- {if(((((const SEvent*)callerdata)->type)&0xF0)==0x90)emit onNoteOn();}
- signals:
- void onNoteOn();
-};
-
class qmpChannelsWindow;
class qmpChannelFunc:public qmpFuncBaseIntf
@@ -75,7 +65,7 @@ class qmpChannelsWindow:public QWidget
Q_OBJECT
public:
- explicit qmpChannelsWindow(QWidget *parent=0);
+ explicit qmpChannelsWindow(QWidget *parent=nullptr);
~qmpChannelsWindow();
void showEvent(QShowEvent *event);
void closeEvent(QCloseEvent *event);
@@ -90,6 +80,9 @@ class qmpChannelsWindow:public QWidget
void on_pbUnmute_clicked();
void on_pbUnsolo_clicked();
+ signals:
+ void noteOn();
+
protected:
bool eventFilter(QObject *o,QEvent *e);
@@ -98,8 +91,8 @@ class qmpChannelsWindow:public QWidget
qmpPresetSelector *pselectw;
qmpChannelEditor *ceditw;
QIcon *cha,*chi;
- qmpCWNoteOnCB *cb;
qmpChannelFunc *chnlf;
+ int eh;
//callback fuse... (avoid black midi blocking the main thread)
int callbacksc,cbcnt,fused;
};