aboutsummaryrefslogtreecommitdiffstats
path: root/audio_read.c
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-07-22 20:47:24 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-07-22 20:47:40 +0200
commitc22a202a672b93fbc7faee4d4c3c5c1e5c145485 (patch)
tree5a4ca63a343ce41918f8a81ce58638c42ae94518 /audio_read.c
parent146795d6862680b7cb5e57fc72e9e18e1d47d2d3 (diff)
downloadtoolame-dab-c22a202a672b93fbc7faee4d4c3c5c1e5c145485.tar.gz
toolame-dab-c22a202a672b93fbc7faee4d4c3c5c1e5c145485.tar.bz2
toolame-dab-c22a202a672b93fbc7faee4d4c3c5c1e5c145485.zip
Add compile-time option for JACK input
Diffstat (limited to 'audio_read.c')
-rw-r--r--audio_read.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/audio_read.c b/audio_read.c
index ca1e603..e7a901c 100644
--- a/audio_read.c
+++ b/audio_read.c
@@ -11,6 +11,7 @@
#include "audio_read.h"
#include "vlc_input.h"
+#if defined(JACK_INPUT)
jack_port_t *input_port_left;
jack_port_t *input_port_right;
jack_client_t *client;
@@ -170,6 +171,7 @@ void jack_shutdown(void *arg)
pthread_cond_signal(&data_ready);
}
+#endif // defined(JACK_INPUT)
/************************************************************************
*
@@ -201,7 +203,9 @@ unsigned long read_samples (music_in_t* musicin, short sample_buffer[2304],
else
samples_read = samples_to_read;
- if (glopts.input_select == INPUT_SELECT_JACK) {
+ if (0) { }
+#if defined(JACK_INPUT)
+ else if (glopts.input_select == INPUT_SELECT_JACK) {
int f = 2;
while (jack_ringbuffer_read_space(rb) < f * samples_read) {
/* wait until process() signals more data */
@@ -230,6 +234,7 @@ unsigned long read_samples (music_in_t* musicin, short sample_buffer[2304],
free(jack_sample_buffer);
}
+#endif // defined(JACK_INPUT)
else if (glopts.input_select == INPUT_SELECT_WAV) {
if ((samples_read =
fread (sample_buffer, sizeof (short), (int) samples_read,