Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BSoftSynth: pointer style, 80 column limit

Browse Source
This commit is contained in:
Stefano Ceccherini 2014-09-21 17:40:10 +02:00
parent 36171a48e7
commit 94bfc1f561
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/kits/midi/SoftSynth.cpp
View File

@ -254,7 +254,8 @@ BSoftSynth::SetReverb(reverb_mode mode)
if (fSynth) {
// We access the table using "mode - 1" because B_REVERB_NONE == 1
ReverbSettings *rvb = &gReverbSettings[mode - 1];
fluid_synth_set_reverb(fSynth, rvb->room, rvb->damp, rvb->width, rvb->level);
fluid_synth_set_reverb(fSynth, rvb->room, rvb->damp, rvb->width,
rvb->level);
}
}
@ -521,15 +522,18 @@ BSoftSynth::_Done()
void
BSoftSynth::PlayBuffer(void * cookie, void * data, size_t size, const media_raw_audio_format & format)
BSoftSynth::PlayBuffer(void* cookie, void* data, size_t size,
const media_raw_audio_format& format)
{
BSoftSynth *synth = (BSoftSynth *)cookie;
BSoftSynth* synth = (BSoftSynth*)cookie;
// we use float samples
if (synth->fSynth)
fluid_synth_write_float(synth->fSynth, size / sizeof(float) / format.channel_count,
if (synth->fSynth) {
fluid_synth_write_float(
synth->fSynth, size / sizeof(float) / format.channel_count,
data, 0, format.channel_count,
data, 1, format.channel_count);
}
}

11
src/kits/midi/SoftSynth.h
View File

@ -29,10 +29,8 @@ class BSynth;
namespace BPrivate {
class BSoftSynth
{
class BSoftSynth {
public:
bool InitCheck();
void Unload();
@ -93,7 +91,8 @@ private:
void _Init();
void _Done();
static void PlayBuffer(void * cookie, void * data, size_t size, const media_raw_audio_format & format);
static void PlayBuffer(void* cookie, void* data, size_t size,
const media_raw_audio_format& format);
bool fInitCheck;
char* fInstrumentsFile;
@ -104,10 +103,10 @@ private:
reverb_mode fReverbMode;
bool fReverbEnabled;
fluid_synth_t *fSynth;
fluid_synth_t* fSynth;
fluid_settings_t* fSettings;
BSoundPlayer *fSoundPlayer;
BSoundPlayer* fSoundPlayer;
};
} // namespace BPrivate