summaryrefslogtreecommitdiff
path: root/gtk2_ardour/crossfade_edit.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/crossfade_edit.cc')
-rw-r--r--gtk2_ardour/crossfade_edit.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 33017b0566..eab26f62c3 100644
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -721,6 +721,20 @@ CrossfadeEditor::redraw ()
void
CrossfadeEditor::apply_preset (Preset *preset)
{
+
+ WhichFade wf = find(fade_in_presets->begin(), fade_in_presets->end(), preset) != fade_in_presets->end() ? In : Out;
+
+ if (current != wf) {
+
+ if (wf == In) {
+ select_in_button.clicked();
+ } else {
+ select_out_button.clicked();
+ }
+
+ curve_select_clicked (wf);
+ }
+
for (list<Point*>::iterator i = fade[current].points.begin(); i != fade[current].points.end(); ++i) {
delete *i;
}
@@ -820,6 +834,8 @@ CrossfadeEditor::reset ()
{
set (xfade->fade_in(), In);
set (xfade->fade_out(), Out);
+
+ curve_select_clicked (current);
}
void
@@ -980,14 +996,6 @@ CrossfadeEditor::curve_select_clicked (WhichFade wf)
(*i)->box->show ();
}
- for (vector<Button*>::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) {
- (*i)->set_sensitive (false);
- }
-
- for (vector<Button*>::iterator i = fade_in_buttons.begin(); i != fade_in_buttons.end(); ++i) {
- (*i)->set_sensitive (true);
- }
-
} else {
for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
@@ -1011,14 +1019,6 @@ CrossfadeEditor::curve_select_clicked (WhichFade wf)
(*i)->box->show();
}
- for (vector<Button*>::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) {
- (*i)->set_sensitive (true);
- }
-
- for (vector<Button*>::iterator i = fade_in_buttons.begin(); i != fade_in_buttons.end(); ++i) {
- (*i)->set_sensitive (false);
- }
-
}
}