From f3eeb67c9ddc8925db293cd6cefe9e2b884c48eb Mon Sep 17 00:00:00 2001 From: Daniel Thor Kristjansson Date: Thu, 20 Dec 2012 10:47:58 -0500 Subject: [PATCH] Use jack_port_get_latency_range when available. jack_port_get_total_latency() is depreciated. --- mythtv/libs/libmyth/audio/audiooutputjack.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.cpp b/mythtv/libs/libmyth/audio/audiooutputjack.cpp index 533fceb..0f5c23b 100644 --- a/mythtv/libs/libmyth/audio/audiooutputjack.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputjack.cpp @@ -14,6 +14,7 @@ using namespace std; #include "mythcorecontext.h" #include "audiooutputjack.h" +#include "mythconfig.h" // for HAVE_JACK_PORT_GET_LATENCY_RANGE #include "mythdate.h" #define LOC QString("AOJack: ") @@ -458,11 +459,19 @@ int AudioOutputJACK::_JackGraphOrderCallback(void *arg) int AudioOutputJACK::JackGraphOrderCallback(void) { int i; - jack_nframes_t port_latency, max_latency = 0; + jack_nframes_t max_latency = 0; for (i = 0; i < channels; ++i) { - port_latency = jack_port_get_total_latency( client, ports[i] ); +#ifdef HAVE_JACK_PORT_GET_LATENCY_RANGE + jack_latency_range_t range; + jack_port_get_latency_range( + ports[i], JackPlaybackLatency, &range); + jack_nframes_t port_latency = range.max; +#else + jack_nframes_t port_latency = + jack_port_get_total_latency(client, ports[i]); +#endif if (port_latency > max_latency) max_latency = port_latency; } -- 1.7.9.5