Lines 1-5
Link Here
|
1 |
$OpenBSD: patch-src_drivers_fluid_adriver_c,v 1.1 2013/03/29 12:37:43 sthen Exp $ |
1 |
--- src/drivers/fluid_adriver.c.orig 2018-05-06 07:05:11 UTC |
2 |
--- src/drivers/fluid_adriver.c.orig 2012-08-16 04:01:13 UTC |
|
|
3 |
+++ src/drivers/fluid_adriver.c |
2 |
+++ src/drivers/fluid_adriver.c |
4 |
@@ -64,6 +64,15 @@ int delete_fluid_oss_audio_driver(fluid_ |
3 |
@@ -64,6 +64,15 @@ int delete_fluid_oss_audio_driver(fluid_ |
5 |
void fluid_oss_audio_driver_settings(fluid_settings_t* settings); |
4 |
void fluid_oss_audio_driver_settings(fluid_settings_t* settings); |
Lines 7-15
$OpenBSD: patch-src_drivers_fluid_adrive
Link Here
|
7 |
|
6 |
|
8 |
+#if SNDIO_SUPPORT |
7 |
+#if SNDIO_SUPPORT |
9 |
+fluid_audio_driver_t* new_fluid_sndio_audio_driver(fluid_settings_t* settings, |
8 |
+fluid_audio_driver_t* new_fluid_sndio_audio_driver(fluid_settings_t* settings, |
10 |
+ fluid_synth_t* synth); |
9 |
+ fluid_synth_t* synth); |
11 |
+fluid_audio_driver_t* new_fluid_sndio_audio_driver2(fluid_settings_t* settings, |
10 |
+fluid_audio_driver_t* new_fluid_sndio_audio_driver2(fluid_settings_t* settings, |
12 |
+ fluid_audio_func_t func, void* data); |
11 |
+ fluid_audio_func_t func, void* data); |
13 |
+int delete_fluid_sndio_audio_driver(fluid_audio_driver_t* p); |
12 |
+int delete_fluid_sndio_audio_driver(fluid_audio_driver_t* p); |
14 |
+void fluid_sndio_audio_driver_settings(fluid_settings_t* settings); |
13 |
+void fluid_sndio_audio_driver_settings(fluid_settings_t* settings); |
15 |
+#endif |
14 |
+#endif |
Lines 17-37
$OpenBSD: patch-src_drivers_fluid_adrive
Link Here
|
17 |
#if COREAUDIO_SUPPORT |
16 |
#if COREAUDIO_SUPPORT |
18 |
fluid_audio_driver_t* new_fluid_core_audio_driver(fluid_settings_t* settings, |
17 |
fluid_audio_driver_t* new_fluid_core_audio_driver(fluid_settings_t* settings, |
19 |
fluid_synth_t* synth); |
18 |
fluid_synth_t* synth); |
20 |
@@ -120,6 +129,13 @@ int delete_fluid_file_audio_driver(fluid |
19 |
@@ -122,6 +131,14 @@ int delete_fluid_file_audio_driver(fluid |
21 |
|
|
|
22 |
/* Available audio drivers, listed in order of preference */ |
20 |
/* Available audio drivers, listed in order of preference */ |
23 |
fluid_audriver_definition_t fluid_audio_drivers[] = { |
21 |
static const fluid_audriver_definition_t fluid_audio_drivers[] = |
|
|
22 |
{ |
24 |
+#if SNDIO_SUPPORT |
23 |
+#if SNDIO_SUPPORT |
25 |
+ { "sndio", |
24 |
+ { "sndio", |
26 |
+ new_fluid_sndio_audio_driver, |
25 |
+ new_fluid_sndio_audio_driver, |
27 |
+ new_fluid_sndio_audio_driver2, |
26 |
+ new_fluid_sndio_audio_driver2, |
28 |
+ delete_fluid_sndio_audio_driver, |
27 |
+ delete_fluid_sndio_audio_driver, |
29 |
+ fluid_sndio_audio_driver_settings }, |
28 |
+ fluid_sndio_audio_driver_settings }, |
30 |
+#endif |
29 |
+#endif |
|
|
30 |
+ |
31 |
#if JACK_SUPPORT |
31 |
#if JACK_SUPPORT |
32 |
{ "jack", |
32 |
{ "jack", |
33 |
new_fluid_jack_audio_driver, |
33 |
new_fluid_jack_audio_driver, |
34 |
@@ -223,7 +239,9 @@ void fluid_audio_driver_settings(fluid_s |
34 |
@@ -238,7 +255,9 @@ void fluid_audio_driver_settings(fluid_s |
35 |
FLUID_DEFAULT_AUDIO_RT_PRIO, 0, 99, 0, NULL, NULL); |
35 |
FLUID_DEFAULT_AUDIO_RT_PRIO, 0, 99, 0, NULL, NULL); |
36 |
|
36 |
|
37 |
/* Set the default driver */ |
37 |
/* Set the default driver */ |
Lines 42-48
$OpenBSD: patch-src_drivers_fluid_adrive
Link Here
|
42 |
fluid_settings_register_str(settings, "audio.driver", "jack", 0, NULL, NULL); |
42 |
fluid_settings_register_str(settings, "audio.driver", "jack", 0, NULL, NULL); |
43 |
#elif ALSA_SUPPORT |
43 |
#elif ALSA_SUPPORT |
44 |
fluid_settings_register_str(settings, "audio.driver", "alsa", 0, NULL, NULL); |
44 |
fluid_settings_register_str(settings, "audio.driver", "alsa", 0, NULL, NULL); |
45 |
@@ -257,6 +275,9 @@ void fluid_audio_driver_settings(fluid_s |
45 |
@@ -272,6 +291,9 @@ void fluid_audio_driver_settings(fluid_s |
46 |
#if OSS_SUPPORT |
46 |
#if OSS_SUPPORT |
47 |
fluid_settings_add_option(settings, "audio.driver", "oss"); |
47 |
fluid_settings_add_option(settings, "audio.driver", "oss"); |
48 |
#endif |
48 |
#endif |