From 86dda29be798073d3d8b08aa833b52773b41daad Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 16 May 2009 01:53:43 +0000 Subject: Move some sync-related options to being session variables. git-svn-id: svn://localhost/ardour2/branches/3.0@5083 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/rc_configuration_vars.h | 6 ------ libs/ardour/ardour/session_configuration_vars.h | 3 +++ libs/ardour/audioengine.cc | 8 ++++---- libs/ardour/session.cc | 2 +- libs/ardour/session_state.cc | 4 ++-- libs/ardour/session_time.cc | 2 +- libs/ardour/session_transport.cc | 2 +- 7 files changed, 12 insertions(+), 15 deletions(-) (limited to 'libs') diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index f90cde88c3..7f319cf2b2 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -113,12 +113,6 @@ CONFIG_VARIABLE (bool, secondary_clock_delta_edit_cursor, "secondary-clock-delta CONFIG_VARIABLE (bool, show_track_meters, "show-track-meters", true) CONFIG_VARIABLE (bool, locate_while_waiting_for_sync, "locate-while-waiting-for-sync", false) -/* timecode and sync */ - -CONFIG_VARIABLE (bool, jack_time_master, "jack-time-master", true) -CONFIG_VARIABLE (bool, use_video_sync, "use-video-sync", false) -CONFIG_VARIABLE (float, video_pullup, "video-pullup", 0.0f) - /* metering */ CONFIG_VARIABLE (float, meter_hold, "meter-hold", 100.0f) diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h index d99fc031d8..51dbc3dad9 100644 --- a/libs/ardour/ardour/session_configuration_vars.h +++ b/libs/ardour/ardour/session_configuration_vars.h @@ -42,3 +42,6 @@ CONFIG_VARIABLE (LayerModel, layer_model, "layer-model", MoveAddHigher) CONFIG_VARIABLE (std::string, auditioner_output_left, "auditioner-output-left", "default") CONFIG_VARIABLE (std::string, auditioner_output_right, "auditioner-output-right", "default") CONFIG_VARIABLE (bool, timecode_source_is_synced, "timecode-source-is-synced", true) +CONFIG_VARIABLE (bool, jack_time_master, "jack-time-master", true) +CONFIG_VARIABLE (bool, use_video_sync, "use-video-sync", false) +CONFIG_VARIABLE (float, video_pullup, "video-pullup", 0.0f) diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 3e1ba8b2d9..1dc646b610 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -178,7 +178,7 @@ AudioEngine::start () jack_set_sync_callback (_jack, _jack_sync_callback, this); jack_set_freewheel_callback (_jack, _freewheel_callback, this); - if (Config->get_jack_time_master()) { + if (session && session->config.get_jack_time_master()) { jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this); } @@ -1090,8 +1090,8 @@ AudioEngine::transport_state () int AudioEngine::reset_timebase () { - if (_jack) { - if (Config->get_jack_time_master()) { + if (_jack && session) { + if (session->config.get_jack_time_master()) { return jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this); } else { return jack_release_timebase (_jack); @@ -1285,7 +1285,7 @@ AudioEngine::reconnect_to_jack () jack_set_sync_callback (_jack, _jack_sync_callback, this); jack_set_freewheel_callback (_jack, _freewheel_callback, this); - if (Config->get_jack_time_master()) { + if (session && session->config.get_jack_time_master()) { jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this); } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index bd20384144..eebde5ffa7 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -543,7 +543,7 @@ Session::when_engine_running () _engine.transport_stop (); } - if (Config->get_jack_time_master()) { + if (config.get_jack_time_master()) { _engine.transport_locate (_transport_frame); } diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 6af308a9b8..4d07a6c6e2 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -230,7 +230,7 @@ Session::first_stage_init (string fullpath, string snapshot_name) process_function = &Session::process_with_events; - if (Config->get_use_video_sync()) { + if (config.get_use_video_sync()) { waiting_for_sync_offset = true; } else { waiting_for_sync_offset = false; @@ -3062,7 +3062,7 @@ Session::config_changed (std::string p, bool ours) } else if (p == "use-video-sync") { - waiting_for_sync_offset = Config->get_use_video_sync(); + waiting_for_sync_offset = config.get_use_video_sync(); } else if (p == "mmc-control") { diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc index 223c30bd1a..4e4c066ba4 100644 --- a/libs/ardour/session_time.cc +++ b/libs/ardour/session_time.cc @@ -150,7 +150,7 @@ Session::smpte_drop_frames() const void Session::sync_time_vars () { - _current_frame_rate = (nframes_t) round (_base_frame_rate * (1.0 + (Config->get_video_pullup()/100.0))); + _current_frame_rate = (nframes_t) round (_base_frame_rate * (1.0 + (config.get_video_pullup()/100.0))); _frames_per_smpte_frame = (double) _current_frame_rate / (double) smpte_frames_per_second(); if (smpte_drop_frames()) { _frames_per_hour = (long)(107892 * _frames_per_smpte_frame); diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index ccdbbb3ef6..b3fa34419a 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -180,7 +180,7 @@ Session::realtime_stop (bool abort) target_phi = 0; phase = 0; - if (Config->get_use_video_sync()) { + if (config.get_use_video_sync()) { waiting_for_sync_offset = true; } -- cgit v1.2.3