diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/Output/jack/bio2jack.c | 77 |
1 files changed, 49 insertions, 28 deletions
diff --git a/src/plugins/Output/jack/bio2jack.c b/src/plugins/Output/jack/bio2jack.c index 3ef41db0d..a4b47d84a 100644 --- a/src/plugins/Output/jack/bio2jack.c +++ b/src/plugins/Output/jack/bio2jack.c @@ -74,35 +74,50 @@ static struct timeval timer_now; #endif #if TRACE_ENABLE -#define TRACE(format,args...) fprintf(OUTFILE, "%s::%s(%d) "format, __FILE__, __FUNCTION__, __LINE__,##args); \ - fflush(OUTFILE); +#define TRACE(format,args...) \ +{ \ + fprintf(OUTFILE, "%s::%s(%d) "format, __FILE__, __FUNCTION__, __LINE__,##args); \ + fflush(OUTFILE); \ +} #else #define TRACE(...) #endif #if DEBUG_OUTPUT -#define DEBUG(format,args...) fprintf(OUTFILE, "%s::%s(%d) "format, __FILE__, __FUNCTION__, __LINE__,##args); \ - fflush(OUTFILE); +#define DEBUG(format,args...) \ +{ \ + fprintf(OUTFILE, "%s::%s(%d) "format, __FILE__, __FUNCTION__, __LINE__,##args); \ + fflush(OUTFILE); \ +} #else #define DEBUG(...) #endif #if TRACE_CALLBACK -#define CALLBACK_TRACE(format,args...) fprintf(OUTFILE, "%s::%s(%d) "format, __FILE__, __FUNCTION__, __LINE__,##args); \ - fflush(OUTFILE); +#define CALLBACK_TRACE(format,args...) \ +{ \ + fprintf(OUTFILE, "%s::%s(%d) "format, __FILE__, __FUNCTION__, __LINE__,##args); \ + fflush(OUTFILE); \ +} #else #define CALLBACK_TRACE(...) #endif #if ENABLE_WARNINGS -#define WARN(format,args...) fprintf(OUTFILE, "WARN: %s::%s(%d) "format, __FILE__,__FUNCTION__,__LINE__,##args); \ - fflush(OUTFILE); +#define WARN(format,args...) \ +{ \ + fprintf(OUTFILE, "WARN: %s::%s(%d) "format, __FILE__,__FUNCTION__,__LINE__,##args); \ + fflush(OUTFILE); \ +} #else #define WARN(...) #endif -#define ERR(format,args...) fprintf(OUTFILE, "ERR: %s::%s(%d) "format, __FILE__,__FUNCTION__,__LINE__,##args); \ - fflush(OUTFILE); +#define ERR(format,args...) \ +{ \ + fprintf(OUTFILE, "ERR: %s::%s(%d) "format, __FILE__,__FUNCTION__,__LINE__,##args); \ + fflush(OUTFILE); \ +} #define min(a,b) (((a) < (b)) ? (a) : (b)) #define max(a,b) (((a) < (b)) ? (b) : (a)) @@ -2412,14 +2427,18 @@ JACK_GetMaxOutputBufferedBytes(int deviceID) jack_driver_t *drv = getDriver(deviceID); long return_val; - if(drv->pPlayPtr == 0 || drv->bytes_per_jack_output_frame == 0) return_val = 0; - - /* adjust from jack bytes to client bytes */ - return_val = - (jack_ringbuffer_read_space(drv->pPlayPtr) + - jack_ringbuffer_write_space(drv->pPlayPtr)) / - drv->bytes_per_jack_output_frame * drv->bytes_per_output_frame; - + if(drv->pPlayPtr == 0 || drv->bytes_per_jack_output_frame == 0) + { + return_val = 0; + } + else + { + /* adjust from jack bytes to client bytes */ + return_val = + (jack_ringbuffer_read_space(drv->pPlayPtr) + + jack_ringbuffer_write_space(drv->pPlayPtr)) / + drv->bytes_per_jack_output_frame * drv->bytes_per_output_frame; + } releaseDriver(drv); TRACE("return_val = %ld\n", return_val); @@ -2434,18 +2453,20 @@ JACK_GetMaxInputBufferedBytes(int deviceID) jack_driver_t *drv = getDriver(deviceID); long return_val; - if(drv->pRecPtr == 0 || drv->bytes_per_jack_input_frame == 0) return_val = 0; - - /* adjust from jack bytes to client bytes */ - return_val = - (jack_ringbuffer_read_space(drv->pRecPtr) + - jack_ringbuffer_write_space(drv->pRecPtr)) / - drv->bytes_per_jack_input_frame * drv->bytes_per_input_frame; - + if(drv->pRecPtr == 0 || drv->bytes_per_jack_input_frame == 0) + { + return_val = 0; + } + else + { + /* adjust from jack bytes to client bytes */ + return_val = + (jack_ringbuffer_read_space(drv->pRecPtr) + + jack_ringbuffer_write_space(drv->pRecPtr)) / + drv->bytes_per_jack_input_frame * drv->bytes_per_input_frame; + } releaseDriver(drv); - TRACE("return_val = %ld\n", return_val); - return return_val; } |