X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=d490ede63b4e7380064078ba33b322fb4e531099;hb=b1c3a224983a6b0cc5c5bb4b042d15f1d67ae5b3;hp=4ca50c241d9e9b1d45c86721403d39ee82eea734;hpb=046f8026628a52adeb6983948e39b2665f4c0b49;p=ardour.git

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 4ca50c241d..d490ede63b 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -27,8 +27,8 @@
 #include "ardour/playlist.h"
 #include "ardour/audioregion.h"
 #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 +57,6 @@
 #define MUTED_ALPHA 10
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
@@ -111,7 +110,6 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other)
 	, _amplitude_above_axis(1.0)
 	, _flags(0)
 	, fade_color(0)
-
 {
 	Gdk::Color c;
 	int r,g,b,a;
@@ -133,7 +131,6 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt
 	, _amplitude_above_axis(1.0)
 	, _flags(0)
 	, fade_color(0)
-
 {
 	Gdk::Color c;
 	int r,g,b,a;
@@ -165,7 +162,8 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
 		store_flags ();
 	}
 
-	if (trackview.editor().new_regionviews_display_gain()) {
+	/* make envelope visible if it has anything interesting in it */
+	if (audio_region()->envelope()->size() > 2) {
 		_flags |= EnvelopeVisible;
 	}
 
@@ -200,15 +198,14 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
 
 	setup_fade_handle_positions ();
 
-	if (!trackview.session().config.get_show_region_fades()) {
+	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 +220,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 +230,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 ();
 
@@ -252,6 +250,10 @@ AudioRegionView::~AudioRegionView ()
 		gnome_canvas_waveview_cache_destroy (*cache);
 	}
 
+	for (vector<ScopedConnection*>::iterator i = _data_ready_connections.begin(); i != _data_ready_connections.end(); ++i) {
+		delete *i;
+	}
+
 	/* all waveviews etc will be destroyed when the group is destroyed */
 
 	delete gain_line;
@@ -265,29 +267,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 +349,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 +362,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,13 +375,17 @@ 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;
 
-	if (what_changed & Change (StartChanged|LengthChanged)) {
+	interesting_stuff.add (ARDOUR::Properties::start);
+	interesting_stuff.add (ARDOUR::Properties::length);
+
+	if (what_changed.contains (interesting_stuff)) {
 
 		for (uint32_t n = 0; n < waves.size(); ++n) {
 			waves[n]->property_region_start() = _region->start();
@@ -415,7 +421,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();
 				}
@@ -469,24 +475,23 @@ AudioRegionView::set_height (gdouble height)
 	// FIXME: ick
 	height -= 2;
 
-	_height = height;
-
-	for (uint32_t n=0; n < wcnt; ++n) {
+	for (uint32_t n = 0; n < wcnt; ++n) {
 		gdouble ht;
 
 		if ((height) < NAME_HIGHLIGHT_THRESH) {
-			ht = ((height-2*wcnt) / (double) wcnt);
+			ht = ((height - 2 * wcnt) / (double) wcnt);
 		} else {
-			ht = (((height-2*wcnt) - NAME_HIGHLIGHT_SIZE) / (double) wcnt);
+			ht = (((height - 2 * wcnt) - NAME_HIGHLIGHT_SIZE) / (double) wcnt);
 		}
 
-		gdouble yoff = n * (ht+1);
+		gdouble yoff = n * (ht + 1);
 
 		waves[n]->property_height() = ht;
 		waves[n]->property_y() = yoff + 2;
 	}
 
 	if (gain_line) {
+
 		if ((height/wcnt) < NAME_HIGHLIGHT_THRESH) {
 			gain_line->hide ();
 		} else {
@@ -494,7 +499,8 @@ AudioRegionView::set_height (gdouble height)
 				gain_line->show ();
 			}
 		}
-		gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE - 2));
+
+		gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE) - 2);
 	}
 
 	manage_zero_line ();
@@ -503,7 +509,6 @@ AudioRegionView::set_height (gdouble height)
 	if (name_pixbuf) {
 		name_pixbuf->raise_to_top();
 	}
-
 }
 
 void
@@ -575,7 +580,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 +671,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();
 	}
 
@@ -844,11 +849,11 @@ AudioRegionView::create_waves ()
 	// cerr << "AudioRegionView::create_waves() called on " << this << endl;//DEBUG
 	RouteTimeAxisView& atv (*(dynamic_cast<RouteTimeAxisView*>(&trackview))); // ick
 
-	if (!atv.get_diskstream()) {
+	if (!atv.track()) {
 		return;
 	}
 
-	ChanCount nchans = atv.get_diskstream()->n_channels();
+	ChanCount nchans = atv.track()->n_channels();
 
 	// cerr << "creating waves for " << _region->name() << " with wfd = " << wait_for_data
 	//		<< " and channels = " << nchans.n_audio() << endl;
@@ -858,6 +863,16 @@ AudioRegionView::create_waves ()
 		tmp_waves.push_back (0);
 	}
 
+	for (vector<ScopedConnection*>::iterator i = _data_ready_connections.begin(); i != _data_ready_connections.end(); ++i) {
+		delete *i;
+	}
+
+	_data_ready_connections.clear ();
+
+	for (uint32_t i = 0; i < nchans.n_audio(); ++i) {
+		_data_ready_connections.push_back (0);
+	}
+
 	for (uint32_t n = 0; n < nchans.n_audio(); ++n) {
 
 		if (n >= audio_region()->n_channels()) {
@@ -869,7 +884,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_connections[n], gui_context())) {
 				// cerr << "\tData is ready\n";
 				create_one_wave (n, true);
 			} else {
@@ -891,7 +906,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/)
 {
 	//cerr << "AudioRegionView::create_one_wave() called which: " << which << " this: " << this << endl;//DEBUG
 	RouteTimeAxisView& atv (*(dynamic_cast<RouteTimeAxisView*>(&trackview))); // ick
-	uint32_t nchans = atv.get_diskstream()->n_channels().n_audio();
+	uint32_t nchans = atv.track()->n_channels().n_audio();
 	uint32_t n;
 	uint32_t nwaves = std::min (nchans, audio_region()->n_channels());
 	gdouble ht;
@@ -965,7 +980,8 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/)
 		tmp_waves.clear ();
 
 		/* all waves created, don't hook into peaks ready anymore */
-		data_ready_connection.disconnect ();
+		delete _data_ready_connections[which];
+		_data_ready_connections[which] = 0;
 
 #if 0
 		if (!zero_line) {
@@ -982,7 +998,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 (invalidator (*this), boost::bind (&AudioRegionView::create_one_wave, this, which, false));
 	// cerr << "AudioRegionView::peaks_ready_handler() called on " << which << " this: " << this << endl;
 }
 
@@ -1018,21 +1034,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
@@ -1156,7 +1176,7 @@ AudioRegionView::add_ghost (TimeAxisView& tv)
 	AudioGhostRegion* ghost = new AudioGhostRegion (tv, trackview, unit_position);
 	uint32_t nchans;
 
-	nchans = rtv->get_diskstream()->n_channels().n_audio();
+	nchans = rtv->track()->n_channels().n_audio();
 
 	for (uint32_t n = 0; n < nchans; ++n) {
 
@@ -1187,8 +1207,6 @@ AudioRegionView::add_ghost (TimeAxisView& tv)
 	ghost->set_colors();
 	ghosts.push_back (ghost);
 
-	ghost->GoingAway.connect (mem_fun(*this, &AudioRegionView::remove_ghost));
-
 	return ghost;
 }