diff options
| author | sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2011-03-28 14:16:20 +0000 |
|---|---|---|
| committer | sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2011-03-28 14:16:20 +0000 |
| commit | 5b9c3e97120699d938504347a9eb9111246d2eb8 (patch) | |
| tree | d56b7d0e93b6d2aba62f82830f3b443311af9f82 /common/netjack_packet.c | |
| parent | dda1354ababe445ba423321f0bfa5cb57076f0ea (diff) | |
| download | jack2-5b9c3e97120699d938504347a9eb9111246d2eb8.tar.gz | |
Fix for CELT and netjack1.
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4228 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'common/netjack_packet.c')
| -rw-r--r-- | common/netjack_packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/netjack_packet.c b/common/netjack_packet.c index 69cc5c18..22829e41 100644 --- a/common/netjack_packet.c +++ b/common/netjack_packet.c @@ -1369,7 +1369,7 @@ render_payload_to_jack_ports_celt (void *packet_payload, jack_nframes_t net_peri { // audio port, decode celt data. CELTDecoder *decoder = src_node->data; - #if HAVE_CELT_API_0_8 + #if HAVE_CELT_API_0_8 | HAVE_CELT_API_0_11 if( !packet_payload ) celt_decode_float( decoder, NULL, net_period_down, buf, nframes ); else @@ -1421,7 +1421,7 @@ render_jack_ports_to_payload_celt (JSList *playback_ports, JSList *playback_srcs float *floatbuf = alloca (sizeof(float) * nframes ); memcpy( floatbuf, buf, nframes*sizeof(float) ); CELTEncoder *encoder = src_node->data; -#if HAVE_CELT_API_0_8 +#if HAVE_CELT_API_0_8 | HAVE_CELT_API_0_11 encoded_bytes = celt_encode_float( encoder, floatbuf, nframes, packet_bufX, net_period_up ); #else encoded_bytes = celt_encode_float( encoder, floatbuf, NULL, packet_bufX, net_period_up ); |