zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-30 07:51:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace LASH_ENABLED by HAVE_LASH

Browse source 
As recommended in #587
This commit is contained in:
derselbst 2019-11-03 12:34:50 +01:00
parent 47e6cdaf50
commit 77ad8c1c87
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bindings/fluid_lash.h
View file

@ -26,8 +26,6 @@
#include "fluid_synth.h"
#define LASH_ENABLED 1
#include <lash/lash.h>
extern lash_client_t *fluid_lash_client;
#define fluid_lash_args_t lash_args_t

4
src/drivers/fluid_alsa.c
View file

@ -1141,7 +1141,7 @@ new_fluid_alsa_seq_driver(fluid_settings_t *settings,
}
/* tell the lash server our client id */
#ifdef LASH_ENABLED
#ifdef HAVE_LASH
{
int enable_lash = 0;
fluid_settings_getint(settings, "lash.enable", &enable_lash);
@ -1151,7 +1151,7 @@ new_fluid_alsa_seq_driver(fluid_settings_t *settings,
fluid_lash_alsa_client_id(fluid_lash_client, snd_seq_client_id(dev->seq_handle));
}
}
#endif /* LASH_ENABLED */
#endif /* HAVE_LASH */
fluid_atomic_int_set(&dev->should_quit, 0);

4
src/drivers/fluid_jack.c
View file

@ -263,7 +263,7 @@ new_fluid_jack_client(fluid_settings_t *settings, int isaudio, void *driver)
}
/* tell the lash server our client name */
#ifdef LASH_ENABLED
#ifdef HAVE_LASH
{
int enable_lash = 0;
fluid_settings_getint(settings, "lash.enable", &enable_lash);
@ -273,7 +273,7 @@ new_fluid_jack_client(fluid_settings_t *settings, int isaudio, void *driver)
fluid_lash_jack_client_name(fluid_lash_client, name);
}
}
#endif /* LASH_ENABLED */
#endif /* HAVE_LASH */
client_ref->server = server; /* !! takes over allocation */
server = NULL; /* Set to NULL so it doesn't get freed below */

10
src/fluidsynth.c
View file

@ -348,7 +348,7 @@ int main(int argc, char **argv)
int dump = 0;
int fast_render = 0;
static const char optchars[] = "a:C:c:dE:f:F:G:g:hijK:L:lm:nO:o:p:qR:r:sT:Vvz:";
#ifdef LASH_ENABLED
#ifdef HAVE_LASH
int connect_lash = 1;
int enabled_lash = 0; /* set to TRUE if lash gets enabled */
fluid_lash_args_t *lash_args;
@ -581,7 +581,7 @@ int main(int argc, char **argv)
break;
case 'l': /* disable LASH */
#ifdef LASH_ENABLED
#ifdef HAVE_LASH
connect_lash = 0;
#endif
break;
@ -756,7 +756,7 @@ int main(int argc, char **argv)
SetPriorityClass(GetCurrentProcess(), REALTIME_PRIORITY_CLASS);
#endif
#ifdef LASH_ENABLED
#ifdef HAVE_LASH
/* connect to the lash server */
if(connect_lash)
@ -948,7 +948,7 @@ int main(int argc, char **argv)
#endif
#ifdef LASH_ENABLED
#ifdef HAVE_LASH
if(enabled_lash)
{
@ -1132,7 +1132,7 @@ print_help(fluid_settings_t *settings)
" Attempt to connect the jack outputs to the physical ports\n");
printf(" -K, --midi-channels=[num]\n"
" The number of midi channels [default = 16]\n");
#ifdef LASH_ENABLED
#ifdef HAVE_LASH
printf(" -l, --disable-lash\n"
" Don't connect to LASH server\n");
#endif