Ticket #9920: 0001-BSynth-upgrade-synth.sf2-search-Reverb-and-GetAudio.patch

headers/os/midi/MidiDefs.h

@@ -13 +13 @@
 //------------------------------------------------------------------------------
 
 /* Synthesizer things */
-
-#define B_SYNTH_DIRECTORY    B_SYSTEM_DATA_DIRECTORY
+#define B_SYNTH_DIRECTORY    B_COMMON_DATA_DIRECTORY
+#define B_SYNTH_FILE     "synth/synth.sf2"
+/* Deprecated BeOS-era naming: */
+#define B_OLD_SYNTH_DIRECTORY    B_SYSTEM_DATA_DIRECTORY
 #define B_BIG_SYNTH_FILE     "synth/big_synth.sy"
 #define B_LITTLE_SYNTH_FILE  "synth/little_synth.sy"
 

src/kits/midi/SoftSynth.cpp

@@ -1 +1 @@
 /*
- * Copyright 2006, Haiku.
+ * Copyright 2006-2013, Haiku.
  *
  * Copyright (c) 2004-2005 Matthijs Hollemans
  * Copyright (c) 2003 Jerome Leveque
@@ -9 +9 @@
  *      Jérôme Duval
  *      Jérôme Leveque
  *      Matthijs Hollemans
+ *      Pete Goodeve
  */
 
 #include <MidiRoster.h>
 #include <MidiConsumer.h>
+#include <File.h>
 #include <FindDirectory.h>
 #include <Path.h>
 #include <string.h>
@@ -29 +31 @@
 :   fInitCheck(false),
     fSynth(NULL),
     fSettings(NULL),
+    fMonitor(NULL), 
+    fMonitorSize(0), 
     fSoundPlayer(NULL)
 {
     fInstrumentsFile = NULL;
@@ -52 +56 @@
     // didn't release our endpoints.
 
     Unload();
+    delete fMonitor;
 }
 
 
@@ -84 +89 @@
 BSoftSynth::SetDefaultInstrumentsFile()
 {
     BPath path;
-    if (B_OK == find_directory(B_SYNTH_DIRECTORY, &path, false, NULL)) {
+    status_t res = B_ERROR;
+
+    // Look for user specified SoundFont first: 
+    if (find_directory(B_USER_SETTINGS_DIRECTORY, &path, false, NULL) == B_OK) {
+        path.Append(B_SYNTH_FILE);
+        res = SetInstrumentsFile(path.Path());
+    }
+    
+    // Otherwise check for defaults:
+    if (res != B_OK && find_directory(B_USER_DATA_DIRECTORY, &path, false, NULL) == B_OK) {
+        path.Append(B_SYNTH_FILE);
+        res = SetInstrumentsFile(path.Path());
+    }
+    
+    if (res != B_OK && find_directory(B_SYNTH_DIRECTORY, &path, false, NULL) == B_OK) {
+        path.Append(B_SYNTH_FILE);
+        res = SetInstrumentsFile(path.Path());
+    }
+    
+    // If nothing else, try old naming convention:
+    if (res != B_OK && find_directory(B_SYSTEM_DATA_DIRECTORY, &path, false, NULL) == B_OK) {
         path.Append(B_BIG_SYNTH_FILE);
-        return SetInstrumentsFile(path.Path());
+        res = SetInstrumentsFile(path.Path());
     }
     
-    return B_ERROR;
+    if (res != B_OK)
+        fprintf(stderr, "No Soundfont found\n");
+
+    return res;
 }
 
 
@@ -98 +126 @@
 {
     if (path == NULL)
         return B_BAD_VALUE;
+    BFile test;
+    status_t res = test.SetTo(path, B_READ_ONLY);
+    if (res != B_OK)
+        return res;
     
     if (IsLoaded())
         Unload();
@@ -216 +248 @@
 }
 
 
+struct ReverbSettings {
+    double room, damp, width, level;
+} gReverbSettings[] = {
+    {0.0, 0.0, 0.0, 0.0},   //  Dummy (table starts at 1)
+    {0.0, 0.0, 0.0, 0.0},   //  B_REVERB_NONE
+    {0.2, 0.0, 0.5, 0.9},   //  B_REVERB_CLOSET
+    {0.5, 0.0, 0.9, 0.9},   //  B_REVERB_GARAGE
+    {0.7, 0.25, 0.9, 0.95}, //  B_REVERB_BALLROOM
+    {0.99, 0.3, 1.0, 1.0},  //  B_REVERB_CAVERN
+    {1.03, 0.6, 1.0, 1.0}   //  B_REVERB_DUNGEON
+};
+
+
 void 
 BSoftSynth::SetReverb(reverb_mode mode)
 {
-    // TODO: this function could change depending on the synth back-end.
-
+    if (mode < B_REVERB_NONE || mode > B_REVERB_DUNGEON)
+        return;
     fReverbMode = mode;
+    if (fSynth) {
+        ReverbSettings *rvb = &gReverbSettings[mode];
+        fluid_synth_set_reverb(fSynth, rvb->room, rvb->damp, rvb->width, rvb->level);
+    }
 }
 
 
@@ -444 +493 @@
         fprintf(stderr, "error in fluid_synth_sfload\n");
         return;
     }
+    
+    SetReverb(fReverbMode);
 
     media_raw_audio_format format = media_raw_audio_format::wildcard;
     format.channel_count = 2;
@@ -491 +542 @@
 
     // we use float samples
     
+    if (synth->fMonitorSize == 0) {
+        synth->fMonitor = (float *)new void *[size];
+        synth->fMonitorSize = size;
+        synth->fMonitorChans = 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);
+    memcpy(synth->fMonitor, data, size);
 }
 

src/kits/midi/SoftSynth.h

@@ -1 +1 @@
 /*
- * Copyright 2006, Haiku.
+ * Copyright 2006-2013, Haiku.
  * 
  * Copyright (c) 2004-2005 Matthijs Hollemans
  * Copyright (c) 2003 Jerome Leveque
@@ -9 +9 @@
  *      Jérôme Duval
  *      Jérôme Leveque
  *      Matthijs Hollemans
+ *      Pete Goodeve
  */
 
 #ifndef _SOFT_SYNTH_H
@@ -106 +107 @@
 
     fluid_synth_t *fSynth;
     fluid_settings_t* fSettings;
+    
+    float *fMonitor;
+    size_t fMonitorSize;
+    int16 fMonitorChans;
 
     BSoundPlayer *fSoundPlayer;
 };

src/kits/midi/Synth.cpp

@@ -1 +1 @@
 /*
- * Copyright 2006, Haiku.
+ * Copyright 2006-2013, Haiku.
  * 
  * Copyright (c) 2002-2004 Matthijs Hollemans
  * Copyright (c) 2003 Jerome Leveque
@@ -8 +8 @@
  * Authors:
  *      Jérôme Leveque
  *      Matthijs Hollemans
+ *      Pete Goodeve
  */
 
 #include <string.h>
@@ -218 +219 @@
 status_t 
 BSynth::GetAudio(int16* pLeft, int16* pRight, int32 max_samples) const
 {
-    // We don't print a "not supported" message here. That would cause
-    // significant slowdowns because applications ask for this many times.
-    
+    if (fSynth->fMonitorSize > 0) {
+        int32 nSamples = fSynth->fMonitorSize / sizeof(float) / fSynth->fMonitorChans;
+        if (nSamples > max_samples)
+            nSamples = max_samples;
+        float *sPtr = fSynth->fMonitor;
+        for (int32 i = 0; i < nSamples; i++, sPtr += fSynth->fMonitorChans) {
+            *pLeft++ = (int16)(*sPtr * 32768);
+            *pRight++ = (int16)(*(sPtr+1) * 32768);
+        }
+        return nSamples;
+    }
+
+    // Just in case there's no data:    
     memset(pLeft, 0, max_samples * sizeof(int16));
     memset(pRight, 0, max_samples * sizeof(int16));
-    
     return max_samples;
 }