smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 17:03:06 +01:00
Code Issues Projects Releases Wiki Activity

more latency compilation fixes

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8869 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-02-16 03:30:12 +00:00
parent bf806a87c3
commit cdcaf9bfb8
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/audioengine.cc
View file

@ -388,11 +388,13 @@ AudioEngine::_registration_callback (jack_port_id_t /*id*/, int /*reg*/, void* a
ae->PortRegisteredOrUnregistered (); /* EMIT SIGNAL */
}
#ifdef HAVE_JACK_NEW_LATENCY
void
AudioEngine::_latency_callback (jack_latency_callback_mode_t mode, void* arg)
{
return static_cast<AudioEngine *> (arg)->jack_latency_callback (mode);
}
#endif
void
AudioEngine::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn, void* arg)
@ -618,6 +620,7 @@ AudioEngine::jack_sample_rate_callback (pframes_t nframes)
return 0;
}
#ifdef HAVE_JACK_NEW_LATENCY
void
AudioEngine::jack_latency_callback (jack_latency_callback_mode_t mode)
{
@ -625,6 +628,7 @@ AudioEngine::jack_latency_callback (jack_latency_callback_mode_t mode)
_session->update_latency (mode == JackPlaybackLatency);
}
}
#endif
int
AudioEngine::_bufsize_callback (pframes_t nframes, void *arg)

2
libs/ardour/route.cc
View file

@ -3690,7 +3690,7 @@ Route::update_port_latencies (const PortSet& operands, const PortSet& feeders, b
p->set_latency_range (all_connections, playback);
DEBUG_TRACE (DEBUG::Latency, string_compose ("Port %1 %5 latency range %2 .. %3 + %4\n",
DEBUG_TRACE (DEBUG::Latency, string_compose ("Port %1 %5 latency range %2 .. %3 (including route latency of %4)\n",
p->name(),
all_connections.min,
all_connections.max,