#347 shem is always on now, forgot to remove some ifdefs after configure options wos changed to always enable

master
Karl Stavestrand 6 years ago
parent d4848c3ebd
commit 894134a2e9
  1. 3
      cava.c
  2. 6
      config.c
  3. 6
      config.h

@ -505,13 +505,10 @@ as of 0.4.0 all options are specified in config file, see in '/home/username/.co
audio.rate = 44100;
break;
#endif
#ifdef SHMEM
case INPUT_SHMEM:
thr_id = pthread_create(&p_thread, NULL, input_shmem, (void *)&audio);
// audio.rate = 44100;
break;
#endif
#ifdef PORTAUDIO
case INPUT_PORTAUDIO:
thr_id = pthread_create(&p_thread, NULL, input_portaudio, (void *)&audio);

@ -29,8 +29,8 @@ const char *input_method_names[] = {
};
const bool has_input_method[] = {
true, /** Always have at least FIFO input. */
HAS_PORTAUDIO, HAS_ALSA, HAS_PULSE, HAS_SNDIO, HAS_SHMEM,
true, /** Always have at least FIFO and shmem input. */
HAS_PORTAUDIO, HAS_ALSA, HAS_PULSE, HAS_SNDIO, true,
};
enum input_method input_method_by_name(const char *str) {
@ -500,12 +500,10 @@ bool load_config(char configPath[PATH_MAX], struct config_params *p, bool colors
p->audio_source = strdup(iniparser_getstring(ini, "input:source", SIO_DEVANY));
break;
#endif
#ifdef SHMEM
case INPUT_SHMEM:
p->audio_source =
strdup(iniparser_getstring(ini, "input:source", "/squeezelite-00:00:00:00:00:00"));
break;
#endif
#ifdef PORTAUDIO
case INPUT_PORTAUDIO:
p->audio_source = strdup(iniparser_getstring(ini, "input:source", "auto"));

@ -31,12 +31,6 @@
#define HAS_SNDIO false
#endif
#ifdef SHMEM
#define HAS_SHMEM true
#else
#define HAS_SHMEM false
#endif
// These are in order of least-favourable to most-favourable choices, in case
// multiple are supported and configured.
enum input_method {

Loading…
Cancel
Save