X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=d490ede63b4e7380064078ba33b322fb4e531099;hb=b1c3a224983a6b0cc5c5bb4b042d15f1d67ae5b3;hp=9e16390751e73807ce88de2b7716b263ea27ba5e;hpb=edfc81352e66a412c6bc180c15f788512eccbe42;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 9e16390751..d490ede63b 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 + 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. @@ -14,7 +14,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ #include @@ -25,12 +24,16 @@ #include -#include -#include -#include -#include -#include -#include +#include "ardour/playlist.h" +#include "ardour/audioregion.h" +#include "ardour/audiosource.h" +#include "ardour/profile.h" +#include "ardour/session.h" + +#include "pbd/memento_command.h" +#include "pbd/stacktrace.h" + +#include "evoral/Curve.hpp" #include "streamview.h" #include "audio_region_view.h" @@ -41,15 +44,19 @@ #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" -using namespace sigc; +#define MUTED_ALPHA 10 + +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -58,7 +65,7 @@ using namespace ArdourCanvas; static const int32_t sync_mark_width = 9; AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr 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) @@ -73,9 +80,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) + +AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr r, double spu, + 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) @@ -91,7 +99,8 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView AudioRegionView::AudioRegionView (const AudioRegionView& other) - : RegionView (other) + : sigc::trackable(other) + , RegionView (other) , zero_line(0) , fade_in_shape(0) , fade_out_shape(0) @@ -101,25 +110,45 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other) , _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 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) +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, false); - + + RegionView::init (basic_color, wfd); + XMLNode *node; _amplitude_above_axis = 1.0; @@ -133,7 +162,8 @@ AudioRegionView::init (Gdk::Color& 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; } @@ -144,39 +174,39 @@ AudioRegionView::init (Gdk::Color& basic_color, bool wfd) fade_in_shape = new ArdourCanvas::Polygon (*group); fade_in_shape->property_fill_color_rgba() = fade_color; fade_in_shape->set_data ("regionview", this); - + fade_out_shape = new ArdourCanvas::Polygon (*group); 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); + } + + const string line_name = _region->name() + ":gain"; - gain_line = new AudioRegionGainLine (foo, trackview.session(), *this, *group, audio_region()->envelope()); + if (!Profile->get_sae()) { + gain_line = new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope()); + } if (!(_flags & EnvelopeVisible)) { gain_line->hide (); @@ -186,23 +216,24 @@ 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 (); - region_resized (BoundsChanged); + + region_resized (ARDOUR::bounds_change); set_waveview_data_src(); region_locked (); envelope_active_changed (); 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)); - 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 (); @@ -219,11 +250,13 @@ AudioRegionView::~AudioRegionView () gnome_canvas_waveview_cache_destroy (*cache); } + for (vector::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 */ - if (gain_line) { - delete gain_line; - } + delete gain_line; } boost::shared_ptr @@ -234,28 +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)); + 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 (); } } @@ -283,7 +317,7 @@ AudioRegionView::fade_in_active_changed () fade_in_shape->property_fill_color_rgba() = col; fade_in_shape->property_width_pixels() = 0; fade_in_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,0); - } else { + } else { col = RGBA_TO_UINT(r,g,b,0); fade_in_shape->property_fill_color_rgba() = col; fade_in_shape->property_width_pixels() = 1; @@ -303,7 +337,7 @@ AudioRegionView::fade_out_active_changed () fade_out_shape->property_fill_color_rgba() = col; fade_out_shape->property_width_pixels() = 0; fade_out_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,0); - } else { + } else { col = RGBA_TO_UINT(r,g,b,0); fade_out_shape->property_fill_color_rgba() = col; fade_out_shape->property_width_pixels() = 1; @@ -315,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 @@ -324,22 +358,47 @@ AudioRegionView::region_scale_amplitude_changed () } void -AudioRegionView::region_resized (Change what_changed) +AudioRegionView::region_renamed () +{ + Glib::ustring str = RegionView::make_name (); + + if (audio_region()->speed_mismatch (trackview.session()->frame_rate())) { + str = string ("*") + str; + } + + if (_region->muted()) { + str = string ("!") + str; + } + + set_item_name (str, this); + set_name_text (str); +} + +void +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); - for (uint32_t n = 0; n < waves.size(); ++n) { - waves[n]->property_region_start() = _region->start(); + if (what_changed.contains (interesting_stuff)) { + + for (uint32_t n = 0; n < waves.size(); ++n) { + waves[n]->property_region_start() = _region->start(); } - - for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - for (vector::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) { - (*w)->property_region_start() = _region->start(); - } - } + for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { + if((agr = dynamic_cast(*i)) != 0) { + + for (vector::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) { + (*w)->property_region_start() = _region->start(); + } + } + } } } @@ -362,8 +421,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(); + } } } } @@ -378,55 +439,75 @@ 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() = 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 - TimeAxisViewItem::set_height (height - 2); - - _height = height; + height -= 2; - 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); + if ((height) < 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); } - - 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_SIZE) { + + if ((height/wcnt) < NAME_HIGHLIGHT_THRESH) { gain_line->hide (); } else { if (_flags & EnvelopeVisible) { gain_line->show (); } } - gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE)); + + gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE) - 2); } manage_zero_line (); reset_fade_shapes (); - - if (name_text) { - name_text->raise_to_top(); + + if (name_pixbuf) { + name_pixbuf->raise_to_top(); } } @@ -438,7 +519,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(); @@ -457,9 +538,9 @@ 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 AudioRegionView::reset_fade_in_shape_width (nframes_t width) { @@ -474,8 +555,8 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width) Points* points; double pwidth = width / samples_per_unit; uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth); - double h; - + double h; + if (_height < 5) { fade_in_shape->hide(); fade_in_handle->hide(); @@ -484,29 +565,31 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width) double handle_center; handle_center = pwidth; - + if (handle_center > 7.0) { handle_center -= 3.0; } else { handle_center = 3.0; } - + fade_in_handle->property_x1() = handle_center - 3.0; fade_in_handle->property_x2() = handle_center + 3.0; - + if (pwidth < 5) { fade_in_shape->hide(); 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; @@ -521,7 +604,7 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width) (*points)[pi].set_x(1 + (pc * xdelta)); (*points)[pi++].set_y(2 + (h - (curve[pc] * h))); } - + /* fold back */ (*points)[pi].set_x(pwidth); @@ -533,20 +616,23 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width) /* connect the dots ... */ (*points)[pi] = (*points)[0]; - + fade_in_shape->property_points() = *points; delete points; + + /* ensure trim handle stays on top */ + frame_handle_start->raise_to_top(); } 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 AudioRegionView::reset_fade_out_shape_width (nframes_t width) -{ +{ if (fade_out_handle == 0) { return; } @@ -568,29 +654,31 @@ AudioRegionView::reset_fade_out_shape_width (nframes_t width) double handle_center; handle_center = (_region->length() - width) / samples_per_unit; - + if (handle_center > 7.0) { handle_center -= 3.0; } else { handle_center = 3.0; } - + fade_out_handle->property_x1() = handle_center - 3.0; fade_out_handle->property_x2() = handle_center + 3.0; /* don't show shape if its too small */ - + if (pwidth < 5) { fade_out_shape->hide(); 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; @@ -607,7 +695,7 @@ AudioRegionView::reset_fade_out_shape_width (nframes_t width) (*points)[pi].set_x(_pixel_width - 1 - pwidth + (pc*xdelta)); (*points)[pi++].set_y(2 + (h - (curve[pc] * h))); } - + /* fold back */ (*points)[pi].set_x(_pixel_width); @@ -622,6 +710,9 @@ AudioRegionView::reset_fade_out_shape_width (nframes_t width) fade_out_shape->property_points() = *points; delete points; + + /* ensure trim handle stays on top */ + frame_handle_end->raise_to_top(); } void @@ -651,10 +742,10 @@ 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; /* gain color computed in envelope_active_changed() */ @@ -667,20 +758,20 @@ void 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(); } } @@ -692,7 +783,7 @@ AudioRegionView::show_region_editor () // GTK2FIX : how to ensure float without realizing // editor->realize (); // trackview.editor.ensure_float (*editor); - } + } editor->present (); editor->show_all(); @@ -755,67 +846,75 @@ AudioRegionView::set_envelope_visible (bool yn) void AudioRegionView::create_waves () { - bool create_zero_line = false; - + // cerr << "AudioRegionView::create_waves() called on " << this << endl;//DEBUG RouteTimeAxisView& atv (*(dynamic_cast(&trackview))); // ick - if (!atv.get_diskstream()) { + if (!atv.track()) { return; } - uint32_t 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; + /* 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 (vector::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()) { 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()->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 { - 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); } - } - // Blame torben - //if (create_zero_line) { - if (0) { - 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) +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(); + uint32_t nchans = atv.track()->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,9 +933,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); @@ -856,9 +963,9 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct) } else { /* n-channel track, >n-channel source */ } - + /* see if we're all ready */ - + for (n = 0; n < nchans; ++n) { if (tmp_waves[n] == 0) { break; @@ -873,23 +980,26 @@ 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 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 } } 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; } void @@ -904,13 +1014,13 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev) /* don't create points that can't be seen */ set_envelope_visible (true); - + x = ev->button.x; y = ev->button.y; 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; @@ -918,34 +1028,38 @@ 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(); + /* 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 ®ion_before = audio_region()->get_state(); audio_region()->set_envelope_active(true); XMLNode ®ion_after = audio_region()->get_state(); - trackview.session().add_command (new MementoCommand(*(audio_region().get()), ®ion_before, ®ion_after)); + trackview.session()->add_command (new MementoCommand(*(audio_region().get()), ®ion_before, ®ion_after)); } - audio_region()->envelope().add (fx, y); - - XMLNode &after = audio_region()->envelope().get_state(); - trackview.session().add_command (new MementoCommand(audio_region()->envelope(), &before, &after)); - trackview.session().commit_reversible_command (); + audio_region()->envelope()->add (fx, y); + + 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) +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 @@ -967,36 +1081,36 @@ AudioRegionView::set_flags (XMLNode* node) XMLProperty *prop; if ((prop = node->property ("waveform-visible")) != 0) { - if (prop->value() == "yes") { + if (string_is_affirmative (prop->value())) { _flags |= WaveformVisible; } } if ((prop = node->property ("envelope-visible")) != 0) { - if (prop->value() == "yes") { + if (string_is_affirmative (prop->value())) { _flags |= EnvelopeVisible; } } if ((prop = node->property ("waveform-rectified")) != 0) { - if (prop->value() == "yes") { + if (string_is_affirmative (prop->value())) { _flags |= WaveformRectified; } } if ((prop = node->property ("waveform-logscaled")) != 0) { - if (prop->value() == "yes") { + if (string_is_affirmative (prop->value())) { _flags |= WaveformLogScaled; } } } - + void AudioRegionView::set_waveform_shape (WaveformShape shape) { bool yn; - /* this slightly odd approach is to leave the door open to + /* this slightly odd approach is to leave the door open to other "shapes" such as spectral displays, etc. */ @@ -1035,7 +1149,7 @@ AudioRegionView::set_waveform_shape (WaveformShape shape) void AudioRegionView::set_waveform_scale (WaveformScale scale) { - bool yn = (scale == LogWaveform); + bool yn = (scale == Logarithmic); if (yn != (bool) (_flags & WaveformLogScaled)) { for (vector::iterator wave = waves.begin(); wave != waves.end() ; ++wave) { @@ -1053,23 +1167,23 @@ 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(); + + nchans = rtv->track()->n_channels().n_audio(); for (uint32_t n = 0; n < nchans; ++n) { - + if (n >= audio_region()->n_channels()) { break; } - + WaveView *wave = new WaveView(*ghost->group); wave->property_data_src() = _region.get(); @@ -1082,9 +1196,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); @@ -1092,10 +1204,9 @@ 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)); - return ghost; } @@ -1109,7 +1220,7 @@ AudioRegionView::entered () uint32_t r,g,b,a; UINT_TO_RGBA(fade_color,&r,&g,&b,&a); a=255; - + if (fade_in_handle) { fade_in_handle->property_fill_color_rgba() = RGBA_TO_UINT(r,g,b,a); fade_out_handle->property_fill_color_rgba() = RGBA_TO_UINT(r,g,b,a); @@ -1122,11 +1233,11 @@ AudioRegionView::exited () if (gain_line) { gain_line->hide_all_but_selected_control_points (); } - + uint32_t r,g,b,a; UINT_TO_RGBA(fade_color,&r,&g,&b,&a); a=0; - + if (fade_in_handle) { fade_in_handle->property_fill_color_rgba() = RGBA_TO_UINT(r,g,b,a); fade_out_handle->property_fill_color_rgba() = RGBA_TO_UINT(r,g,b,a); @@ -1137,51 +1248,142 @@ 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) { // TODO: something else to let it know the channel waves[n]->property_data_src() = _region.get(); } - + for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - + (*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 cGhostTrackWave: - case cGhostTrackWaveClip: - 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(); + } + } + } + } +} + +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 (); + } + } +} + +void +AudioRegionView::update_coverage_frames (LayerDisplay d) +{ + RegionView::update_coverage_frames (d); + + fade_in_handle->raise_to_top (); + fade_out_handle->raise_to_top (); }