smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-29 09:57:44 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13659 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Ben Loftis 2012-12-13 16:42:05 +00:00
parent 1224fc0700
commit 2292e33ee4
16 changed files with 134 additions and 585 deletions
Download patch file Download diff file Expand all files Collapse all files

32
gtk2_ardour/session_option_editor.cc
View file

@ -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)
);
@ -156,15 +144,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"),
@ -174,13 +153,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
_("ms")
));
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"),
@ -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)
));