From 98fc075356be8ec15dfc9d35f96d581c840ceee8 Mon Sep 17 00:00:00 2001 From: sletz Date: Tue, 29 Mar 2011 09:46:19 +0000 Subject: [PATCH] Typos. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4231 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackNetOneDriver.cpp | 4 ++-- common/netjack_packet.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/JackNetOneDriver.cpp b/common/JackNetOneDriver.cpp index 641ba5c9..93adecdd 100644 --- a/common/JackNetOneDriver.cpp +++ b/common/JackNetOneDriver.cpp @@ -702,7 +702,7 @@ namespace Jack // audio port, decode celt data. CELTDecoder *decoder = (CELTDecoder *)src_node->data; - #if HAVE_CELT_API_0_8 | HAVE_CELT_API_0_11 + #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 @@ -758,7 +758,7 @@ namespace Jack jack_default_audio_sample_t *floatbuf = (jack_default_audio_sample_t *)alloca (sizeof(jack_default_audio_sample_t) * nframes ); memcpy( floatbuf, buf, nframes * sizeof(jack_default_audio_sample_t) ); CELTEncoder *encoder = (CELTEncoder *)src_node->data; - #if HAVE_CELT_API_0_8 | HAVE_CELT_API_0_11 + #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 ); diff --git a/common/netjack_packet.c b/common/netjack_packet.c index 58e80d4b..638e3d82 100644 --- a/common/netjack_packet.c +++ b/common/netjack_packet.c @@ -1365,7 +1365,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 | HAVE_CELT_API_0_11 + #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 @@ -1417,7 +1417,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 | HAVE_CELT_API_0_11 +#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 );