diff options
author | Robin Gareus <robin@gareus.org> | 2013-01-09 15:47:19 +0000 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-01-09 15:47:19 +0000 |
commit | 5da4e2be2def7a60116c097154659aaf317e5c88 (patch) | |
tree | ca88a68bd597284232a278459929ed556eacb595 | |
parent | f402a63a0effb704ac25d0a2165c2f469755202b (diff) |
remove timecode subframe configuration
There is no actual use-case to set it to anything else than 100.
timecode subframes are only used for ruler marks and the snap to grid.
libtimecode is still /aware/ of the subframe setting.
git-svn-id: svn://localhost/ardour2/branches/3.0@13817 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/editor_actions.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/session_option_editor.cc | 12 | ||||
-rw-r--r-- | libs/ardour/ltc_slave.cc | 1 | ||||
-rw-r--r-- | libs/ardour/mtc_slave.cc | 1 |
4 files changed, 0 insertions, 16 deletions
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 6fc16c85c5..54c36218f0 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -1447,8 +1447,6 @@ Editor::parameter_changed (std::string p) update_region_fade_visibility (); } else if (p == "edit-mode") { edit_mode_selector.set_active_text (edit_mode_to_string (Config->get_edit_mode())); - } else if (p == "subframes-per-frame") { - update_just_timecode (); } else if (p == "show-track-meters") { toggle_meter_updating(); } else if (p == "show-summary") { diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index 2b5c480503..45c0c803a3 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -60,18 +60,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s) add_option (_("Timecode"), smf); - ComboOption<uint32_t>* spf = new ComboOption<uint32_t> ( - "subframes-per-frame", - _("Subframes per frame"), - sigc::mem_fun (*_session_config, &SessionConfiguration::get_subframes_per_frame), - sigc::mem_fun (*_session_config, &SessionConfiguration::set_subframes_per_frame) - ); - - spf->add (80, _("80")); - spf->add (100, _("100")); - - add_option (_("Timecode"), spf); - _vpu = new ComboOption<float> ( "video-pullup", _("Pull-up / pull-down"), diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index f063e830c1..7fdc2cdedf 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -95,7 +95,6 @@ void LTC_Slave::parameter_changed (std::string const & p) { if (p == "slave-timecode-offset" - || p == "subframes-per-frame" || p == "timecode-format" ) { parse_timecode_offset(); diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index dcc51ee5c8..eadc40646b 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -118,7 +118,6 @@ void MTC_Slave::parameter_changed (std::string const & p) { if (p == "slave-timecode-offset" - || p == "subframes-per-frame" || p == "timecode-format" ) { parse_timecode_offset(); |