diff options
| author | Doug McLain <doug@nostar.net> | 2008-02-13 14:38:49 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2008-02-13 14:38:49 +0000 |
| commit | b248526fe35a846af0f62985c18e62e3e8817f9c (patch) | |
| tree | ce04389cc34fde7eba640aea5bb729dd850a788f /libs/ardour | |
| parent | cc19e1ef9993ad6fafb4f7fd0028ebec6a1b7f0a (diff) | |
add option to create xrun markers on the location markerbar
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3048 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/configuration_vars.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/session_transport.cc | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h index cb045091ef..d6c87a59af 100644 --- a/libs/ardour/ardour/configuration_vars.h +++ b/libs/ardour/ardour/configuration_vars.h @@ -105,6 +105,7 @@ CONFIG_VARIABLE (bool, punch_out, "punch-out", false) CONFIG_VARIABLE (bool, plugins_stop_with_transport, "plugins-stop-with-transport", false) CONFIG_VARIABLE (bool, do_not_record_plugins, "do-not-record-plugins", false) CONFIG_VARIABLE (bool, stop_recording_on_xrun, "stop-recording-on-xrun", false) +CONFIG_VARIABLE (bool, create_xrun_marker, "create-xrun-marker", false) CONFIG_VARIABLE (bool, stop_at_session_end, "stop-at-session-end", true) CONFIG_VARIABLE (bool, seamless_loop, "seamless-loop", false) CONFIG_VARIABLE (nframes_t, preroll, "preroll", 0) diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 9ad291662d..2889e73c38 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -346,7 +346,7 @@ class Session : public PBD::StatefulDestructible sigc::signal<void> TransportStateChange; /* generic */ sigc::signal<void,nframes_t> PositionChanged; /* sent after any non-sequential motion */ sigc::signal<void> DurationChanged; - sigc::signal<void> HaltOnXrun; + sigc::signal<void,nframes_t> Xrun; sigc::signal<void> TransportLooped; sigc::signal<void,RouteList&> RouteAdded; diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 9aeb5a0e57..1c44830954 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -1229,9 +1229,9 @@ Session::engine_halted () void Session::xrun_recovery () { - if (Config->get_stop_recording_on_xrun() && actively_recording()) { + Xrun (transport_frame()); //EMIT SIGNAL - HaltOnXrun (); /* EMIT SIGNAL */ + if (Config->get_stop_recording_on_xrun() && actively_recording()) { /* it didn't actually halt, but we need to handle things in the same way. |