From f8d78dc7d0e82ae6eda9fe5ef8152288d1b67a09 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Wed, 23 Mar 2011 11:13:12 +0000
Subject: [PATCH] Fix CELT code in JackNetOneDriver.cpp.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4218 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/JackNetOneDriver.cpp   | 4 ++--
 linux/alsa/JackAlsaDriver.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/JackNetOneDriver.cpp b/common/JackNetOneDriver.cpp
index 2fc931ed..9b6d7b89 100644
--- a/common/JackNetOneDriver.cpp
+++ b/common/JackNetOneDriver.cpp
@@ -158,7 +158,7 @@ namespace Jack
 
             if( netj.bitdepth == CELT_MODE ) {
         #if HAVE_CELT
-        #if HAVE_CELT_API_0_7
+        #if HAVE_CELT_API_0_7 || HAVE_CELT_API_0_8
                 celt_int32 lookahead;
                 CELTMode *celt_mode = celt_mode_create( netj.sample_rate, netj.period_size, NULL );
                 netj.capture_srcs = jack_slist_append(netj.capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) );
@@ -207,7 +207,7 @@ namespace Jack
 
             if( netj.bitdepth == CELT_MODE ) {
         #if HAVE_CELT
-        #if HAVE_CELT_API_0_7
+        #if HAVE_CELT_API_0_7 || HAVE_CELT_API_0_8
                 CELTMode *celt_mode = celt_mode_create( netj.sample_rate, netj.period_size, NULL );
                 netj.playback_srcs = jack_slist_append(netj.playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) );
         #else
diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp
index c2c8939e..3cbe271a 100644
--- a/linux/alsa/JackAlsaDriver.cpp
+++ b/linux/alsa/JackAlsaDriver.cpp
@@ -365,7 +365,7 @@ retry:
     }
 
     if (nframes != fEngineControl->fBufferSize)
-        jack_log("JackAlsaDriver::Read warning nframes = %ld", nframes);
+        jack_log("JackAlsaDriver::Read warning fBufferSize = %ld nframes = %ld", fEngineControl->fBufferSize, nframes);
 
     // Has to be done before read
     JackDriver::CycleIncTime();