diff options
| author | nedko <nedko@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2011-04-22 13:18:01 +0000 |
|---|---|---|
| committer | nedko <nedko@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2011-04-22 13:18:01 +0000 |
| commit | c1b057874e2652179113bd0bd3251ecf80ff2876 (patch) | |
| tree | 523967a221f6e3f13ee7c1a458973b27413bf837 /common | |
| parent | f62062ad3fbd98186c9b4102260883aeb2763a37 (diff) | |
| download | jack2-c1b057874e2652179113bd0bd3251ecf80ff2876.tar.gz | |
fix build when celt is not available
when celt is not available HAVE_CELT is defined as 0.
some checks for celt were if 0, others were ifdef
now all of them are if 0
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4350 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'common')
| -rw-r--r-- | common/JackNetInterface.cpp | 8 | ||||
| -rw-r--r-- | common/JackNetOneDriver.h | 2 | ||||
| -rw-r--r-- | common/JackNetTool.cpp | 2 | ||||
| -rw-r--r-- | common/JackNetTool.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/common/JackNetInterface.cpp b/common/JackNetInterface.cpp index b9ee5e8e..bdba22ab 100644 --- a/common/JackNetInterface.cpp +++ b/common/JackNetInterface.cpp @@ -258,7 +258,7 @@ namespace Jack break; case JackCeltEncoder: - #ifdef HAVE_CELT + #if HAVE_CELT fNetAudioCaptureBuffer = new NetCeltAudioBuffer(&fParams, fParams.fSendAudioChannels, fTxData, fParams.fKBps); #endif break; @@ -280,7 +280,7 @@ namespace Jack break; case JackCeltEncoder: - #ifdef HAVE_CELT + #if HAVE_CELT fNetAudioPlaybackBuffer = new NetCeltAudioBuffer(&fParams, fParams.fReturnAudioChannels, fRxData, fParams.fKBps); #endif break; @@ -800,7 +800,7 @@ namespace Jack break; case JackCeltEncoder: - #ifdef HAVE_CELT + #if HAVE_CELT fNetAudioCaptureBuffer = new NetCeltAudioBuffer(&fParams, fParams.fSendAudioChannels, fRxData, fParams.fKBps); #endif break; @@ -822,7 +822,7 @@ namespace Jack break; case JackCeltEncoder: - #ifdef HAVE_CELT + #if HAVE_CELT fNetAudioPlaybackBuffer = new NetCeltAudioBuffer(&fParams, fParams.fReturnAudioChannels, fTxData, fParams.fKBps); #endif break; diff --git a/common/JackNetOneDriver.h b/common/JackNetOneDriver.h index 577c2f6f..b97575ae 100644 --- a/common/JackNetOneDriver.h +++ b/common/JackNetOneDriver.h @@ -41,7 +41,7 @@ class JackNetOneDriver : public JackAudioDriver render_payload_to_jack_ports_float(void *packet_payload, jack_nframes_t net_period_down, JSList *capture_ports, JSList *capture_srcs, jack_nframes_t nframes, int dont_htonl_floats); void render_jack_ports_to_payload_float(JSList *playback_ports, JSList *playback_srcs, jack_nframes_t nframes, void *packet_payload, jack_nframes_t net_period_up, int dont_htonl_floats ); -#ifdef HAVE_CELT +#if HAVE_CELT void render_payload_to_jack_ports_celt(void *packet_payload, jack_nframes_t net_period_down, JSList *capture_ports, JSList *capture_srcs, jack_nframes_t nframes); void diff --git a/common/JackNetTool.cpp b/common/JackNetTool.cpp index fe30b2c5..f4dec3a2 100644 --- a/common/JackNetTool.cpp +++ b/common/JackNetTool.cpp @@ -249,7 +249,7 @@ namespace Jack // Celt audio buffer ********************************************************************************* -#ifdef HAVE_CELT +#if HAVE_CELT #define KPS 32 #define KPS_DIV 8 diff --git a/common/JackNetTool.h b/common/JackNetTool.h index f7efae9e..9d0b3cad 100644 --- a/common/JackNetTool.h +++ b/common/JackNetTool.h @@ -558,7 +558,7 @@ namespace Jack int RenderToNetwork (int subcycle, size_t total_size ); }; -#ifdef HAVE_CELT +#if HAVE_CELT #include <celt/celt.h> |