patches from Stephane Letz for JACK, and Nimal Ratnayake for play range and play region

git-svn-id: svn://localhost/ardour2/trunk@1260 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-01-02 21:25:37 +00:00
parent 8fabcf4f76
commit b5f497c0c9
4 changed files with 30 additions and 7 deletions

View file

@ -167,7 +167,6 @@ AudioEngine::stop (bool forever)
}
bool
AudioEngine::get_sync_offset (nframes_t& offset) const
{
@ -736,8 +735,6 @@ AudioEngine::halted (void *arg)
AudioEngine* ae = static_cast<AudioEngine *> (arg);
ae->_running = false;
ae->_jack = 0;
ae->_buffer_size = 0;
ae->_frame_rate = 0;
@ -1045,9 +1042,7 @@ AudioEngine::disconnect_from_jack ()
return 0;
}
if (jack_client_close (_jack)) {
error << _("cannot shutdown connection to JACK") << endmsg;
}
jack_client_close (_jack);
_buffer_size = 0;
_frame_rate = 0;

View file

@ -1150,7 +1150,7 @@ void
Session::request_bounded_roll (nframes_t start, nframes_t end)
{
request_stop ();
Event *ev = new Event (Event::StopOnce, Event::Replace, Event::Immediate, end, 0.0);
Event *ev = new Event (Event::StopOnce, Event::Replace, end, Event::Immediate, 0.0);
queue_event (ev);
request_locate (start, true);
}