diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-08-31 13:23:43 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-08-31 13:23:43 +0000 |
| commit | 21d85f1854461ab6209d23e278fe289505cd106c (patch) | |
| tree | 0c6d154757bcfb6c49223e59fc75a433e8e79bb2 /gtk2_ardour/ardour_ui_options.cc | |
| parent | dde980289aaf264863186eead99fd98a67cc6862 (diff) | |
merge changes from harrison branch back into trunk, by hand
git-svn-id: svn://localhost/ardour2/trunk@878 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui_options.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 665c92d264..205180a344 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -43,7 +43,8 @@ ARDOUR_UI::setup_config_options () std::vector<Glib::ustring> groups; groups.push_back("options"); groups.push_back("Editor"); - + groups.push_back("Transport"); + struct { char* name; bool (Configuration::*method)(void) const; @@ -69,6 +70,7 @@ ARDOUR_UI::setup_config_options () { "MeterHoldShort", &Configuration::get_meter_hold_short, 'r' }, { "MeterHoldMedium", &Configuration::get_meter_hold_medium, 'r' }, { "MeterHoldLong", &Configuration::get_meter_hold_long, 'r' }, + { "ToggleVideoSync", &Configuration::get_use_video_sync, 't' }, { 0, 0, 0 } }; @@ -77,8 +79,13 @@ ARDOUR_UI::setup_config_options () Glib::RefPtr<Action> act = ActionManager::get_action (i->c_str(), options[n].name); if (act) { Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - if (options[n].act_type == 't' || (options[n].act_type == 'r' && (Config->*(options[n].method))())) - tact->set_active ((Config->*(options[n].method))()); + if (options[n].act_type == 't' || options[n].act_type == 'r') { + if ((Config->*(options[n].method))()) { + tact->set_active (true); + } else { + tact->set_active (false); + } + } continue; } } @@ -237,6 +244,16 @@ ARDOUR_UI::toggle_punch_out () toggle_session_state ("Transport", "TogglePunchOut", &Session::set_punch_out, &Session::get_punch_out); } + void +ARDOUR_UI::toggle_video_sync() +{ + Glib::RefPtr<Action> act = ActionManager::get_action ("Transport", "ToggleVideoSync"); + if (act) { + Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); + Config->set_use_video_sync (tact->get_active()); + } +} + void ARDOUR_UI::toggle_editing_space() { |