diff options
| author | Florian Jung <flo@windfisch.org> | 2011-06-28 12:38:56 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-06-28 12:38:56 +0000 |
| commit | 1ee2c8cb621fdc9b165b891f6d8d4607dadabf9b (patch) | |
| tree | 27174350316c57d48f8ecaad54f7919f0ba106e1 /muse2/synti/fluid/fluid.h | |
| parent | 2f4a98c62adf7241944ea7949d4b6a50d4b4af36 (diff) | |
| parent | 933aeb536f3d90eb38bc96308de628eeedd81755 (diff) | |
merged with current trunk. i hope this works...
Diffstat (limited to 'muse2/synti/fluid/fluid.h')
| -rw-r--r-- | muse2/synti/fluid/fluid.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/muse2/synti/fluid/fluid.h b/muse2/synti/fluid/fluid.h index e80f1463..02b111e4 100644 --- a/muse2/synti/fluid/fluid.h +++ b/muse2/synti/fluid/fluid.h @@ -20,8 +20,9 @@ #include <list> #include <fluidsynth.h> #include "libsynti/mess.h" +#include "common_defs.h" -enum SfOp { SF_REPLACE = 1, SF_ADD, SF_REMOVE }; +//enum SfOp { SF_REPLACE = 1, SF_ADD, SF_REMOVE }; class FLUIDGui; //--------------------------------------------------------- @@ -73,8 +74,12 @@ class ISynth : public Mess { public: ISynth(); - ~ISynth(); + virtual ~ISynth(); + // This is only a kludge required to support old songs' midistates. Do not use in any new synth. + // Note for Fluid, do nothing because unlike other synths, Fluid already had correct sysex headers. + //virtual int oldMidiStateHeader(const unsigned char** data) const; + fluid_synth_t* synth() { return _fluidsynth; } const fluid_synth_t* synth() const { return _fluidsynth; } char* getFont() const { return sfont; } |