diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-11-19 21:31:44 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-11-19 21:31:44 +0000 |
| commit | 8b3d0f04c13493e6026f4609a4f8138273e01c62 (patch) | |
| tree | b6a49230ee2fe2e46ab69b56b4ff62324fde42ba | |
| parent | eb1382bd9aae3d433f78d55fdee9abc071bf7dd8 (diff) | |
tweak config param for automation sampling interval, set to 500msec by default, and expose in prefs dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@13533 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 9 | ||||
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 2 | ||||
| -rw-r--r-- | libs/ardour/automation_watch.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 4bab2304a1..e001f5e908 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -973,6 +973,15 @@ RCOptionEditor::RCOptionEditor () 0, 1000, 1, 20 )); + add_option (_("Misc"), + new SpinOption<double> ( + "automation-interval-msecs", + _("Automation sampling interval (milliseconds)"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_interval_msecs), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_interval_msecs), + 1, 1000, 1, 20 + )); + /* TRANSPORT */ BoolOption* tsf; diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index ef697b4043..54de92dca5 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -166,7 +166,7 @@ CONFIG_VARIABLE (int32_t, history_depth, "history-depth", 20) CONFIG_VARIABLE (bool, use_overlap_equivalency, "use-overlap-equivalency", false) CONFIG_VARIABLE (bool, periodic_safety_backups, "periodic-safety-backups", true) CONFIG_VARIABLE (uint32_t, periodic_safety_backup_interval, "periodic-safety-backup-interval", 120) -CONFIG_VARIABLE (float, automation_interval, "automation-interval", 500) +CONFIG_VARIABLE (float, automation_interval_msecs, "automation-interval-msecs", 100) CONFIG_VARIABLE (bool, sync_all_route_ordering, "sync-all-route-ordering", true) CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", false) CONFIG_VARIABLE (bool, keep_tearoffs, "keep-tearoffs", false) diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc index 7f67bb2c03..0fa98f2133 100644 --- a/libs/ardour/automation_watch.cc +++ b/libs/ardour/automation_watch.cc @@ -132,7 +132,7 @@ void AutomationWatch::thread () { while (_run_thread) { - usleep (100000); // Config->get_automation_interval() * 10); + usleep ((useconds_t) floor (Config->get_automation_interval_msecs() * 1000)); timer (); } } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 83074fae1f..47516c544d 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1341,7 +1341,7 @@ Session::set_frame_rate (framecnt_t frames_per_second) sync_time_vars(); - Automatable::set_automation_interval (ceil ((double) frames_per_second * (0.001 * Config->get_automation_interval()))); + Automatable::set_automation_interval (ceil ((double) frames_per_second * 0.001 * Config->get_automation_interval_msecs())); clear_clicks (); |