X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=2bc45ddaca17329a246ef568fc40e158196f44c8;hb=3be87c2c91acf3cc238e3531cfed2638d6c1c7f2;hp=feb8f4fd0b459a90747d7e698039dea0af6807a5;hpb=79986643c0c904f6574bb5323e2233a43a9e622e;p=ardour.git

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index feb8f4fd0b..2bc45ddaca 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -1,7 +1,7 @@
 /*
     Copyright (C) 2001-2006 Paul Davis 
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software; you can r>edistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cmath>
@@ -30,6 +29,9 @@
 #include <ardour/audioregion.h>
 #include <ardour/audiosource.h>
 #include <ardour/audio_diskstream.h>
+#include <ardour/profile.h>
+#include <pbd/memento_command.h>
+#include <pbd/stacktrace.h>
 
 #include "streamview.h"
 #include "audio_region_view.h"
@@ -45,9 +47,12 @@
 #include "utils.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
+#include "ardour_ui.h"
 
 #include "i18n.h"
 
+#define MUTED_ALPHA 10
+
 using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
@@ -56,7 +61,7 @@ using namespace ArdourCanvas;
 
 static const int32_t sync_mark_width = 9;
 
-AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, AudioRegion& r, double spu,
+AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
 				  Gdk::Color& basic_color)
 	: RegionView (parent, tv, r, spu, basic_color)
 	, sync_mark(0)
@@ -72,9 +77,10 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView
 {
 }
 
-AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, AudioRegion& r, double spu, 
-				  Gdk::Color& basic_color, TimeAxisViewItem::Visibility visibility)
-	: RegionView (parent, tv, r, spu, basic_color, visibility)
+
+AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu, 
+				  Gdk::Color& basic_color, bool recording, TimeAxisViewItem::Visibility visibility)
+	: RegionView (parent, tv, r, spu, basic_color, recording, visibility)
 	, sync_mark(0)
 	, zero_line(0)
 	, fade_in_shape(0)
@@ -88,21 +94,66 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView
 {
 }
 
+
+AudioRegionView::AudioRegionView (const AudioRegionView& other)
+	: RegionView (other)
+	, zero_line(0)
+	, fade_in_shape(0)
+	, fade_out_shape(0)
+	, fade_in_handle(0)
+	, fade_out_handle(0)
+	, gain_line(0)
+	, _amplitude_above_axis(1.0)
+	, _flags(0)
+	, fade_color(0)
+
+{
+	Gdk::Color c;
+	int r,g,b,a;
+
+	UINT_TO_RGBA (other.fill_color, &r, &g, &b, &a);
+	c.set_rgb_p (r/255.0, g/255.0, b/255.0);
+	
+	init (c, true);
+}
+
+AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_ptr<AudioRegion> other_region)
+	: RegionView (other, boost::shared_ptr<Region> (other_region))
+	, zero_line(0)
+	, fade_in_shape(0)
+	, fade_out_shape(0)
+	, fade_in_handle(0)
+	, fade_out_handle(0)
+	, gain_line(0)
+	, _amplitude_above_axis(1.0)
+	, _flags(0)
+	, fade_color(0)
+
+{
+	Gdk::Color c;
+	int r,g,b,a;
+
+	UINT_TO_RGBA (other.fill_color, &r, &g, &b, &a);
+	c.set_rgb_p (r/255.0, g/255.0, b/255.0);
+	
+	init (c, true);
+}
+
 void
 AudioRegionView::init (Gdk::Color& basic_color, bool wfd)
 {
 	// FIXME: Some redundancy here with RegionView::init.  Need to figure out
 	// where order is important and where it isn't...
 	
-	RegionView::init(basic_color, wfd);
-
+	RegionView::init (basic_color, wfd);
+	
 	XMLNode *node;
 
 	_amplitude_above_axis = 1.0;
 	zero_line             = 0;
 	_flags                = 0;
 
-	if ((node = _region.extra_xml ("GUI")) != 0) {
+	if ((node = _region->extra_xml ("GUI")) != 0) {
 		set_flags (node);
 	} else {
 		_flags = WaveformVisible;
@@ -114,7 +165,7 @@ AudioRegionView::init (Gdk::Color& basic_color, bool wfd)
 	}
 
 	compute_colors (basic_color);
-
+	
 	create_waves ();
 
 	fade_in_shape = new ArdourCanvas::Polygon (*group);
@@ -148,23 +199,23 @@ AudioRegionView::init (Gdk::Color& basic_color, bool wfd)
 		fade_out_handle->set_data ("regionview", this);
 	}
 
-	string foo = _region.name();
+	string foo = _region->name();
 	foo += ':';
 	foo += "gain";
 
-	gain_line = new AudioRegionGainLine (foo, trackview.session(), *this, *group, audio_region().envelope());
+	if (!Profile->get_sae()) {
+		gain_line = new AudioRegionGainLine (foo, trackview.session(), *this, *group, audio_region()->envelope());
 
-	if (!(_flags & EnvelopeVisible)) {
-		gain_line->hide ();
-	} else {
-		gain_line->show ();
-	}
-
-	reset_width_dependent_items ((double) _region.length() / samples_per_unit);
+		if (!(_flags & EnvelopeVisible)) {
+			gain_line->hide ();
+		} else {
+			gain_line->show ();
+		}
 
-	gain_line->reset ();
+		gain_line->reset ();
+	}
 
-	set_height (trackview.height);
+	set_height (trackview.current_height());
 
 	region_muted ();
 	region_sync_changed ();
@@ -175,7 +226,7 @@ AudioRegionView::init (Gdk::Color& basic_color, bool wfd)
 	fade_in_active_changed ();
 	fade_out_active_changed ();
 
-	_region.StateChanged.connect (mem_fun(*this, &AudioRegionView::region_changed));
+	_region->StateChanged.connect (mem_fun(*this, &AudioRegionView::region_changed));
 
 	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));
@@ -204,17 +255,18 @@ AudioRegionView::~AudioRegionView ()
 	}
 }
 
-ARDOUR::AudioRegion&
+boost::shared_ptr<ARDOUR::AudioRegion>
 AudioRegionView::audio_region() const
 {
 	// "Guaranteed" to succeed...
-	return dynamic_cast<AudioRegion&>(_region);
+	return boost::dynamic_pointer_cast<AudioRegion>(_region);
 }
 
 void
 AudioRegionView::region_changed (Change what_changed)
 {
 	ENSURE_GUI_THREAD (bind (mem_fun(*this, &AudioRegionView::region_changed), what_changed));
+	//cerr << "AudioRegionView::region_changed() called" << endl;
 
 	RegionView::region_changed(what_changed);
 
@@ -249,19 +301,6 @@ AudioRegionView::fade_out_changed ()
 {
 	reset_fade_out_shape ();
 }
-
-void
-AudioRegionView::set_fade_in_active (bool yn)
-{
-	audio_region().set_fade_in_active (yn);
-}
-
-void
-AudioRegionView::set_fade_out_active (bool yn)
-{
-	audio_region().set_fade_out_active (yn);
-}
-
 void
 AudioRegionView::fade_in_active_changed ()
 {
@@ -269,7 +308,7 @@ AudioRegionView::fade_in_active_changed ()
 	uint32_t col;
 	UINT_TO_RGBA(fade_color,&r,&g,&b,&a);
 
-	if (audio_region().fade_in_active()) {
+	if (audio_region()->fade_in_active()) {
 		col = RGBA_TO_UINT(r,g,b,120);
 		fade_in_shape->property_fill_color_rgba() = col;
 		fade_in_shape->property_width_pixels() = 0;
@@ -289,7 +328,7 @@ AudioRegionView::fade_out_active_changed ()
 	uint32_t col;
 	UINT_TO_RGBA(fade_color,&r,&g,&b,&a);
 
-	if (audio_region().fade_out_active()) {
+	if (audio_region()->fade_out_active()) {
 		col = RGBA_TO_UINT(r,g,b,120);
 		fade_out_shape->property_fill_color_rgba() = col;
 		fade_out_shape->property_width_pixels() = 0;
@@ -310,7 +349,7 @@ AudioRegionView::region_scale_amplitude_changed ()
 
 	for (uint32_t n = 0; n < waves.size(); ++n) {
 		// force a reload of the cache
-		waves[n]->property_data_src() = &_region;
+		waves[n]->property_data_src() = _region.get();
 	}
 }
 
@@ -322,13 +361,13 @@ AudioRegionView::region_resized (Change what_changed)
 	if (what_changed & Change (StartChanged|LengthChanged)) {
 
 	 	for (uint32_t n = 0; n < waves.size(); ++n) {
- 			waves[n]->property_region_start() = _region.start();
+ 			waves[n]->property_region_start() = _region->start();
 		}
 		
  		for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
 
  			for (vector<WaveView*>::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) {
-				(*w)->property_region_start() = _region.start();
+				(*w)->property_region_start() = _region->start();
  			}
  		}
 	}
@@ -368,10 +407,10 @@ AudioRegionView::region_muted ()
 	RegionView::region_muted();
 
 	for (uint32_t n=0; n < waves.size(); ++n) {
-		if (_region.muted()) {
-			waves[n]->property_wave_color() = color_map[cMutedWaveForm];
+		if (_region->muted()) {
+			waves[n]->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA);
 		} else {
-			waves[n]->property_wave_color() = color_map[cWaveForm];
+			waves[n]->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get();
 		}
 	}
 }
@@ -380,17 +419,21 @@ AudioRegionView::region_muted ()
 void
 AudioRegionView::set_height (gdouble height)
 {
+	RegionView::set_height (height);
+
 	uint32_t wcnt = waves.size();
 
 	// FIXME: ick
-	TimeAxisViewItem::set_height (height - 2);
+	height -= 2;
+	TimeAxisViewItem::set_height (height);
+	
 	
 	_height = height;
 
 	for (uint32_t n=0; n < wcnt; ++n) {
 		gdouble ht;
 
-		if ((height) <= NAME_HIGHLIGHT_THRESH) {
+		if ((height) < NAME_HIGHLIGHT_THRESH) {
 			ht = ((height-2*wcnt) / (double) wcnt);
 		} else {
 			ht = (((height-2*wcnt) - NAME_HIGHLIGHT_SIZE) / (double) wcnt);
@@ -403,7 +446,7 @@ AudioRegionView::set_height (gdouble height)
 	}
 
 	if (gain_line) {
-		if ((height/wcnt) < NAME_HIGHLIGHT_SIZE) {
+		if ((height/wcnt) < NAME_HIGHLIGHT_THRESH) {
 			gain_line->hide ();
 		} else {
 			if (_flags & EnvelopeVisible) {
@@ -448,11 +491,11 @@ AudioRegionView::reset_fade_shapes ()
 void
 AudioRegionView::reset_fade_in_shape ()
 {
-	reset_fade_in_shape_width ((jack_nframes_t) audio_region().fade_in().back()->when);
+	reset_fade_in_shape_width ((nframes_t) audio_region()->fade_in().back()->when);
 }
 	
 void
-AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
+AudioRegionView::reset_fade_in_shape_width (nframes_t width)
 {
 	if (fade_in_handle == 0) {
 		return;
@@ -460,7 +503,7 @@ AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
 
 	/* smallest size for a fade is 64 frames */
 
-	width = std::max ((jack_nframes_t) 64, width);
+	width = std::max ((nframes_t) 64, width);
 
 	Points* points;
 	double pwidth = width / samples_per_unit;
@@ -481,7 +524,7 @@ AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
 	} else {
 		handle_center = 3.0;
 	}
-	
+
 	fade_in_handle->property_x1() =  handle_center - 3.0;
 	fade_in_handle->property_x2() =  handle_center + 3.0;
 	
@@ -493,11 +536,11 @@ AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
 	fade_in_shape->show();
 
 	float curve[npoints];
-	audio_region().fade_in().get_vector (0, audio_region().fade_in().back()->when, curve, npoints);
+	audio_region()->fade_in().get_vector (0, audio_region()->fade_in().back()->when, curve, npoints);
 
 	points = get_canvas_points ("fade in shape", npoints+3);
 
-	if (_height > NAME_HIGHLIGHT_THRESH) {
+	if (_height >= NAME_HIGHLIGHT_THRESH) {
 		h = _height - NAME_HIGHLIGHT_SIZE;
 	} else {
 		h = _height;
@@ -532,11 +575,11 @@ AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
 void
 AudioRegionView::reset_fade_out_shape ()
 {
-	reset_fade_out_shape_width ((jack_nframes_t) audio_region().fade_out().back()->when);
+	reset_fade_out_shape_width ((nframes_t) audio_region()->fade_out().back()->when);
 }
 
 void
-AudioRegionView::reset_fade_out_shape_width (jack_nframes_t width)
+AudioRegionView::reset_fade_out_shape_width (nframes_t width)
 {	
 	if (fade_out_handle == 0) {
 		return;
@@ -544,7 +587,7 @@ AudioRegionView::reset_fade_out_shape_width (jack_nframes_t width)
 
 	/* smallest size for a fade is 64 frames */
 
-	width = std::max ((jack_nframes_t) 64, width);
+	width = std::max ((nframes_t) 64, width);
 
 	Points* points;
 	double pwidth = width / samples_per_unit;
@@ -558,7 +601,7 @@ AudioRegionView::reset_fade_out_shape_width (jack_nframes_t width)
 	}
 
 	double handle_center;
-	handle_center = (_region.length() - width) / samples_per_unit;
+	handle_center = (_region->length() - width) / samples_per_unit;
 	
 	if (handle_center > 7.0) {
 		handle_center -= 3.0;
@@ -579,9 +622,9 @@ AudioRegionView::reset_fade_out_shape_width (jack_nframes_t width)
 	fade_out_shape->show();
 
 	float curve[npoints];
-	audio_region().fade_out().get_vector (0, audio_region().fade_out().back()->when, curve, npoints);
+	audio_region()->fade_out().get_vector (0, audio_region()->fade_out().back()->when, curve, npoints);
 
-	if (_height > NAME_HIGHLIGHT_THRESH) {
+	if (_height >= NAME_HIGHLIGHT_THRESH) {
 		h = _height - NAME_HIGHLIGHT_SIZE;
 	} else {
 		h = _height;
@@ -620,13 +663,16 @@ AudioRegionView::set_samples_per_unit (gdouble spu)
 {
 	RegionView::set_samples_per_unit (spu);
 
-	for (uint32_t n=0; n < waves.size(); ++n) {
-		waves[n]->property_samples_per_unit() = spu;
+	if (_flags & WaveformVisible) {
+		for (uint32_t n=0; n < waves.size(); ++n) {
+			waves[n]->property_samples_per_unit() = spu;
+		}
 	}
 
 	if (gain_line) {
 		gain_line->reset ();
 	}
+
 	reset_fade_shapes ();
 }
 
@@ -657,15 +703,18 @@ AudioRegionView::set_colors ()
 	RegionView::set_colors();
 	
 	if (gain_line) {
-		gain_line->set_line_color (audio_region().envelope_active() ? color_map[cGainLine] : color_map[cGainLineInactive]);
+		gain_line->set_line_color (audio_region()->envelope_active() ? ARDOUR_UI::config()->canvasvar_GainLine.get() : ARDOUR_UI::config()->canvasvar_GainLineInactive.get());
 	}
 
 	for (uint32_t n=0; n < waves.size(); ++n) {
-		if (_region.muted()) {
-			waves[n]->property_wave_color() = color_map[cMutedWaveForm];
+		if (_region->muted()) {
+			waves[n]->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA);
 		} else {
-			waves[n]->property_wave_color() = color_map[cWaveForm];
+			waves[n]->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get();
 		}
+
+		waves[n]->property_clip_color() = ARDOUR_UI::config()->canvasvar_WaveFormClip.get();
+		waves[n]->property_zero_color() = ARDOUR_UI::config()->canvasvar_ZeroLine.get();
 	}
 }
 
@@ -679,8 +728,8 @@ AudioRegionView::show_region_editor ()
 		// trackview.editor.ensure_float (*editor);
 	} 
 
-	editor->show_all ();
-	editor->get_window()->raise();
+	editor->present ();
+	editor->show_all();
 }
 
 void
@@ -689,6 +738,10 @@ AudioRegionView::set_waveform_visible (bool yn)
 	if (((_flags & WaveformVisible) != yn)) {
 		if (yn) {
 			for (uint32_t n=0; n < waves.size(); ++n) {
+				/* make sure the zoom level is correct, since we don't update
+				   this when waveforms are hidden.
+				*/
+				waves[n]->property_samples_per_unit() = samples_per_unit;
 				waves[n]->show();
 			}
 			_flags |= WaveformVisible;
@@ -736,8 +789,7 @@ AudioRegionView::set_envelope_visible (bool yn)
 void
 AudioRegionView::create_waves ()
 {
-	bool create_zero_line = true;
-
+	// cerr << "AudioRegionView::create_waves() called on " << this << endl;//DEBUG
 	RouteTimeAxisView& atv (*(dynamic_cast<RouteTimeAxisView*>(&trackview))); // ick
 
 	if (!atv.get_diskstream()) {
@@ -745,60 +797,63 @@ AudioRegionView::create_waves ()
 	}
 
 	uint32_t nchans = atv.get_diskstream()->n_channels();
+
+	// cerr << "creating waves for " << _region->name() << " with wfd = " << wait_for_data << " and channels = " << nchans << endl;
 	
 	/* in tmp_waves, set up null pointers for each channel so the vector is allocated */
 	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()) {
+		if (n >= audio_region()->n_channels()) {
 			break;
 		}
 		
 		wave_caches.push_back (WaveView::create_cache ());
 
+		// cerr << "\tchannel " << n << endl;
+
 		if (wait_for_data) {
-			if (audio_region().source(n).peaks_ready (bind (mem_fun(*this, &AudioRegionView::peaks_ready_handler), n), data_ready_connection)) {
+			if (audio_region()->source(n)->peaks_ready (bind (mem_fun(*this, &AudioRegionView::peaks_ready_handler), n), data_ready_connection)) {
+				// cerr << "\tData is ready\n";
 				create_one_wave (n, true);
 			} else {
-				create_zero_line = false;
+				// cerr << "\tdata is not ready\n";
+				// we'll get a PeaksReady signal from the source in the future
+				// and will call create_one_wave(n) then.
 			}
+			
 		} else {
+			// cerr << "\tdon't delay, display today!\n";
 			create_one_wave (n, true);
 		}
-	}
 
-	if (create_zero_line) {
-		zero_line = new ArdourCanvas::SimpleLine (*group);
-		zero_line->property_x1() = (gdouble) 1.0;
-		zero_line->property_x2() = (gdouble) (_region.length() / samples_per_unit) - 1.0;
-		zero_line->property_color_rgba() = (guint) color_map[cZeroLine];
-		manage_zero_line ();
 	}
 }
 
 void
 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();
 	uint32_t n;
-	uint32_t nwaves = std::min (nchans, audio_region().n_channels());
+	uint32_t nwaves = std::min (nchans, audio_region()->n_channels());
 	gdouble ht;
 
-	if (trackview.height < NAME_HIGHLIGHT_SIZE) {
-		ht = ((trackview.height) / (double) nchans);
+	if (trackview.current_height() < NAME_HIGHLIGHT_THRESH) {
+		ht = ((trackview.current_height()) / (double) nchans);
 	} else {
-		ht = ((trackview.height - NAME_HIGHLIGHT_SIZE) / (double) nchans);
+		ht = ((trackview.current_height() - NAME_HIGHLIGHT_SIZE) / (double) nchans);
 	}
 
 	gdouble yoff = which * ht;
 
 	WaveView *wave = new WaveView(*group);
 
-	wave->property_data_src() = (gpointer) &_region;
+	wave->property_data_src() = (gpointer) _region.get();
 	wave->property_cache() =  wave_caches[which];
 	wave->property_cache_updater() = true;
 	wave->property_channel() =  which;
@@ -810,8 +865,20 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct)
 	wave->property_height() =  (double) ht;
 	wave->property_samples_per_unit() =  samples_per_unit;
 	wave->property_amplitude_above_axis() =  _amplitude_above_axis;
-	wave->property_wave_color() = _region.muted() ? color_map[cMutedWaveForm] : color_map[cWaveForm];
-	wave->property_region_start() = _region.start();
+
+	if (_recregion) {
+		wave->property_wave_color() = _region->muted() ? UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_RecWaveForm.get(), MUTED_ALPHA) : ARDOUR_UI::config()->canvasvar_RecWaveForm.get();
+		wave->property_fill_color() = ARDOUR_UI::config()->canvasvar_RecWaveFormFill.get();
+	} else {
+		wave->property_wave_color() = _region->muted() ? UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA) : ARDOUR_UI::config()->canvasvar_WaveForm.get();
+		wave->property_fill_color() = ARDOUR_UI::config()->canvasvar_WaveFormFill.get();
+	}
+
+	wave->property_clip_color() = ARDOUR_UI::config()->canvasvar_WaveFormClip.get();
+	wave->property_zero_color() = ARDOUR_UI::config()->canvasvar_ZeroLine.get();
+	wave->property_region_start() = _region->start();
+	wave->property_rectified() = (bool) (_flags & WaveformRectified);
+	wave->property_logscaled() = (bool) (_flags & WaveformLogScaled);
 
 	if (!(_flags & WaveformVisible)) {
 		wave->hide();
@@ -836,7 +903,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct)
 			break;
 		}
 	}
-	
+
 	if (n == nwaves && waves.empty()) {
 		/* all waves are ready */
 		tmp_waves.resize(nwaves);
@@ -844,11 +911,14 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct)
 		waves = tmp_waves;
 		tmp_waves.clear ();
 
+		/* all waves created, don't hook into peaks ready anymore */
+		data_ready_connection.disconnect ();		
+
 		if (!zero_line) {
 			zero_line = new ArdourCanvas::SimpleLine (*group);
 			zero_line->property_x1() = (gdouble) 1.0;
-			zero_line->property_x2() = (gdouble) (_region.length() / samples_per_unit) - 1.0;
-			zero_line->property_color_rgba() = (guint) color_map[cZeroLine];
+			zero_line->property_x2() = (gdouble) (_region->length() / samples_per_unit) - 1.0;
+			zero_line->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();
 			manage_zero_line ();
 		}
 	}
@@ -858,11 +928,7 @@ void
 AudioRegionView::peaks_ready_handler (uint32_t which)
 {
 	Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &AudioRegionView::create_one_wave), which, false));
-
-	if (!waves.empty()) {
-		/* all waves created, don't hook into peaks ready anymore */
-		data_ready_connection.disconnect ();		
-	}
+	// cerr << "AudioRegionView::peaks_ready_handler() called on " << which << " this: " << this << endl;
 }
 
 void
@@ -883,33 +949,34 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
 
 	item->w2i (x, y);
 
-	jack_nframes_t fx = trackview.editor.pixel_to_frame (x);
+	nframes_t fx = trackview.editor.pixel_to_frame (x);
 
-	if (fx > _region.length()) {
+	if (fx > _region->length()) {
 		return;
 	}
 
 	/* compute vertical fractional position */
 
-	y = 1.0 - (y / (trackview.height - NAME_HIGHLIGHT_SIZE));
+	y = 1.0 - (y / (trackview.current_height() - NAME_HIGHLIGHT_SIZE));
 	
 	/* map using gain line */
 
 	gain_line->view_to_model_y (y);
 
 	trackview.session().begin_reversible_command (_("add gain control point"));
-	trackview.session().add_undo (audio_region().envelope().get_memento());
-
+	XMLNode &before = audio_region()->envelope().get_state();
 
-	if (!audio_region().envelope_active()) {
-		trackview.session().add_undo( bind( mem_fun(audio_region(), &AudioRegion::set_envelope_active), false) );
-		audio_region().set_envelope_active(true);
-		trackview.session().add_redo( bind( mem_fun(audio_region(), &AudioRegion::set_envelope_active), true) );
+	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));
 	}
 
-	audio_region().envelope().add (fx, y);
+	audio_region()->envelope().add (fx, y);
 	
-	trackview.session().add_redo_no_execute (audio_region().envelope().get_memento());
+	XMLNode &after = audio_region()->envelope().get_state();
+	trackview.session().add_command (new MementoCommand<Curve>(audio_region()->envelope(), &before, &after));
 	trackview.session().commit_reversible_command ();
 }
 
@@ -917,7 +984,7 @@ void
 AudioRegionView::remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
 {
         ControlPoint *cp = reinterpret_cast<ControlPoint *> (item->get_data ("control_point"));
-	audio_region().envelope().erase (cp->model);
+	audio_region()->envelope().erase (cp->model);
 }
 
 void
@@ -927,8 +994,10 @@ AudioRegionView::store_flags()
 
 	node->add_property ("waveform-visible", (_flags & WaveformVisible) ? "yes" : "no");
 	node->add_property ("envelope-visible", (_flags & EnvelopeVisible) ? "yes" : "no");
+	node->add_property ("waveform-rectified", (_flags & WaveformRectified) ? "yes" : "no");
+	node->add_property ("waveform-logscaled", (_flags & WaveformLogScaled) ? "yes" : "no");
 
-	_region.add_extra_xml (*node);
+	_region->add_extra_xml (*node);
 }
 
 void
@@ -947,6 +1016,18 @@ AudioRegionView::set_flags (XMLNode* node)
 			_flags |= EnvelopeVisible;
 		}
 	}
+
+	if ((prop = node->property ("waveform-rectified")) != 0) {
+		if (prop->value() == "yes") {
+			_flags |= WaveformRectified;
+		}
+	}
+
+	if ((prop = node->property ("waveform-logscaled")) != 0) {
+		if (prop->value() == "yes") {
+			_flags |= WaveformLogScaled;
+		}
+	}
 }
 	
 void
@@ -986,16 +1067,37 @@ AudioRegionView::set_waveform_shape (WaveformShape shape)
 		} else {
 			_flags &= ~WaveformRectified;
 		}
+		store_flags ();
 	}
 }
 
+void
+AudioRegionView::set_waveform_scale (WaveformScale scale)
+{
+	bool yn = (scale == LogWaveform);
+
+	if (yn != (bool) (_flags & WaveformLogScaled)) {
+		for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
+			(*wave)->property_logscaled() = yn;
+		}
+
+		if (yn) {
+			_flags |= WaveformLogScaled;
+		} else {
+			_flags &= ~WaveformLogScaled;
+		}
+		store_flags ();
+	}
+}
+
+
 GhostRegion*
 AudioRegionView::add_ghost (AutomationTimeAxisView& atv)
 {
 	RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&trackview);
 	assert(rtv);
 
-	double unit_position = _region.position () / samples_per_unit;
+	double unit_position = _region->position () / samples_per_unit;
 	GhostRegion* ghost = new GhostRegion (atv, unit_position);
 	uint32_t nchans;
 	
@@ -1003,13 +1105,13 @@ AudioRegionView::add_ghost (AutomationTimeAxisView& atv)
 
 	for (uint32_t n = 0; n < nchans; ++n) {
 		
-		if (n >= audio_region().n_channels()) {
+		if (n >= audio_region()->n_channels()) {
 			break;
 		}
 		
 		WaveView *wave = new WaveView(*ghost->group);
 
-		wave->property_data_src() =  &_region;
+		wave->property_data_src() = _region.get();
 		wave->property_cache() =  wave_caches[n];
 		wave->property_cache_updater() = false;
 		wave->property_channel() = n;
@@ -1019,14 +1121,17 @@ AudioRegionView::add_ghost (AutomationTimeAxisView& atv)
 		wave->property_x() =  0.0;
 		wave->property_samples_per_unit() =  samples_per_unit;
 		wave->property_amplitude_above_axis() =  _amplitude_above_axis;
-		wave->property_wave_color() = color_map[cGhostTrackWave];
-		wave->property_region_start() = _region.start();
+		wave->property_wave_color() = ARDOUR_UI::config()->canvasvar_GhostTrackWave.get();
+		wave->property_fill_color() = ARDOUR_UI::config()->canvasvar_GhostTrackWave.get();
+		wave->property_clip_color() = ARDOUR_UI::config()->canvasvar_GhostTrackWaveClip.get();
+		wave->property_zero_color() = ARDOUR_UI::config()->canvasvar_GhostTrackZeroLine.get();
+		wave->property_region_start() = _region->start();
 
 		ghost->waves.push_back(wave);
 	}
 
 	ghost->set_height ();
-	ghost->set_duration (_region.length() / samples_per_unit);
+	ghost->set_duration (_region->length() / samples_per_unit);
 	ghosts.push_back (ghost);
 
 	ghost->GoingAway.connect (mem_fun(*this, &AudioRegionView::remove_ghost));
@@ -1072,7 +1177,7 @@ void
 AudioRegionView::envelope_active_changed ()
 {
 	if (gain_line) {
-		gain_line->set_line_color (audio_region().envelope_active() ? color_map[cGainLine] : color_map[cGainLineInactive]);
+		gain_line->set_line_color (audio_region()->envelope_active() ? ARDOUR_UI::config()->canvasvar_GainLine.get() : ARDOUR_UI::config()->canvasvar_GainLineInactive.get());
 	}
 }
 
@@ -1080,11 +1185,11 @@ void
 AudioRegionView::set_waveview_data_src()
 {
 
-	double unit_length= _region.length() / samples_per_unit;
+	double unit_length= _region->length() / samples_per_unit;
 
 	for (uint32_t n = 0; n < waves.size(); ++n) {
 		// TODO: something else to let it know the channel
-		waves[n]->property_data_src() = &_region;
+		waves[n]->property_data_src() = _region.get();
 	}
 	
 	for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
@@ -1092,36 +1197,72 @@ AudioRegionView::set_waveview_data_src()
 		(*i)->set_duration (unit_length);
 		
 		for (vector<WaveView*>::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) {
-			(*w)->property_data_src() = &_region;
+			(*w)->property_data_src() = _region.get();
 		}
 	}
 
 }
 
 void
-AudioRegionView::color_handler (ColorID id, uint32_t val)
+AudioRegionView::color_handler ()
 {
-	switch (id) {
-	case cMutedWaveForm:
-	case cWaveForm:
-		set_colors ();
-		break;
+	set_colors ();
+	envelope_active_changed();
+}
 
-	case cGainLineInactive:
-	case cGainLine:
-		envelope_active_changed();
-		break;
-		
-	case cZeroLine:
-		if (zero_line) {
-			zero_line->property_color_rgba() = (guint) color_map[cZeroLine];
-		}
-		break;
+void
+AudioRegionView::set_frame_color ()
+{
+	if (!frame) {
+		return;
+	}
 
-	case cGhostTrackWave:
-		break;
+	if (_region->opaque()) {
+		fill_opacity = 130;
+	} else {
+		fill_opacity = 0;
+	}
 
-	default:
-		break;
+	uint32_t r,g,b,a;
+	
+	if (_selected && should_show_selection) {
+		UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), &r, &g, &b, &a);
+		frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a);
+
+		for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
+			if (_region->muted()) {
+				(*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get(), MUTED_ALPHA);
+			} else {
+				(*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get();
+				(*w)->property_fill_color() = ARDOUR_UI::config()->canvasvar_SelectedWaveFormFill.get();
+			}
+		}
+	} else {
+		if (_recregion) {
+			UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_RecordingRect.get(), &r, &g, &b, &a);
+			frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a);
+
+			for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
+				if (_region->muted()) {
+					(*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_RecWaveForm.get(), MUTED_ALPHA);
+				} else {
+					(*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_RecWaveForm.get();
+					(*w)->property_fill_color() = ARDOUR_UI::config()->canvasvar_RecWaveFormFill.get();
+				}
+			}
+		} else {
+			UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a);
+			frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a);
+
+			for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
+				if (_region->muted()) {
+					(*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA);
+				} else {
+					(*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get();
+					(*w)->property_fill_color() = ARDOUR_UI::config()->canvasvar_WaveFormFill.get();
+				}
+			}
+		}
 	}
 }
+