X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=e8550656318d21eb362b6948fc447a17002e7796;hb=d8ade6d30595a3a8be343b392e47d422940eac27;hp=3fb1a016e43c9fa7fb6ffa562376e9b8f62b9628;hpb=13151b43f058ae97408a39b4c5160974c512c9ae;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 3fb1a016e4..e855065631 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. @@ -28,6 +28,8 @@ #include #include #include +#include + #include #include @@ -40,14 +42,18 @@ #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 sigc; using namespace ARDOUR; using namespace PBD; @@ -72,9 +78,10 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView { } + AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr r, double spu, - Gdk::Color& basic_color, TimeAxisViewItem::Visibility visibility) - : RegionView (parent, tv, r, spu, basic_color, visibility) + 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) @@ -111,13 +118,35 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other) init (c, false); } +AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_ptr other_region) + : RegionView (other, boost::shared_ptr (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, false); + RegionView::init (basic_color, wfd); XMLNode *node; @@ -137,7 +166,7 @@ AudioRegionView::init (Gdk::Color& basic_color, bool wfd) } compute_colors (basic_color); - + create_waves (); fade_in_shape = new ArdourCanvas::Polygon (*group); @@ -148,12 +177,10 @@ 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; @@ -169,11 +196,13 @@ AudioRegionView::init (Gdk::Color& basic_color, bool wfd) setup_fade_handle_positions (); - string foo = _region->name(); - foo += ':'; - foo += "gain"; + string line_name = _region->name(); + line_name += ':'; + line_name += "gain"; - gain_line = new AudioRegionGainLine (foo, trackview.session(), *this, *group, audio_region()->envelope()); + if (!Profile->get_sae()) { + gain_line = new AudioRegionGainLine (line_name, trackview.session(), *this, *group, audio_region()->envelope()); + } if (!(_flags & EnvelopeVisible)) { gain_line->hide (); @@ -183,7 +212,7 @@ AudioRegionView::init (Gdk::Color& basic_color, bool wfd) gain_line->reset (); - set_y_position_and_height (0, trackview.height); + set_y_position_and_height (0, trackview.current_height()); region_muted (); region_sync_changed (); @@ -194,6 +223,8 @@ AudioRegionView::init (Gdk::Color& basic_color, bool wfd) fade_in_active_changed (); fade_out_active_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)); fade_out_shape->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_event), fade_out_shape, this)); @@ -232,6 +263,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); @@ -338,6 +370,8 @@ AudioRegionView::region_renamed () void AudioRegionView::region_resized (Change what_changed) { + AudioGhostRegion* agr; + RegionView::region_resized(what_changed); if (what_changed & Change (StartChanged|LengthChanged)) { @@ -347,10 +381,12 @@ AudioRegionView::region_resized (Change what_changed) } for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { + if((agr = dynamic_cast(*i)) != 0) { - for (vector::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) { - (*w)->property_region_start() = _region->start(); - } + for (vector::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) { + (*w)->property_region_start() = _region->start(); + } + } } } } @@ -390,39 +426,61 @@ 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::setup_fade_handle_positions() +{ + /* 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() = _y_position + handle_pos; + fade_in_handle->property_y2() = _y_position + handle_pos + handle_height; + } + + if (fade_out_handle) { + fade_out_handle->property_y1() = _y_position + handle_pos; + fade_out_handle->property_y2() = _y_position + handle_pos + handle_height; + } +} + void AudioRegionView::set_y_position_and_height (double y, double h) { - RegionView::set_y_position_and_height(y, h - 1); + RegionView::set_y_position_and_height (y, h - 1); + + /* XXX why is this code here */ _y_position = y; _height = h; - uint32_t const wcnt = waves.size(); - for (uint32_t n = 0; n < wcnt; ++n) { - double ht; + const uint32_t wcnt = waves.size(); + + for (uint32_t n=0; n < wcnt; ++n) { + gdouble ht; - if (h <= NAME_HIGHLIGHT_THRESH) { - ht = ((_height - 2 * wcnt) / (double) wcnt); + if ((h) < NAME_HIGHLIGHT_THRESH) { + 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); } - double const yoff = n * (ht + 1); + gdouble yoff = n * (ht+1); waves[n]->property_height() = ht; - waves[n]->property_y() = _y_position + yoff + 2; + waves[n]->property_y() = yoff + 2; } if (gain_line) { - if ((_height / wcnt) < NAME_HIGHLIGHT_SIZE) { + if ((_height/wcnt) < NAME_HIGHLIGHT_THRESH) { gain_line->hide (); } else { if (_flags & EnvelopeVisible) { @@ -432,7 +490,6 @@ AudioRegionView::set_y_position_and_height (double y, double h) gain_line->set_y_position_and_height ((uint32_t) _y_position, (uint32_t) rint (_height - NAME_HIGHLIGHT_SIZE)); } - setup_fade_handle_positions (); manage_zero_line (); reset_fade_shapes (); @@ -441,25 +498,6 @@ AudioRegionView::set_y_position_and_height (double y, double h) } } -void -AudioRegionView::setup_fade_handle_positions() -{ - /* 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() = _y_position + handle_pos; - fade_in_handle->property_y2() = _y_position + handle_pos + handle_height; - } - - if (fade_out_handle) { - fade_out_handle->property_y1() = _y_position + handle_pos; - fade_out_handle->property_y2() = _y_position + handle_pos + handle_height; - } -} - void AudioRegionView::manage_zero_line () { @@ -487,7 +525,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 @@ -520,7 +558,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; @@ -532,11 +570,11 @@ AudioRegionView::reset_fade_in_shape_width (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()->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; @@ -571,7 +609,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 @@ -618,9 +656,9 @@ AudioRegionView::reset_fade_out_shape_width (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()->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; @@ -699,18 +737,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() = color_map[cWaveFormClip]; - waves[n]->property_zero_color() = color_map[cZeroLine]; + waves[n]->property_clip_color() = ARDOUR_UI::config()->canvasvar_WaveFormClip.get(); + waves[n]->property_zero_color() = ARDOUR_UI::config()->canvasvar_ZeroLine.get(); } } @@ -785,20 +823,24 @@ AudioRegionView::set_envelope_visible (bool yn) void AudioRegionView::create_waves () { + // cerr << "AudioRegionView::create_waves() called on " << this << endl;//DEBUG RouteTimeAxisView& atv (*(dynamic_cast(&trackview))); // ick if (!atv.get_diskstream()) { return; } - uint32_t nchans = atv.get_diskstream()->n_channels().n_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; @@ -806,30 +848,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 { + // 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); } + } } 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(&trackview))); // ick 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; @@ -848,9 +902,17 @@ 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_clip_color() = color_map[cWaveFormClip]; - wave->property_zero_color() = color_map[cZeroLine]; + + 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); @@ -889,14 +951,15 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct) /* all waves created, don't hook into peaks ready anymore */ data_ready_connection.disconnect (); - if(0) +#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 } } @@ -904,6 +967,7 @@ void AudioRegionView::peaks_ready_handler (uint32_t which) { Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &AudioRegionView::create_one_wave), which, false)); + // cerr << "AudioRegionView::peaks_ready_handler() called on " << which << " this: " << this << endl; } void @@ -932,14 +996,14 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev) /* compute vertical fractional position */ - y = 1.0 - ((y - _y_position) / (_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")); - XMLNode &before = audio_region()->envelope().get_state(); + XMLNode &before = audio_region()->envelope()->get_state(); if (!audio_region()->envelope_active()) { XMLNode ®ion_before = audio_region()->get_state(); @@ -948,18 +1012,18 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev) trackview.session().add_command (new MementoCommand(*(audio_region().get()), ®ion_before, ®ion_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(audio_region()->envelope(), &before, &after)); + XMLNode &after = audio_region()->envelope()->get_state(); + trackview.session().add_command (new MementoCommand(*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 (item->get_data ("control_point")); - audio_region()->envelope().erase (cp->model); + ControlPoint *cp = reinterpret_cast (item->get_data ("control_point")); + audio_region()->envelope()->erase (cp->model()); } void @@ -1067,13 +1131,13 @@ AudioRegionView::set_waveform_scale (WaveformScale scale) GhostRegion* -AudioRegionView::add_ghost (AutomationTimeAxisView& atv) +AudioRegionView::add_ghost (TimeAxisView& tv) { RouteTimeAxisView* rtv = dynamic_cast(&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().n_audio(); @@ -1096,9 +1160,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_clip_color() = color_map[cGhostTrackWaveClip]; - wave->property_zero_color() = color_map[cGhostTrackZeroLine]; + wave->property_region_start() = _region->start(); ghost->waves.push_back(wave); @@ -1106,6 +1168,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)); @@ -1151,14 +1214,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) { @@ -1170,30 +1233,83 @@ AudioRegionView::set_waveview_data_src() (*i)->set_duration (unit_length); - for (vector::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) { - (*w)->property_data_src() = _region.get(); + if((agr = dynamic_cast(*i)) != 0) { + for (vector::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: - case cWaveFormClip: - case cZeroLine: - set_colors (); - break; + //case cMutedWaveForm: + //case cWaveForm: + //case cWaveFormClip: + //case cZeroLine: + set_colors (); - case cGainLineInactive: - case cGainLine: - envelope_active_changed(); - break; + //case cGainLineInactive: + //case cGainLine: + envelope_active_changed(); - 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::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::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::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(); + } + } + } } } +