From a5625544e43800ec075afe5d4d20389f3f1d088f Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 20 Aug 2021 10:29:26 -0400 Subject: [PATCH] 2021-08-20 Fred Gleason * Removed vestigal JACK dependencies from the core caed(8) code. Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ cae/cae.cpp | 15 --------------- cae/cae.h | 9 --------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8c8652e..4267b43c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22316,3 +22316,5 @@ * Cleaned up code in 'cae/'. 2021-08-20 Fred Gleason * Renamed audio driver components in caed(8). +2021-08-20 Fred Gleason + * Removed vestigal JACK dependencies from the core caed(8) code. diff --git a/cae/cae.cpp b/cae/cae.cpp index 72c64fc0..2e98c650 100644 --- a/cae/cae.cpp +++ b/cae/cae.cpp @@ -51,11 +51,6 @@ #include "driver_jack.h" volatile bool exiting=false; -#ifdef JACK -extern jack_client_t *jack_client; -#endif // JACK - -#define PRINT_COMMANDS #ifndef HAVE_SRC_CONV void src_int_to_float_array (const int *in, float *out, int len) @@ -144,9 +139,6 @@ MainObject::MainObject(QObject *parent) #endif // HAVE_MAD } } -#ifdef JACK - jack_client=NULL; -#endif // JACK // // Server Front End @@ -282,13 +274,6 @@ MainObject::MainObject(QObject *parent) struct sched_param sched_params; int result = 0; memset(&sched_params,0,sizeof(struct sched_param)); -#ifdef JACK - if(jack_client!=NULL) { - pthread_getschedparam(jack_client_thread_id(jack_client),&sched_policy, - &sched_params); - jack_running=true; - } -#endif // JACK if(rda->config()->useRealtime()) { if(!jack_running) { sched_params.sched_priority=rda->config()->realtimePriority(); diff --git a/cae/cae.h b/cae/cae.h index ac763d22..6ebd29f1 100644 --- a/cae/cae.h +++ b/cae/cae.h @@ -34,10 +34,6 @@ #include -#ifdef JACK -#include -#endif // JACK - #ifdef HAVE_TWOLAME #include #endif // HAVE_TWOLAME @@ -57,11 +53,6 @@ void src_int_to_float_array (const int *in, float *out, int len); void src_float_to_int_array (const float *in, int *out, int len); #endif // HAVE_SRC_CONV -// -// Debug Options -// -//#define PRINT_COMMANDS - // // Global CAE Definitions //