diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2007-01-02 13:57:06 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2007-01-02 13:57:06 +0000 |
| commit | 1bddf1bc884feedb5deb5c35f08c7b9730936dae (patch) | |
| tree | bb8ef1d1fb866027a671ce3f641ee9475804c361 /gtk2_ardour/ardour_ui_options.cc | |
| parent | a3a1e4b413776cf6f0d72be831a33d8a8e6048ae (diff) | |
General SMPTE fixes mostly relating to non-integer frame rates. Please Test. Fix for sometimes entering an invalid SMPTE format by CHANGING THE SESSION FILE. ****Warning. the SMPTE frame rate will be reset to 30 NDF if you load an old sessionardour2_broken/***. Calculate the HMS verbose canvas cursor properly. Fix incorrect SMPTE display in clocks/VCC. Standardise size of SMPTE display in editor clocks. Make the zoom controls smaller (anyone with some smaller icons?).
git-svn-id: svn://localhost/ardour2/trunk@1257 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui_options.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 8bb5782cce..b69a24e95b 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -416,9 +416,9 @@ ARDOUR_UI::map_solo_model () const char* on; if (Config->get_solo_model() == InverseMute) { - on = "SoloInPlace"; + on = X_("SoloInPlace"); } else { - on = "SoloViaBus"; + on = X_("SoloViaBus"); } Glib::RefPtr<Action> act = ActionManager::get_action ("options", on); @@ -840,7 +840,7 @@ ARDOUR_UI::parameter_changed (const char* parameter_name) map_meter_falloff (); } else if (PARAM_IS ("verify-remove-last-capture")) { ActionManager::map_some_state ("options", "VerifyRemoveLastCapture", &Configuration::get_verify_remove_last_capture); - } else if (PARAM_IS ("video-pullup") || PARAM_IS ("smpte-frames-per-second")) { + } else if (PARAM_IS ("video-pullup") || PARAM_IS ("smpte-format")) { if (session) { primary_clock.set (session->audible_frame(), true); secondary_clock.set (session->audible_frame(), true); |