Make waveform show / scale / shape a global option in the prefs dialog to clean thing...
[ardour.git] / gtk2_ardour / audio_region_view.cc
index 73ac0c341da1f6a48cca511319c7eea4ce838b1a..b36a237da5627d66d97a468dc5ba354763431bf6 100644 (file)
@@ -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.
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/playlist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audiosource.h>
-#include <ardour/audio_diskstream.h>
-#include <pbd/memento_command.h>
+#include "ardour/playlist.h"
+#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 "evoral/Curve.hpp"
 
 #include "streamview.h"
 #include "audio_region_view.h"
 #include "public_editor.h"
 #include "audio_region_editor.h"
 #include "region_gain_line.h"
+#include "control_point.h"
 #include "ghostregion.h"
 #include "audio_time_axis.h"
 #include "utils.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
+#include "ardour_ui.h"
 
 #include "i18n.h"
 
+#define MUTED_ALPHA 10
+
+using namespace std;
 using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
@@ -56,7 +66,7 @@ using namespace ArdourCanvas;
 static const int32_t sync_mark_width = 9;
 
 AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
-                                 Gdk::Color& basic_color)
+                                 Gdk::Color const & basic_color)
        : RegionView (parent, tv, r, spu, basic_color)
        , sync_mark(0)
        , zero_line(0)
@@ -71,9 +81,10 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView
 {
 }
 
+
 AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu, 
-                                 Gdk::Color& basic_color, TimeAxisViewItem::Visibility visibility)
-       : RegionView (parent, tv, r, spu, basic_color, visibility)
+                                 Gdk::Color const & 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)
@@ -87,14 +98,60 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView
 {
 }
 
+
+AudioRegionView::AudioRegionView (const AudioRegionView& other)
+       : sigc::trackable(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, false);
+}
+
+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)
+AudioRegionView::init (Gdk::Color const & 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;
@@ -108,12 +165,12 @@ AudioRegionView::init (Gdk::Color& basic_color, bool wfd)
                store_flags ();
        }
 
-       if (trackview.editor.new_regionviews_display_gain()) {
+       if (trackview.editor().new_regionviews_display_gain()) {
                _flags |= EnvelopeVisible;
        }
 
        compute_colors (basic_color);
-
+       
        create_waves ();
 
        fade_in_shape = new ArdourCanvas::Polygon (*group);
@@ -124,34 +181,35 @@ AudioRegionView::init (Gdk::Color& basic_color, bool wfd)
        fade_out_shape->property_fill_color_rgba() = fade_color;
        fade_out_shape->set_data ("regionview", this);
 
-
        {
                uint32_t r,g,b,a;
                UINT_TO_RGBA(fill_color,&r,&g,&b,&a);
        
-
                fade_in_handle = new ArdourCanvas::SimpleRect (*group);
                fade_in_handle->property_fill_color_rgba() = RGBA_TO_UINT(r,g,b,0);
                fade_in_handle->property_outline_pixels() = 0;
-               fade_in_handle->property_y1() = 2.0;
-               fade_in_handle->property_y2() = 7.0;
                
                fade_in_handle->set_data ("regionview", this);
                
                fade_out_handle = new ArdourCanvas::SimpleRect (*group);
                fade_out_handle->property_fill_color_rgba() = RGBA_TO_UINT(r,g,b,0);
                fade_out_handle->property_outline_pixels() = 0;
-               fade_out_handle->property_y1() = 2.0;
-               fade_out_handle->property_y2() = 7.0;
                
                fade_out_handle->set_data ("regionview", this);
        }
 
-       string foo = _region->name();
-       foo += ':';
-       foo += "gain";
+       setup_fade_handle_positions ();
+
+       if (!trackview.session().config.get_show_region_fades()) {
+               set_fade_visibility (false);
+       }
 
-       gain_line = new AudioRegionGainLine (foo, trackview.session(), *this, *group, audio_region()->envelope());
+       const string line_name = _region->name() + ":gain";
+
+       if (!Profile->get_sae()) {
+               gain_line = new AudioRegionGainLine (line_name, trackview.session(), *this, *group,
+                               audio_region()->envelope());
+       }
 
        if (!(_flags & EnvelopeVisible)) {
                gain_line->hide ();
@@ -161,7 +219,7 @@ AudioRegionView::init (Gdk::Color& basic_color, bool wfd)
 
        gain_line->reset ();
 
-       set_height (trackview.height);
+       set_height (trackview.current_height());
 
        region_muted ();
        region_sync_changed ();
@@ -172,7 +230,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));
+       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));
@@ -196,9 +254,7 @@ AudioRegionView::~AudioRegionView ()
 
        /* all waveviews etc will be destroyed when the group is destroyed */
 
-       if (gain_line) {
-               delete gain_line;
-       }
+       delete gain_line;
 }
 
 boost::shared_ptr<ARDOUR::AudioRegion>
@@ -212,6 +268,7 @@ 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);
 
@@ -246,19 +303,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 ()
 {
@@ -314,19 +358,8 @@ AudioRegionView::region_scale_amplitude_changed ()
 void
 AudioRegionView::region_renamed ()
 {
-       // FIXME: ugly duplication with RegionView...
+       Glib::ustring str = RegionView::make_name ();
        
-       string str;
-
-       if (_region->locked()) {
-               str += '>';
-               str += _region->name();
-               str += '<';
-       } else {
-               str = _region->name();
-       }
-
-       // ... because of this
        if (audio_region()->speed_mismatch (trackview.session().frame_rate())) {
                str = string ("*") + str;
        }
@@ -342,6 +375,8 @@ AudioRegionView::region_renamed ()
 void
 AudioRegionView::region_resized (Change what_changed)
 {
+       AudioGhostRegion* agr;
+
        RegionView::region_resized(what_changed);
 
        if (what_changed & Change (StartChanged|LengthChanged)) {
@@ -351,10 +386,12 @@ AudioRegionView::region_resized (Change what_changed)
                }
                
                for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
+                       if((agr = dynamic_cast<AudioGhostRegion*>(*i)) != 0) {
 
-                       for (vector<WaveView*>::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) {
-                               (*w)->property_region_start() = _region->start();
-                       }
+                               for (vector<WaveView*>::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) {
+                                       (*w)->property_region_start() = _region->start();
+                               }
+                       }
                }
        }
 }
@@ -378,8 +415,10 @@ AudioRegionView::reset_width_dependent_items (double pixel_width)
                                fade_in_handle->hide();
                                fade_out_handle->hide();
                        } else {
-                               fade_in_handle->show();
-                               fade_out_handle->show();
+                               if (trackview.session().config.get_show_region_fades()) {
+                                       fade_in_handle->show();
+                                       fade_out_handle->show();
+                               }
                        }
                }
        }
@@ -394,24 +433,48 @@ AudioRegionView::region_muted ()
 
        for (uint32_t n=0; n < waves.size(); ++n) {
                if (_region->muted()) {
-                       waves[n]->property_wave_color() = color_map[cMutedWaveForm];
+                       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();
                }
        }
 }
 
 void
-AudioRegionView::set_height (gdouble height)
+AudioRegionView::setup_fade_handle_positions()
 {
-       RegionView::set_height(height);
+       /* position of fade handle offset from the top of the region view */
+       double const handle_pos = 2;
+       /* height of fade handles */
+       double const handle_height = 5;
+
+       if (fade_in_handle) {
+               fade_in_handle->property_y1() = handle_pos;
+               fade_in_handle->property_y2() = handle_pos + handle_height;
+       }
        
+       if (fade_out_handle) {
+               fade_out_handle->property_y1() = handle_pos;
+               fade_out_handle->property_y2() = handle_pos + handle_height;
+       }
+}
+
+void
+AudioRegionView::set_height (gdouble height)
+{
+       RegionView::set_height (height);
+
        uint32_t wcnt = waves.size();
 
+       // FIXME: ick
+       height -= 2;
+       
+       _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);
@@ -424,7 +487,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) {
@@ -436,10 +499,11 @@ AudioRegionView::set_height (gdouble height)
 
        manage_zero_line ();
        reset_fade_shapes ();
-       
-       if (name_text) {
-               name_text->raise_to_top();
+
+       if (name_pixbuf) {
+               name_pixbuf->raise_to_top();
        }
+
 }
 
 void
@@ -450,7 +514,7 @@ AudioRegionView::manage_zero_line ()
        }
 
        if (_height >= 100) {
-               gdouble wave_midpoint = (_height - NAME_HIGHLIGHT_SIZE) / 2.0;
+               double const wave_midpoint = (_height - NAME_HIGHLIGHT_SIZE) / 2.0;
                zero_line->property_y1() = wave_midpoint;
                zero_line->property_y2() = wave_midpoint;
                zero_line->show();
@@ -469,7 +533,7 @@ AudioRegionView::reset_fade_shapes ()
 void
 AudioRegionView::reset_fade_in_shape ()
 {
-       reset_fade_in_shape_width ((nframes_t) audio_region()->fade_in().back()->when);
+       reset_fade_in_shape_width ((nframes_t) audio_region()->fade_in()->back()->when);
 }
        
 void
@@ -502,7 +566,7 @@ AudioRegionView::reset_fade_in_shape_width (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;
        
@@ -511,14 +575,16 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width)
                return;
        }
 
-       fade_in_shape->show();
+       if (trackview.session().config.get_show_region_fades()) {
+               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()->curve().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;
@@ -553,7 +619,7 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width)
 void
 AudioRegionView::reset_fade_out_shape ()
 {
-       reset_fade_out_shape_width ((nframes_t) audio_region()->fade_out().back()->when);
+       reset_fade_out_shape_width ((nframes_t) audio_region()->fade_out()->back()->when);
 }
 
 void
@@ -597,12 +663,14 @@ AudioRegionView::reset_fade_out_shape_width (nframes_t width)
                return;
        } 
        
-       fade_out_shape->show();
+       if (trackview.session().config.get_show_region_fades()) {
+               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()->curve().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;
@@ -641,13 +709,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 ();
 }
 
@@ -660,9 +731,9 @@ AudioRegionView::set_amplitude_above_axis (gdouble spp)
 }
 
 void
-AudioRegionView::compute_colors (Gdk::Color& basic_color)
+AudioRegionView::compute_colors (Gdk::Color const & basic_color)
 {
-       RegionView::compute_colors(basic_color);
+       RegionView::compute_colors (basic_color);
        
        uint32_t r, g, b, a;
 
@@ -678,15 +749,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];
+                       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();
        }
 }
 
@@ -700,8 +774,8 @@ AudioRegionView::show_region_editor ()
                // trackview.editor.ensure_float (*editor);
        } 
 
-       editor->show_all ();
-       editor->get_window()->raise();
+       editor->present ();
+       editor->show_all();
 }
 
 void
@@ -710,6 +784,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;
@@ -757,22 +835,24 @@ 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()) {
                return;
        }
 
-       uint32_t nchans = atv.get_diskstream()->n_channels().get(DataType::AUDIO);
+       ChanCount nchans = atv.get_diskstream()->n_channels();
+
+       // cerr << "creating waves for " << _region->name() << " with wfd = " << wait_for_data
+       //              << " and channels = " << nchans.n_audio() << endl;
        
        /* in tmp_waves, set up null pointers for each channel so the vector is allocated */
-       for (uint32_t n = 0; n < nchans; ++n) {
+       for (uint32_t n = 0; n < nchans.n_audio(); ++n) {
                tmp_waves.push_back (0);
        }
-       
-       for (uint32_t n = 0; n < nchans; ++n) {
+
+       for (uint32_t n = 0; n < nchans.n_audio(); ++n) {
                
                if (n >= audio_region()->n_channels()) {
                        break;
@@ -780,42 +860,42 @@ AudioRegionView::create_waves ()
                
                wave_caches.push_back (WaveView::create_cache ());
 
+               // 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)) {
+                               // cerr << "\tData is ready\n";
+                               cerr << "\tData is ready\n";
+                               // 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) {
-               if (zero_line) {
-                       delete 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().get(DataType::AUDIO);
+       uint32_t nchans = atv.get_diskstream()->n_channels().n_audio();
        uint32_t n;
        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;
@@ -834,8 +914,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];
+
+       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();
@@ -860,7 +952,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct)
                        break;
                }
        }
-       
+
        if (n == nwaves && waves.empty()) {
                /* all waves are ready */
                tmp_waves.resize(nwaves);
@@ -868,13 +960,18 @@ 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 0
                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_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();
                        manage_zero_line ();
                }
+#endif
        }
 }
 
@@ -882,11 +979,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
@@ -907,7 +1000,7 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
 
        item->w2i (x, y);
 
-       nframes_t fx = trackview.editor.pixel_to_frame (x);
+       nframes_t fx = trackview.editor().pixel_to_frame (x);
 
        if (fx > _region->length()) {
                return;
@@ -915,35 +1008,34 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
 
        /* compute vertical fractional position */
 
-       y = 1.0 - (y / (trackview.height - NAME_HIGHLIGHT_SIZE));
-       
+       y = 1.0 - (y / (_height - NAME_HIGHLIGHT_SIZE));
+
        /* map using gain line */
 
-       gain_line->view_to_model_y (y);
+       gain_line->view_to_model_coord (x, y);
 
        trackview.session().begin_reversible_command (_("add gain control point"));
-       XMLNode &before = audio_region()->envelope().get_state();
-
+       XMLNode &before = audio_region()->envelope()->get_state();
 
        if (!audio_region()->envelope_active()) {
-               XMLNode &before = audio_region()->get_state();
+               XMLNode &region_before = audio_region()->get_state();
                audio_region()->set_envelope_active(true);
-               XMLNode &after = audio_region()->get_state();
-               trackview.session().add_command (new MementoCommand<AudioRegion>(*(audio_region().get()), &before, &after));
+               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);
        
-       XMLNode &after = audio_region()->envelope().get_state();
-       trackview.session().add_command (new MementoCommand<Curve>(audio_region()->envelope(), &before, &after));
+       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 ();
 }
 
 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);
+       ControlPoint *cp = reinterpret_cast<ControlPoint *> (item->get_data ("control_point"));
+       audio_region()->envelope()->erase (cp->model());
 }
 
 void
@@ -953,6 +1045,8 @@ 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);
 }
@@ -973,6 +1067,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
@@ -1012,20 +1118,41 @@ AudioRegionView::set_waveform_shape (WaveformShape shape)
                } else {
                        _flags &= ~WaveformRectified;
                }
+               store_flags ();
+       }
+}
+
+void
+AudioRegionView::set_waveform_scale (WaveformScale scale)
+{
+       bool yn = (scale == Logarithmic);
+
+       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)
+AudioRegionView::add_ghost (TimeAxisView& tv)
 {
        RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&trackview);
        assert(rtv);
 
        double unit_position = _region->position () / samples_per_unit;
-       GhostRegion* ghost = new GhostRegion (atv, unit_position);
+       AudioGhostRegion* ghost = new AudioGhostRegion (tv, trackview, unit_position);
        uint32_t nchans;
        
-       nchans = rtv->get_diskstream()->n_channels().get(DataType::AUDIO);
+       nchans = rtv->get_diskstream()->n_channels().n_audio();
 
        for (uint32_t n = 0; n < nchans; ++n) {
                
@@ -1045,7 +1172,7 @@ 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();
 
                ghost->waves.push_back(wave);
@@ -1053,6 +1180,7 @@ AudioRegionView::add_ghost (AutomationTimeAxisView& atv)
 
        ghost->set_height ();
        ghost->set_duration (_region->length() / samples_per_unit);
+       ghost->set_colors();
        ghosts.push_back (ghost);
 
        ghost->GoingAway.connect (mem_fun(*this, &AudioRegionView::remove_ghost));
@@ -1098,14 +1226,14 @@ 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());
        }
 }
 
 void
 AudioRegionView::set_waveview_data_src()
 {
-
+       AudioGhostRegion* agr;
        double unit_length= _region->length() / samples_per_unit;
 
        for (uint32_t n = 0; n < waves.size(); ++n) {
@@ -1117,37 +1245,114 @@ 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.get();
+               if((agr = dynamic_cast<AudioGhostRegion*>(*i)) != 0) {
+                       for (vector<WaveView*>::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) {
+                               (*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;
+       //case cMutedWaveForm:
+       //case cWaveForm:
+       //case cWaveFormClip:
+       //case cZeroLine:
+       set_colors ();
 
-       case cGainLineInactive:
-       case cGainLine:
-               envelope_active_changed();
-               break;
-               
-       case cZeroLine:
-               if (zero_line) {
-                       zero_line->property_color_rgba() = (guint) color_map[cZeroLine];
-               }
-               break;
+       //case cGainLineInactive:
+       //case cGainLine:
+       envelope_active_changed();
 
-       case cGhostTrackWave:
-               break;
+}
 
-       default:
-               break;
+void
+AudioRegionView::set_frame_color ()
+{
+       if (!frame) {
+               return;
+       }
+
+       if (_region->opaque()) {
+               fill_opacity = 130;
+       } else {
+               fill_opacity = 0;
+       }
+
+       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();
+                               }
+                       }
+               }
+       }
+}
+
+void
+AudioRegionView::set_fade_visibility (bool yn)
+{
+       if (yn) {
+               if (fade_in_shape) {
+                       fade_in_shape->show();
+               }
+               if (fade_out_shape) {
+                       fade_out_shape->show ();
+               } 
+               if (fade_in_handle) {
+                       fade_in_handle->show ();
+               } 
+               if (fade_out_handle) {
+                       fade_out_handle->show ();
+               }
+       } else {
+               if (fade_in_shape) {
+                       fade_in_shape->hide();
+               }
+               if (fade_out_shape) {
+                       fade_out_shape->hide ();
+               } 
+               if (fade_in_handle) {
+                       fade_in_handle->hide ();
+               } 
+               if (fade_out_handle) {
+                       fade_out_handle->hide ();
+               }
        }
 }