save/restore monitor processor state; key handling in torn off monitor section window

[ardour.git] / gtk2_ardour / audio_region_view.cc

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index c8d33ec2e2c9233911345a54ea1429dbf477fc81..7a0e76606ef9d14a3cfa8fb4014112adaac78091 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -29,6 +29,7 @@
 #include "ardour/audiosource.h"
 #include "ardour/audio_diskstream.h"
 #include "ardour/profile.h"
+#include "ardour/session.h"
 
 #include "pbd/memento_command.h"
 #include "pbd/stacktrace.h"
@@ -57,7 +58,6 @@
 #define MUTED_ALPHA 10
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
@@ -200,15 +200,14 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
 
        setup_fade_handle_positions ();
 
-       if (!trackview.session().config.get_show_region_fades()) {
-               set_fade_visibility (false);
-       }
+       if (!trackview.session()->config.get_show_region_fades()) {
+               set_fade_visibility (false);
+       }
 
        const string line_name = _region->name() + ":gain";
 
        if (!Profile->get_sae()) {
-               gain_line = new AudioRegionGainLine (line_name, trackview.session(), *this, *group,
-                               audio_region()->envelope());
+               gain_line = new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope());
        }
 
        if (!(_flags & EnvelopeVisible)) {
@@ -223,7 +222,8 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
 
        region_muted ();
        region_sync_changed ();
-       region_resized (BoundsChanged);
+
+       region_resized (ARDOUR::bounds_change);
        set_waveview_data_src();
        region_locked ();
        envelope_active_changed ();
@@ -232,10 +232,10 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
 
        reset_width_dependent_items (_pixel_width);
 
-       fade_in_shape->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_event), fade_in_shape, this));
-       fade_in_handle->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_handle_event), fade_in_handle, this));
-       fade_out_shape->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_event), fade_out_shape, this));
-       fade_out_handle->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_handle_event), fade_out_handle, this));
+       fade_in_shape->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_event), fade_in_shape, this));
+       fade_in_handle->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_handle_event), fade_in_handle, this));
+       fade_out_shape->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_event), fade_out_shape, this));
+       fade_out_handle->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_handle_event), fade_out_handle, this));
 
        set_colors ();
 
@@ -265,29 +265,29 @@ AudioRegionView::audio_region() const
 }
 
 void
-AudioRegionView::region_changed (Change what_changed)
+AudioRegionView::region_changed (const PropertyChange& what_changed)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &AudioRegionView::region_changed), what_changed));
-       //cerr << "AudioRegionView::region_changed() called" << endl;
+       ENSURE_GUI_THREAD (*this, &AudioRegionView::region_changed, what_changed);
+        // cerr << "AudioRegionView::region_changed() called" << endl;
 
-       RegionView::region_changed(what_changed);
+       RegionView::region_changed (what_changed);
 
-       if (what_changed & AudioRegion::ScaleAmplitudeChanged) {
+       if (what_changed.contains (ARDOUR::Properties::scale_amplitude)) {
                region_scale_amplitude_changed ();
        }
-       if (what_changed & AudioRegion::FadeInChanged) {
-               fade_in_changed ();
+       if (what_changed.contains (ARDOUR::Properties::fade_in)) {
+                fade_in_changed ();
        }
-       if (what_changed & AudioRegion::FadeOutChanged) {
+       if (what_changed.contains (ARDOUR::Properties::fade_out)) {
                fade_out_changed ();
        }
-       if (what_changed & AudioRegion::FadeInActiveChanged) {
+       if (what_changed.contains (ARDOUR::Properties::fade_in_active)) {
                fade_in_active_changed ();
        }
-       if (what_changed & AudioRegion::FadeOutActiveChanged) {
+       if (what_changed.contains (ARDOUR::Properties::fade_out_active)) {
                fade_out_active_changed ();
        }
-       if (what_changed & AudioRegion::EnvelopeActiveChanged) {
+       if (what_changed.contains (ARDOUR::Properties::envelope_active)) {
                envelope_active_changed ();
        }
 }
@@ -347,7 +347,7 @@ AudioRegionView::fade_out_active_changed ()
 void
 AudioRegionView::region_scale_amplitude_changed ()
 {
-       ENSURE_GUI_THREAD (mem_fun(*this, &AudioRegionView::region_scale_amplitude_changed));
+       ENSURE_GUI_THREAD (*this, &AudioRegionView::region_scale_amplitude_changed)
 
        for (uint32_t n = 0; n < waves.size(); ++n) {
                // force a reload of the cache
@@ -360,7 +360,7 @@ AudioRegionView::region_renamed ()
 {
        Glib::ustring str = RegionView::make_name ();
 
-       if (audio_region()->speed_mismatch (trackview.session().frame_rate())) {
+       if (audio_region()->speed_mismatch (trackview.session()->frame_rate())) {
                str = string ("*") + str;
        }
 
@@ -373,26 +373,30 @@ AudioRegionView::region_renamed ()
 }
 
 void
-AudioRegionView::region_resized (Change what_changed)
+AudioRegionView::region_resized (const PropertyChange& what_changed)
 {
        AudioGhostRegion* agr;
 
        RegionView::region_resized(what_changed);
+       PropertyChange interesting_stuff;
+
+       interesting_stuff.add (ARDOUR::Properties::start);
+       interesting_stuff.add (ARDOUR::Properties::length);
 
-       if (what_changed & Change (StartChanged|LengthChanged)) {
+       if (what_changed.contains (interesting_stuff)) {
 
-               for (uint32_t n = 0; n < waves.size(); ++n) {
-                       waves[n]->property_region_start() = _region->start();
+               for (uint32_t n = 0; n < waves.size(); ++n) {
+                       waves[n]->property_region_start() = _region->start();
                }
 
-               for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
+               for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
                        if((agr = dynamic_cast<AudioGhostRegion*>(*i)) != 0) {
 
                                for (vector<WaveView*>::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) {
                                        (*w)->property_region_start() = _region->start();
                                }
                        }
-               }
+               }
        }
 }
 
@@ -415,7 +419,7 @@ AudioRegionView::reset_width_dependent_items (double pixel_width)
                                fade_in_handle->hide();
                                fade_out_handle->hide();
                        } else {
-                               if (trackview.session().config.get_show_region_fades()) {
+                               if (trackview.session()->config.get_show_region_fades()) {
                                        fade_in_handle->show();
                                        fade_out_handle->show();
                                }
@@ -494,7 +498,7 @@ AudioRegionView::set_height (gdouble height)
                                gain_line->show ();
                        }
                }
-               gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE));
+               gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE - 2));
        }
 
        manage_zero_line ();
@@ -575,7 +579,7 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width)
                return;
        }
 
-       if (trackview.session().config.get_show_region_fades()) {
+       if (trackview.session()->config.get_show_region_fades()) {
                fade_in_shape->show();
        }
 
@@ -666,7 +670,7 @@ AudioRegionView::reset_fade_out_shape_width (nframes_t width)
                return;
        }
 
-       if (trackview.session().config.get_show_region_fades()) {
+       if (trackview.session()->config.get_show_region_fades()) {
                fade_out_shape->show();
        }
 
@@ -869,7 +873,7 @@ AudioRegionView::create_waves ()
                // cerr << "\tchannel " << n << endl;
 
                if (wait_for_data) {
-                       if (audio_region()->audio_source(n)->peaks_ready (bind (mem_fun(*this, &AudioRegionView::peaks_ready_handler), n), data_ready_connection)) {
+                       if (audio_region()->audio_source(n)->peaks_ready (boost::bind (&AudioRegionView::peaks_ready_handler, this, n), data_ready_connection, gui_context())) {
                                // cerr << "\tData is ready\n";
                                create_one_wave (n, true);
                        } else {
@@ -982,7 +986,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/)
 void
 AudioRegionView::peaks_ready_handler (uint32_t which)
 {
-       Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &AudioRegionView::create_one_wave), which, false));
+       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&AudioRegionView::create_one_wave, this, which, false));
        // cerr << "AudioRegionView::peaks_ready_handler() called on " << which << " this: " << this << endl;
 }
 
@@ -1018,21 +1022,25 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
 
        gain_line->view_to_model_coord (x, y);
 
-       trackview.session().begin_reversible_command (_("add gain control point"));
+        /* XXX STATEFUL: can't convert to stateful diff until we 
+           can represent automation data with it.
+        */
+
+       trackview.session()->begin_reversible_command (_("add gain control point"));
        XMLNode &before = audio_region()->envelope()->get_state();
 
        if (!audio_region()->envelope_active()) {
                XMLNode &region_before = audio_region()->get_state();
                audio_region()->set_envelope_active(true);
                XMLNode &region_after = audio_region()->get_state();
-               trackview.session().add_command (new MementoCommand<AudioRegion>(*(audio_region().get()), &region_before, &region_after));
+               trackview.session()->add_command (new MementoCommand<AudioRegion>(*(audio_region().get()), &region_before, &region_after));
        }
 
        audio_region()->envelope()->add (fx, y);
 
        XMLNode &after = audio_region()->envelope()->get_state();
-       trackview.session().add_command (new MementoCommand<AutomationList>(*audio_region()->envelope().get(), &before, &after));
-       trackview.session().commit_reversible_command ();
+       trackview.session()->add_command (new MementoCommand<AutomationList>(*audio_region()->envelope().get(), &before, &after));
+       trackview.session()->commit_reversible_command ();
 }
 
 void
@@ -1187,8 +1195,6 @@ AudioRegionView::add_ghost (TimeAxisView& tv)
        ghost->set_colors();
        ghosts.push_back (ghost);
 
-       ghost->GoingAway.connect (mem_fun(*this, &AudioRegionView::remove_ghost));
-
        return ghost;
 }