diff options
| author | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
| commit | d2a88cfaad5ac385fc3c6212c09ad7fbc38e9454 (patch) | |
| tree | 387da0b38255003e1a971629ea0de32273ac3d3c /muse2/muse/osc.h | |
| parent | 716f5a5b56a3b7ff59004ef0a1af5f98cb2a691c (diff) | |
merged with release_2_0
Diffstat (limited to 'muse2/muse/osc.h')
| -rw-r--r-- | muse2/muse/osc.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/muse2/muse/osc.h b/muse2/muse/osc.h index f75b5168..df811f16 100644 --- a/muse2/muse/osc.h +++ b/muse2/muse/osc.h @@ -57,9 +57,16 @@ class OscIF char* _uiOscControlPath; char* _uiOscShowPath; bool _oscGuiVisible; - + + unsigned long old_prog; + unsigned long old_bank; + float* old_control; + unsigned long maxDssiPort; + const std::vector<unsigned long>* control_port_mapper; + virtual bool oscInitGui(const QString& typ, const QString& baseName, const QString& name, - const QString& label, const QString& filePath, const QString& guiPath); + const QString& label, const QString& filePath, const QString& guiPath, + const std::vector<unsigned long>* control_port_mapper_); public: OscIF(); @@ -72,8 +79,8 @@ class OscIF virtual int oscMidi(lo_arg**) { return 0; } virtual int oscConfigure(lo_arg**) { return 0; } - virtual void oscSendProgram(unsigned long prog, unsigned long bank); - virtual void oscSendControl(unsigned long dssiPort, float val); + virtual void oscSendProgram(unsigned long prog, unsigned long bank, bool force=false); + virtual void oscSendControl(unsigned long dssiPort, float val, bool force=false); virtual void oscSendConfigure(const char *key, const char *val); virtual bool oscInitGui() { return false; } @@ -91,7 +98,7 @@ class OscEffectIF : public OscIF public: OscEffectIF() {} - void oscSetPluginI(PluginI*); + void oscSetPluginI(PluginI*); // this MUST be called with NULL-argument from PluginI's destructor! virtual int oscUpdate(lo_arg**); virtual int oscControl(lo_arg**); @@ -111,7 +118,7 @@ class OscDssiIF : public OscIF public: OscDssiIF() {} - void oscSetSynthIF(DssiSynthIF*); + void oscSetSynthIF(DssiSynthIF*); // this MUST be called with NULL-argument from DssiSynthIF's destructor! virtual int oscUpdate(lo_arg**); virtual int oscProgram(lo_arg**); |