diff --git a/configure.ac b/configure.ac index c389342..bc256c8 100644 --- a/configure.ac +++ b/configure.ac @@ -709,7 +709,7 @@ fi # Celt low-latency audio codec. netjack transmission via internet. HAVE_CELT=false -PKG_CHECK_MODULES(CELT, celt >= 0.5.0,[HAVE_CELT=true], [true]) +PKG_CHECK_MODULES(CELT, celt >= 0.7.0,[HAVE_CELT=true], [true]) if test x$HAVE_CELT = xfalse; then AC_DEFINE(HAVE_CELT,0,"Whether CELT is available") AC_MSG_RESULT(no) diff --git a/drivers/netjack/net_driver.c b/drivers/netjack/net_driver.c index 4e09ce8..998ff8b 100644 --- a/drivers/netjack/net_driver.c +++ b/drivers/netjack/net_driver.c @@ -549,13 +549,13 @@ net_driver_attach (net_driver_t *driver) if( driver->bitdepth == 1000 ) { #if HAVE_CELT - celt_int32_t lookahead; + celt_int32 lookahead; // XXX: memory leak - CELTMode *celt_mode = celt_mode_create( driver->sample_rate, 1, driver->period_size, NULL ); + CELTMode *celt_mode = celt_mode_create( driver->sample_rate, driver->period_size, NULL ); celt_mode_info( celt_mode, CELT_GET_LOOKAHEAD, &lookahead ); driver->codec_latency = 2*lookahead; - driver->capture_srcs = jack_slist_append(driver->capture_srcs, celt_decoder_create( celt_mode ) ); + driver->capture_srcs = jack_slist_append(driver->capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) ); #endif } else { #if HAVE_SAMPLERATE @@ -597,8 +597,8 @@ net_driver_attach (net_driver_t *driver) if( driver->bitdepth == 1000 ) { #if HAVE_CELT // XXX: memory leak - CELTMode *celt_mode = celt_mode_create( driver->sample_rate, 1, driver->period_size, NULL ); - driver->playback_srcs = jack_slist_append(driver->playback_srcs, celt_encoder_create( celt_mode ) ); + CELTMode *celt_mode = celt_mode_create( driver->sample_rate, driver->period_size, NULL ); + driver->playback_srcs = jack_slist_append(driver->playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) ); #endif } else { #if HAVE_SAMPLERATE diff --git a/tools/netsource.c b/tools/netsource.c index 6e2e311..2c846c0 100644 --- a/tools/netsource.c +++ b/tools/netsource.c @@ -124,8 +124,8 @@ alloc_ports (int n_capture_audio, int n_playback_audio, int n_capture_midi, int if( bitdepth == 1000 ) { #if HAVE_CELT // XXX: memory leak - CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), 1, jack_get_buffer_size(client), NULL ); - capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode ) ); + CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), jack_get_buffer_size(client), NULL ); + capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) ); #endif } else { #if HAVE_SAMPLERATE @@ -163,8 +163,8 @@ alloc_ports (int n_capture_audio, int n_playback_audio, int n_capture_midi, int if( bitdepth == 1000 ) { #if HAVE_CELT // XXX: memory leak - CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), 1, jack_get_buffer_size(client), NULL ); - playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode ) ); + CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), jack_get_buffer_size(client), NULL ); + playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) ); #endif } else { #if HAVE_SAMPLERATE