make sndio audio and midi drivers the default. remove patch to use

jackd default sample rate by default. use SIO_LE_NATIVE.
2009-12-24 10:34:43 +00:00 · 2009-12-24 10:34:43 +00:00 · 8176f6e6e3
commit 8176f6e6e3
parent abf7fdf526
5 changed files with 41 additions and 59 deletions
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2009/10/17 07:21:35 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.8 2009/12/24 10:34:43 jakemsr Exp $

 COMMENT =		SoundFont2 software synthesizer
 DISTNAME =		fluidsynth-1.0.9
-PKGNAME =		${DISTNAME}p0
+PKGNAME =		${DISTNAME}p1

 SHARED_LIBS =		fluidsynth	0.1

--- a/audio/fluidsynth/files/fluid_sndio.c
+++ b/audio/fluidsynth/files/fluid_sndio.c
@ -123,13 +123,8 @@ new_fluid_sndio_audio_driver(fluid_settings_t* settings, fluid_synth_t* synth)

  if (fluid_settings_str_equal(settings, "audio.sample-format", "16bits")) {
    dev->par.bits = 16;
-#ifdef WORDS_BIGENDIAN
-    dev->par.le = 0;
-#else
-    dev->par.le = 1;
-#endif
+    dev->par.le = SIO_LE_NATIVE;
    dev->read = fluid_synth_write_s16;
-
  } else {
    FLUID_LOG(FLUID_ERR, "Unknown sample format");
    goto error_recovery;
@ -231,12 +226,7 @@ new_fluid_sndio_audio_driver2(fluid_settings_t* settings, fluid_audio_func_t fun
  dev->par.round = period_size;

  dev->par.bits = 16;
-#ifdef WORDS_BIGENDIAN
-  dev->par.le = 0;
-#else
-  dev->par.le = 1;
-#endif
-
+  dev->par.le = SIO_LE_NATIVE;
  dev->par.pchan = 2;
  dev->par.rate = sample_rate;

--- a/audio/fluidsynth/patches/patch-src_fluid_adriver_c
+++ b/audio/fluidsynth/patches/patch-src_fluid_adriver_c
@ -1,6 +1,6 @@
-$OpenBSD: patch-src_fluid_adriver_c,v 1.2 2009/10/15 15:44:50 jakemsr Exp $
+$OpenBSD: patch-src_fluid_adriver_c,v 1.3 2009/12/24 10:34:43 jakemsr Exp $
 --- src/fluid_adriver.c.orig	Sun Mar 15 18:02:15 2009
-+++ src/fluid_adriver.c	Tue Oct 13 20:55:26 2009
+++ src/fluid_adriver.c	Wed Dec 23 01:31:00 2009
@@ -64,6 +64,15 @@ int delete_fluid_oss_audio_driver(fluid_audio_driver_t
 void fluid_oss_audio_driver_settings(fluid_settings_t* settings);
 #endif
@ -17,10 +17,10 @@ $OpenBSD: patch-src_fluid_adriver_c,v 1.2 2009/10/15 15:44:50 jakemsr Exp $
 #if COREAUDIO_SUPPORT
 fluid_audio_driver_t* new_fluid_core_audio_driver(fluid_settings_t* settings,
 						  fluid_synth_t* synth);
-@@ -129,6 +138,13 @@ fluid_audriver_definition_t fluid_audio_drivers[] = {
-     delete_fluid_jack_audio_driver,
-     fluid_jack_audio_driver_settings },
- #endif
+@@ -122,6 +131,13 @@ void fluid_file_audio_driver_settings(fluid_settings_t
+ 
+ /* Available audio drivers, listed in order of preference */
+ fluid_audriver_definition_t fluid_audio_drivers[] = {
 +#if SNDIO_SUPPORT
 +  { "sndio",
 +    new_fluid_sndio_audio_driver,
@ -28,18 +28,20 @@ $OpenBSD: patch-src_fluid_adriver_c,v 1.2 2009/10/15 15:44:50 jakemsr Exp $
 +    delete_fluid_sndio_audio_driver,
 +    fluid_sndio_audio_driver_settings },
 +#endif
- #if ALSA_SUPPORT
-   { "alsa",
-     new_fluid_alsa_audio_driver,
-@@ -230,6 +246,8 @@ void fluid_audio_driver_settings(fluid_settings_t* set
-   fluid_settings_register_str(settings, "audio.driver", "pulseaudio", 0, NULL, NULL);
- #elif OSS_SUPPORT
-   fluid_settings_register_str(settings, "audio.driver", "oss", 0, NULL, NULL);
-+#elif SNDIO_SUPPORT
+ #if JACK_SUPPORT
+   { "jack",
+     new_fluid_jack_audio_driver,
+@@ -222,7 +238,9 @@ void fluid_audio_driver_settings(fluid_settings_t* set
+ #endif
+ 
+   /* Set the default driver */
+-#if JACK_SUPPORT
+#if SNDIO_SUPPORT
 +  fluid_settings_register_str(settings, "audio.driver", "sndio", 0, NULL, NULL);
- #elif COREAUDIO_SUPPORT
-   fluid_settings_register_str(settings, "audio.driver", "coreaudio", 0, NULL, NULL);
- #elif DSOUND_SUPPORT
+#elif JACK_SUPPORT
+   fluid_settings_register_str(settings, "audio.driver", "jack", 0, NULL, NULL);
+ #elif ALSA_SUPPORT
+   fluid_settings_register_str(settings, "audio.driver", "alsa", 0, NULL, NULL);
@@ -255,6 +273,9 @@ void fluid_audio_driver_settings(fluid_settings_t* set
 #endif
 #if OSS_SUPPORT
--- a/audio/fluidsynth/patches/patch-src_fluid_mdriver_c
+++ b/audio/fluidsynth/patches/patch-src_fluid_mdriver_c
@ -1,5 +1,5 @@
 --- src/fluid_mdriver.c.orig	Sun Mar  8 21:31:02 2009
-+++ src/fluid_mdriver.c	Tue Oct 13 21:12:59 2009
+++ src/fluid_mdriver.c	Wed Dec 23 01:32:21 2009
@@ -46,6 +46,15 @@ fluid_midi_driver_t *new_fluid_jack_midi_driver (fluid
 int delete_fluid_jack_midi_driver(fluid_midi_driver_t *p);
 #endif
@ -16,28 +16,30 @@
 /* OSS */
 #if OSS_SUPPORT
 fluid_midi_driver_t* new_fluid_oss_midi_driver(fluid_settings_t* settings,
-@@ -118,6 +127,12 @@ struct fluid_mdriver_definition_t fluid_midi_drivers[]
-     delete_fluid_alsa_seq_driver,
-     fluid_alsa_seq_driver_settings },
- #endif
+@@ -96,6 +105,12 @@ struct fluid_mdriver_definition_t {
+ 
+ 
+ struct fluid_mdriver_definition_t fluid_midi_drivers[] = {
 +#if SNDIO_SUPPORT
 +  { "sndio",
 +    new_fluid_sndio_midi_driver,
 +    delete_fluid_sndio_midi_driver,
 +    fluid_sndio_midi_driver_settings },
 +#endif
- #if WINMIDI_SUPPORT
-   { "winmidi",
-     new_fluid_winmidi_driver,
-@@ -152,6 +167,8 @@ void fluid_midi_driver_settings(fluid_settings_t* sett
-   fluid_settings_register_str(settings, "midi.driver", "jack", 0, NULL, NULL);
- #elif OSS_SUPPORT
-   fluid_settings_register_str(settings, "midi.driver", "oss", 0, NULL, NULL);
-+#elif SNDIO_SUPPORT
+ #if JACK_SUPPORT
+   { "jack",
+     new_fluid_jack_midi_driver,
+@@ -146,7 +161,9 @@ void fluid_midi_driver_settings(fluid_settings_t* sett
+   int i;
+ 
+   /* Set the default driver */
+-#if ALSA_SUPPORT
+#if SNDIO_SUPPORT
 +  fluid_settings_register_str(settings, "midi.driver", "sndio", 0, NULL, NULL);
- #elif WINMIDI_SUPPORT
-   fluid_settings_register_str(settings, "midi.driver", "winmidi", 0, NULL, NULL);
- #elif MIDISHARE_SUPPORT
+#elif ALSA_SUPPORT
+   fluid_settings_register_str(settings, "midi.driver", "alsa_seq", 0, NULL, NULL);
+ #elif JACK_SUPPORT
+   fluid_settings_register_str(settings, "midi.driver", "jack", 0, NULL, NULL);
@@ -166,6 +183,9 @@ void fluid_midi_driver_settings(fluid_settings_t* sett
 #if ALSA_SUPPORT
   fluid_settings_add_option(settings, "midi.driver", "alsa_seq");
--- a/audio/fluidsynth/patches/patch-src_fluid_synth_c
+++ b/audio/fluidsynth/patches/patch-src_fluid_synth_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-src_fluid_synth_c,v 1.2 2009/10/15 15:44:50 jakemsr Exp $
--- src/fluid_synth.c.orig	Sun Mar 15 20:01:36 2009
-+++ src/fluid_synth.c	Tue Oct 13 20:47:41 2009
-@@ -128,7 +128,7 @@ void fluid_synth_settings(fluid_settings_t* settings)
-   fluid_settings_register_int(settings, "synth.effects-channels",
- 			     2, 2, 2, 0, NULL, NULL);
-   fluid_settings_register_num(settings, "synth.sample-rate",
-			     44100.0f, 22050.0f, 96000.0f,
-+			     48000.0f, 22050.0f, 96000.0f,
- 			     0, NULL, NULL);
- }
-