summaryrefslogtreecommitdiff
path: root/muse2/synti
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-10-08 13:47:24 +0000
committerFlorian Jung <flo@windfisch.org>2011-10-08 13:47:24 +0000
commita347445db32f51562aee5c6a786c312d1f612d2f (patch)
treeba3dc9a6e03eec2edf2c213b7f4d7e5e49903edc /muse2/synti
parent375d6a53630f364c6560eb40255a8cc4c0496b8c (diff)
parent5367067f7a36dce8a362dcc000d41ac581bffdfe (diff)
merged namespace changes. HOPEFULLY the last one.
Diffstat (limited to 'muse2/synti')
-rw-r--r--muse2/synti/deicsonze/deicsonze.cpp474
-rw-r--r--muse2/synti/deicsonze/deicsonze.h12
-rw-r--r--muse2/synti/deicsonze/deicsonzegui.cpp60
-rw-r--r--muse2/synti/deicsonze/deicsonzegui.h2
-rw-r--r--muse2/synti/deicsonze/deicsonzeplugin.cpp36
-rw-r--r--muse2/synti/fluid/fluid.cpp26
-rw-r--r--muse2/synti/fluid/fluid.h2
-rw-r--r--muse2/synti/fluid/fluidgui.cpp6
-rw-r--r--muse2/synti/fluid/fluidgui.h2
-rw-r--r--muse2/synti/fluidsynth/fluidsynthgui.cpp14
-rw-r--r--muse2/synti/fluidsynth/fluidsynthgui.h2
-rw-r--r--muse2/synti/fluidsynth/fluidsynti.cpp104
-rw-r--r--muse2/synti/fluidsynth/fluidsynti.h28
-rw-r--r--muse2/synti/libsynti/gui.cpp16
-rw-r--r--muse2/synti/libsynti/gui.h12
-rw-r--r--muse2/synti/libsynti/mess.cpp22
-rw-r--r--muse2/synti/libsynti/mess.h6
-rw-r--r--muse2/synti/libsynti/poly.cpp4
-rw-r--r--muse2/synti/organ/organ.cpp20
-rw-r--r--muse2/synti/organ/organ.h36
-rw-r--r--muse2/synti/organ/organgui.cpp6
-rw-r--r--muse2/synti/organ/organgui.h2
-rw-r--r--muse2/synti/simpledrums2/common.h2
-rw-r--r--muse2/synti/simpledrums2/simpledrums.cpp82
-rw-r--r--muse2/synti/simpledrums2/simpledrums.h2
-rw-r--r--muse2/synti/simpledrums2/simpledrumsgui.cpp8
-rw-r--r--muse2/synti/simpledrums2/simpledrumsgui.h2
-rw-r--r--muse2/synti/vam/vam.cpp10
-rw-r--r--muse2/synti/vam/vam.h2
-rw-r--r--muse2/synti/vam/vamgui.cpp70
-rw-r--r--muse2/synti/vam/vamgui.h2
31 files changed, 537 insertions, 535 deletions
diff --git a/muse2/synti/deicsonze/deicsonze.cpp b/muse2/synti/deicsonze/deicsonze.cpp
index 01608fcb..9048b727 100644
--- a/muse2/synti/deicsonze/deicsonze.cpp
+++ b/muse2/synti/deicsonze/deicsonze.cpp
@@ -143,15 +143,15 @@ DeicsOnze::DeicsOnze() : Mess(2) {
_gui->setWindowTitle(QString("DeicsOnze"));
//FX
- Plugin* p;
- p = plugins.find("freeverb", "freeverb1");
+ MusECore::Plugin* p;
+ p = MusEGlobal::plugins.find("freeverb", "freeverb1");
_pluginIReverb = NULL;
if(p) initPluginReverb(p);
_pluginIChorus = NULL;
- p = plugins.find("doublechorus", "doublechorus1");
+ p = MusEGlobal::plugins.find("doublechorus", "doublechorus1");
if(p) initPluginChorus(p);
_pluginIDelay = NULL;
- p = plugins.find("pandelay", "pandelay");
+ p = MusEGlobal::plugins.find("pandelay", "pandelay");
if(p) initPluginDelay(p);
//Filter
@@ -197,7 +197,7 @@ DeicsOnze::DeicsOnze() : Mess(2) {
unsigned char dataMasterVol[2];
dataMasterVol[0]=SYSEX_MASTERVOL;
dataMasterVol[1]=getMasterVol();
- MidiPlayEvent evSysexMasterVol(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexMasterVol(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataMasterVol,
2);
_gui->writeEvent(evSysexMasterVol);
@@ -205,30 +205,30 @@ DeicsOnze::DeicsOnze() : Mess(2) {
unsigned char *dataReverbRet = new unsigned char[2];
dataReverbRet[0]=SYSEX_REVERBRETURN;
dataReverbRet[1]=(unsigned char)getReverbReturn();
- MidiPlayEvent evReverbRet(0, 0, ME_SYSEX,(const unsigned char*)dataReverbRet, 2);
+ MusECore::MidiPlayEvent evReverbRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataReverbRet, 2);
_gui->writeEvent(evReverbRet);
unsigned char *dataChorusRet = new unsigned char[2];
dataChorusRet[0]=SYSEX_CHORUSRETURN;
dataChorusRet[1]=(unsigned char)getChorusReturn();
- MidiPlayEvent evChorusRet(0, 0, ME_SYSEX,(const unsigned char*)dataChorusRet, 2);
+ MusECore::MidiPlayEvent evChorusRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataChorusRet, 2);
_gui->writeEvent(evChorusRet);
unsigned char *dataDelayRet = new unsigned char[2];
dataDelayRet[0]=SYSEX_DELAYRETURN;
dataDelayRet[1]=(unsigned char)getDelayReturn();
//printf("DELAY RET = %d, REVERB RET = %d\n",
//getDelayReturn(), getReverbReturn());
- MidiPlayEvent evDelayRet(0, 0, ME_SYSEX,(const unsigned char*)dataDelayRet, 2);
+ MusECore::MidiPlayEvent evDelayRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataDelayRet, 2);
_gui->writeEvent(evDelayRet);
//update font size
unsigned char *dataFontSize = new unsigned char[2];
dataFontSize[0]=SYSEX_FONTSIZE;
dataFontSize[1]=(unsigned char)_global.fontSize;
- MidiPlayEvent evFontSize(0, 0, ME_SYSEX, (const unsigned char*)dataFontSize, 2);
+ MusECore::MidiPlayEvent evFontSize(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataFontSize, 2);
_gui->writeEvent(evFontSize);
//display load preset
unsigned char dataUpdateGuiSet[1];
dataUpdateGuiSet[0]=SYSEX_UPDATESETGUI;
- MidiPlayEvent evSysexUpdateGuiSet(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexUpdateGuiSet(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataUpdateGuiSet,
1);
_gui->writeEvent(evSysexUpdateGuiSet);
@@ -1271,7 +1271,7 @@ void DeicsOnze::loadSet(QString fileName) {
//display load preset
unsigned char dataUpdateGuiSet[1];
dataUpdateGuiSet[0]=SYSEX_UPDATESETGUI;
- MidiPlayEvent evSysexUpdateGuiSet(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexUpdateGuiSet(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataUpdateGuiSet,
1);
_gui->writeEvent(evSysexUpdateGuiSet);
@@ -2065,7 +2065,7 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
/*
if(qdEl.tagName()==NBRVOICESSTR) {
setNbrVoices(qdEl.text().toInt());
- MidiPlayEvent evNbrVoices(0, 0, 0, ME_CONTROLLER,
+ MusECore::MidiPlayEvent evNbrVoices(0, 0, 0, MusECore::ME_CONTROLLER,
CTRL_NBRVOICES, _global.nbrVoices);
_gui->writeEvent(evNbrVoices);
}*/
@@ -2076,8 +2076,8 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
unsigned char *dataChannelNum = new unsigned char[2];
dataChannelNum[0]=SYSEX_CHANNELNUM;
dataChannelNum[1]=(unsigned char)_global.channelNum;
- MidiPlayEvent
- evChannelNum(0, 0, ME_SYSEX, (const unsigned char*)dataChannelNum, 2);
+ MusECore::MidiPlayEvent
+ evChannelNum(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataChannelNum, 2);
_gui->writeEvent(evChannelNum);
}*/
//quality
@@ -2089,7 +2089,7 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
unsigned char *dataQuality = new unsigned char[2];
dataQuality[0]=SYSEX_QUALITY;
dataQuality[1]=(unsigned char)_global.quality;
- MidiPlayEvent evQuality(0, 0, ME_SYSEX, (const unsigned char*)dataQuality, 2);
+ MusECore::MidiPlayEvent evQuality(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataQuality, 2);
_gui->writeEvent(evQuality);
}
//filter
@@ -2098,7 +2098,7 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
unsigned char *dataFilter = new unsigned char[2];
dataFilter[0]=SYSEX_FILTER;
dataFilter[1]=(unsigned char)getFilter();
- MidiPlayEvent evFilter(0, 0, ME_SYSEX, (const unsigned char*)dataFilter, 2);
+ MusECore::MidiPlayEvent evFilter(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataFilter, 2);
_gui->writeEvent(evFilter);
}
//font size
@@ -2107,7 +2107,7 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
unsigned char *dataFontSize = new unsigned char[2];
dataFontSize[0]=SYSEX_FONTSIZE;
dataFontSize[1]=(unsigned char)_global.fontSize;
- MidiPlayEvent evFontSize(0, 0, ME_SYSEX, (const unsigned char*)dataFontSize, 2);
+ MusECore::MidiPlayEvent evFontSize(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataFontSize, 2);
_gui->writeEvent(evFontSize);
}
//saveConfig
@@ -2116,8 +2116,8 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
unsigned char *dataSaveConfig = new unsigned char[2];
dataSaveConfig[0]=SYSEX_SAVECONFIG;
dataSaveConfig[1]=(unsigned char)_saveConfig;
- MidiPlayEvent
- evSaveConfig(0, 0, ME_SYSEX, (const unsigned char*)dataSaveConfig, 2);
+ MusECore::MidiPlayEvent
+ evSaveConfig(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataSaveConfig, 2);
_gui->writeEvent(evSaveConfig);
}
//saveOnlyUsed
@@ -2126,8 +2126,8 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
unsigned char *dataSaveOnlyUsed = new unsigned char[2];
dataSaveOnlyUsed[0]=SYSEX_SAVEONLYUSED;
dataSaveOnlyUsed[1]=(unsigned char)_saveOnlyUsed;
- MidiPlayEvent
- evSaveOnlyUsed(0, 0, ME_SYSEX, (const unsigned char*)dataSaveOnlyUsed, 2);
+ MusECore::MidiPlayEvent
+ evSaveOnlyUsed(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataSaveOnlyUsed, 2);
_gui->writeEvent(evSaveOnlyUsed);
}
//colors
@@ -2145,8 +2145,8 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
unsigned char *dataIsInitSet = new unsigned char[2];
dataIsInitSet[0]=SYSEX_ISINITSET;
dataIsInitSet[1]=(unsigned char)_isInitSet;
- MidiPlayEvent
- evIsInitSet(0, 0, ME_SYSEX, (const unsigned char*)dataIsInitSet, 2);
+ MusECore::MidiPlayEvent
+ evIsInitSet(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataIsInitSet, 2);
_gui->writeEvent(evIsInitSet);
}
if(qdEl.tagName()==INITSETPATHSTR) {
@@ -2156,8 +2156,8 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
dataInitSetPath[0]=SYSEX_INITSETPATH;
strncpy((char*)&dataInitSetPath[1], _initSetPath.toLatin1().constData(),
MAXSTRLENGTHINITSETPATH);
- MidiPlayEvent
- evInitSetPath(0, 0, ME_SYSEX, (const unsigned char*)dataInitSetPath,
+ MusECore::MidiPlayEvent
+ evInitSetPath(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataInitSetPath,
1+MAXSTRLENGTHINITSETPATH);
_gui->writeEvent(evInitSetPath);
}
@@ -2167,8 +2167,8 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
unsigned char *dataIsBackgroundPix = new unsigned char[2];
dataIsBackgroundPix[0]=SYSEX_ISBACKGROUNDPIX;
dataIsBackgroundPix[1]=(unsigned char)_isBackgroundPix;
- MidiPlayEvent
- evIsBackgroundPix(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent
+ evIsBackgroundPix(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataIsBackgroundPix, 2);
_gui->writeEvent(evIsBackgroundPix);
}
@@ -2180,8 +2180,8 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
strncpy((char*)&dataBackgroundPixPath[1],
_backgroundPixPath.toLatin1().constData(),
MAXSTRLENGTHBACKGROUNDPIXPATH);
- MidiPlayEvent
- evBackgroundPixPath(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent
+ evBackgroundPixPath(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataBackgroundPixPath,
1+MAXSTRLENGTHBACKGROUNDPIXPATH);
_gui->writeEvent(evBackgroundPixPath);
@@ -2203,7 +2203,7 @@ void DeicsOnze::readConfiguration(QDomNode qdn) {
dataColorGui[10]=(unsigned char)editBackgroundColor.red();
dataColorGui[11]=(unsigned char)editBackgroundColor.green();
dataColorGui[12]=(unsigned char)editBackgroundColor.blue();
- MidiPlayEvent evSysexColor(0, 0, ME_SYSEX, (const unsigned char*)dataColorGui,
+ MusECore::MidiPlayEvent evSysexColor(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataColorGui,
COLORSYSEXLENGTH+1);
_gui->writeEvent(evSysexColor);
}
@@ -2465,84 +2465,84 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
unsigned char *dataMasterVol = new unsigned char[2];
dataMasterVol[0]=SYSEX_MASTERVOL;
dataMasterVol[1]=(unsigned char) getMasterVol();
- MidiPlayEvent
- evMasterVol(0, 0, ME_SYSEX, (const unsigned char*)dataMasterVol, 2);
+ MusECore::MidiPlayEvent
+ evMasterVol(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataMasterVol, 2);
_gui->writeEvent(evMasterVol);
//channel configuration
for(int c = 0; c < NBRCHANNELS; c++) {
//isEnable
setChannelEnable(c, data[NUM_CHANNEL_ENABLE + c]);
- MidiPlayEvent
- evChEnable(0, 0, c, ME_CONTROLLER,
+ MusECore::MidiPlayEvent
+ evChEnable(0, 0, c, MusECore::ME_CONTROLLER,
CTRL_CHANNELENABLE, data[NUM_CHANNEL_ENABLE + c]);
_gui->writeEvent(evChEnable);
//nbrVoices
setNbrVoices(c, data[NUM_NBRVOICES + c]);
- MidiPlayEvent
- evNbrVoices(0, 0, c,ME_CONTROLLER,CTRL_NBRVOICES, data[NUM_NBRVOICES + c]);
+ MusECore::MidiPlayEvent
+ evNbrVoices(0, 0, c,MusECore::ME_CONTROLLER,CTRL_NBRVOICES, data[NUM_NBRVOICES + c]);
_gui->writeEvent(evNbrVoices);
//channel volume
setChannelVol(c, data[NUM_CHANNEL_VOL + c]);
- MidiPlayEvent
- evChVol(0, 0, c, ME_CONTROLLER,
+ MusECore::MidiPlayEvent
+ evChVol(0, 0, c, MusECore::ME_CONTROLLER,
CTRL_CHANNELVOLUME, data[NUM_CHANNEL_VOL + c]);
_gui->writeEvent(evChVol);
//channel pan
setChannelPan(c, data[NUM_CHANNEL_PAN + c]);
- MidiPlayEvent
- evChPan(0, 0, c, ME_CONTROLLER, CTRL_CHANNELPAN,
+ MusECore::MidiPlayEvent
+ evChPan(0, 0, c, MusECore::ME_CONTROLLER, CTRL_CHANNELPAN,
data[NUM_CHANNEL_PAN + c]);
_gui->writeEvent(evChPan);
if(getChannelEnable(c)) applyChannelAmp(c);
//channel detune
setChannelDetune(c, data[NUM_CHANNEL_DETUNE + c]-MAXCHANNELDETUNE);
- MidiPlayEvent
- evChDetune(0, 0, c, ME_CONTROLLER, CTRL_CHANNELDETUNE,
+ MusECore::MidiPlayEvent
+ evChDetune(0, 0, c, MusECore::ME_CONTROLLER, CTRL_CHANNELDETUNE,
data[NUM_CHANNEL_DETUNE + c]-MAXCHANNELDETUNE);
_gui->writeEvent(evChDetune);
//channel brightness
setChannelBrightness(c,
data[NUM_CHANNEL_BRIGHTNESS + 2*c]
+ data[NUM_CHANNEL_BRIGHTNESS + 2*c + 1] * 256);
- MidiPlayEvent
- evChBrightness(0, 0, c, ME_CONTROLLER,
+ MusECore::MidiPlayEvent
+ evChBrightness(0, 0, c, MusECore::ME_CONTROLLER,
CTRL_FINEBRIGHTNESS, getChannelBrightness(c));
_gui->writeEvent(evChBrightness);
//channel modulation
setChannelModulation(c, data[NUM_CHANNEL_MODULATION + c]);
- MidiPlayEvent
- evChMod(0, 0, c, ME_CONTROLLER,
- CTRL_MODULATION, data[NUM_CHANNEL_MODULATION + c]);
+ MusECore::MidiPlayEvent
+ evChMod(0, 0, c, MusECore::ME_CONTROLLER,
+ MusECore::CTRL_MODULATION, data[NUM_CHANNEL_MODULATION + c]);
_gui->writeEvent(evChMod);
//channel attack
setChannelAttack(c, data[NUM_CHANNEL_ATTACK + c]);
- MidiPlayEvent
- evChAttack(0, 0, c, ME_CONTROLLER,
- CTRL_ATTACK_TIME, data[NUM_CHANNEL_ATTACK + c]);
+ MusECore::MidiPlayEvent
+ evChAttack(0, 0, c, MusECore::ME_CONTROLLER,
+ MusECore::CTRL_ATTACK_TIME, data[NUM_CHANNEL_ATTACK + c]);
_gui->writeEvent(evChAttack);
//channel release
setChannelRelease(c, data[NUM_CHANNEL_RELEASE + c]);
- MidiPlayEvent
- evChRelease(0, 0, c, ME_CONTROLLER,
- CTRL_RELEASE_TIME, data[NUM_CHANNEL_RELEASE + c]);
+ MusECore::MidiPlayEvent
+ evChRelease(0, 0, c, MusECore::ME_CONTROLLER,
+ MusECore::CTRL_RELEASE_TIME, data[NUM_CHANNEL_RELEASE + c]);
_gui->writeEvent(evChRelease);
//channel reverb
setChannelReverb(c, data[NUM_CHANNEL_REVERB + c]);
- MidiPlayEvent
- evChReverb(0, 0, c, ME_CONTROLLER,
- CTRL_REVERB_SEND, data[NUM_CHANNEL_REVERB + c]);
+ MusECore::MidiPlayEvent
+ evChReverb(0, 0, c, MusECore::ME_CONTROLLER,
+ MusECore::CTRL_REVERB_SEND, data[NUM_CHANNEL_REVERB + c]);
_gui->writeEvent(evChReverb);
//channel chorus
setChannelChorus(c, data[NUM_CHANNEL_CHORUS + c]);
- MidiPlayEvent
- evChChorus(0, 0, c, ME_CONTROLLER,
- CTRL_CHORUS_SEND, data[NUM_CHANNEL_CHORUS + c]);
+ MusECore::MidiPlayEvent
+ evChChorus(0, 0, c, MusECore::ME_CONTROLLER,
+ MusECore::CTRL_CHORUS_SEND, data[NUM_CHANNEL_CHORUS + c]);
_gui->writeEvent(evChChorus);
//channel delay
setChannelDelay(c, data[NUM_CHANNEL_DELAY + c]);
- MidiPlayEvent
- evChDelay(0, 0, c, ME_CONTROLLER,
- CTRL_VARIATION_SEND, data[NUM_CHANNEL_DELAY + c]);
+ MusECore::MidiPlayEvent
+ evChDelay(0, 0, c, MusECore::ME_CONTROLLER,
+ MusECore::CTRL_VARIATION_SEND, data[NUM_CHANNEL_DELAY + c]);
_gui->writeEvent(evChDelay);
}
//load configuration
@@ -2550,8 +2550,8 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
unsigned char *dataSaveConfig = new unsigned char[2];
dataSaveConfig[0]=SYSEX_SAVECONFIG;
dataSaveConfig[1]=(unsigned char)_saveConfig;
- MidiPlayEvent
- evSaveConfig(0, 0, ME_SYSEX, (const unsigned char*)dataSaveConfig, 2);
+ MusECore::MidiPlayEvent
+ evSaveConfig(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataSaveConfig, 2);
_gui->writeEvent(evSaveConfig);
if(_saveConfig) {
//saveOnlyUsed
@@ -2559,15 +2559,15 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
unsigned char *dataSaveOnlyUsed = new unsigned char[2];
dataSaveOnlyUsed[0]=SYSEX_SAVEONLYUSED;
dataSaveOnlyUsed[1]=(unsigned char)_saveOnlyUsed;
- MidiPlayEvent
- evSaveOnlyUsed(0, 0, ME_SYSEX, (const unsigned char*)dataSaveOnlyUsed, 2);
+ MusECore::MidiPlayEvent
+ evSaveOnlyUsed(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataSaveOnlyUsed, 2);
_gui->writeEvent(evSaveOnlyUsed);
//colors
unsigned char dataColorGui[COLORSYSEXLENGTH+1];
dataColorGui[0]=SYSEX_COLORGUI;
for (int i=0; i<COLORSYSEXLENGTH; i++)
dataColorGui[i+1]=data[NUM_RED_TEXT+i];
- MidiPlayEvent evSysexColor(0, 0, ME_SYSEX, (const unsigned char*)dataColorGui,
+ MusECore::MidiPlayEvent evSysexColor(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataColorGui,
COLORSYSEXLENGTH+1);
_gui->writeEvent(evSysexColor);
//quality
@@ -2575,47 +2575,47 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
dataQuality[0]=SYSEX_QUALITY;
dataQuality[1]=data[NUM_QUALITY];
setQuality((Quality)data[NUM_QUALITY]);
- MidiPlayEvent evQuality(0, 0, ME_SYSEX, (const unsigned char*)dataQuality, 2);
+ MusECore::MidiPlayEvent evQuality(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataQuality, 2);
_gui->writeEvent(evQuality);
//filter
unsigned char dataFilter[2];
dataFilter[0]=SYSEX_FILTER;
dataFilter[1]=data[NUM_FILTER];
setFilter((bool)data[NUM_FILTER]);
- MidiPlayEvent evFilter(0, 0, ME_SYSEX, (const unsigned char*)dataFilter, 2);
+ MusECore::MidiPlayEvent evFilter(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataFilter, 2);
_gui->writeEvent(evFilter);
//font size
unsigned char dataFontSize[2];
dataFontSize[0]=SYSEX_FONTSIZE;
dataFontSize[1]=data[NUM_FONTSIZE];
- MidiPlayEvent evFontSize(0, 0, ME_SYSEX, (const unsigned char*)dataFontSize, 2);
+ MusECore::MidiPlayEvent evFontSize(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataFontSize, 2);
_gui->writeEvent(evFontSize);
//load init set
unsigned char dataIsInitSet[2];
dataIsInitSet[0]=SYSEX_ISINITSET;
dataIsInitSet[1]=data[NUM_ISINITSET];
- MidiPlayEvent evIsInitSet(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evIsInitSet(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataIsInitSet, 2);
_gui->writeEvent(evIsInitSet);
unsigned char dataInitSetPath[1+MAXSTRLENGTHINITSETPATH];
dataInitSetPath[0]=SYSEX_INITSETPATH;
for(int a = 0; a < MAXSTRLENGTHINITSETPATH; a++)
dataInitSetPath[a+1] = data[a+NUM_INITSETPATH];
- MidiPlayEvent evInitSetPath(0, 0, ME_SYSEX,(const unsigned char*)dataInitSetPath,
+ MusECore::MidiPlayEvent evInitSetPath(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataInitSetPath,
1+MAXSTRLENGTHINITSETPATH);
_gui->writeEvent(evInitSetPath);
//load background pix
unsigned char dataIsBackgroundPix[2];
dataIsBackgroundPix[0]=SYSEX_ISBACKGROUNDPIX;
dataIsBackgroundPix[1]=data[NUM_ISBACKGROUNDPIX];
- MidiPlayEvent evIsBackgroundPix(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evIsBackgroundPix(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataIsBackgroundPix, 2);
_gui->writeEvent(evIsBackgroundPix);
unsigned char dataBackgroundPixPath[1+MAXSTRLENGTHBACKGROUNDPIXPATH];
dataBackgroundPixPath[0]=SYSEX_BACKGROUNDPIXPATH;
for(int a = 0; a < MAXSTRLENGTHBACKGROUNDPIXPATH; a++)
dataBackgroundPixPath[a+1] = data[a+NUM_BACKGROUNDPIXPATH];
- MidiPlayEvent evBackgroundPixPath(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evBackgroundPixPath(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataBackgroundPixPath,
1+MAXSTRLENGTHBACKGROUNDPIXPATH);
_gui->writeEvent(evBackgroundPixPath);
@@ -2627,16 +2627,16 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
unsigned char *dataReverbAct = new unsigned char[2];
dataReverbAct[0]=SYSEX_REVERBACTIV;
dataReverbAct[1]=(unsigned char)_global.isReverbActivated;
- MidiPlayEvent evReverbAct(0, 0, ME_SYSEX,(const unsigned char*)dataReverbAct, 2);
+ MusECore::MidiPlayEvent evReverbAct(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataReverbAct, 2);
_gui->writeEvent(evReverbAct);
setReverbReturn((int)data[NUM_REVERB_RETURN]);
unsigned char *dataReverbRet = new unsigned char[2];
dataReverbRet[0]=SYSEX_REVERBRETURN;
dataReverbRet[1]=(unsigned char)getReverbReturn();
- MidiPlayEvent evReverbRet(0, 0, ME_SYSEX,(const unsigned char*)dataReverbRet, 2);
+ MusECore::MidiPlayEvent evReverbRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataReverbRet, 2);
_gui->writeEvent(evReverbRet);
- Plugin* p;
- p = plugins.find((const char*)&data[NUM_REVERB_LIB],
+ MusECore::Plugin* p;
+ p = MusEGlobal::plugins.find((const char*)&data[NUM_REVERB_LIB],
(const char*)&data[NUM_REVERB_LABEL]);
if(p) {
initPluginReverb(p);
@@ -2648,7 +2648,7 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
}
char dataBuildRev;
dataBuildRev = SYSEX_BUILDGUIREVERB;
- MidiPlayEvent evSysexBuildRev(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexBuildRev(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)&dataBuildRev, 1);
_gui->writeEvent(evSysexBuildRev);
}
@@ -2658,15 +2658,15 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
unsigned char *dataChorusAct = new unsigned char[2];
dataChorusAct[0]=SYSEX_CHORUSACTIV;
dataChorusAct[1]=(unsigned char)_global.isChorusActivated;
- MidiPlayEvent evChorusAct(0, 0, ME_SYSEX,(const unsigned char*)dataChorusAct, 2);
+ MusECore::MidiPlayEvent evChorusAct(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataChorusAct, 2);
_gui->writeEvent(evChorusAct);
setChorusReturn((int)data[NUM_CHORUS_RETURN]);
unsigned char *dataChorusRet = new unsigned char[2];
dataChorusRet[0]=SYSEX_CHORUSRETURN;
dataChorusRet[1]=(unsigned char)getChorusReturn();
- MidiPlayEvent evChorusRet(0, 0, ME_SYSEX,(const unsigned char*)dataChorusRet, 2);
+ MusECore::MidiPlayEvent evChorusRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataChorusRet, 2);
_gui->writeEvent(evChorusRet);
- p = plugins.find((const char*)&data[NUM_CHORUS_LIB],
+ p = MusEGlobal::plugins.find((const char*)&data[NUM_CHORUS_LIB],
(const char*)&data[NUM_CHORUS_LABEL]);
if(p) {
initPluginChorus(p);
@@ -2681,7 +2681,7 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
}
char dataBuildCho;
dataBuildCho = SYSEX_BUILDGUICHORUS;
- MidiPlayEvent evSysexBuildCho(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexBuildCho(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)&dataBuildCho, 1);
_gui->writeEvent(evSysexBuildCho);
}
@@ -2691,22 +2691,22 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
unsigned char *dataDelayAct = new unsigned char[2];
dataDelayAct[0]=SYSEX_DELAYACTIV;
dataDelayAct[1]=(unsigned char)_global.isDelayActivated;
- MidiPlayEvent evDelayAct(0, 0, ME_SYSEX,(const unsigned char*)dataDelayAct, 2);
+ MusECore::MidiPlayEvent evDelayAct(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataDelayAct, 2);
_gui->writeEvent(evDelayAct);
setDelayReturn((int)data[NUM_DELAY_RETURN]);
unsigned char *dataDelayRet = new unsigned char[2];
dataDelayRet[0]=SYSEX_DELAYRETURN;
dataDelayRet[1]=(unsigned char)getDelayReturn();
- MidiPlayEvent evDelayRet(0, 0, ME_SYSEX,(const unsigned char*)dataDelayRet, 2);
+ MusECore::MidiPlayEvent evDelayRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataDelayRet, 2);
_gui->writeEvent(evDelayRet);
- //initPluginDelay(plugins.find("pandelay", "pandelay"));
+ //initPluginDelay(MusEGlobal::plugins.find("pandelay", "pandelay"));
float delayfloat;
memcpy(&delayfloat, &data[NUM_DELAY_BPM], sizeof(float));
setDelayBPM(delayfloat);
char dataDelayBPM[sizeof(float)+1];
dataDelayBPM[0] = SYSEX_DELAYBPM;
memcpy(&dataDelayBPM[1], &delayfloat, sizeof(float));
- MidiPlayEvent evSysexDelayBPM(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexDelayBPM(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataDelayBPM,
sizeof(float)+1);
_gui->writeEvent(evSysexDelayBPM);
@@ -2715,7 +2715,7 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
char dataDelayBeatRatio[sizeof(float)+1];
dataDelayBeatRatio[0] = SYSEX_DELAYBEATRATIO;
memcpy(&dataDelayBeatRatio[1], &delayfloat, sizeof(float));
- MidiPlayEvent evSysexDelayBeatRatio(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexDelayBeatRatio(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataDelayBeatRatio,
sizeof(float)+1);
_gui->writeEvent(evSysexDelayBeatRatio);
@@ -2724,7 +2724,7 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
char dataDelayFeedback[sizeof(float)+1];
dataDelayFeedback[0] = SYSEX_DELAYFEEDBACK;
memcpy(&dataDelayFeedback[1], &delayfloat, sizeof(float));
- MidiPlayEvent evSysexDelayFeedback(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexDelayFeedback(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataDelayFeedback,
sizeof(float)+1);
_gui->writeEvent(evSysexDelayFeedback);
@@ -2733,7 +2733,7 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
char dataDelayLFOFreq[sizeof(float)+1];
dataDelayLFOFreq[0] = SYSEX_DELAYLFOFREQ;
memcpy(&dataDelayLFOFreq[1], &delayfloat, sizeof(float));
- MidiPlayEvent evSysexDelayLFOFreq(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexDelayLFOFreq(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataDelayLFOFreq,
sizeof(float)+1);
_gui->writeEvent(evSysexDelayLFOFreq);
@@ -2742,7 +2742,7 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
char dataDelayLFODepth[sizeof(float)+1];
dataDelayLFODepth[0] = SYSEX_DELAYLFODEPTH;
memcpy(&dataDelayLFODepth[1], &delayfloat, sizeof(float));
- MidiPlayEvent evSysexDelayLFODepth(0, 0, ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexDelayLFODepth(0, 0, MusECore::ME_SYSEX,
(const unsigned char*)dataDelayLFODepth,
sizeof(float)+1);
_gui->writeEvent(evSysexDelayLFODepth);
@@ -2804,7 +2804,7 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
dataSend[0]=SYSEX_LOADSET;
dataSend[1]=data[NUM_SAVEONLYUSED];
//for(int i=2; i<dL; i++) dataSend[i]=baUncop.at(i-2);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX,(const unsigned char*)dataSend, dL);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataSend, dL);
_gui->writeEvent(evSysex);
//select programs per channel
@@ -2814,7 +2814,7 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) {
int prog=(int)data[NUM_CURRENTPROG+c];
programSelect(c, hbank, lbank, prog);
int val=prog+(lbank<<8)+(hbank<<16);
- MidiPlayEvent evProgSel(0, 0, c, ME_CONTROLLER, CTRL_PROGRAM, val);
+ MusECore::MidiPlayEvent evProgSel(0, 0, c, MusECore::ME_CONTROLLER, MusECore::CTRL_PROGRAM, val);
_gui->writeEvent(evProgSel);
}
@@ -2853,8 +2853,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///setMasterVol((int)data[1]);
setMasterVol((int)d[1]);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2862,8 +2862,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///_global.channelNum = (char)data[1];
//_global.channelNum = (char)d[1];
//if(!fromGui) {
- /// MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- // MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ /// MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ // MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
// _gui->writeEvent(evSysex);
//}
//break;
@@ -2871,8 +2871,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///setQuality((Quality)data[1]);
setQuality((Quality)d[1]);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2880,8 +2880,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///setFilter((bool)data[1]);
setFilter((bool)d[1]);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2889,8 +2889,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///_global.fontSize = (int)data[1];
_global.fontSize = (int)d[1];
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2898,8 +2898,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///_saveConfig = (bool)data[1];
_saveConfig = (bool)d[1];
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2907,8 +2907,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///_saveOnlyUsed = (bool)data[1];
_saveOnlyUsed = (bool)d[1];
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2916,8 +2916,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///_isInitSet = (bool)data[1];
_isInitSet = (bool)d[1];
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2925,8 +2925,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///_initSetPath = (char*)&data[1];
_initSetPath = (char*)&d[1];
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2934,8 +2934,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///_isBackgroundPix = (bool)data[1];
_isBackgroundPix = (bool)d[1];
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2943,8 +2943,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///_backgroundPixPath = (char*)&data[1];
_backgroundPixPath = (char*)&d[1];
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2955,8 +2955,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///_global.isChorusActivated = (bool)data[1];
_global.isChorusActivated = (bool)d[1];
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2967,8 +2967,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
memcpy(&f, &d[2], sizeof(float));
setChorusParam(index, (double)f);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2976,8 +2976,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///_global.isReverbActivated = (bool)data[1];
_global.isReverbActivated = (bool)d[1];
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2988,8 +2988,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
memcpy(&f, &d[2], sizeof(float));
setReverbParam(index, (double)f);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -2997,8 +2997,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///_global.isDelayActivated = (bool)data[1];
_global.isDelayActivated = (bool)d[1];
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -3006,8 +3006,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///setChorusReturn((int)data[1]);
setChorusReturn((int)d[1]);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -3015,8 +3015,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///setReverbReturn((int)data[1]);
setReverbReturn((int)d[1]);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -3024,21 +3024,21 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
///setDelayReturn((int)data[1]);
setDelayReturn((int)d[1]);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
case SYSEX_SELECTREVERB:
- Plugin* pluginReverb;
- ///memcpy(&pluginReverb, &data[1], sizeof(Plugin*));
- memcpy(&pluginReverb, &d[1], sizeof(Plugin*));
+ MusECore::Plugin* pluginReverb;
+ ///memcpy(&pluginReverb, &data[1], sizeof(MusECore::Plugin*));
+ memcpy(&pluginReverb, &d[1], sizeof(MusECore::Plugin*));
initPluginReverb(pluginReverb);
break;
case SYSEX_SELECTCHORUS:
- Plugin* pluginChorus;
- ///memcpy(&pluginChorus, &data[1], sizeof(Plugin*));
- memcpy(&pluginChorus, &d[1], sizeof(Plugin*));
+ MusECore::Plugin* pluginChorus;
+ ///memcpy(&pluginChorus, &data[1], sizeof(MusECore::Plugin*));
+ memcpy(&pluginChorus, &d[1], sizeof(MusECore::Plugin*));
initPluginChorus(pluginChorus);
break;
case SYSEX_DELAYBPM:
@@ -3046,8 +3046,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
memcpy(&f, &d[1], sizeof(float));
setDelayBPM(f);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -3056,8 +3056,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
memcpy(&f, &d[1], sizeof(float));
setDelayBeatRatio(f);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -3066,8 +3066,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
memcpy(&f, &d[1], sizeof(float));
setDelayFeedback(f);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -3076,8 +3076,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
memcpy(&f, &d[1], sizeof(float));
setDelayLFOFreq(f);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -3086,8 +3086,8 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
memcpy(&f, &d[1], sizeof(float));
setDelayLFODepth(f);
if(!fromGui) {
- ///MidiPlayEvent evSysex(0, 0, ME_SYSEX, data, length);
- MidiPlayEvent evSysex(0, 0, ME_SYSEX, d, l);
+ ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
+ MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
_gui->writeEvent(evSysex);
}
break;
@@ -3119,7 +3119,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->eg[k].ar=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_AR+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_AR+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3127,7 +3127,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->eg[k].d1r=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_D1R+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_D1R+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3135,7 +3135,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->eg[k].d2r=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_D2R+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_D2R+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3143,7 +3143,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->eg[k].rr=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_RR+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_RR+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3151,7 +3151,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->eg[k].d1l=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_D1L+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_D1L+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3159,7 +3159,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->scaling.level[k]=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_LS+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_LS+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3167,7 +3167,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->scaling.rate[k]=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_RS+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_RS+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3175,7 +3175,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->sensitivity.egBias[k]=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_EBS+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_EBS+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3183,7 +3183,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->sensitivity.ampOn[k]=val==1;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_AME+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_AME+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3191,7 +3191,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->sensitivity.keyVelocity[k]=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_KVS+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_KVS+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3200,7 +3200,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->outLevel[k]=val;
setOutLevel(k);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_OUT+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_OUT+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3208,7 +3208,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->frequency[k].ratio=((double)val)/100.0;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,
CTRL_RATIO+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
@@ -3217,7 +3217,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->detune[k]=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_DET+k*DECAPAR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_DET+k*DECAPAR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3225,7 +3225,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->algorithm=(Algorithm)val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_ALG,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_ALG,val);
_gui->writeEvent(ev);
}
break;
@@ -3234,7 +3234,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->feedback=val;
setFeedback(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_FEEDBACK,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_FEEDBACK,val);
_gui->writeEvent(ev);
}
break;
@@ -3243,7 +3243,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->lfo.speed=val;
setLfo(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_SPEED,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_SPEED,val);
_gui->writeEvent(ev);
}
break;
@@ -3252,7 +3252,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->lfo.delay=val;
setLfo(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_DELAY,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_DELAY,val);
_gui->writeEvent(ev);
}
break;
@@ -3261,7 +3261,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->lfo.pModDepth=val;
setLfo(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_PMODDEPTH,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_PMODDEPTH,val);
_gui->writeEvent(ev);
}
break;
@@ -3270,7 +3270,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->lfo.aModDepth=val;
setLfo(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_AMODDEPTH,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_AMODDEPTH,val);
_gui->writeEvent(ev);
}
break;
@@ -3279,7 +3279,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->lfo.sync=val==1;
setLfo(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_SYNC,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_SYNC,val);
_gui->writeEvent(ev);
}
break;
@@ -3288,7 +3288,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->lfo.wave=(Wave)val;
setLfo(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_WAVE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_WAVE,val);
_gui->writeEvent(ev);
}
break;
@@ -3297,7 +3297,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->sensitivity.pitch=val;
setLfo(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_PMODSENS,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_PMODSENS,val);
_gui->writeEvent(ev);
}
break;
@@ -3306,7 +3306,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->sensitivity.amplitude=val;
setLfo(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_AMS,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_AMS,val);
_gui->writeEvent(ev);
}
break;
@@ -3314,7 +3314,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.transpose=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_TRANSPOSE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_TRANSPOSE,val);
_gui->writeEvent(ev);
}
break;
@@ -3322,7 +3322,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.mode=(Mode)val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_POLYMODE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_POLYMODE,val);
_gui->writeEvent(ev);
}
break;
@@ -3330,7 +3330,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.pBendRange=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_PBENDRANGE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_PBENDRANGE,val);
_gui->writeEvent(ev);
}
break;
@@ -3338,7 +3338,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.portamento=(Portamento)val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_PORTAMODE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_PORTAMODE,val);
_gui->writeEvent(ev);
}
break;
@@ -3346,7 +3346,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.portamentoTime=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_PORTATIME,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_PORTATIME,val);
_gui->writeEvent(ev);
}
break;
@@ -3354,7 +3354,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.fcVolume=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_FCVOLUME,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_FCVOLUME,val);
_gui->writeEvent(ev);
}
break;
@@ -3362,7 +3362,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.footSw=(FootSw)val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_FSW,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_FSW,val);
_gui->writeEvent(ev);
}
break;
@@ -3370,7 +3370,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.mwPitch=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_MWPITCH,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_MWPITCH,val);
_gui->writeEvent(ev);
}
break;
@@ -3378,7 +3378,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.mwAmplitude=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_MWAMPLITUDE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_MWAMPLITUDE,val);
_gui->writeEvent(ev);
}
break;
@@ -3386,7 +3386,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.bcPitch=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_BCPITCH,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_BCPITCH,val);
_gui->writeEvent(ev);
}
break;
@@ -3394,7 +3394,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.bcAmplitude=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_BCAMPLITUDE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_BCAMPLITUDE,val);
_gui->writeEvent(ev);
}
break;
@@ -3402,7 +3402,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.bcPitchBias=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_BCPITCHBIAS,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_BCPITCHBIAS,val);
_gui->writeEvent(ev);
}
break;
@@ -3410,7 +3410,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.bcEgBias=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_BCEGBIAS,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_BCEGBIAS,val);
_gui->writeEvent(ev);
}
break;
@@ -3418,7 +3418,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.atPitch=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_ATPITCH,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_ATPITCH,val);
_gui->writeEvent(ev);
}
break;
@@ -3426,7 +3426,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.atAmplitude=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_ATAMPLITUDE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_ATAMPLITUDE,val);
_gui->writeEvent(ev);
}
break;
@@ -3434,7 +3434,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.atPitchBias=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_ATPITCHBIAS,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_ATPITCHBIAS,val);
_gui->writeEvent(ev);
}
break;
@@ -3442,7 +3442,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.atEgBias=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_ATEGBIAS,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_ATEGBIAS,val);
_gui->writeEvent(ev);
}
break;
@@ -3450,7 +3450,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->pitchEg.pr1=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_PR1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_PR1,val);
_gui->writeEvent(ev);
}
break;
@@ -3458,7 +3458,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->pitchEg.pr2=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_PR2,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_PR2,val);
_gui->writeEvent(ev);
}
break;
@@ -3466,7 +3466,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->pitchEg.pr3=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_PR3,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_PR3,val);
_gui->writeEvent(ev);
}
break;
@@ -3474,7 +3474,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->pitchEg.pl1=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_PL1,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_PL1,val);
_gui->writeEvent(ev);
}
break;
@@ -3482,7 +3482,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->pitchEg.pl2=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_PL2,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_PL2,val);
_gui->writeEvent(ev);
}
break;
@@ -3490,7 +3490,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->pitchEg.pl3=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_PL3,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_PL3,val);
_gui->writeEvent(ev);
}
break;
@@ -3498,7 +3498,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->frequency[k].isFix=val==1;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_FIX+k*DECAPAR2,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_FIX+k*DECAPAR2,val);
_gui->writeEvent(ev);
}
break;
@@ -3506,7 +3506,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->frequency[k].freq=((double)val)/100.0;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,
CTRL_FIXRANGE+k*DECAPAR2,val);
_gui->writeEvent(ev);
}
@@ -3515,7 +3515,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->oscWave[k]=(OscWave)val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_OSW+k*DECAPAR2,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_OSW+k*DECAPAR2,val);
_gui->writeEvent(ev);
}
break;
@@ -3523,7 +3523,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->eg[k].egShift=(egShiftValue)val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_SHFT+k*DECAPAR2,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_SHFT+k*DECAPAR2,val);
_gui->writeEvent(ev);
}
break;
@@ -3531,7 +3531,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.reverbRate=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_REVERBRATE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_REVERBRATE,val);
_gui->writeEvent(ev);
}
break;
@@ -3539,7 +3539,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.fcPitch=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_FCPITCH,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_FCPITCH,val);
_gui->writeEvent(ev);
}
break;
@@ -3547,14 +3547,14 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
_preset[ch]->function.fcAmplitude=val;
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_FCAMPLITUDE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_FCAMPLITUDE,val);
_gui->writeEvent(ev);
}
break;
case CTRL_CHANNELENABLE:
setChannelEnable(ch, (bool)val);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_CHANNELENABLE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_CHANNELENABLE,val);
_gui->writeEvent(ev);
}
break;
@@ -3562,7 +3562,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
_preset[ch]->setIsUsed(true);
setChannelDetune(ch, val);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_CHANNELDETUNE,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_CHANNELDETUNE,val);
_gui->writeEvent(ev);
}
break;
@@ -3570,18 +3570,18 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
setChannelVol(ch, val);
applyChannelAmp(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch,ME_CONTROLLER,CTRL_CHANNELVOLUME,val);
+ MusECore::MidiPlayEvent ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_CHANNELVOLUME,val);
_gui->writeEvent(ev);
}
break;
case CTRL_NBRVOICES:
setNbrVoices(ch, val);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, CTRL_NBRVOICES, val);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, CTRL_NBRVOICES, val);
_gui->writeEvent(ev);
}
break;
- case CTRL_PROGRAM: {
+ case MusECore::CTRL_PROGRAM: {
int hbank = (val & 0xff0000) >> 16;
int lbank = (val & 0xff00) >> 8;
int prog = val & 0x7f;
@@ -3592,27 +3592,27 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
programSelect(ch, hbank, lbank, prog);
_preset[ch]->setIsUsed(true);//TODO : not sure to put that
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, CTRL_PROGRAM, val);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, MusECore::CTRL_PROGRAM, val);
_gui->writeEvent(ev);
}
} break;
- case CTRL_MODULATION:
+ case MusECore::CTRL_MODULATION:
setModulation(ch, val);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, CTRL_MODULATION, val);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, MusECore::CTRL_MODULATION, val);
_gui->writeEvent(ev);
}
break;
- case CTRL_PITCH:
+ case MusECore::CTRL_PITCH:
setPitchBendCoef(ch, val);
break;
- case CTRL_PANPOT:
+ case MusECore::CTRL_PANPOT:
_preset[ch]->setIsUsed(true);
deiPan = val*2*MAXCHANNELPAN/127-MAXCHANNELPAN;
setChannelPan(ch, deiPan);
applyChannelAmp(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, CTRL_CHANNELPAN, deiPan);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, CTRL_CHANNELPAN, deiPan);
_gui->writeEvent(ev);
}
break;
@@ -3621,7 +3621,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
setChannelPan(ch, val);
applyChannelAmp(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, CTRL_CHANNELPAN, val);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, CTRL_CHANNELPAN, val);
_gui->writeEvent(ev);
}
break;
@@ -3630,72 +3630,72 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) {
setChannelBrightness(ch, val);
setOutLevel(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, CTRL_FINEBRIGHTNESS, val);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, CTRL_FINEBRIGHTNESS, val);
_gui->writeEvent(ev);
}
break;
- case CTRL_BRIGHTNESS:
+ case MusECore::CTRL_BRIGHTNESS:
_preset[ch]->setIsUsed(true);
setChannelBrightness(ch, val*(MIDFINEBRIGHTNESS/MIDBRIGHTNESS));
setOutLevel(ch);
if(!fromGui) {
- MidiPlayEvent
- ev(0, 0, ch,ME_CONTROLLER,CTRL_FINEBRIGHTNESS,getChannelBrightness(ch));
+ MusECore::MidiPlayEvent
+ ev(0, 0, ch,MusECore::ME_CONTROLLER,CTRL_FINEBRIGHTNESS,getChannelBrightness(ch));
_gui->writeEvent(ev);
}
break;
- case CTRL_ATTACK_TIME:
+ case MusECore::CTRL_ATTACK_TIME:
_preset[ch]->setIsUsed(true);
setChannelAttack(ch, val);
setEnvAttack(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, CTRL_ATTACK_TIME, val);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, MusECore::CTRL_ATTACK_TIME, val);
_gui->writeEvent(ev);
}
break;
- case CTRL_RELEASE_TIME:
+ case MusECore::CTRL_RELEASE_TIME:
_preset[ch]->setIsUsed(true);
setChannelRelease(ch, val);
setEnvRelease(ch);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, CTRL_RELEASE_TIME, val);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, MusECore::CTRL_RELEASE_TIME, val);
_gui->writeEvent(ev);
}
break;
- case CTRL_REVERB_SEND:
+ case MusECore::CTRL_REVERB_SEND:
setChannelReverb(ch, val);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, CTRL_REVERB_SEND, val);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, MusECore::CTRL_REVERB_SEND, val);
_gui->writeEvent(ev);
}
break;
- case CTRL_CHORUS_SEND:
+ case MusECore::CTRL_CHORUS_SEND:
setChannelChorus(ch, val);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, CTRL_CHORUS_SEND, val);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, MusECore::CTRL_CHORUS_SEND, val);
_gui->writeEvent(ev);
}
break;
- case CTRL_VARIATION_SEND:
+ case MusECore::CTRL_VARIATION_SEND:
setChannelDelay(ch, val);
if(!fromGui) {
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, CTRL_VARIATION_SEND, val);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, MusECore::CTRL_VARIATION_SEND, val);
_gui->writeEvent(ev);
}
break;
- case CTRL_SUSTAIN:
+ case MusECore::CTRL_SUSTAIN:
setSustain(ch, val);
break;
- case CTRL_VOLUME:
+ case MusECore::CTRL_VOLUME:
setChannelVol(ch, val*(MAXCHANNELVOLUME/127));
applyChannelAmp(ch);
if(!fromGui) {
- MidiPlayEvent
- ev(0, 0, ch, ME_CONTROLLER, CTRL_CHANNELVOLUME, getChannelVol(ch));
+ MusECore::MidiPlayEvent
+ ev(0, 0, ch, MusECore::ME_CONTROLLER, CTRL_CHANNELVOLUME, getChannelVol(ch));
_gui->writeEvent(ev);
}
break;
- case CTRL_ALL_SOUNDS_OFF:
+ case MusECore::CTRL_ALL_SOUNDS_OFF:
resetVoices();
default:
break;
@@ -4090,12 +4090,12 @@ void DeicsOnze::processMessages()
{
//Process messages from the gui
while (_gui->fifoSize()) {
- MidiPlayEvent ev = _gui->readEvent();
- if (ev.type() == ME_SYSEX) {
+ MusECore::MidiPlayEvent ev = _gui->readEvent();
+ if (ev.type() == MusECore::ME_SYSEX) {
sysex(ev.len(), ev.data(), true);
sendEvent(ev);
}
- else if (ev.type() == ME_CONTROLLER) {
+ else if (ev.type() == MusECore::ME_CONTROLLER) {
setController(ev.channel(), ev.dataA(), ev.dataB(), true);
sendEvent(ev);
}
@@ -4110,12 +4110,12 @@ void DeicsOnze::process(float** buffer, int offset, int n) {
/*
//Process messages from the gui
while (_gui->fifoSize()) {
- MidiPlayEvent ev = _gui->readEvent();
- if (ev.type() == ME_SYSEX) {
+ MusECore::MidiPlayEvent ev = _gui->readEvent();
+ if (ev.type() == MusECore::ME_SYSEX) {
sysex(ev.len(), ev.data(), true);
sendEvent(ev);
}
- else if (ev.type() == ME_CONTROLLER) {
+ else if (ev.type() == MusECore::ME_CONTROLLER) {
setController(ev.channel(), ev.dataA(), ev.dataB(), true);
sendEvent(ev);
}
diff --git a/muse2/synti/deicsonze/deicsonze.h b/muse2/synti/deicsonze/deicsonze.h
index 53a3afee..124c8d46 100644
--- a/muse2/synti/deicsonze/deicsonze.h
+++ b/muse2/synti/deicsonze/deicsonze.h
@@ -470,13 +470,13 @@ class DeicsOnze : public Mess {
Preset* _initialPreset;
//FX
- PluginI* _pluginIReverb;
- PluginI* _pluginIChorus;
- PluginI* _pluginIDelay;
+ MusECore::PluginI* _pluginIReverb;
+ MusECore::PluginI* _pluginIChorus;
+ MusECore::PluginI* _pluginIDelay;
- void initPluginReverb(Plugin*);
- void initPluginChorus(Plugin*);
- void initPluginDelay(Plugin*);
+ void initPluginReverb(MusECore::Plugin*);
+ void initPluginChorus(MusECore::Plugin*);
+ void initPluginDelay(MusECore::Plugin*);
void setReverbParam(int i, double val);
double getReverbParam(int i) const;
diff --git a/muse2/synti/deicsonze/deicsonzegui.cpp b/muse2/synti/deicsonze/deicsonzegui.cpp
index b88a47fc..b4965e7b 100644
--- a/muse2/synti/deicsonze/deicsonzegui.cpp
+++ b/muse2/synti/deicsonze/deicsonzegui.cpp
@@ -49,7 +49,9 @@
//#include "deicsonzegui.h"
+namespace MusEGui {
class PluginDialog;
+}
DeicsOnzeGui::DeicsOnzeGui(DeicsOnze* deicsOnze)
: QDialog(0),
@@ -503,10 +505,10 @@ void DeicsOnzeGui::setResCtrl() {
sendController(_currentChannel, CTRL_FINEBRIGHTNESS, MIDFINEBRIGHTNESS);
//Attack
updateAttack(MIDATTACK);
- sendController(_currentChannel, CTRL_ATTACK_TIME, MIDATTACK);
+ sendController(_currentChannel, MusECore::CTRL_ATTACK_TIME, MIDATTACK);
//Release
updateRelease(MIDRELEASE);
- sendController(_currentChannel, CTRL_RELEASE_TIME, MIDRELEASE);
+ sendController(_currentChannel, MusECore::CTRL_RELEASE_TIME, MIDRELEASE);
}
//-----------------------------------------------------------
@@ -1393,10 +1395,10 @@ void QFrameEnvelope::env2Points(int ar, int d1r, int d1l, int d2r, int rr) {
//-----------------------------------------------------------
// processEvent(const MidiEvent&);
//-----------------------------------------------------------
-void DeicsOnzeGui::processEvent(const MidiPlayEvent& ev) {
+void DeicsOnzeGui::processEvent(const MusECore::MidiPlayEvent& ev) {
//Controler
- if (ev.type() == ME_CONTROLLER) {
- //printf("ME_CONTROLLER\n");
+ if (ev.type() == MusECore::ME_CONTROLLER) {
+ //printf("MusECore::ME_CONTROLLER\n");
int id=ev.dataA();
int ch=ev.channel();
int val=ev.dataB();
@@ -1511,13 +1513,13 @@ void DeicsOnzeGui::processEvent(const MidiPlayEvent& ev) {
case CTRL_CHANNELVOLUME: updateChannelVolume(val); break;
case CTRL_NBRVOICES: updateNbrVoices(val); break;
case CTRL_FINEBRIGHTNESS: updateBrightness(val); break;
- case CTRL_ATTACK_TIME: updateAttack(val); break;
- case CTRL_RELEASE_TIME: updateRelease(val); break;
- case CTRL_CHORUS_SEND: updateChannelChorus(val); break;
- case CTRL_REVERB_SEND: updateChannelReverb(val); break;
- case CTRL_VARIATION_SEND: updateChannelDelay(val); break;
- case CTRL_MODULATION: updateModulation(val); break;
- case CTRL_PROGRAM :
+ case MusECore::CTRL_ATTACK_TIME: updateAttack(val); break;
+ case MusECore::CTRL_RELEASE_TIME: updateRelease(val); break;
+ case MusECore::CTRL_CHORUS_SEND: updateChannelChorus(val); break;
+ case MusECore::CTRL_REVERB_SEND: updateChannelReverb(val); break;
+ case MusECore::CTRL_VARIATION_SEND: updateChannelDelay(val); break;
+ case MusECore::CTRL_MODULATION: updateModulation(val); break;
+ case MusECore::CTRL_PROGRAM :
int hbank = (val & 0xff0000) >> 16;
int lbank = (val & 0xff00) >> 8;
if (hbank > 127) // map "dont care" to 0
@@ -1538,8 +1540,8 @@ void DeicsOnzeGui::processEvent(const MidiPlayEvent& ev) {
}
}
// Sysexes
- else if (ev.type() == ME_SYSEX) {
- //printf("ME_SYSEX\n");
+ else if (ev.type() == MusECore::ME_SYSEX) {
+ //printf("MusECore::ME_SYSEX\n");
unsigned char* data = ev.data();
int cmd = *data;
@@ -2587,7 +2589,7 @@ void DeicsOnzeGui::setChorusActiv(bool a) {
sendSysex(message, 4);
}
void DeicsOnzeGui::setChannelChorus(int c) {
- sendController(_currentChannel, CTRL_CHORUS_SEND, c);
+ sendController(_currentChannel, MusECore::CTRL_CHORUS_SEND, c);
}
void DeicsOnzeGui::setChorusReturn(int val) {
unsigned char message[4];
@@ -2598,14 +2600,14 @@ void DeicsOnzeGui::setChorusReturn(int val) {
sendSysex(message, 4);
}
void DeicsOnzeGui::setSelectChorusPlugin() {
- Plugin* pluginChorus = PluginDialog::getPlugin(this);
+ MusECore::Plugin* pluginChorus = MusEGui::PluginDialog::getPlugin(this);
if(pluginChorus) {
- unsigned char message[3+sizeof(Plugin*)];
+ unsigned char message[3+sizeof(MusECore::Plugin*)];
message[0]=MUSE_SYNTH_SYSEX_MFG_ID;
message[1]=DEICSONZE_UNIQUE_ID;
message[2]=SYSEX_SELECTCHORUS;
- memcpy(&message[3], &pluginChorus, sizeof(Plugin*));
- sendSysex(message, 3+sizeof(Plugin*));
+ memcpy(&message[3], &pluginChorus, sizeof(MusECore::Plugin*));
+ sendSysex(message, 3+sizeof(MusECore::Plugin*));
}
}
/*void DeicsOnzeGui::setPanChorus1(double i) {
@@ -2665,7 +2667,7 @@ void DeicsOnzeGui::setReverbActiv(bool a) {
sendSysex(message, 4);
}
void DeicsOnzeGui::setChannelReverb(int r) {
- sendController(_currentChannel, CTRL_REVERB_SEND, r);
+ sendController(_currentChannel, MusECore::CTRL_REVERB_SEND, r);
}
void DeicsOnzeGui::setReverbReturn(int val) {
unsigned char message[4];
@@ -2676,14 +2678,14 @@ void DeicsOnzeGui::setReverbReturn(int val) {
sendSysex(message, 4);
}
void DeicsOnzeGui::setSelectReverbPlugin() {
- Plugin* pluginReverb = PluginDialog::getPlugin(this);
+ MusECore::Plugin* pluginReverb = MusEGui::PluginDialog::getPlugin(this);
if(pluginReverb) {
- unsigned char message[3+sizeof(Plugin*)];
+ unsigned char message[3+sizeof(MusECore::Plugin*)];
message[0]=MUSE_SYNTH_SYSEX_MFG_ID;
message[1]=DEICSONZE_UNIQUE_ID;
message[2]=SYSEX_SELECTREVERB;
- memcpy(&message[3], &pluginReverb, sizeof(Plugin*));
- sendSysex(message, 3+sizeof(Plugin*));
+ memcpy(&message[3], &pluginReverb, sizeof(MusECore::Plugin*));
+ sendSysex(message, 3+sizeof(MusECore::Plugin*));
}
}
@@ -2699,7 +2701,7 @@ void DeicsOnzeGui::setBrightnessKnob(double val) {
(int)(val*(double)MAXFINEBRIGHTNESS));
}
void DeicsOnzeGui::setModulationKnob(double val) {
- sendController(_currentChannel, CTRL_MODULATION,
+ sendController(_currentChannel, MusECore::CTRL_MODULATION,
(int)(val*(double)MAXMODULATION));
}
void DeicsOnzeGui::setDetuneKnob(double val) {
@@ -2707,11 +2709,11 @@ void DeicsOnzeGui::setDetuneKnob(double val) {
setChannelDetune((int)((2.0*val-1.0)*(double)MAXCHANNELDETUNE));
}
void DeicsOnzeGui::setAttackKnob(double val) {
- sendController(_currentChannel, CTRL_ATTACK_TIME,
+ sendController(_currentChannel, MusECore::CTRL_ATTACK_TIME,
(int)(val*(double)MAXATTACK));
}
void DeicsOnzeGui::setReleaseKnob(double val) {
- sendController(_currentChannel, CTRL_RELEASE_TIME, (int)(val*(double)MAXRELEASE));
+ sendController(_currentChannel, MusECore::CTRL_RELEASE_TIME, (int)(val*(double)MAXRELEASE));
}
//-----------------------------------------------------------
// Global control
@@ -3119,7 +3121,7 @@ void DeicsOnzeGui::setDelayReturn(int r) {
sendSysex(message, 4);
}
void DeicsOnzeGui::setChannelDelay(int d) {
- sendController(_currentChannel, CTRL_VARIATION_SEND, (unsigned char)d);
+ sendController(_currentChannel, MusECore::CTRL_VARIATION_SEND, (unsigned char)d);
}
//void DeicsOnzeGui::setDelayTime(int t) {
// unsigned char message[4];
@@ -3306,7 +3308,7 @@ void DeicsOnzeGui::setPreset(QTreeWidgetItem* pre) {
int hbank = cpre->_preset->_subcategory->_category->_hbank;
setEnabledPreset(true);
updatePreset(cpre->_preset);
- sendController(_currentChannel, CTRL_PROGRAM, (hbank<<16)+(lbank<<8)+prog);
+ sendController(_currentChannel, MusECore::CTRL_PROGRAM, (hbank<<16)+(lbank<<8)+prog);
}
}
//--------------------------------------------------------------
diff --git a/muse2/synti/deicsonze/deicsonzegui.h b/muse2/synti/deicsonze/deicsonzegui.h
index 7dec344f..33886062 100644
--- a/muse2/synti/deicsonze/deicsonzegui.h
+++ b/muse2/synti/deicsonze/deicsonzegui.h
@@ -359,7 +359,7 @@ class DeicsOnzeGui : public QDialog, public Ui::DeicsOnzeGuiBase, public MessGui
void setSubcategory(QTreeWidgetItem*);
void setPreset(QTreeWidgetItem*);
public:
- virtual void processEvent(const MidiPlayEvent&);
+ virtual void processEvent(const MusECore::MidiPlayEvent&);
void updateSelectPreset(int hbank, int lbank, int prog);
//update the gui
void setEnabledPreset(bool b);
diff --git a/muse2/synti/deicsonze/deicsonzeplugin.cpp b/muse2/synti/deicsonze/deicsonzeplugin.cpp
index c8f5b086..442a61c5 100644
--- a/muse2/synti/deicsonze/deicsonzeplugin.cpp
+++ b/muse2/synti/deicsonze/deicsonzeplugin.cpp
@@ -43,11 +43,11 @@ using Awl::CheckBox;
class PluginDialog;
-void DeicsOnze::initPluginReverb(Plugin* pluginReverb) {
+void DeicsOnze::initPluginReverb(MusECore::Plugin* pluginReverb) {
//init plugin
if(_pluginIReverb) delete(_pluginIReverb);
- ///_pluginIReverb = new PluginI(NULL);
- _pluginIReverb = new PluginI();
+ ///_pluginIReverb = new MusECore::PluginI(NULL);
+ _pluginIReverb = new MusECore::PluginI();
_pluginIReverb->initPluginInstance(pluginReverb, 2);
@@ -66,14 +66,14 @@ void DeicsOnze::initPluginReverb(Plugin* pluginReverb) {
//send build gui to the gui
char data;
data = SYSEX_BUILDGUIREVERB;
- MidiPlayEvent evSysex(0, 0,ME_SYSEX,(const unsigned char*)&data, 1);
+ MusECore::MidiPlayEvent evSysex(0, 0,MusECore::ME_SYSEX,(const unsigned char*)&data, 1);
_gui->writeEvent(evSysex);
}
-void DeicsOnze::initPluginChorus(Plugin* pluginChorus) {
+void DeicsOnze::initPluginChorus(MusECore::Plugin* pluginChorus) {
if(_pluginIChorus) delete(_pluginIChorus);
- ///_pluginIChorus = new PluginI(NULL);
- _pluginIChorus = new PluginI();
+ ///_pluginIChorus = new MusECore::PluginI(NULL);
+ _pluginIChorus = new MusECore::PluginI();
_pluginIChorus->initPluginInstance(pluginChorus, 2);
@@ -93,14 +93,14 @@ void DeicsOnze::initPluginChorus(Plugin* pluginChorus) {
//send build gui to the gui
char data;
data = SYSEX_BUILDGUICHORUS;
- MidiPlayEvent evSysex(0, 0,ME_SYSEX,(const unsigned char*)&data, 1);
+ MusECore::MidiPlayEvent evSysex(0, 0,MusECore::ME_SYSEX,(const unsigned char*)&data, 1);
_gui->writeEvent(evSysex);
}
-void DeicsOnze::initPluginDelay(Plugin* pluginDelay) {
+void DeicsOnze::initPluginDelay(MusECore::Plugin* pluginDelay) {
if(_pluginIDelay) delete(_pluginIDelay);
- ///_pluginIDelay = new PluginI(NULL);
- _pluginIDelay = new PluginI();
+ ///_pluginIDelay = new MusECore::PluginI(NULL);
+ _pluginIDelay = new MusECore::PluginI();
_pluginIDelay->initPluginInstance(pluginDelay, 2);
@@ -123,7 +123,7 @@ void DeicsOnze::initPluginDelay(Plugin* pluginDelay) {
dataDelayBPM[0] = SYSEX_DELAYBPM;
f = getDelayBPM();
memcpy(&dataDelayBPM[1], &f, sizeof(float));
- MidiPlayEvent evSysexDelayBPM(0, 0,ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexDelayBPM(0, 0,MusECore::ME_SYSEX,
(const unsigned char*)dataDelayBPM,
sizeof(float)+1);
_gui->writeEvent(evSysexDelayBPM);
@@ -131,7 +131,7 @@ void DeicsOnze::initPluginDelay(Plugin* pluginDelay) {
dataDelayBeatRatio[0] = SYSEX_DELAYBEATRATIO;
f = getDelayBeatRatio();
memcpy(&dataDelayBeatRatio[1], &f, sizeof(float));
- MidiPlayEvent evSysexDelayBeatRatio(0, 0,ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexDelayBeatRatio(0, 0,MusECore::ME_SYSEX,
(const unsigned char*)dataDelayBeatRatio,
sizeof(float)+1);
_gui->writeEvent(evSysexDelayBeatRatio);
@@ -139,7 +139,7 @@ void DeicsOnze::initPluginDelay(Plugin* pluginDelay) {
dataDelayFeedback[0] = SYSEX_DELAYFEEDBACK;
f = getDelayFeedback();
memcpy(&dataDelayFeedback[1], &f, sizeof(float));
- MidiPlayEvent evSysexDelayFeedback(0, 0,ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexDelayFeedback(0, 0,MusECore::ME_SYSEX,
(const unsigned char*)dataDelayFeedback,
sizeof(float)+1);
_gui->writeEvent(evSysexDelayFeedback);
@@ -147,7 +147,7 @@ void DeicsOnze::initPluginDelay(Plugin* pluginDelay) {
dataDelayLFOFreq[0] = SYSEX_DELAYLFOFREQ;
f = getDelayLFOFreq();
memcpy(&dataDelayLFOFreq[1], &f, sizeof(float));
- MidiPlayEvent evSysexDelayLFOFreq(0, 0,ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexDelayLFOFreq(0, 0,MusECore::ME_SYSEX,
(const unsigned char*)dataDelayLFOFreq,
sizeof(float)+1);
_gui->writeEvent(evSysexDelayLFOFreq);
@@ -155,7 +155,7 @@ void DeicsOnze::initPluginDelay(Plugin* pluginDelay) {
dataDelayLFODepth[0] = SYSEX_DELAYLFODEPTH;
f = getDelayLFODepth();
memcpy(&dataDelayLFODepth, &f, sizeof(float)+1);
- MidiPlayEvent evSysexDelayLFODepth(0, 0,ME_SYSEX,
+ MusECore::MidiPlayEvent evSysexDelayLFODepth(0, 0,MusECore::ME_SYSEX,
(const unsigned char*)dataDelayLFODepth,
sizeof(float)+1);
_gui->writeEvent(evSysexDelayLFODepth);
@@ -275,7 +275,7 @@ void DeicsOnzeGui::addPluginSlider(int index, QString text, bool isLog,
}
void DeicsOnzeGui::buildGuiReverb() {
- PluginI* plugI = _deicsOnze->_pluginIReverb;
+ MusECore::PluginI* plugI = _deicsOnze->_pluginIReverb;
QString name = plugI->name();
name.resize(name.size()-2);
updateLadspaReverbLineEdit(name);
@@ -326,7 +326,7 @@ void DeicsOnzeGui::buildGuiReverb() {
}
void DeicsOnzeGui::buildGuiChorus() {
- PluginI* plugI = _deicsOnze->_pluginIChorus;
+ MusECore::PluginI* plugI = _deicsOnze->_pluginIChorus;
QString name = plugI->name();
name.resize(name.size()-2);
updateLadspaChorusLineEdit(name);
diff --git a/muse2/synti/fluid/fluid.cpp b/muse2/synti/fluid/fluid.cpp
index 1431460f..48d68fb4 100644
--- a/muse2/synti/fluid/fluid.cpp
+++ b/muse2/synti/fluid/fluid.cpp
@@ -137,7 +137,7 @@ bool ISynth::setController(int ch, int ctrl, int val)
return true;
}
switch(ctrl) {
- case CTRL_PROGRAM:
+ case MusECore::CTRL_PROGRAM:
{
int hbank = (val & 0xff0000) >> 16;
int lbank = (val & 0xff00) >> 8;
@@ -153,7 +153,7 @@ bool ISynth::setController(int ch, int ctrl, int val)
}
break;
- case CTRL_PITCH:
+ case MusECore::CTRL_PITCH:
fluid_synth_pitch_bend (_fluidsynth, ch, val);
break;
@@ -374,23 +374,23 @@ void ISynth::process(float** ports, int offset, int n)
// processEvent
// All events from the sequencer go here
//---------------------------------------------------------
-bool ISynth::processEvent(const MidiPlayEvent& ev)
+bool ISynth::processEvent(const MusECore::MidiPlayEvent& ev)
{
switch(ev.type()) {
- case ME_CONTROLLER:
+ case MusECore::ME_CONTROLLER:
setController(ev.channel(), ev.dataA(), ev.dataB());
return true;
- case ME_NOTEON:
+ case MusECore::ME_NOTEON:
return playNote(ev.channel(), ev.dataA(), ev.dataB());
- case ME_NOTEOFF:
+ case MusECore::ME_NOTEOFF:
return playNote(ev.channel(), ev.dataA(), 0);
- case ME_SYSEX:
+ case MusECore::ME_SYSEX:
return sysex(ev.len(), ev.data());
- case ME_PITCHBEND:
- setController(ev.channel(), CTRL_PITCH, ev.dataA());
+ case MusECore::ME_PITCHBEND:
+ setController(ev.channel(), MusECore::CTRL_PITCH, ev.dataA());
break;
- case ME_PROGRAM:
- setController(ev.channel(), CTRL_PROGRAM, ev.dataA());
+ case MusECore::ME_PROGRAM:
+ setController(ev.channel(), MusECore::CTRL_PROGRAM, ev.dataA());
break;
default:
break;
@@ -405,7 +405,7 @@ bool ISynth::processEvent(const MidiPlayEvent& ev)
const char* ISynth::getPatchName(int /*ch*/, int val, int, bool /*drum*/) const
{
int prog = val & 0xff;
- if(val == CTRL_VAL_UNKNOWN || prog == 0xff)
+ if(val == MusECore::CTRL_VAL_UNKNOWN || prog == 0xff)
return "<unknown>";
prog &= 0x7f;
@@ -593,7 +593,7 @@ void ISynth::noRTHelper()
if(slen != 0)
memcpy(d + 1, fontname, slen);
d[1 + slen] = 0;
- MidiPlayEvent ev(0,0, ME_SYSEX, d, n);
+ MusECore::MidiPlayEvent ev(0,0, MusECore::ME_SYSEX, d, n);
gui->writeEvent(ev);
#ifdef FS_DEBUG
diff --git a/muse2/synti/fluid/fluid.h b/muse2/synti/fluid/fluid.h
index cc5dfc26..658be687 100644
--- a/muse2/synti/fluid/fluid.h
+++ b/muse2/synti/fluid/fluid.h
@@ -75,7 +75,7 @@ class ISynth : public Mess {
virtual bool setController(int, int, int);
virtual bool sysex(int len, const unsigned char* p);
- virtual bool processEvent(const MidiPlayEvent&);
+ virtual bool processEvent(const MusECore::MidiPlayEvent&);
virtual const char* getPatchName (int, int, int, bool) const;
virtual const MidiPatch* getPatchInfo(int, const MidiPatch *) const;
virtual void getInitData(int*, const unsigned char**);
diff --git a/muse2/synti/fluid/fluidgui.cpp b/muse2/synti/fluid/fluidgui.cpp
index 9c13e81f..ec1c77b7 100644
--- a/muse2/synti/fluid/fluidgui.cpp
+++ b/muse2/synti/fluid/fluidgui.cpp
@@ -50,7 +50,7 @@ FLUIDGui::FLUIDGui()
QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read);
connect(s, SIGNAL(activated(int)), SLOT(readMessage(int)));
- fdialogButton->setIcon(QIcon(*openIcon));
+ fdialogButton->setIcon(QIcon(*MusEGui::openIcon));
connect(fdialogButton, SIGNAL(clicked()), SLOT(soundFontFileDialog()));
connect(loadButton, SIGNAL(clicked()), SLOT(loadFont()));
@@ -102,10 +102,10 @@ void FLUIDGui::soundFontFileDialog()
}
}
-void FLUIDGui::processEvent(const MidiPlayEvent& ev)
+void FLUIDGui::processEvent(const MusECore::MidiPlayEvent& ev)
{
// p4.0.27
- if (ev.type() == ME_SYSEX) {
+ if (ev.type() == MusECore::ME_SYSEX) {
const unsigned char* data = ev.data();
switch (*data) {
case FS_SEND_SOUNDFONT_NAME: {
diff --git a/muse2/synti/fluid/fluidgui.h b/muse2/synti/fluid/fluidgui.h
index 87bc6b24..e3cec499 100644
--- a/muse2/synti/fluid/fluidgui.h
+++ b/muse2/synti/fluid/fluidgui.h
@@ -48,7 +48,7 @@ class FLUIDGui : public QDialog, public Ui::FLUIDGuiBase, public MessGui {
public:
FLUIDGui();
- virtual void processEvent(const MidiPlayEvent&);
+ virtual void processEvent(const MusECore::MidiPlayEvent&);
};
#endif
diff --git a/muse2/synti/fluidsynth/fluidsynthgui.cpp b/muse2/synti/fluidsynth/fluidsynthgui.cpp
index 62d8e791..b6a3a4bd 100644
--- a/muse2/synti/fluidsynth/fluidsynthgui.cpp
+++ b/muse2/synti/fluidsynth/fluidsynthgui.cpp
@@ -66,8 +66,8 @@ FluidSynthGui::FluidSynthGui()
fluidLabel->setPixmap(QIcon(":/fluidsynth1.png").pixmap(124, 45));
FluidGrid->addWidget(fluidLabel, 2, 1, Qt::AlignHCenter);
- ChorusType->setItemIcon(0, QIcon(*sineIcon));
- ChorusType->setItemIcon(1, QIcon(*sawIcon));
+ ChorusType->setItemIcon(0, QIcon(*MusEGui::sineIcon));
+ ChorusType->setItemIcon(1, QIcon(*MusEGui::sawIcon));
//Connect socketnotifier to fifo
QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read);
@@ -240,10 +240,10 @@ void FluidSynthGui::sendLoadFont(QString filename)
// processEvent
//---------------------------------------------------------
-void FluidSynthGui::processEvent(const MidiPlayEvent& ev)
+void FluidSynthGui::processEvent(const MusECore::MidiPlayEvent& ev)
{
//Sysexes sent from the client
- if (ev.type() == ME_SYSEX) {
+ if (ev.type() == MusECore::ME_SYSEX) {
byte* data = ev.data();
switch (*data) {
case FS_LASTDIR_CHANGE:
@@ -308,7 +308,7 @@ void FluidSynthGui::processEvent(const MidiPlayEvent& ev)
}
//Controllers sent from the client:
else
- if(ev.type() == ME_CONTROLLER) {
+ if(ev.type() == MusECore::ME_CONTROLLER) {
int id = ev.dataA();
int val = ev.dataB();
switch (id) {
@@ -439,9 +439,9 @@ void FluidSynthGui::updateChannelListView()
QTableWidgetItem* chan_ = new QTableWidgetItem(chanstr);
channelListView->setItem(i, FS_CHANNEL_COL, chan_);
- QTableWidgetItem* sfid_ = new QTableWidgetItem(QIcon(*buttondownIcon), sfidstr);
+ QTableWidgetItem* sfid_ = new QTableWidgetItem(QIcon(*MusEGui::buttondownIcon), sfidstr);
channelListView->setItem(i, FS_SF_ID_COL, sfid_);
- QTableWidgetItem* drum_ = new QTableWidgetItem(QIcon(*buttondownIcon), drumchanstr);
+ QTableWidgetItem* drum_ = new QTableWidgetItem(QIcon(*MusEGui::buttondownIcon), drumchanstr);
channelListView->setItem(i, FS_DRUM_CHANNEL_COL, drum_);
}
channelListView->resizeColumnsToContents();
diff --git a/muse2/synti/fluidsynth/fluidsynthgui.h b/muse2/synti/fluidsynth/fluidsynthgui.h
index d0709109..01df66cd 100644
--- a/muse2/synti/fluidsynth/fluidsynthgui.h
+++ b/muse2/synti/fluidsynth/fluidsynthgui.h
@@ -177,7 +177,7 @@ class FluidSynthGui : public QDialog, public Ui::FLUIDSynthGuiBase, public MessG
{
Q_OBJECT
private:
- virtual void processEvent(const MidiPlayEvent& ev);
+ virtual void processEvent(const MusECore::MidiPlayEvent& ev);
void sendLastdir(QString);
void sendLoadFont(QString);
void sendChannelChange(byte font_id, byte channel);
diff --git a/muse2/synti/fluidsynth/fluidsynti.cpp b/muse2/synti/fluidsynth/fluidsynti.cpp
index cc5c496a..fded650d 100644
--- a/muse2/synti/fluidsynth/fluidsynti.cpp
+++ b/muse2/synti/fluidsynth/fluidsynti.cpp
@@ -39,14 +39,14 @@
#include "muse/midi.h"
FluidCtrl FluidSynth::fluidCtrl[] = {
- //{ "Expression", CTRL_EXPRESSION, 0, 127 },
- //{ "Sustain", CTRL_SUSTAIN, 0, 127 },
- //{ "Portamento", CTRL_PORTAMENTO, 0, 127 },
- //{ "Soft Pedal", CTRL_SOFT_PEDAL, 0, 127 },
- //{ "Variation", CTRL_VARIATION_SEND, 0, 127 },
- //{ "Channel reverb send", CTRL_REVERB_SEND, 0, 127 },
- //{ "Channel chorus send", CTRL_CHORUS_SEND, 0, 127 },
- //{ "Pitch", CTRL_PITCH, -8192, 8191 }
+ //{ "Expression", MusECore::CTRL_EXPRESSION, 0, 127 },
+ //{ "Sustain", MusECore::CTRL_SUSTAIN, 0, 127 },
+ //{ "Portamento", MusECore::CTRL_PORTAMENTO, 0, 127 },
+ //{ "Soft Pedal", MusECore::CTRL_SOFT_PEDAL, 0, 127 },
+ //{ "Variation", MusECore::CTRL_VARIATION_SEND, 0, 127 },
+ //{ "Channel reverb send", MusECore::CTRL_REVERB_SEND, 0, 127 },
+ //{ "Channel chorus send", MusECore::CTRL_CHORUS_SEND, 0, 127 },
+ //{ "Pitch", MusECore::CTRL_PITCH, -8192, 8191 }
// These controllers' initial values are set by the FS_PREDEF_ values, so just set them to zero here.
{ "Gain", FS_GAIN ,0, 127, 0},
@@ -62,19 +62,19 @@ FluidCtrl FluidSynth::fluidCtrl[] = {
{ "Master chorus depth", FS_CHORUS_DEPTH, 0, 16384, 0}, // [0,40]
{ "Master chorus level", FS_CHORUS_LEVEL, 0, 16384, 0}, // [0,1]
- { "Program", CTRL_PROGRAM, 0, 0xffffff, 0},
- { "Modulation", CTRL_MODULATION, 0, 127, 0},
- { "Portamento time", CTRL_PORTAMENTO_TIME, 0, 127, 0},
- { "Volume", CTRL_VOLUME, 0, 127, 100},
- { "Pan", CTRL_PANPOT, -64, 63, 0},
- { "Expression", CTRL_EXPRESSION, 0, 127, 127},
- { "Sustain", CTRL_SUSTAIN, 0, 127, 0},
- { "Portamento", CTRL_PORTAMENTO, 0, 127, 0},
- { "Soft Pedal", CTRL_SOFT_PEDAL, 0, 127, 0},
- { "Variation", CTRL_VARIATION_SEND, 0, 127, 0},
- { "Channel reverb send", CTRL_REVERB_SEND, 0, 127, 40},
- { "Channel chorus send", CTRL_CHORUS_SEND, 0, 127, 0},
- { "Pitch", CTRL_PITCH, -8192, 8191, 0},
+ { "Program", MusECore::CTRL_PROGRAM, 0, 0xffffff, 0},
+ { "Modulation", MusECore::CTRL_MODULATION, 0, 127, 0},
+ { "Portamento time", MusECore::CTRL_PORTAMENTO_TIME, 0, 127, 0},
+ { "Volume", MusECore::CTRL_VOLUME, 0, 127, 100},
+ { "Pan", MusECore::CTRL_PANPOT, -64, 63, 0},
+ { "Expression", MusECore::CTRL_EXPRESSION, 0, 127, 127},
+ { "Sustain", MusECore::CTRL_SUSTAIN, 0, 127, 0},
+ { "Portamento", MusECore::CTRL_PORTAMENTO, 0, 127, 0},
+ { "Soft Pedal", MusECore::CTRL_SOFT_PEDAL, 0, 127, 0},
+ { "Variation", MusECore::CTRL_VARIATION_SEND, 0, 127, 0},
+ { "Channel reverb send", MusECore::CTRL_REVERB_SEND, 0, 127, 40},
+ { "Channel chorus send", MusECore::CTRL_CHORUS_SEND, 0, 127, 0},
+ { "Pitch", MusECore::CTRL_PITCH, -8192, 8191, 0},
// Added by T356
{ "Pitch bend sensitivity", FS_PITCHWHEELSENS, 0, 24, 2}
};
@@ -192,13 +192,13 @@ void FluidSynth::processMessages()
//Process messages from the gui
while (gui->fifoSize())
{
- MidiPlayEvent ev = gui->readEvent();
- if (ev.type() == ME_SYSEX)
+ MusECore::MidiPlayEvent ev = gui->readEvent();
+ if (ev.type() == MusECore::ME_SYSEX)
{
sysex(ev.len(), ev.data());
sendEvent(ev);
}
- else if (ev.type() == ME_CONTROLLER)
+ else if (ev.type() == MusECore::ME_CONTROLLER)
{
setController(ev.channel(), ev.dataA(), ev.dataB(), true);
sendEvent(ev);
@@ -222,12 +222,12 @@ void FluidSynth::process(float** ports, int offset, int len)
/*
//Process messages from the gui
while (gui->fifoSize()) {
- MidiPlayEvent ev = gui->readEvent();
- if (ev.type() == ME_SYSEX) {
+ MusECore::MidiPlayEvent ev = gui->readEvent();
+ if (ev.type() == MusECore::ME_SYSEX) {
sysex(ev.len(), ev.data());
sendEvent(ev);
}
- else if (ev.type() == ME_CONTROLLER) {
+ else if (ev.type() == MusECore::ME_CONTROLLER) {
setController(ev.channel(), ev.dataA(), ev.dataB(), true);
sendEvent(ev);
}
@@ -478,10 +478,10 @@ void FluidSynth::parseInitData(int n, const byte* d)
// All events from the sequencer goes here
//---------------------------------------------------------
-bool FluidSynth::processEvent(const MidiPlayEvent& ev)
+bool FluidSynth::processEvent(const MusECore::MidiPlayEvent& ev)
{
switch(ev.type()) {
- case ME_CONTROLLER:
+ case MusECore::ME_CONTROLLER:
if (FS_DEBUG_DATA) {
printf("*** FluidSynth::process - Controller. Chan: %x dataA: %x dataB: %x\n", ev.channel(), ev.dataA(), ev.dataB());
for (int i=0; i< ev.len(); i++)
@@ -489,11 +489,11 @@ bool FluidSynth::processEvent(const MidiPlayEvent& ev)
}
setController(ev.channel(), ev.dataA(), ev.dataB(), false);
return true;
- case ME_NOTEON:
+ case MusECore::ME_NOTEON:
return playNote(ev.channel(), ev.dataA(), ev.dataB());
- case ME_NOTEOFF:
+ case MusECore::ME_NOTEOFF:
return playNote(ev.channel(), ev.dataA(), 0);
- case ME_SYSEX:
+ case MusECore::ME_SYSEX:
//Debug print
if (FS_DEBUG_DATA) {
printf("*** FluidSynth::process - Sysex received\n");
@@ -502,12 +502,12 @@ bool FluidSynth::processEvent(const MidiPlayEvent& ev)
printf("\n");
}
return sysex(ev.len(), ev.data());
- case ME_PITCHBEND:
- setController(ev.channel(), CTRL_PITCH, ev.dataA(), false);
+ case MusECore::ME_PITCHBEND:
+ setController(ev.channel(), MusECore::CTRL_PITCH, ev.dataA(), false);
break;
- case ME_PROGRAM:
- setController(ev.channel(), CTRL_PROGRAM, ev.dataA(), false);
+ case MusECore::ME_PROGRAM:
+ setController(ev.channel(), MusECore::CTRL_PROGRAM, ev.dataA(), false);
break;
default:
break;
@@ -584,7 +584,7 @@ bool FluidSynth::sysex(int n, const unsigned char* d)
//---------------------------------------------------------
void FluidSynth::sendSysex(int l, const unsigned char* d)
{
- MidiPlayEvent ev(0, 0, ME_SYSEX, d, l);
+ MusECore::MidiPlayEvent ev(0, 0, MusECore::ME_SYSEX, d, l);
//printf("FluidSynth::sendSysex gui:%p\n", gui);
gui->writeEvent(ev);
}
@@ -851,7 +851,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
fluid_synth_set_gain(fluidsynth, (float) val/25); //gives val an interval of approximately[0,5]
//Forward to gui if not from Gui
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_GAIN, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_GAIN, val);
gui->writeEvent(ev);
}
break;
@@ -862,7 +862,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
//if (rev_on)
// fluid_synth_set_reverb(fluidsynth, rev_size, rev_damping, rev_width, rev_level);
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_REVERB_ON, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_REVERB_ON, val);
gui->writeEvent(ev);
}
break;
@@ -873,7 +873,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
//if (rev_on)
fluid_synth_set_reverb(fluidsynth, rev_size, rev_damping, rev_width, rev_level);
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_REVERB_LEVEL, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_REVERB_LEVEL, val);
gui->writeEvent(ev);
}
break;
@@ -882,7 +882,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
//if (rev_on)
fluid_synth_set_reverb(fluidsynth, rev_size, rev_damping, rev_width, rev_level);
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_REVERB_WIDTH, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_REVERB_WIDTH, val);
gui->writeEvent(ev);
}
break;
@@ -891,7 +891,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
//if (rev_on)
fluid_synth_set_reverb(fluidsynth, rev_size, rev_damping, rev_width, rev_level);
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_REVERB_DAMPING, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_REVERB_DAMPING, val);
gui->writeEvent(ev);
}
break;
@@ -900,7 +900,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
//if (rev_on)
fluid_synth_set_reverb(fluidsynth, rev_size, rev_damping, rev_width, rev_level);
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_REVERB_ROOMSIZE, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_REVERB_ROOMSIZE, val);
gui->writeEvent(ev);
}
break;
@@ -908,7 +908,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
cho_on = val;
fluid_synth_set_chorus_on(fluidsynth, val);
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_CHORUS_ON, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_CHORUS_ON, val);
gui->writeEvent(ev);
}
break;
@@ -917,7 +917,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
cho_num = val;
fluid_synth_set_chorus(fluidsynth, cho_num, cho_level, cho_speed, cho_depth, cho_type);
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_CHORUS_NUM, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_CHORUS_NUM, val);
gui->writeEvent(ev);
}
break;
@@ -926,7 +926,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
cho_type = val;
fluid_synth_set_chorus(fluidsynth, cho_num, cho_level, cho_speed, cho_depth, cho_type);
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_CHORUS_TYPE, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_CHORUS_TYPE, val);
gui->writeEvent(ev);
}
break;
@@ -935,7 +935,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
cho_speed = (double)(0.291 + (double)val/3479);
fluid_synth_set_chorus(fluidsynth, cho_num, cho_level, cho_speed, cho_depth, cho_type);
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_CHORUS_SPEED, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_CHORUS_SPEED, val);
gui->writeEvent(ev);
}
break;
@@ -944,7 +944,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
cho_depth = (double) val*40/16383;
fluid_synth_set_chorus(fluidsynth, cho_num, cho_level, cho_speed, cho_depth, cho_type);
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_CHORUS_DEPTH, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_CHORUS_DEPTH, val);
gui->writeEvent(ev);
}
break;
@@ -953,7 +953,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
cho_level = (double) val/16383;
fluid_synth_set_chorus(fluidsynth, cho_num, cho_level, cho_speed, cho_depth, cho_type);
if (!fromGui) {
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, FS_CHORUS_LEVEL, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, FS_CHORUS_LEVEL, val);
gui->writeEvent(ev);
}
break;
@@ -961,7 +961,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
//
// Controllers that depend on channels
//
- case CTRL_PITCH:
+ case MusECore::CTRL_PITCH:
// MusE's range is from -8192 to +8191, fluidsynth seems to be [0, 16384]
val +=8192;
err = fluid_synth_pitch_bend (fluidsynth, channel, val);
@@ -972,7 +972,7 @@ void FluidSynth::setController(int channel, int id, int val, bool fromGui)
err = fluid_synth_pitch_wheel_sens(fluidsynth, channel, val);
break;
- case CTRL_PROGRAM: {
+ case MusECore::CTRL_PROGRAM: {
//Check if MusE is trying to set a preset on an unspecified font. If so, ignore.
if (FS_DEBUG)
printf("Program select : channel %d val %d\n",channel, val);
@@ -1140,7 +1140,7 @@ void FluidSynth::sendLastdir(const char* lastdir)
memcpy(d+1,lastdir, strlen(lastdir)+1);
//memcpy(d+3,lastdir, strlen(lastdir)+1);
- MidiPlayEvent ev(0,0, ME_SYSEX, d, n);
+ MusECore::MidiPlayEvent ev(0,0, MusECore::ME_SYSEX, d, n);
gui->writeEvent(ev);
}
diff --git a/muse2/synti/fluidsynth/fluidsynti.h b/muse2/synti/fluidsynth/fluidsynti.h
index 7a97904e..0628a385 100644
--- a/muse2/synti/fluidsynth/fluidsynti.h
+++ b/muse2/synti/fluidsynth/fluidsynti.h
@@ -64,20 +64,20 @@ struct FluidCtrl {
};
// NRPN-controllers:
-static const int FS_GAIN = 0 + CTRL_NRPN14_OFFSET;
-static const int FS_REVERB_ON = 1 + CTRL_NRPN14_OFFSET;
-static const int FS_REVERB_LEVEL = 2 + CTRL_NRPN14_OFFSET;
-static const int FS_REVERB_ROOMSIZE = 3 + CTRL_NRPN14_OFFSET;
-static const int FS_REVERB_DAMPING = 4 + CTRL_NRPN14_OFFSET;
-static const int FS_REVERB_WIDTH = 5 + CTRL_NRPN14_OFFSET;
-static const int FS_CHORUS_ON = 6 + CTRL_NRPN14_OFFSET;
-static const int FS_CHORUS_NUM = 7 + CTRL_NRPN14_OFFSET;
-static const int FS_CHORUS_TYPE = 8 + CTRL_NRPN14_OFFSET;
-static const int FS_CHORUS_SPEED = 9 + CTRL_NRPN14_OFFSET;
-static const int FS_CHORUS_DEPTH = 10 + CTRL_NRPN14_OFFSET;
-static const int FS_CHORUS_LEVEL = 11 + CTRL_NRPN14_OFFSET;
+static const int FS_GAIN = 0 + MusECore::CTRL_NRPN14_OFFSET;
+static const int FS_REVERB_ON = 1 + MusECore::CTRL_NRPN14_OFFSET;
+static const int FS_REVERB_LEVEL = 2 + MusECore::CTRL_NRPN14_OFFSET;
+static const int FS_REVERB_ROOMSIZE = 3 + MusECore::CTRL_NRPN14_OFFSET;
+static const int FS_REVERB_DAMPING = 4 + MusECore::CTRL_NRPN14_OFFSET;
+static const int FS_REVERB_WIDTH = 5 + MusECore::CTRL_NRPN14_OFFSET;
+static const int FS_CHORUS_ON = 6 + MusECore::CTRL_NRPN14_OFFSET;
+static const int FS_CHORUS_NUM = 7 + MusECore::CTRL_NRPN14_OFFSET;
+static const int FS_CHORUS_TYPE = 8 + MusECore::CTRL_NRPN14_OFFSET;
+static const int FS_CHORUS_SPEED = 9 + MusECore::CTRL_NRPN14_OFFSET;
+static const int FS_CHORUS_DEPTH = 10 + MusECore::CTRL_NRPN14_OFFSET;
+static const int FS_CHORUS_LEVEL = 11 + MusECore::CTRL_NRPN14_OFFSET;
// Added by T356
-static const int FS_PITCHWHEELSENS = 0 + CTRL_RPN_OFFSET;
+static const int FS_PITCHWHEELSENS = 0 + MusECore::CTRL_RPN_OFFSET;
// FluidChannel is used to map different soundfonts to different fluid-channels
// This is to be able to select different presets from specific soundfonts, since
@@ -141,7 +141,7 @@ public:
virtual const char* getPatchName(int, int, int, bool) const;
virtual const MidiPatch* getPatchInfo(int i, const MidiPatch* patch) const;
virtual int getControllerInfo(int, const char**, int*, int*, int*, int*) const;
- virtual bool processEvent(const MidiPlayEvent&);
+ virtual bool processEvent(const MusECore::MidiPlayEvent&);
//virtual bool hasGui() const { return true; }
//virtual bool guiVisible() const;
diff --git a/muse2/synti/libsynti/gui.cpp b/muse2/synti/libsynti/gui.cpp
index 194e186a..92935ae2 100644
--- a/muse2/synti/libsynti/gui.cpp
+++ b/muse2/synti/libsynti/gui.cpp
@@ -78,7 +78,7 @@ void MessGui::readMessage()
// sendEvent
//---------------------------------------------------------
-void MessGui::sendEvent(const MidiPlayEvent& ev)
+void MessGui::sendEvent(const MusECore::MidiPlayEvent& ev)
{
if (wFifoSize == EVENT_FIFO_SIZE) {
printf("event gui->synti fifo overflow\n");
@@ -95,10 +95,10 @@ void MessGui::sendEvent(const MidiPlayEvent& ev)
void MessGui::sendController(int ch, int idx, int val)
{
-// MidiPlayEvent pe(0, 0, ch, ME_CONTROLLER, idx, val);
+// MusECore::MidiPlayEvent pe(0, 0, ch, MusECore::ME_CONTROLLER, idx, val);
// sendEvent(pe);
- sendEvent(MidiPlayEvent(0, 0, ch, ME_CONTROLLER, idx, val));
+ sendEvent(MusECore::MidiPlayEvent(0, 0, ch, MusECore::ME_CONTROLLER, idx, val));
}
//---------------------------------------------------------
@@ -107,10 +107,10 @@ void MessGui::sendController(int ch, int idx, int val)
void MessGui::sendSysex(unsigned char* p, int n)
{
-// MidiPlayEvent pe(0, 0, ME_SYSEX, p, n);
+// MusECore::MidiPlayEvent pe(0, 0, MusECore::ME_SYSEX, p, n);
// sendEvent(pe);
- sendEvent(MidiPlayEvent(0, 0, ME_SYSEX, p, n));
+ sendEvent(MusECore::MidiPlayEvent(0, 0, MusECore::ME_SYSEX, p, n));
}
//---------------------------------------------------------
@@ -118,7 +118,7 @@ void MessGui::sendSysex(unsigned char* p, int n)
// send an event to synti gui
//---------------------------------------------------------
-void MessGui::writeEvent(const MidiPlayEvent& ev)
+void MessGui::writeEvent(const MusECore::MidiPlayEvent& ev)
{
if (rFifoSize == EVENT_FIFO_SIZE) {
printf("event synti->gui fifo overflow\n");
@@ -135,9 +135,9 @@ void MessGui::writeEvent(const MidiPlayEvent& ev)
// read event from synti gui
//---------------------------------------------------------
-MidiPlayEvent MessGui::readEvent()
+MusECore::MidiPlayEvent MessGui::readEvent()
{
- MidiPlayEvent ev = wFifo[wFifoRindex];
+ MusECore::MidiPlayEvent ev = wFifo[wFifoRindex];
wFifoRindex = (wFifoRindex + 1) % EVENT_FIFO_SIZE;
--wFifoSize;
return ev;
diff --git a/muse2/synti/libsynti/gui.h b/muse2/synti/libsynti/gui.h
index 96ac907f..1fda6c26 100644
--- a/muse2/synti/libsynti/gui.h
+++ b/muse2/synti/libsynti/gui.h
@@ -39,13 +39,13 @@ class MessGui {
int writeFd;
// Event Fifo synti -> GUI
- MidiPlayEvent rFifo[EVENT_FIFO_SIZE];
+ MusECore::MidiPlayEvent rFifo[EVENT_FIFO_SIZE];
volatile int rFifoSize;
int rFifoWindex;
int rFifoRindex;
// Event Fifo GUI -> synti
- MidiPlayEvent wFifo[EVENT_FIFO_SIZE];
+ MusECore::MidiPlayEvent wFifo[EVENT_FIFO_SIZE];
volatile int wFifoSize;
int wFifoWindex;
int wFifoRindex;
@@ -53,19 +53,19 @@ class MessGui {
protected:
int readFd;
void readMessage();
- void sendEvent(const MidiPlayEvent& ev);
+ void sendEvent(const MusECore::MidiPlayEvent& ev);
void sendController(int,int,int);
void sendSysex(unsigned char*, int);
- virtual void processEvent(const MidiPlayEvent&) {};
+ virtual void processEvent(const MusECore::MidiPlayEvent&) {};
public:
MessGui();
virtual ~MessGui();
- void writeEvent(const MidiPlayEvent&);
+ void writeEvent(const MusECore::MidiPlayEvent&);
int fifoSize() const { return wFifoSize; }
- MidiPlayEvent readEvent();
+ MusECore::MidiPlayEvent readEvent();
};
//---------------------------------------------------------
diff --git a/muse2/synti/libsynti/mess.cpp b/muse2/synti/libsynti/mess.cpp
index 62a281e1..027a30c1 100644
--- a/muse2/synti/libsynti/mess.cpp
+++ b/muse2/synti/libsynti/mess.cpp
@@ -32,7 +32,7 @@ static const int FIFO_SIZE = 32;
struct MessP {
// Event Fifo synti -> Host:
- MidiPlayEvent fifo[FIFO_SIZE];
+ MusECore::MidiPlayEvent fifo[FIFO_SIZE];
volatile int fifoSize;
int fifoWindex;
int fifoRindex;
@@ -92,7 +92,7 @@ void Mess::getNativeGeometry(int* x, int* y, int* w, int* h) const
// send Event synti -> host
//---------------------------------------------------------
-void Mess::sendEvent(MidiPlayEvent ev)
+void Mess::sendEvent(MusECore::MidiPlayEvent ev)
{
if (d->fifoSize == FIFO_SIZE) {
printf("event synti->host fifo overflow\n");
@@ -108,9 +108,9 @@ void Mess::sendEvent(MidiPlayEvent ev)
// called from host
//---------------------------------------------------------
-MidiPlayEvent Mess::receiveEvent()
+MusECore::MidiPlayEvent Mess::receiveEvent()
{
- MidiPlayEvent ev = d->fifo[d->fifoRindex];
+ MusECore::MidiPlayEvent ev = d->fifo[d->fifoRindex];
d->fifoRindex = (d->fifoRindex + 1) % FIFO_SIZE;
--(d->fifoSize);
return ev;
@@ -134,19 +134,19 @@ int Mess::eventsPending() const
// return true if synti is busy
//---------------------------------------------------------
-bool Mess::processEvent(const MidiPlayEvent& ev)
+bool Mess::processEvent(const MusECore::MidiPlayEvent& ev)
{
switch(ev.type()) {
- case ME_NOTEON:
+ case MusECore::ME_NOTEON:
return playNote(ev.channel(), ev.dataA(), ev.dataB());
- case ME_NOTEOFF:
+ case MusECore::ME_NOTEOFF:
return playNote(ev.channel(), ev.dataA(), 0);
- case ME_SYSEX:
+ case MusECore::ME_SYSEX:
return sysex(ev.len(), ev.data());
- case ME_CONTROLLER:
+ case MusECore::ME_CONTROLLER:
return setController(ev.channel(), ev.dataA(), ev.dataB());
- case ME_PITCHBEND: // Tim.
- return setController(ev.channel(), CTRL_PITCH, ev.dataA());
+ case MusECore::ME_PITCHBEND: // Tim.
+ return setController(ev.channel(), MusECore::CTRL_PITCH, ev.dataA());
}
return false;
}
diff --git a/muse2/synti/libsynti/mess.h b/muse2/synti/libsynti/mess.h
index 65f30e26..f9853330 100644
--- a/muse2/synti/libsynti/mess.h
+++ b/muse2/synti/libsynti/mess.h
@@ -81,7 +81,7 @@ class Mess {
// the synti has to (re-)implement processEvent() or provide
// some of the next three functions:
- virtual bool processEvent(const MidiPlayEvent&);
+ virtual bool processEvent(const MusECore::MidiPlayEvent&);
virtual bool setController(int, int, int) { return false; }
virtual bool playNote(int, int, int) { return false; }
virtual bool sysex(int, const unsigned char*) { return false; }
@@ -92,8 +92,8 @@ class Mess {
virtual const MidiPatch* getPatchInfo(int, const MidiPatch*) const { return 0; }
// synthesizer -> host communication
- void sendEvent(MidiPlayEvent); // called from synti
- MidiPlayEvent receiveEvent(); // called from host
+ void sendEvent(MusECore::MidiPlayEvent); // called from synti
+ MusECore::MidiPlayEvent receiveEvent(); // called from host
int eventsPending() const;
// GUI interface routines
diff --git a/muse2/synti/libsynti/poly.cpp b/muse2/synti/libsynti/poly.cpp
index 1dec00fd..e76dfc6b 100644
--- a/muse2/synti/libsynti/poly.cpp
+++ b/muse2/synti/libsynti/poly.cpp
@@ -41,8 +41,8 @@ bool MessPoly::playNote(int /*channel*/, int /*pitch*/, int /*velo*/)
bool MessPoly::setController(int /*channel*/, int num, int /*val*/)
{
switch(num) {
- case CTRL_VOLUME:
- case CTRL_EXPRESSION:
+ case MusECore::CTRL_VOLUME:
+ case MusECore::CTRL_EXPRESSION:
break;
}
return false;
diff --git a/muse2/synti/organ/organ.cpp b/muse2/synti/organ/organ.cpp
index d9613992..fdcd02aa 100644
--- a/muse2/synti/organ/organ.cpp
+++ b/muse2/synti/organ/organ.cpp
@@ -58,7 +58,7 @@ SynthCtrl Organ::synthCtrl[] = {
{ "reed", REED, 1 },
{ "velocity", VELO, 0 },
// next controller not send as init data
- { "volume", CTRL_VOLUME, 100 },
+ { "volume", MusECore::CTRL_VOLUME, 100 },
};
static int NUM_CONTROLLER = sizeof(Organ::synthCtrl)/sizeof(*(Organ::synthCtrl));
@@ -209,8 +209,8 @@ void Organ::processMessages()
//
while (gui->fifoSize())
{
- MidiPlayEvent ev = gui->readEvent();
- if (ev.type() == ME_CONTROLLER)
+ MusECore::MidiPlayEvent ev = gui->readEvent();
+ if (ev.type() == MusECore::ME_CONTROLLER)
{
// process local?
setController(ev.dataA(), ev.dataB());
@@ -238,8 +238,8 @@ void Organ::process(float** ports, int offset, int sampleCount)
// synthesizer GUI
//
while (gui->fifoSize()) {
- MidiPlayEvent ev = gui->readEvent();
- if (ev.type() == ME_CONTROLLER) {
+ MusECore::MidiPlayEvent ev = gui->readEvent();
+ if (ev.type() == MusECore::ME_CONTROLLER) {
// process local?
setController(ev.dataA(), ev.dataB());
sendEvent(ev);
@@ -537,15 +537,15 @@ void Organ::setController(int ctrl, int data)
case VELO:
velo = data;
break;
- case CTRL_VOLUME:
+ case MusECore::CTRL_VOLUME:
data &= 0x7f;
volume = data == 0 ? 0.0 : cb2amp(int(200 * log10((127.0 * 127)/(data*data))));
break;
- case CTRL_ALL_SOUNDS_OFF:
+ case MusECore::CTRL_ALL_SOUNDS_OFF:
for (int i = 0; i < VOICES; ++i)
voices[i].isOn = false;
break;
- case CTRL_RESET_ALL_CTRL:
+ case MusECore::CTRL_RESET_ALL_CTRL:
for (int i = 0; i < NUM_CONTROLLER; ++i)
setController(0, synthCtrl[i].num, synthCtrl[i].val);
break;
@@ -591,7 +591,7 @@ bool Organ::setController(int channel, int ctrl, int data)
case REED:
case VELO:
{
- MidiPlayEvent ev(0, 0, channel, ME_CONTROLLER, ctrl, data);
+ MusECore::MidiPlayEvent ev(0, 0, channel, MusECore::ME_CONTROLLER, ctrl, data);
#ifdef ORGAN_DEBUG
fprintf(stderr, "OrganGui:setController before gui->writeEvent ctrl:%d data:%d\n", ctrl, data);
#endif
@@ -681,7 +681,7 @@ int Organ::getControllerInfo(int id, const char** name, int* controller,
*name = synthCtrl[id].name;
*initval = synthCtrl[id].val;
- if(synthCtrl[id].num == CTRL_VOLUME)
+ if(synthCtrl[id].num == MusECore::CTRL_VOLUME)
{
*min = 0;
*max = 127;
diff --git a/muse2/synti/organ/organ.h b/muse2/synti/organ/organ.h
index b85f9282..8a7de162 100644
--- a/muse2/synti/organ/organ.h
+++ b/muse2/synti/organ/organ.h
@@ -89,24 +89,24 @@ struct Envelope {
}
};
-static const int HARM0 = 0 + CTRL_RPN14_OFFSET;
-static const int HARM1 = 1 + CTRL_RPN14_OFFSET;
-static const int HARM2 = 2 + CTRL_RPN14_OFFSET;
-static const int HARM3 = 3 + CTRL_RPN14_OFFSET;
-static const int HARM4 = 4 + CTRL_RPN14_OFFSET;
-static const int HARM5 = 5 + CTRL_RPN14_OFFSET;
-static const int ATTACK_LO = 6 + CTRL_RPN14_OFFSET;
-static const int DECAY_LO = 7 + CTRL_RPN14_OFFSET;
-static const int SUSTAIN_LO = 8 + CTRL_RPN14_OFFSET;
-static const int RELEASE_LO = 9 + CTRL_RPN14_OFFSET;
-static const int ATTACK_HI = 10 + CTRL_RPN14_OFFSET;
-static const int DECAY_HI = 11 + CTRL_RPN14_OFFSET;
-static const int SUSTAIN_HI = 12 + CTRL_RPN14_OFFSET;
-static const int RELEASE_HI = 13 + CTRL_RPN14_OFFSET;
-static const int BRASS = 14 + CTRL_RPN14_OFFSET;
-static const int FLUTE = 15 + CTRL_RPN14_OFFSET;
-static const int REED = 16 + CTRL_RPN14_OFFSET;
-static const int VELO = 17 + CTRL_RPN14_OFFSET;
+static const int HARM0 = 0 + MusECore::CTRL_RPN14_OFFSET;
+static const int HARM1 = 1 + MusECore::CTRL_RPN14_OFFSET;
+static const int HARM2 = 2 + MusECore::CTRL_RPN14_OFFSET;
+static const int HARM3 = 3 + MusECore::CTRL_RPN14_OFFSET;
+static const int HARM4 = 4 + MusECore::CTRL_RPN14_OFFSET;
+static const int HARM5 = 5 + MusECore::CTRL_RPN14_OFFSET;
+static const int ATTACK_LO = 6 + MusECore::CTRL_RPN14_OFFSET;
+static const int DECAY_LO = 7 + MusECore::CTRL_RPN14_OFFSET;
+static const int SUSTAIN_LO = 8 + MusECore::CTRL_RPN14_OFFSET;
+static const int RELEASE_LO = 9 + MusECore::CTRL_RPN14_OFFSET;
+static const int ATTACK_HI = 10 + MusECore::CTRL_RPN14_OFFSET;
+static const int DECAY_HI = 11 + MusECore::CTRL_RPN14_OFFSET;
+static const int SUSTAIN_HI = 12 + MusECore::CTRL_RPN14_OFFSET;
+static const int RELEASE_HI = 13 + MusECore::CTRL_RPN14_OFFSET;
+static const int BRASS = 14 + MusECore::CTRL_RPN14_OFFSET;
+static const int FLUTE = 15 + MusECore::CTRL_RPN14_OFFSET;
+static const int REED = 16 + MusECore::CTRL_RPN14_OFFSET;
+static const int VELO = 17 + MusECore::CTRL_RPN14_OFFSET;
//---------------------------------------------------------
// SynthCtrl
diff --git a/muse2/synti/organ/organgui.cpp b/muse2/synti/organ/organgui.cpp
index e648a9e6..21f8e828 100644
--- a/muse2/synti/organ/organgui.cpp
+++ b/muse2/synti/organ/organgui.cpp
@@ -107,7 +107,7 @@ void OrganGui::ctrlChanged(int idx)
else if (ctrl->type == SynthGuiCtrl::SWITCH) {
val = ((QCheckBox*)(ctrl->editor))->isChecked();
}
- sendController(0, idx + CTRL_RPN14_OFFSET, val);
+ sendController(0, idx + MusECore::CTRL_RPN14_OFFSET, val);
}
//---------------------------------------------------------
@@ -185,9 +185,9 @@ void OrganGui::setParam(int param, int val)
// processEvent
//---------------------------------------------------------
-void OrganGui::processEvent(const MidiPlayEvent& ev)
+void OrganGui::processEvent(const MusECore::MidiPlayEvent& ev)
{
- if (ev.type() == ME_CONTROLLER)
+ if (ev.type() == MusECore::ME_CONTROLLER)
setParam(ev.dataA(), ev.dataB());
else
{
diff --git a/muse2/synti/organ/organgui.h b/muse2/synti/organ/organgui.h
index 826ecf09..2af6a959 100644
--- a/muse2/synti/organ/organgui.h
+++ b/muse2/synti/organ/organgui.h
@@ -51,7 +51,7 @@ class OrganGui : public QWidget, public Ui::OrganGuiBase, public MessGui {
void readMessage(int);
public:
- virtual void processEvent(const MidiPlayEvent&);
+ virtual void processEvent(const MusECore::MidiPlayEvent&);
int getControllerMinMax(int id, int* min, int* max) const;
OrganGui();
};
diff --git a/muse2/synti/simpledrums2/common.h b/muse2/synti/simpledrums2/common.h
index 827d68c0..e3046f0f 100644
--- a/muse2/synti/simpledrums2/common.h
+++ b/muse2/synti/simpledrums2/common.h
@@ -76,7 +76,7 @@
#define SS_NR_OF_PLUGIN_CONTROLLERS 2
#define SS_NR_OF_CONTROLLERS (SS_NR_OF_MASTER_CONTROLLERS + (SS_NR_OF_CHANNELS * SS_NR_OF_CHANNEL_CONTROLLERS) + (SS_NR_OF_PLUGIN_CONTROLLERS*SS_NR_OF_SENDEFFECTS))
-#define SS_FIRST_MASTER_CONTROLLER CTRL_NRPN14_OFFSET
+#define SS_FIRST_MASTER_CONTROLLER MusECore::CTRL_NRPN14_OFFSET
#define SS_FIRST_CHANNEL_CONTROLLER (SS_FIRST_MASTER_CONTROLLER + SS_NR_OF_MASTER_CONTROLLERS)
#define SS_LAST_MASTER_CONTROLLER (SS_FIRST_CHANNEL_CONTROLLER - 1)
#define SS_LAST_CHANNEL_CONTROLLER (SS_FIRST_CHANNEL_CONTROLLER -1 + (SS_NR_OF_CHANNEL_CONTROLLERS * SS_NR_OF_CHANNELS))
diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp
index 2321ec4b..c7c2c85f 100644
--- a/muse2/synti/simpledrums2/simpledrums.cpp
+++ b/muse2/synti/simpledrums2/simpledrums.cpp
@@ -142,7 +142,7 @@ SimpleSynth::SimpleSynth(int sr)
//Build controller list:
controllers[0].name = "Master volume";
- controllers[0].num = CTRL_NRPN14_OFFSET;
+ controllers[0].num = MusECore::CTRL_NRPN14_OFFSET;
controllers[0].min = 0;
controllers[0].max = 127;
@@ -157,36 +157,36 @@ SimpleSynth::SimpleSynth(int sr)
QString c7 = "Channel " + QString::number(ch + 1) + " fx send 3";
QString c8 = "Channel " + QString::number(ch + 1) + " fx send 4";
controllers[i].name = c1.toLatin1().constData();
- controllers[i].num = CTRL_NRPN14_OFFSET+i;
+ controllers[i].num = MusECore::CTRL_NRPN14_OFFSET+i;
controllers[i].min = 0;
controllers[i].max = 127;
controllers[i+1].name = c2.toLatin1().constData();
- controllers[i+1].num = CTRL_NRPN14_OFFSET+i+1;
+ controllers[i+1].num = MusECore::CTRL_NRPN14_OFFSET+i+1;
controllers[i+1].min = 0;
controllers[i+1].max = 127;
controllers[i+2].name = c3.toLatin1().constData();
- controllers[i+2].num = CTRL_NRPN14_OFFSET+i+2;
+ controllers[i+2].num = MusECore::CTRL_NRPN14_OFFSET+i+2;
controllers[i+2].min = 0;
controllers[i+2].max = 1;
controllers[i+3].name = c4.toLatin1().constData();
- controllers[i+3].num = CTRL_NRPN14_OFFSET+i+3;
+ controllers[i+3].num = MusECore::CTRL_NRPN14_OFFSET+i+3;
controllers[i+3].min = 0;
controllers[i+3].max = 1;
controllers[i+4].name = c5.toLatin1().constData();
- controllers[i+4].num = CTRL_NRPN14_OFFSET+i+4;
+ controllers[i+4].num = MusECore::CTRL_NRPN14_OFFSET+i+4;
controllers[i+5].name = c6.toLatin1().constData();
- controllers[i+5].num = CTRL_NRPN14_OFFSET+i+5;
+ controllers[i+5].num = MusECore::CTRL_NRPN14_OFFSET+i+5;
controllers[i+6].name = c7.toLatin1().constData();
- controllers[i+6].num = CTRL_NRPN14_OFFSET+i+6;
+ controllers[i+6].num = MusECore::CTRL_NRPN14_OFFSET+i+6;
controllers[i+7].name = c8.toLatin1().constData();
- controllers[i+7].num = CTRL_NRPN14_OFFSET+i+7;
+ controllers[i+7].num = MusECore::CTRL_NRPN14_OFFSET+i+7;
controllers[i+4].min = controllers[i+5].min = controllers[i+6].min = controllers[i+7].min = 0;
controllers[i+4].max = controllers[i+5].max = controllers[i+6].max = controllers[i+7].max = 127;
@@ -198,12 +198,12 @@ SimpleSynth::SimpleSynth(int sr)
QString c1 = "Sendfx " + QString::number(sfx) + " ret gain";
QString c2 = "Sendfx " + QString::number(sfx) + " on/off";
controllers[i].name = c1.toLatin1().constData();
- controllers[i].num = CTRL_NRPN14_OFFSET+i;
+ controllers[i].num = MusECore::CTRL_NRPN14_OFFSET+i;
controllers[i].min = 0;
controllers[i].max = 127;
controllers[i+1].name = c2.toLatin1().constData();
- controllers[i+1].num = CTRL_NRPN14_OFFSET+i+1;
+ controllers[i+1].num = MusECore::CTRL_NRPN14_OFFSET+i+1;
controllers[i+1].min = 0;
controllers[i+1].max = 1;
i+=2;
@@ -355,11 +355,11 @@ bool SimpleSynth::playNote(int /*channel*/, int pitch, int velo)
\return false for ok, true for not ok
*/
//---------------------------------------------------------
-bool SimpleSynth::processEvent(const MidiPlayEvent& ev)
+bool SimpleSynth::processEvent(const MusECore::MidiPlayEvent& ev)
{
SS_TRACE_IN
switch(ev.type()) {
- case ME_CONTROLLER:
+ case MusECore::ME_CONTROLLER:
if (SS_DEBUG_MIDI) {
printf("SimpleSynth::processEvent - Controller. Chan: %x dataA: %x dataB: %x\n", ev.channel(), ev.dataA(), ev.dataB());
for (int i=0; i< ev.len(); i++)
@@ -367,11 +367,11 @@ bool SimpleSynth::processEvent(const MidiPlayEvent& ev)
}
setController(ev.channel(), ev.dataA(), ev.dataB(), false);
return true;
- case ME_NOTEON:
+ case MusECore::ME_NOTEON:
return playNote(ev.channel(), ev.dataA(), ev.dataB());
- case ME_NOTEOFF:
+ case MusECore::ME_NOTEOFF:
return playNote(ev.channel(), ev.dataA(), 0);
- case ME_SYSEX:
+ case MusECore::ME_SYSEX:
//Debug print
if (SS_DEBUG_MIDI) {
printf("SimpleSynth::processEvent - Sysex received\n");
@@ -471,7 +471,7 @@ bool SimpleSynth::setController(int channel, int id, int val)
master_vol = (double) master_vol_ctrlval / SS_MASTER_VOLUME_QUOT;
}
// Emmm, this one should've been there in the beginning
- else if (id == CTRL_VOLUME) {
+ else if (id == MusECore::CTRL_VOLUME) {
if (SS_DEBUG_MIDI) {
printf("Ctrl volume received: vol: %d\n", val);
}
@@ -620,8 +620,8 @@ bool SimpleSynth::sysex(int len, const unsigned char* d)
///delete[] tmp_initdata;
///tmp_initdata = NULL;
- ///MidiPlayEvent ev(0, 0, ME_SYSEX, event_data, totlen);
- MidiPlayEvent ev(0, 0, ME_SYSEX, tmp_initdata + 1, initdata_len - 1); // Strip MFG ID.
+ ///MusECore::MidiPlayEvent ev(0, 0, MusECore::ME_SYSEX, event_data, totlen);
+ MusECore::MidiPlayEvent ev(0, 0, MusECore::ME_SYSEX, tmp_initdata + 1, initdata_len - 1); // Strip MFG ID.
gui->writeEvent(ev);
///delete[] event_data;
@@ -715,12 +715,12 @@ void SimpleSynth::processMessages()
{
//Process messages from the gui
while (gui->fifoSize()) {
- MidiPlayEvent ev = gui->readEvent();
- if (ev.type() == ME_SYSEX) {
+ MusECore::MidiPlayEvent ev = gui->readEvent();
+ if (ev.type() == MusECore::ME_SYSEX) {
sysex(ev.len(), ev.data());
sendEvent(ev);
}
- else if (ev.type() == ME_CONTROLLER) {
+ else if (ev.type() == MusECore::ME_CONTROLLER) {
setController(ev.channel(), ev.dataA(), ev.dataB(), true);
sendEvent(ev);
}
@@ -746,12 +746,12 @@ void SimpleSynth::process(float** out, int offset, int len)
/*
//Process messages from the gui
while (gui->fifoSize()) {
- MidiPlayEvent ev = gui->readEvent();
- if (ev.type() == ME_SYSEX) {
+ MusECore::MidiPlayEvent ev = gui->readEvent();
+ if (ev.type() == MusECore::ME_SYSEX) {
sysex(ev.len(), ev.data());
sendEvent(ev);
}
- else if (ev.type() == ME_CONTROLLER) {
+ else if (ev.type() == MusECore::ME_CONTROLLER) {
setController(ev.channel(), ev.dataA(), ev.dataB(), true);
sendEvent(ev);
}
@@ -1284,7 +1284,7 @@ void SimpleSynth::parseInitData(const unsigned char* data)
sendEffects[i].retgain_ctrlval = retgain;
sendEffects[i].retgain = retgain;
sendEffects[i].retgain = (double) retgain/ 75.0;
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, SS_PLUGIN_RETURNLEVEL_CONTROLLER(i), retgain);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, SS_PLUGIN_RETURNLEVEL_CONTROLLER(i), retgain);
gui->writeEvent(ev);
// Jun 10 2011. This one was missing. p4.0.27 Tim.
@@ -1293,7 +1293,7 @@ void SimpleSynth::parseInitData(const unsigned char* data)
if (SS_DEBUG_INIT)
printf("buffer[%ld] - sendeffect[%d] state=%d\n", long(ptr-data), i, *(ptr));
sendEffects[i].state = (SS_SendFXState) *(ptr);
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, SS_PLUGIN_ONOFF_CONTROLLER(i), sendEffects[i].state);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, SS_PLUGIN_ONOFF_CONTROLLER(i), sendEffects[i].state);
gui->writeEvent(ev);
ptr++;
}
@@ -1547,7 +1547,7 @@ void SimpleSynth::updateVolume(int ch, int invol_ctrlval)
void SimpleSynth::guiUpdateBalance(int ch, int bal)
{
SS_TRACE_IN
- MidiPlayEvent ev(0, 0, ch, ME_CONTROLLER, SS_CHANNEL_PAN_CONTROLLER(ch), bal);
+ MusECore::MidiPlayEvent ev(0, 0, ch, MusECore::ME_CONTROLLER, SS_CHANNEL_PAN_CONTROLLER(ch), bal);
gui->writeEvent(ev);
SS_TRACE_OUT
}
@@ -1559,7 +1559,7 @@ void SimpleSynth::guiUpdateBalance(int ch, int bal)
void SimpleSynth::guiUpdateVolume(int ch, int val)
{
SS_TRACE_IN
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, SS_CHANNEL_VOLUME_CONTROLLER(ch), val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, SS_CHANNEL_VOLUME_CONTROLLER(ch), val);
gui->writeEvent(ev);
SS_TRACE_OUT
}
@@ -1571,7 +1571,7 @@ void SimpleSynth::guiUpdateVolume(int ch, int val)
void SimpleSynth::guiUpdateNoff(int ch, bool b)
{
SS_TRACE_IN
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, SS_CHANNEL_NOFF_CONTROLLER(ch), b);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, SS_CHANNEL_NOFF_CONTROLLER(ch), b);
gui->writeEvent(ev);
SS_TRACE_OUT
}
@@ -1583,7 +1583,7 @@ void SimpleSynth::guiUpdateNoff(int ch, bool b)
void SimpleSynth::guiUpdateChoff(int ch, bool b)
{
SS_TRACE_IN
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, SS_CHANNEL_ONOFF_CONTROLLER(ch), b);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, SS_CHANNEL_ONOFF_CONTROLLER(ch), b);
gui->writeEvent(ev);
SS_TRACE_OUT
}
@@ -1595,7 +1595,7 @@ void SimpleSynth::guiUpdateChoff(int ch, bool b)
void SimpleSynth::guiUpdateMasterVol(int val)
{
SS_TRACE_IN
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, SS_MASTER_CTRL_VOLUME, val);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, SS_MASTER_CTRL_VOLUME, val);
gui->writeEvent(ev);
SS_TRACE_OUT
}
@@ -1606,7 +1606,7 @@ void SimpleSynth::guiUpdateMasterVol(int val)
void SimpleSynth::guiUpdateSendFxLevel(int channel, int fxid, int level)
{
SS_TRACE_IN
- MidiPlayEvent ev(0, 0, 0, ME_CONTROLLER, SS_CHANNEL_SENDFX_CONTROLLER(channel, fxid), level);
+ MusECore::MidiPlayEvent ev(0, 0, 0, MusECore::ME_CONTROLLER, SS_CHANNEL_SENDFX_CONTROLLER(channel, fxid), level);
gui->writeEvent(ev);
SS_TRACE_OUT
}
@@ -1636,7 +1636,7 @@ void SimpleSynth::guiSendSampleLoaded(bool success, int ch, const char* filename
//out[3] = ch;
memcpy(out+2, filename, strlen(filename)+1);
//memcpy(out+4, filename, strlen(filename)+1);
- MidiPlayEvent ev(0, 0, ME_SYSEX, out, len);
+ MusECore::MidiPlayEvent ev(0, 0, MusECore::ME_SYSEX, out, len);
gui->writeEvent(ev);
SS_TRACE_OUT
}
@@ -1758,7 +1758,7 @@ bool SimpleSynth::initSendEffect(int id, QString lib, QString name)
///out[2] = j;
//out[4] = j;
*((unsigned*)(out + 2)) = j;
- MidiPlayEvent ev(0, 0, ME_SYSEX, out, len);
+ MusECore::MidiPlayEvent ev(0, 0, MusECore::ME_SYSEX, out, len);
gui->writeEvent(ev);
}
}
@@ -1804,8 +1804,8 @@ void SimpleSynth::cleanupPlugin(int id)
//d[1] = SIMPLEDRUMS_UNIQUE_ID;
//d[2] = SS_SYSEX_CLEAR_SENDEFFECT_OK;
//d[3] = id;
- MidiPlayEvent ev(0, 0, ME_SYSEX, d, 2);
- //MidiPlayEvent ev(0, 0, ME_SYSEX, d, 4);
+ MusECore::MidiPlayEvent ev(0, 0, MusECore::ME_SYSEX, d, 2);
+ //MusECore::MidiPlayEvent ev(0, 0, MusECore::ME_SYSEX, d, 4);
gui->writeEvent(ev);
SS_TRACE_OUT
}
@@ -1870,8 +1870,8 @@ void SimpleSynth::guiUpdateFxParameter(int fxid, int param, float val)
//d[3] = fxid;
//d[4] = param;
//d[5] = intval;
- MidiPlayEvent ev(0, 0, ME_SYSEX, d, 4);
- //MidiPlayEvent ev(0, 0, ME_SYSEX, d, 6);
+ MusECore::MidiPlayEvent ev(0, 0, MusECore::ME_SYSEX, d, 4);
+ //MusECore::MidiPlayEvent ev(0, 0, MusECore::ME_SYSEX, d, 6);
gui->writeEvent(ev);
SS_TRACE_OUT
}
@@ -1922,8 +1922,8 @@ void SimpleSynth::guiNotifySampleCleared(int ch)
//d[1] = SIMPLEDRUMS_UNIQUE_ID;
//d[2] = SS_SYSEX_CLEAR_SAMPLE_OK;
//d[3] = (byte) ch;
- MidiPlayEvent ev(0, 0, ME_SYSEX, d, 2);
- //MidiPlayEvent ev(0, 0, ME_SYSEX, d, 4);
+ MusECore::MidiPlayEvent ev(0, 0, MusECore::ME_SYSEX, d, 2);
+ //MusECore::MidiPlayEvent ev(0, 0, MusECore::ME_SYSEX, d, 4);
gui->writeEvent(ev);
SS_TRACE_OUT
}
diff --git a/muse2/synti/simpledrums2/simpledrums.h b/muse2/synti/simpledrums2/simpledrums.h
index a3df0092..f76a3237 100644
--- a/muse2/synti/simpledrums2/simpledrums.h
+++ b/muse2/synti/simpledrums2/simpledrums.h
@@ -134,7 +134,7 @@ class SimpleSynth : public Mess
virtual bool nativeGuiVisible() const;
virtual bool hasNativeGui() const;
virtual bool playNote(int arg1, int arg2, int arg3);
- virtual bool processEvent(const MidiPlayEvent& arg1);
+ virtual bool processEvent(const MusECore::MidiPlayEvent& arg1);
virtual bool setController(int arg1, int arg2, int arg3);
virtual bool sysex(int arg1, const unsigned char* arg2);
virtual const char* getPatchName(int arg1, int arg2, int arg3) const;
diff --git a/muse2/synti/simpledrums2/simpledrumsgui.cpp b/muse2/synti/simpledrums2/simpledrumsgui.cpp
index d4271e1b..54063959 100644
--- a/muse2/synti/simpledrums2/simpledrumsgui.cpp
+++ b/muse2/synti/simpledrums2/simpledrumsgui.cpp
@@ -477,15 +477,15 @@ void SimpleSynthGui::readMessage(int)
}
/*!
- \fn SimpleSynthGui::processEvent(const MidiPlayEvent& ev)
+ \fn SimpleSynthGui::processEvent(const MusECore::MidiPlayEvent& ev)
*/
-void SimpleSynthGui::processEvent(const MidiPlayEvent& ev)
+void SimpleSynthGui::processEvent(const MusECore::MidiPlayEvent& ev)
{
SS_TRACE_IN
if (SS_DEBUG_MIDI) {
printf("GUI received midi event\n");
}
- if (ev.type() == ME_CONTROLLER) {
+ if (ev.type() == MusECore::ME_CONTROLLER) {
int id = ev.dataA();
int val = ev.dataB();
@@ -583,7 +583,7 @@ void SimpleSynthGui::processEvent(const MidiPlayEvent& ev)
//
// Sysexes:
//
- else if (ev.type() == ME_SYSEX) {
+ else if (ev.type() == MusECore::ME_SYSEX) {
byte* data = ev.data();
//byte* data = d + 2;
int cmd = *data;
diff --git a/muse2/synti/simpledrums2/simpledrumsgui.h b/muse2/synti/simpledrums2/simpledrumsgui.h
index 3cb11ba3..05c38cfd 100644
--- a/muse2/synti/simpledrums2/simpledrumsgui.h
+++ b/muse2/synti/simpledrums2/simpledrumsgui.h
@@ -172,7 +172,7 @@ class SimpleSynthGui : public QDialog, public Ui::SimpleDrumsGuiBase, public Mes
Q_OBJECT
private:
// MESS interface:
- virtual void processEvent(const MidiPlayEvent& ev);
+ virtual void processEvent(const MusECore::MidiPlayEvent& ev);
void setChannelVolume(int channel, int volume);
void displayPluginGui();
QGroupBox* channelButtonGroups[SS_NR_OF_CHANNELS];
diff --git a/muse2/synti/vam/vam.cpp b/muse2/synti/vam/vam.cpp
index b473188f..7928aec2 100644
--- a/muse2/synti/vam/vam.cpp
+++ b/muse2/synti/vam/vam.cpp
@@ -450,8 +450,8 @@ void VAM::processMessages()
//
while (gui->fifoSize())
{
- MidiPlayEvent ev = gui->readEvent();
- if (ev.type() == ME_CONTROLLER)
+ MusECore::MidiPlayEvent ev = gui->readEvent();
+ if (ev.type() == MusECore::ME_CONTROLLER)
{
// process local?
//setController(ev.dataA() & 0xfff, ev.dataB());
@@ -480,8 +480,8 @@ void VAM::process(float** ports, int offset, int sampleCount)
// synthesizer GUI
//
while (gui->fifoSize()) {
- MidiPlayEvent ev = gui->readEvent();
- if (ev.type() == ME_CONTROLLER) {
+ MusECore::MidiPlayEvent ev = gui->readEvent();
+ if (ev.type() == MusECore::ME_CONTROLLER) {
// process local?
setController(ev.dataA() & 0xfff, ev.dataB());
sendEvent(ev);
@@ -636,7 +636,7 @@ bool VAM::setController(int /*channel*/, int ctrl, int data)
}
setController(ctrl, data);
- MidiPlayEvent ev(0, 0, channel, ME_CONTROLLER, ctrl, data);
+ MusECore::MidiPlayEvent ev(0, 0, channel, MusECore::ME_CONTROLLER, ctrl, data);
gui->writeEvent(ev);
return false;
}
diff --git a/muse2/synti/vam/vam.h b/muse2/synti/vam/vam.h
index 54f0e465..0c628a99 100644
--- a/muse2/synti/vam/vam.h
+++ b/muse2/synti/vam/vam.h
@@ -25,7 +25,7 @@
enum {
//DCO1_PITCHMOD,
- DCO1_PITCHMOD = CTRL_RPN14_OFFSET, // p4.0.27
+ DCO1_PITCHMOD = MusECore::CTRL_RPN14_OFFSET, // p4.0.27
DCO1_WAVEFORM, DCO1_FM, DCO1_PWM,
DCO1_ATTACK, DCO1_DECAY, DCO1_SUSTAIN, DCO1_RELEASE,
DCO2_PITCHMOD, DCO2_WAVEFORM, DCO2_FM, DCO2_PWM,
diff --git a/muse2/synti/vam/vamgui.cpp b/muse2/synti/vam/vamgui.cpp
index 0993087b..31efc389 100644
--- a/muse2/synti/vam/vamgui.cpp
+++ b/muse2/synti/vam/vamgui.cpp
@@ -68,9 +68,9 @@ const char *vam_ctrl_names[] = {
struct Preset {
QString name;
int ctrl[NUM_CONTROLLER];
- void readConfiguration(Xml& xml);
- void readControl(Xml& xml);
- void writeConfiguration(Xml& xml, int level);
+ void readConfiguration(MusECore::Xml& xml);
+ void readControl(MusECore::Xml& xml);
+ void writeConfiguration(MusECore::Xml& xml, int level);
};
std::list<Preset> presets;
@@ -91,21 +91,21 @@ typedef std::list<Preset>::iterator iPreset;
// readControl
//---------------------------------------------------------
-void Preset::readControl(Xml& xml)
+void Preset::readControl(MusECore::Xml& xml)
{
int idx = 0;
int val = 0;
for (;;) {
- Xml::Token token(xml.parse());
+ MusECore::Xml::Token token(xml.parse());
const QString& tag(xml.s1());
switch (token) {
- case Xml::Error:
- case Xml::End:
+ case MusECore::Xml::Error:
+ case MusECore::Xml::End:
return;
- case Xml::TagStart:
+ case MusECore::Xml::TagStart:
xml.unknown("control");
break;
- case Xml::Attribut:
+ case MusECore::Xml::Attribut:
if (tag == "idx") {
idx = xml.s2().toInt();
if (idx >= NUM_CONTROLLER)
@@ -114,7 +114,7 @@ void Preset::readControl(Xml& xml)
else if (tag == "val")
val = xml.s2().toInt();
break;
- case Xml::TagEnd:
+ case MusECore::Xml::TagEnd:
if (tag == "control") {
ctrl[idx] = val;
return;
@@ -129,26 +129,26 @@ void Preset::readControl(Xml& xml)
// readConfiguration
//---------------------------------------------------------
-void Preset::readConfiguration(Xml& xml)
+void Preset::readConfiguration(MusECore::Xml& xml)
{
for (;;) {
- Xml::Token token(xml.parse());
+ MusECore::Xml::Token token(xml.parse());
const QString& tag(xml.s1());
switch (token) {
- case Xml::Error:
- case Xml::End:
+ case MusECore::Xml::Error:
+ case MusECore::Xml::End:
return;
- case Xml::TagStart:
+ case MusECore::Xml::TagStart:
if (tag == "control")
readControl(xml);
else
xml.unknown("preset");
break;
- case Xml::Attribut:
+ case MusECore::Xml::Attribut:
if (tag == "name")
name = xml.s2();
break;
- case Xml::TagEnd:
+ case MusECore::Xml::TagEnd:
if (tag == "preset")
return;
default:
@@ -161,10 +161,10 @@ void Preset::readConfiguration(Xml& xml)
// writeConfiguration
//---------------------------------------------------------
-void Preset::writeConfiguration(Xml& xml, int level)
+void Preset::writeConfiguration(MusECore::Xml& xml, int level)
{
//xml.tag(level++, "preset name=\"%s\"", name.ascii());
- xml.tag(level++, "preset name=\"%s\"", Xml::xmlString(name).toAscii().constData());
+ xml.tag(level++, "preset name=\"%s\"", MusECore::Xml::xmlString(name).toAscii().constData());
for (int i = 0; i < NUM_CONTROLLER; ++i) {
xml.tag(level, "control idx=\"%d\" val=\"%d\" /", i, ctrl[i]);
}
@@ -183,10 +183,10 @@ VAMGui::VAMGui()
QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read);
connect(s, SIGNAL(activated(int)), SLOT(readMessage(int)));
- loadPresets->setIcon(QIcon(*openIcon));
- savePresets->setIcon(QIcon(*saveIcon));
- savePresetsToFile->setIcon(QIcon(*saveasIcon));
- deletePreset->setIcon(QIcon(*deleteIcon));
+ loadPresets->setIcon(QIcon(*MusEGui::openIcon));
+ savePresets->setIcon(QIcon(*MusEGui::saveIcon));
+ savePresetsToFile->setIcon(QIcon(*MusEGui::saveasIcon));
+ deletePreset->setIcon(QIcon(*MusEGui::deleteIcon));
// p4.0.27 First ctrl offset.
dctrl[DCO1_PITCHMOD - VAM_FIRST_CTRL] = SynthGuiCtrl(PitchModS, LCDNumber1, SynthGuiCtrl::SLIDER);
@@ -277,7 +277,7 @@ void VAMGui::ctrlChanged(int idx)
else if (ctrl->type == SynthGuiCtrl::SWITCH) {
val = ((QCheckBox*)(ctrl->editor))->isChecked();
}
- //sendController(0, idx + CTRL_RPN14_OFFSET, val);
+ //sendController(0, idx + MusECore::CTRL_RPN14_OFFSET, val);
sendController(0, idx + VAM_FIRST_CTRL, val); // p4.0.27
}
@@ -566,9 +566,9 @@ void VAMGui::sysexReceived(const unsigned char* /*data*/, int /*len*/)
// processEvent
//---------------------------------------------------------
-void VAMGui::processEvent(const MidiPlayEvent& ev)
+void VAMGui::processEvent(const MusECore::MidiPlayEvent& ev)
{
- if (ev.type() == ME_CONTROLLER)
+ if (ev.type() == MusECore::ME_CONTROLLER)
{
//setParam(ev.dataA() & 0xfff, ev.dataB());
// p4.0.27
@@ -583,7 +583,7 @@ void VAMGui::processEvent(const MidiPlayEvent& ev)
setParam(ctl - VAM_FIRST_CTRL, ev.dataB());
}
- else if (ev.type() == ME_SYSEX)
+ else if (ev.type() == MusECore::ME_SYSEX)
sysexReceived(ev.data(), ev.len());
else
{
@@ -619,16 +619,16 @@ void VAMGui::loadPresetsPressed()
presets.clear();
presetList->clear();
- Xml xml(f);
+ MusECore::Xml xml(f);
int mode = 0;
for (;;) {
- Xml::Token token = xml.parse();
+ MusECore::Xml::Token token = xml.parse();
QString tag = xml.s1();
switch (token) {
- case Xml::Error:
- case Xml::End:
+ case MusECore::Xml::Error:
+ case MusECore::Xml::End:
return;
- case Xml::TagStart:
+ case MusECore::Xml::TagStart:
if (mode == 0 && tag == "muse")
mode = 1;
// else if (mode == 1 && tag == "instrument")
@@ -643,7 +643,7 @@ void VAMGui::loadPresetsPressed()
else if(mode != 1)
xml.unknown("SynthPreset");
break;
- case Xml::Attribut:
+ case MusECore::Xml::Attribut:
if(mode == 1 && tag == "iname") {
// fprintf(stderr, "%s\n", xml.s2().toLatin1());
if(xml.s2() != "vam-1.0")
@@ -651,7 +651,7 @@ void VAMGui::loadPresetsPressed()
else mode = 2;
}
break;
- case Xml::TagEnd:
+ case MusECore::Xml::TagEnd:
if (tag == "muse")
goto ende;
default:
@@ -692,7 +692,7 @@ void VAMGui::doSavePresets(const QString& fn, bool showWarning)
FILE* f = fopen(fn.toAscii().constData(),"w");//fileOpen(this, fn, QString(".pre"), "w", popenFlag, false, showWarning);
if (f == 0)
return;
- Xml xml(f);
+ MusECore::Xml xml(f);
xml.header();
xml.tag(0, "muse version=\"1.0\"");
xml.tag(0, "instrument iname=\"vam-1.0\" /");
diff --git a/muse2/synti/vam/vamgui.h b/muse2/synti/vam/vamgui.h
index abee3c43..b73da2ca 100644
--- a/muse2/synti/vam/vamgui.h
+++ b/muse2/synti/vam/vamgui.h
@@ -56,7 +56,7 @@ class VAMGui : public QWidget, public Ui::VAMGuiBase, public MessGui {
void addNewPreset(const QString&);
void deleteNamedPreset(const QString&);
void activatePreset(Preset* preset);
- virtual void processEvent(const MidiPlayEvent&);
+ virtual void processEvent(const MusECore::MidiPlayEvent&);
private slots:
void ctrlChanged(int idx);