X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=ba5b9a1ce115f9cc38a470e3686f2afb54f2a377;hb=aa60114843f4990ef93ba83974501495ddda358b;hp=c71abe8676aa361c7bc0c974b096be7ded4a31d4;hpb=486020b4032da9bbb20fafd83ec6f10263c892e5;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index c71abe8676..ba5b9a1ce1 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -249,55 +249,6 @@ AudioRegionView::fade_out_changed () { reset_fade_out_shape (); } - -void -AudioRegionView::set_fade_in_shape (AudioRegion::FadeShape shape) -{ - AutomationList& alist = audio_region()->fade_in(); - XMLNode& before (alist.get_state()); - trackview.session().begin_reversible_command ("fade in shape"); - audio_region()->set_fade_in_shape (shape); - XMLNode& after (alist.get_state()); - trackview.session().add_command (new MementoCommand(alist, &before, &after)); - trackview.session().commit_reversible_command (); -} - -void -AudioRegionView::set_fade_out_shape (AudioRegion::FadeShape shape) -{ - AutomationList& alist = audio_region()->fade_out(); - XMLNode& before (alist.get_state()); - trackview.session().begin_reversible_command ("fade out shape"); - audio_region()->set_fade_out_shape (shape); - XMLNode& after (alist.get_state()); - trackview.session().add_command (new MementoCommand(alist, &before, &after)); - trackview.session().commit_reversible_command (); -} - -void -AudioRegionView::set_fade_in_active (bool yn) -{ - AutomationList& alist = audio_region()->fade_in(); - XMLNode& before (alist.get_state()); - trackview.session().begin_reversible_command ("fade in shape"); - audio_region()->set_fade_in_active (yn); - XMLNode& after (alist.get_state()); - trackview.session().add_command (new MementoCommand(alist, &before, &after)); - trackview.session().commit_reversible_command (); -} - -void -AudioRegionView::set_fade_out_active (bool yn) -{ - AutomationList& alist = audio_region()->fade_out(); - XMLNode& before (alist.get_state()); - trackview.session().begin_reversible_command ("fade out shape"); - audio_region()->set_fade_out_active (yn); - XMLNode& after (alist.get_state()); - trackview.session().add_command (new MementoCommand(alist, &before, &after)); - trackview.session().commit_reversible_command (); -} - void AudioRegionView::fade_in_active_changed () { @@ -716,6 +667,7 @@ AudioRegionView::show_region_editor () } editor->present (); + editor->show_all(); } void @@ -785,7 +737,7 @@ AudioRegionView::create_waves () for (uint32_t n = 0; n < nchans; ++n) { tmp_waves.push_back (0); } - + for (uint32_t n = 0; n < nchans; ++n) { if (n >= audio_region()->n_channels()) { @@ -876,7 +828,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct) break; } } - + if (n == nwaves && waves.empty()) { /* all waves are ready */ tmp_waves.resize(nwaves);