diff options
| author | Florian Jung <flo@windfisch.org> | 2011-10-08 13:47:24 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-10-08 13:47:24 +0000 |
| commit | a347445db32f51562aee5c6a786c312d1f612d2f (patch) | |
| tree | ba3dc9a6e03eec2edf2c213b7f4d7e5e49903edc /muse2/synti/fluidsynth/fluidsynti.h | |
| parent | 375d6a53630f364c6560eb40255a8cc4c0496b8c (diff) | |
| parent | 5367067f7a36dce8a362dcc000d41ac581bffdfe (diff) | |
merged namespace changes. HOPEFULLY the last one.
Diffstat (limited to 'muse2/synti/fluidsynth/fluidsynti.h')
| -rw-r--r-- | muse2/synti/fluidsynth/fluidsynti.h | 28 |
1 files changed, 14 insertions, 14 deletions
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; |