summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2011-07-14 06:21:40 +0000
committerTim E. Real <termtech@rogers.com>2011-07-14 06:21:40 +0000
commitedf44d278da25cb159024fc60596b76bec227924 (patch)
tree0634d865a09cbe6702f0c3e0610c8d9f2fe4f1c7
parentf375241ea30ecbaecb341ed01bc0a29f2c35f817 (diff)
Fixed loading of old songs with synths - added static keyword to array in
each synth's oldMidiStateHeader() member.
-rw-r--r--muse2/ChangeLog3
-rw-r--r--muse2/muse/dssihost.cpp2
-rw-r--r--muse2/synti/deicsonze/deicsonze.cpp2
-rw-r--r--muse2/synti/fluidsynth/fluidsynti.cpp2
-rw-r--r--muse2/synti/organ/organ.cpp2
-rw-r--r--muse2/synti/simpledrums2/simpledrums.cpp2
-rw-r--r--muse2/synti/vam/vam.cpp2
7 files changed, 9 insertions, 6 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 260d7225..9f01c1e4 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,6 @@
+14.07.2011:
+ - Fixed loading of old songs with synths. (Tim)
+ Added static keyword to array in each synth's oldMidiStateHeader() member.
27.06.2011:
- Massively speeded up muse by using operation groups (flo93)
- Changed behaviour of middle click in all canvases to "delete" (flo93)
diff --git a/muse2/muse/dssihost.cpp b/muse2/muse/dssihost.cpp
index fd33a135..850fc8b8 100644
--- a/muse2/muse/dssihost.cpp
+++ b/muse2/muse/dssihost.cpp
@@ -1352,7 +1352,7 @@ DssiSynthIF::~DssiSynthIF()
int DssiSynthIF::oldMidiStateHeader(const unsigned char** data) const
{
- unsigned char const d[2] = {MUSE_SYNTH_SYSEX_MFG_ID, DSSI_SYNTH_UNIQUE_ID};
+ static unsigned char const d[2] = {MUSE_SYNTH_SYSEX_MFG_ID, DSSI_SYNTH_UNIQUE_ID};
*data = &d[0];
return 2;
}
diff --git a/muse2/synti/deicsonze/deicsonze.cpp b/muse2/synti/deicsonze/deicsonze.cpp
index b723e925..bffedf53 100644
--- a/muse2/synti/deicsonze/deicsonze.cpp
+++ b/muse2/synti/deicsonze/deicsonze.cpp
@@ -265,7 +265,7 @@ DeicsOnze::~DeicsOnze()
int DeicsOnze::oldMidiStateHeader(const unsigned char** data) const
{
- unsigned char const d[2] = {MUSE_SYNTH_SYSEX_MFG_ID, DEICSONZE_UNIQUE_ID};
+ static unsigned char const d[2] = {MUSE_SYNTH_SYSEX_MFG_ID, DEICSONZE_UNIQUE_ID};
*data = &d[0];
return 2;
}
diff --git a/muse2/synti/fluidsynth/fluidsynti.cpp b/muse2/synti/fluidsynth/fluidsynti.cpp
index 35ee16df..63a516ed 100644
--- a/muse2/synti/fluidsynth/fluidsynti.cpp
+++ b/muse2/synti/fluidsynth/fluidsynti.cpp
@@ -144,7 +144,7 @@ bool FluidSynth::init(const char* name)
int FluidSynth::oldMidiStateHeader(const unsigned char** data) const
{
- unsigned char const d[2] = {MUSE_SYNTH_SYSEX_MFG_ID, FLUIDSYNTH_UNIQUE_ID};
+ static unsigned char const d[2] = {MUSE_SYNTH_SYSEX_MFG_ID, FLUIDSYNTH_UNIQUE_ID};
*data = &d[0];
return 2;
}
diff --git a/muse2/synti/organ/organ.cpp b/muse2/synti/organ/organ.cpp
index f3bb3b9f..60f3f52d 100644
--- a/muse2/synti/organ/organ.cpp
+++ b/muse2/synti/organ/organ.cpp
@@ -175,7 +175,7 @@ bool Organ::init(const char* name)
int Organ::oldMidiStateHeader(const unsigned char** data) const
{
- unsigned char const d[3] = {MUSE_SYNTH_SYSEX_MFG_ID, ORGAN_UNIQUE_ID, INIT_DATA_CMD};
+ static unsigned char const d[3] = {MUSE_SYNTH_SYSEX_MFG_ID, ORGAN_UNIQUE_ID, INIT_DATA_CMD};
*data = &d[0];
return 3;
}
diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp
index 80f61102..2da4ed82 100644
--- a/muse2/synti/simpledrums2/simpledrums.cpp
+++ b/muse2/synti/simpledrums2/simpledrums.cpp
@@ -251,7 +251,7 @@ SimpleSynth::~SimpleSynth()
int SimpleSynth::oldMidiStateHeader(const unsigned char** data) const
{
- unsigned char const d[2] = {MUSE_SYNTH_SYSEX_MFG_ID, SIMPLEDRUMS_UNIQUE_ID};
+ static unsigned char const d[2] = {MUSE_SYNTH_SYSEX_MFG_ID, SIMPLEDRUMS_UNIQUE_ID};
*data = &d[0];
return 2;
}
diff --git a/muse2/synti/vam/vam.cpp b/muse2/synti/vam/vam.cpp
index 14280651..78328eb2 100644
--- a/muse2/synti/vam/vam.cpp
+++ b/muse2/synti/vam/vam.cpp
@@ -258,7 +258,7 @@ VAM::~VAM()
int VAM::oldMidiStateHeader(const unsigned char** data) const
{
- unsigned char const d[3] = {MUSE_SYNTH_SYSEX_MFG_ID, VAM_UNIQUE_ID, INIT_DATA_CMD};
+ static unsigned char const d[3] = {MUSE_SYNTH_SYSEX_MFG_ID, VAM_UNIQUE_ID, INIT_DATA_CMD};
*data = &d[0];
return 3;
}