ardour/livetrax
13
0
Fork 0
Code

patch from robin to fix where the transport start occurs when exporting (#4098)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13305 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-10-17 22:33:02 +00:00
parent 97eb00274f
commit aa3fe77d7f
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/session.h
View File

@ -964,6 +964,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
framepos_t post_export_position;
bool _exporting;
bool _export_started;
bool _export_rolling;
boost::shared_ptr<ExportHandler> export_handler;

16
libs/ardour/session_export.cc
View File

@ -106,6 +106,7 @@ Session::start_audio_export (framepos_t position)
{
if (!_exporting) {
pre_export ();
_export_started = false;
}
/* We're about to call Track::seek, so the butler must have finished everything
@ -145,11 +146,6 @@ Session::start_audio_export (framepos_t position)
since then has re-awakened it.
*/
set_transport_speed (1.0, false);
butler_transport_work ();
g_atomic_int_set (&_butler->should_do_transport_work, 0);
post_transport ();
/* we are ready to go ... */
if (!_engine.connected()) {
@ -193,6 +189,16 @@ Session::process_export (pframes_t nframes)
int
Session::process_export_fw (pframes_t nframes)
{
if (!_export_started) {
_export_started=true;
set_transport_speed (1.0, false);
butler_transport_work ();
g_atomic_int_set (&_butler->should_do_transport_work, 0);
post_transport ();
return 0;
}
_engine.main_thread()->get_buffers ();
process_export (nframes);
_engine.main_thread()->drop_buffers ();