diff options
| author | Ben Loftis <ben@glw.com> | 2012-12-13 16:42:05 +0000 |
|---|---|---|
| committer | Ben Loftis <ben@glw.com> | 2012-12-13 16:42:05 +0000 |
| commit | 2292e33ee418070c4d12971a72e01eb29dfc8de9 (patch) | |
| tree | 6ed7d15db7ff0984efd2bd87f6f3cfa22adc3444 /gtk2_ardour/session_option_editor.cc | |
| parent | 1224fc07007a99a138678a800497c841f4f04e1b (diff) | |
crossfade hack and slash. removed overlap checks, overlap mode, default length, fade_is_xfade, fade_is_short, and other leftovers from previous crossfade models. Draw crossfade drags in realtime so fade_line is no longer needed. remove code for hiding crossfades during a drag. moved crossfade rect to top layer so crossfade lines dont grab mouse focus. drag-trim-with-fixed-fade-anchor is partially implemented and needs discussion
git-svn-id: svn://localhost/ardour2/branches/3.0@13659 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/session_option_editor.cc')
| -rw-r--r-- | gtk2_ardour/session_option_editor.cc | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index b0a353e5e8..aa2a7c9ccd 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -131,21 +131,9 @@ SessionOptionEditor::SessionOptionEditor (Session* s) /* FADES */ - ComboOption<CrossfadeModel>* cfm = new ComboOption<CrossfadeModel> ( - "xfade-model", - _("Crossfades are created"), - sigc::mem_fun (*_session_config, &SessionConfiguration::get_xfade_model), - sigc::mem_fun (*_session_config, &SessionConfiguration::set_xfade_model) - ); - - cfm->add (FullCrossfade, _("to span entire overlap")); - cfm->add (ShortCrossfade, _("short")); - - add_option (_("Fades"), cfm); - ComboOption<CrossfadeChoice>* cfc = new ComboOption<CrossfadeChoice> ( "xfade-choice", - _("Crossfade type"), + _("Default crossfade type"), sigc::mem_fun (*_session_config, &SessionConfiguration::get_xfade_choice), sigc::mem_fun (*_session_config, &SessionConfiguration::set_xfade_choice) ); @@ -157,15 +145,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s) add_option (_("Fades"), cfc); add_option (_("Fades"), new SpinOption<float> ( - _("short-xfade-seconds"), - _("Short crossfade length"), - sigc::mem_fun (*_session_config, &SessionConfiguration::get_short_xfade_seconds), - sigc::mem_fun (*_session_config, &SessionConfiguration::set_short_xfade_seconds), - 0, 1000, 1, 10, - _("ms"), 0.001 - )); - - add_option (_("Fades"), new SpinOption<float> ( _("destructive-xfade-seconds"), _("Destructive crossfade length"), sigc::mem_fun (*_session_config, &SessionConfiguration::get_destructive_xfade_msecs), @@ -175,13 +154,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s) )); add_option (_("Fades"), new BoolOption ( - "auto-xfade", - _("Create crossfades automatically"), - sigc::mem_fun (*_session_config, &SessionConfiguration::get_auto_xfade), - sigc::mem_fun (*_session_config, &SessionConfiguration::set_auto_xfade) - )); - - add_option (_("Fades"), new BoolOption ( "use-region-fades", _("Region fades active"), sigc::mem_fun (*_session_config, &SessionConfiguration::get_use_region_fades), @@ -243,7 +215,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s) add_option (_("Monitoring"), new BoolOption ( "auto-input", - _("Monitoring automatically follows transport state (\"auto-input\")"), + _("Track Input Monitoring automatically follows transport state (\"auto-input\")"), sigc::mem_fun (*_session_config, &SessionConfiguration::get_auto_input), sigc::mem_fun (*_session_config, &SessionConfiguration::set_auto_input) )); |