From 18af0454db620150bd409edd451b5dd1283880b0 Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Tue, 12 Apr 2011 18:14:23 +0000 Subject: Possible fix for FLAM GUI controls - send current control values in PluginI::oscUpdate() --- muse2/ChangeLog | 2 ++ muse2/muse/plugin.cpp | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/muse2/ChangeLog b/muse2/ChangeLog index d42c3127..9241b4cb 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,3 +1,5 @@ +11.04.2011: + - Possible fix for FLAM GUI controls - send current control values in PluginI::oscUpdate().(Tim) 10.04.2011: * Added: Expanded all routing choices: Synth to Wave track, Wave track to Wave track etc. (Tim) * Added: DSSI synths can now show generic LADSPA GUI as well as native. (Tim p4.0.20) diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp index e1abbb5e..0acb5f8b 100644 --- a/muse2/muse/plugin.cpp +++ b/muse2/muse/plugin.cpp @@ -2518,7 +2518,6 @@ int PluginI::oscUpdate() #ifdef DSSI_SUPPORT // Send project directory. _oscif.oscSendConfigure(DSSI_PROJECT_DIRECTORY_KEY, museProject.toLatin1().constData()); // song->projectPath() - #endif /* // Send current string configuration parameters. @@ -2537,19 +2536,20 @@ int PluginI::oscUpdate() unsigned long bank, prog; synti->currentProg(&prog, &bank, 0); _oscIF.oscSendProgram(prog, bank); + */ // Send current control values. - unsigned long ports = synth->_controlInPorts; - for(unsigned long i = 0; i < ports; ++i) + //unsigned long ports = controlPorts; + for(int i = 0; i < controlPorts; ++i) { - unsigned long k = synth->pIdx(i); - _oscIF.oscSendControl(k, controls[i]); + //unsigned long k = synth->pIdx(i); + //_oscIF.oscSendControl(k, controls[i]); + _oscif.oscSendControl(controls[i].idx, controls[i].val); // Avoid overloading the GUI if there are lots and lots of ports. if((i+1) % 50 == 0) usleep(300000); } - - */ + #endif // DSSI_SUPPORT return 0; } -- cgit v1.2.3