ardour/livetrax
13
0
Fork 0
Code

move timecode-is-clock-synced option to global configuration parameters, not per session

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13235 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-10-10 22:56:21 +00:00
parent d5b5c78e0e
commit 71b7326576
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk2_ardour/rc_option_editor.cc
View File

@ -1016,13 +1016,20 @@ RCOptionEditor::RCOptionEditor ()
BoolOption* tsf = new BoolOption (
"timecode-sync-frame-rate",
_("Force Ardour's timecode rate to match timecode master"),
_("Force Ardour's timecode rate to match an external source"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_sync_frame_rate),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_sync_frame_rate)
);
tsf->set_note (_("If off, Ardour will chase the master but will use its own timecode frame rate"));
tsf->set_note (_("If off, slaving to timecode will cause Ardour to chase the external sync source\nbut it will use its own timecode frame rate"));
add_option (_("Transport"), tsf);
add_option (_("Transport"), new BoolOption (
"timecode-source-is-synced",
_("Timecode source shares sample clock with audio interface"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_is_synced),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_is_synced)
));
/* EDITOR */
add_option (_("Editor"),

7
gtk2_ardour/session_option_editor.cc
View File

@ -83,13 +83,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
add_option (_("Timecode"), spf);
add_option (_("Timecode"), new BoolOption (
"timecode-source-is-synced",
_("Timecode source shares sample clock with audio interface"),
sigc::mem_fun (*_session_config, &SessionConfiguration::get_timecode_source_is_synced),
sigc::mem_fun (*_session_config, &SessionConfiguration::set_timecode_source_is_synced)
));
ComboOption<float>* vpu = new ComboOption<float> (
"video-pullup",
_("Pull-up / pull-down"),

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

@ -45,6 +45,7 @@ CONFIG_VARIABLE (int32_t, mmc_send_device_id, "mmc-send-device-id", 0)
CONFIG_VARIABLE (int32_t, initial_program_change, "initial-program-change", -1)
CONFIG_VARIABLE (int, mtc_qf_speed_tolerance, "mtc-qf-speed-tolerance", 5)
CONFIG_VARIABLE (bool, timecode_sync_frame_rate, "timecode-sync-frame-rate", true)
CONFIG_VARIABLE (bool, timecode_source_is_synced, "timecode-source-is-synced", true)
CONFIG_VARIABLE (bool, first_midi_bank_is_zero, "diplay-first-midi-bank-as-zero", false)
/* control surfaces */

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

@ -46,7 +46,6 @@ CONFIG_VARIABLE_SPECIAL(std::string, audio_search_path, "audio-search-path", "",
CONFIG_VARIABLE_SPECIAL(std::string, midi_search_path, "midi-search-path", "", search_path_expand)
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)

4
libs/ardour/session_process.cc
View File

@ -513,7 +513,7 @@ Session::follow_slave (pframes_t nframes)
slave_speed = 0.0f;
}
if (_slave->is_always_synced() || config.get_timecode_source_is_synced()) {
if (_slave->is_always_synced() || Config->get_timecode_source_is_synced()) {
/* if the TC source is synced, then we assume that its
speed is binary: 0.0 or 1.0
@ -541,7 +541,7 @@ Session::follow_slave (pframes_t nframes)
_slave_state, slave_transport_frame, slave_speed, this_delta, average_slave_delta));
if (_slave_state == Running && !_slave->is_always_synced() && !config.get_timecode_source_is_synced()) {
if (_slave_state == Running && !_slave->is_always_synced() && !Config->get_timecode_source_is_synced()) {
if (_transport_speed != 0.0f) {