X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=4729024159e45febf5fb2c8fb484ac82ad7eff31;hb=d4433b9ab384196bb5b8876890863d7939339ee2;hp=d4e846aec50174c6a8f5e9a637159ce8ce4bb2cc;hpb=0178875021916feea05a830325c25e9a7db81d34;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index d4e846aec5..4729024159 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2006 Paul Davis + Copyright (C) 2001-2006 Paul Davis 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 @@ -27,8 +27,8 @@ #include "ardour/playlist.h" #include "ardour/audioregion.h" #include "ardour/audiosource.h" -#include "ardour/audio_diskstream.h" #include "ardour/profile.h" +#include "ardour/session.h" #include "pbd/memento_command.h" #include "pbd/stacktrace.h" @@ -57,7 +57,6 @@ #define MUTED_ALPHA 10 using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -69,11 +68,11 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView Gdk::Color const & basic_color) : RegionView (parent, tv, r, spu, basic_color) , sync_mark(0) - , zero_line(0) , fade_in_shape(0) , fade_out_shape(0) , fade_in_handle(0) , fade_out_handle(0) + , fade_position_line(0) , gain_line(0) , _amplitude_above_axis(1.0) , _flags(0) @@ -82,58 +81,33 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView } -AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr r, double spu, +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) - , 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) -{ -} - - -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) + , fade_position_line(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 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) + , fade_position_line(0) , gain_line(0) - , _amplitude_above_axis(1.0) - , _flags(0) + , _amplitude_above_axis (other._amplitude_above_axis) + , _flags (other._flags) , fade_color(0) - { Gdk::Color c; int r,g,b,a; @@ -149,13 +123,12 @@ 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); - + XMLNode *node; _amplitude_above_axis = 1.0; - zero_line = 0; _flags = 0; if ((node = _region->extra_xml ("GUI")) != 0) { @@ -165,50 +138,55 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) store_flags (); } - if (trackview.editor().new_regionviews_display_gain()) { + /* make envelope visible if it has anything interesting in it */ + boost::shared_ptr env = audio_region()->envelope (); + if (env->size() > 2 || (env->size() == 2 && env->front()->value != env->back()->value)) { _flags |= EnvelopeVisible; } compute_colors (basic_color); - + create_waves (); 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); - + if (!_recregion) { 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_fill_color_rgba() = UINT_RGBA_CHANGE_A (fill_color, 0); fade_in_handle->property_outline_pixels() = 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_fill_color_rgba() = UINT_RGBA_CHANGE_A (fill_color, 0); fade_out_handle->property_outline_pixels() = 0; - + fade_out_handle->set_data ("regionview", this); + + fade_position_line = new ArdourCanvas::SimpleLine (*group); + fade_position_line->property_color_rgba() = 0xBBBBBBAA; + fade_position_line->property_y1() = 7; + fade_position_line->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1; + + fade_position_line->hide(); } setup_fade_handle_positions (); - if (!trackview.session().config.get_show_region_fades()) { - set_fade_visibility (false); - } + if (!trackview.session()->config.get_show_region_fades()) { + set_fade_visibility (false); + } const string line_name = _region->name() + ":gain"; if (!Profile->get_sae()) { - gain_line = new AudioRegionGainLine (line_name, trackview.session(), *this, *group, - audio_region()->envelope()); + gain_line = new AudioRegionGainLine (line_name, *this, *group, audio_region()->envelope()); } if (!(_flags & EnvelopeVisible)) { @@ -223,7 +201,8 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) region_muted (); region_sync_changed (); - region_resized (BoundsChanged); + + region_resized (ARDOUR::bounds_change); set_waveview_data_src(); region_locked (); envelope_active_changed (); @@ -232,10 +211,16 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) reset_width_dependent_items (_pixel_width); - fade_in_shape->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_event), fade_in_shape, this)); - fade_in_handle->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_handle_event), fade_in_handle, this)); - fade_out_shape->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_event), fade_out_shape, this)); - fade_out_handle->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_handle_event), fade_out_handle, this)); + fade_in_shape->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_event), fade_in_shape, this)); + if (fade_in_handle) { + 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)); + + if (fade_out_handle) { + fade_out_handle->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_handle_event), fade_out_handle, this)); + } set_colors (); @@ -252,6 +237,14 @@ AudioRegionView::~AudioRegionView () gnome_canvas_waveview_cache_destroy (*cache); } + for (vector::iterator i = _data_ready_connections.begin(); i != _data_ready_connections.end(); ++i) { + delete *i; + } + + for (list >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) { + delete ((*i).second); + } + /* all waveviews etc will be destroyed when the group is destroyed */ delete gain_line; @@ -265,31 +258,34 @@ AudioRegionView::audio_region() const } void -AudioRegionView::region_changed (Change what_changed) +AudioRegionView::region_changed (const PropertyChange& what_changed) { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &AudioRegionView::region_changed), what_changed)); - //cerr << "AudioRegionView::region_changed() called" << endl; + ENSURE_GUI_THREAD (*this, &AudioRegionView::region_changed, what_changed); + // cerr << "AudioRegionView::region_changed() called" << endl; - RegionView::region_changed(what_changed); + RegionView::region_changed (what_changed); - if (what_changed & AudioRegion::ScaleAmplitudeChanged) { + if (what_changed.contains (ARDOUR::Properties::scale_amplitude)) { region_scale_amplitude_changed (); } - if (what_changed & AudioRegion::FadeInChanged) { + 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 (); } + if (what_changed.contains (ARDOUR::Properties::valid_transients)) { + transients_changed (); + } } void @@ -306,40 +302,24 @@ AudioRegionView::fade_out_changed () void AudioRegionView::fade_in_active_changed () { - uint32_t r,g,b,a; - uint32_t col; - UINT_TO_RGBA(fade_color,&r,&g,&b,&a); - if (audio_region()->fade_in_active()) { - col = RGBA_TO_UINT(r,g,b,120); - fade_in_shape->property_fill_color_rgba() = col; - fade_in_shape->property_width_pixels() = 0; - fade_in_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,0); - } else { - col = RGBA_TO_UINT(r,g,b,0); - fade_in_shape->property_fill_color_rgba() = col; + fade_in_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,90); // FIXME make a themeable colour + fade_in_shape->property_width_pixels() = 1; + } else { + fade_in_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,20); // FIXME make a themeable colour fade_in_shape->property_width_pixels() = 1; - fade_in_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,255); } } void AudioRegionView::fade_out_active_changed () { - uint32_t r,g,b,a; - uint32_t col; - UINT_TO_RGBA(fade_color,&r,&g,&b,&a); - if (audio_region()->fade_out_active()) { - col = RGBA_TO_UINT(r,g,b,120); - fade_out_shape->property_fill_color_rgba() = col; - fade_out_shape->property_width_pixels() = 0; - fade_out_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,0); - } else { - col = RGBA_TO_UINT(r,g,b,0); - fade_out_shape->property_fill_color_rgba() = col; + fade_out_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,90); // FIXME make a themeable colour + fade_out_shape->property_width_pixels() = 1; + } else { + fade_out_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,20); // FIXME make a themeable colour fade_out_shape->property_width_pixels() = 1; - fade_out_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,255); } } @@ -347,7 +327,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 @@ -358,9 +338,9 @@ AudioRegionView::region_scale_amplitude_changed () void AudioRegionView::region_renamed () { - Glib::ustring str = RegionView::make_name (); - - if (audio_region()->speed_mismatch (trackview.session().frame_rate())) { + std::string str = RegionView::make_name (); + + if (audio_region()->speed_mismatch (trackview.session()->frame_rate())) { str = string ("*") + str; } @@ -373,26 +353,42 @@ AudioRegionView::region_renamed () } void -AudioRegionView::region_resized (Change what_changed) +AudioRegionView::region_resized (const PropertyChange& what_changed) { AudioGhostRegion* agr; RegionView::region_resized(what_changed); + PropertyChange interesting_stuff; + + interesting_stuff.add (ARDOUR::Properties::start); + interesting_stuff.add (ARDOUR::Properties::length); - if (what_changed & Change (StartChanged|LengthChanged)) { + if (what_changed.contains (interesting_stuff)) { - for (uint32_t n = 0; n < waves.size(); ++n) { - waves[n]->property_region_start() = _region->start(); + 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) { - if((agr = dynamic_cast(*i)) != 0) { + + 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(); } } - } + } + + /* hide transient lines that extend beyond the region end */ + + list >::iterator l; + + for (l = feature_lines.begin(); l != feature_lines.end(); ++l) { + if (l->first > _region->length() - 1) { + l->second->hide(); + } else { + l->second->show(); + } + } } } @@ -402,25 +398,32 @@ AudioRegionView::reset_width_dependent_items (double pixel_width) RegionView::reset_width_dependent_items(pixel_width); assert(_pixel_width == pixel_width); - if (zero_line) { - zero_line->property_x2() = pixel_width - 1.0; - } - if (fade_in_handle) { - if (pixel_width <= 6.0) { + if (pixel_width <= 6.0 || _height < 5.0 || !trackview.session()->config.get_show_region_fades()) { fade_in_handle->hide(); fade_out_handle->hide(); - } else { - if (_height < 5.0) { - fade_in_handle->hide(); - fade_out_handle->hide(); - } else { - if (trackview.session().config.get_show_region_fades()) { - fade_in_handle->show(); - fade_out_handle->show(); - } - } } + else { + fade_in_handle->show(); + fade_out_handle->show(); + } + } + + AnalysisFeatureList analysis_features = _region->transients(); + AnalysisFeatureList::const_iterator i; + + list >::iterator l; + + for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) { + + float x_pos = trackview.editor().frame_to_pixel (*i); + + ArdourCanvas::Points points; + points.push_back(Gnome::Art::Point(x_pos, 2.0)); // first x-coord needs to be a non-normal value + points.push_back(Gnome::Art::Point(x_pos, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); + + (*l).first = *i; + (*l).second->property_points() = points; } reset_fade_shapes (); @@ -452,7 +455,7 @@ AudioRegionView::setup_fade_handle_positions() 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; @@ -466,27 +469,23 @@ AudioRegionView::set_height (gdouble height) uint32_t wcnt = waves.size(); - // FIXME: ick - height -= 2; - - _height = height; - - for (uint32_t n=0; n < wcnt; ++n) { + for (uint32_t n = 0; n < wcnt; ++n) { gdouble ht; - if ((height) < NAME_HIGHLIGHT_THRESH) { - ht = ((height-2*wcnt) / (double) wcnt); + 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_THRESH) { gain_line->hide (); } else { @@ -494,32 +493,39 @@ AudioRegionView::set_height (gdouble height) 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_pixbuf) { - name_pixbuf->raise_to_top(); + /* Update hights for any active feature lines */ + list >::iterator l; + + for (l = feature_lines.begin(); l != feature_lines.end(); ++l) { + + float pos_x = trackview.editor().frame_to_pixel((*l).first); + + ArdourCanvas::Points points; + + points.push_back(Gnome::Art::Point(pos_x, 2.0)); // first x-coord needs to be a non-normal value + points.push_back(Gnome::Art::Point(pos_x, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); + + (*l).second->property_points() = points; } -} + if (fade_position_line) { -void -AudioRegionView::manage_zero_line () -{ - if (!zero_line) { - return; + if (height < NAME_HIGHLIGHT_THRESH) { + fade_position_line->property_y2() = _height - 1; + } + else { + fade_position_line->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1; + } } - if (_height >= 100) { - 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(); - } else { - zero_line->hide(); + if (name_pixbuf) { + name_pixbuf->raise_to_top(); } } @@ -533,11 +539,11 @@ 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 ((framecnt_t) audio_region()->fade_in()->back()->when); } - + void -AudioRegionView::reset_fade_in_shape_width (nframes_t width) +AudioRegionView::reset_fade_in_shape_width (framecnt_t width) { if (fade_in_handle == 0) { return; @@ -545,47 +551,43 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width) /* smallest size for a fade is 64 frames */ - width = std::max ((nframes_t) 64, width); + width = std::max ((framecnt_t) 64, width); Points* points; - double pwidth = width / samples_per_unit; + + /* round here to prevent little visual glitches with sub-pixel placement */ + double const pwidth = rint (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(); return; } - double handle_center; - handle_center = pwidth; - - if (handle_center > 7.0) { - handle_center -= 3.0; - } else { - handle_center = 3.0; - } + double const handle_center = pwidth; + + /* Put the fade in handle so that its left side is at the end-of-fade line */ + fade_in_handle->property_x1() = handle_center; + fade_in_handle->property_x2() = handle_center + 6; - 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; } - if (trackview.session().config.get_show_region_fades()) { + if (trackview.session()->config.get_show_region_fades()) { fade_in_shape->show(); } float 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); + points = get_canvas_points ("fade in shape", npoints + 3); if (_height >= NAME_HIGHLIGHT_THRESH) { - h = _height - NAME_HIGHLIGHT_SIZE; + h = _height - NAME_HIGHLIGHT_SIZE - 2; } else { h = _height; } @@ -599,7 +601,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); @@ -611,33 +613,37 @@ 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(); + if (frame_handle_start) { + 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 ((framecnt_t) audio_region()->fade_out()->back()->when); } void -AudioRegionView::reset_fade_out_shape_width (nframes_t width) -{ +AudioRegionView::reset_fade_out_shape_width (framecnt_t width) +{ if (fade_out_handle == 0) { return; } /* smallest size for a fade is 64 frames */ - width = std::max ((nframes_t) 64, width); + width = std::max ((framecnt_t) 64, width); Points* points; - double pwidth = width / samples_per_unit; + + /* round here to prevent little visual glitches with sub-pixel placement */ + double const pwidth = rint (width / samples_per_unit); uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth); double h; @@ -647,26 +653,22 @@ AudioRegionView::reset_fade_out_shape_width (nframes_t width) return; } - 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; + double const handle_center = (_region->length() - width) / samples_per_unit; + + /* Put the fade out handle so that its right side is at the end-of-fade line; + * it's `one out' for precise pixel accuracy. + */ + fade_out_handle->property_x1() = handle_center - 5; + fade_out_handle->property_x2() = handle_center + 1; /* don't show shape if its too small */ - + if (pwidth < 5) { fade_out_shape->hide(); return; - } - - if (trackview.session().config.get_show_region_fades()) { + } + + if (trackview.session()->config.get_show_region_fades()) { fade_out_shape->show(); } @@ -674,23 +676,23 @@ AudioRegionView::reset_fade_out_shape_width (nframes_t width) audio_region()->fade_out()->curve().get_vector (0, audio_region()->fade_out()->back()->when, curve, npoints); if (_height >= NAME_HIGHLIGHT_THRESH) { - h = _height - NAME_HIGHLIGHT_SIZE; + h = _height - NAME_HIGHLIGHT_SIZE - 2; } else { h = _height; } /* points *MUST* be in anti-clockwise order */ - points = get_canvas_points ("fade out shape", npoints+3); + points = get_canvas_points ("fade out shape", npoints + 3); uint32_t pi, pc; double xdelta = pwidth/npoints; for (pi = 0, pc = 0; pc < npoints; ++pc) { - (*points)[pi].set_x(_pixel_width - 1 - pwidth + (pc*xdelta)); + (*points)[pi].set_x(_pixel_width - pwidth + (pc * xdelta)); (*points)[pi++].set_y(2 + (h - (curve[pc] * h))); } - + /* fold back */ (*points)[pi].set_x(_pixel_width); @@ -705,9 +707,11 @@ 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(); + if (frame_handle_end) { + frame_handle_end->raise_to_top(); + } } void @@ -740,20 +744,17 @@ void AudioRegionView::compute_colors (Gdk::Color const & basic_color) { RegionView::compute_colors (basic_color); - - uint32_t r, g, b, a; /* gain color computed in envelope_active_changed() */ - UINT_TO_RGBA (fill_color, &r, &g, &b, &a); - fade_color = RGBA_TO_UINT(r,g,b,120); + fade_color = UINT_RGBA_CHANGE_A (fill_color, 120); } void AudioRegionView::set_colors () { RegionView::set_colors(); - + if (gain_line) { gain_line->set_line_color (audio_region()->envelope_active() ? ARDOUR_UI::config()->canvasvar_GainLine.get() : ARDOUR_UI::config()->canvasvar_GainLineInactive.get()); } @@ -770,20 +771,6 @@ AudioRegionView::set_colors () } } -void -AudioRegionView::show_region_editor () -{ - if (editor == 0) { - editor = new AudioRegionEditor (trackview.session(), audio_region(), *this); - // GTK2FIX : how to ensure float without realizing - // editor->realize (); - // trackview.editor.ensure_float (*editor); - } - - editor->present (); - editor->show_all(); -} - void AudioRegionView::set_waveform_visible (bool yn) { @@ -844,32 +831,42 @@ AudioRegionView::create_waves () // cerr << "AudioRegionView::create_waves() called on " << this << endl;//DEBUG RouteTimeAxisView& atv (*(dynamic_cast(&trackview))); // ick - if (!atv.get_diskstream()) { + if (!atv.track()) { return; } - ChanCount nchans = atv.get_diskstream()->n_channels(); + ChanCount nchans = atv.track()->n_channels(); // cerr << "creating waves for " << _region->name() << " with wfd = " << wait_for_data // << " and channels = " << nchans.n_audio() << endl; - + /* in tmp_waves, set up null pointers for each channel so the vector is allocated */ for (uint32_t n = 0; n < nchans.n_audio(); ++n) { tmp_waves.push_back (0); } + 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()->audio_source(n)->peaks_ready (bind (mem_fun(*this, &AudioRegionView::peaks_ready_handler), n), data_ready_connection)) { + if (audio_region()->audio_source(n)->peaks_ready (boost::bind (&AudioRegionView::peaks_ready_handler, this, n), &_data_ready_connections[n], gui_context())) { // cerr << "\tData is ready\n"; create_one_wave (n, true); } else { @@ -877,7 +874,7 @@ AudioRegionView::create_waves () // 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); @@ -891,7 +888,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) { //cerr << "AudioRegionView::create_one_wave() called which: " << which << " this: " << this << endl;//DEBUG RouteTimeAxisView& atv (*(dynamic_cast(&trackview))); // ick - uint32_t nchans = atv.get_diskstream()->n_channels().n_audio(); + uint32_t nchans = atv.track()->n_channels().n_audio(); uint32_t n; uint32_t nwaves = std::min (nchans, audio_region()->n_channels()); gdouble ht; @@ -929,6 +926,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) wave->property_clip_color() = ARDOUR_UI::config()->canvasvar_WaveFormClip.get(); wave->property_zero_color() = ARDOUR_UI::config()->canvasvar_ZeroLine.get(); + wave->property_zero_line() = true; wave->property_region_start() = _region->start(); wave->property_rectified() = (bool) (_flags & WaveformRectified); wave->property_logscaled() = (bool) (_flags & WaveformLogScaled); @@ -948,9 +946,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; @@ -965,24 +963,15 @@ 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 (); - -#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) ARDOUR_UI::config()->canvasvar_ZeroLine.get(); - manage_zero_line (); - } -#endif + delete _data_ready_connections[which]; + _data_ready_connections[which] = 0; } } 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; } @@ -998,13 +987,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); + framepos_t fx = trackview.editor().pixel_to_frame (x); if (fx > _region->length()) { return; @@ -1018,21 +1007,25 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev) gain_line->view_to_model_coord (x, y); - trackview.session().begin_reversible_command (_("add gain control point")); + /* XXX STATEFUL: can't convert to stateful diff until we + can represent automation data with it. + */ + + trackview.session()->begin_reversible_command (_("add gain control point")); XMLNode &before = audio_region()->envelope()->get_state(); if (!audio_region()->envelope_active()) { XMLNode ®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().get(), &before, &after)); - trackview.session().commit_reversible_command (); + trackview.session()->add_command (new MementoCommand(*audio_region()->envelope().get(), &before, &after)); + trackview.session()->commit_reversible_command (); } void @@ -1061,36 +1054,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. */ @@ -1109,14 +1102,6 @@ AudioRegionView::set_waveform_shape (WaveformShape shape) (*wave)->property_rectified() = yn; } - if (zero_line) { - if (yn) { - zero_line->hide(); - } else { - zero_line->show(); - } - } - if (yn) { _flags |= WaveformRectified; } else { @@ -1155,15 +1140,15 @@ AudioRegionView::add_ghost (TimeAxisView& tv) double unit_position = _region->position () / samples_per_unit; AudioGhostRegion* ghost = new AudioGhostRegion (tv, trackview, unit_position); uint32_t nchans; - - nchans = rtv->get_diskstream()->n_channels().n_audio(); + + nchans = rtv->track()->n_channels().n_audio(); for (uint32_t n = 0; n < nchans; ++n) { - + if (n >= audio_region()->n_channels()) { break; } - + WaveView *wave = new WaveView(*ghost->group); wave->property_data_src() = _region.get(); @@ -1187,42 +1172,38 @@ AudioRegionView::add_ghost (TimeAxisView& tv) ghost->set_colors(); ghosts.push_back (ghost); - ghost->GoingAway.connect (mem_fun(*this, &AudioRegionView::remove_ghost)); - return ghost; } void -AudioRegionView::entered () +AudioRegionView::entered (bool internal_editing) { + trackview.editor().set_current_trimmable (_region); + trackview.editor().set_current_movable (_region); + if (gain_line && _flags & EnvelopeVisible) { gain_line->show_all_control_points (); } - 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); + if (fade_in_handle && !internal_editing) { + fade_in_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 255); + fade_out_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 255); } } void AudioRegionView::exited () { + trackview.editor().set_current_trimmable (boost::shared_ptr()); + trackview.editor().set_current_movable (boost::shared_ptr()); + 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); + fade_in_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 0); + fade_out_handle->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fade_color, 0); } } @@ -1244,11 +1225,11 @@ AudioRegionView::set_waveview_data_src() // 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); - + if((agr = dynamic_cast(*i)) != 0) { for (vector::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) { (*w)->property_data_src() = _region.get(); @@ -1286,47 +1267,44 @@ AudioRegionView::set_frame_color () 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); + TimeAxisViewItem::set_frame_color (); - 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(); - } - } + uint32_t wc; + uint32_t fc; + + if (_selected) { + if (_region->muted()) { + wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get(), MUTED_ALPHA); + } else { + wc = ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get(); + } + fc = 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(); - } - } + if (_region->muted()) { + wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_RecWaveForm.get(), MUTED_ALPHA); + } else { + wc = ARDOUR_UI::config()->canvasvar_RecWaveForm.get(); + } + fc = 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(); - } - } + if (_region->muted()) { + wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA); + } else { + wc = ARDOUR_UI::config()->canvasvar_WaveForm.get(); + } + fc = ARDOUR_UI::config()->canvasvar_WaveFormFill.get(); } } + + for (vector::iterator w = waves.begin(); w != waves.end(); ++w) { + if (_region->muted()) { + (*w)->property_wave_color() = wc; + } else { + (*w)->property_wave_color() = wc; + (*w)->property_fill_color() = fc; + } + } } void @@ -1338,10 +1316,10 @@ AudioRegionView::set_fade_visibility (bool yn) } if (fade_out_shape) { fade_out_shape->show (); - } + } if (fade_in_handle) { fade_in_handle->show (); - } + } if (fade_out_handle) { fade_out_handle->show (); } @@ -1351,12 +1329,160 @@ AudioRegionView::set_fade_visibility (bool yn) } 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); + + if (fade_in_handle) { + fade_in_handle->raise_to_top (); + fade_out_handle->raise_to_top (); + } +} + +void +AudioRegionView::show_region_editor () +{ + if (editor == 0) { + editor = new AudioRegionEditor (trackview.session(), audio_region()); + } + + editor->present (); + editor->set_position (Gtk::WIN_POS_MOUSE); + editor->show_all(); +} + + +void +AudioRegionView::show_fade_line (framepos_t pos) +{ + fade_position_line->property_x1() = trackview.editor().frame_to_pixel (pos); + fade_position_line->property_x2() = trackview.editor().frame_to_pixel (pos); + fade_position_line->show (); + fade_position_line->raise_to_top (); +} + +void +AudioRegionView::hide_fade_line () +{ + fade_position_line->hide (); +} + + +void +AudioRegionView::transients_changed () +{ + AnalysisFeatureList analysis_features = _region->transients(); + + while (feature_lines.size() < analysis_features.size()) { + + ArdourCanvas::Line* canvas_item = new ArdourCanvas::Line(*group); + + ArdourCanvas::Points points; + + points.push_back(Gnome::Art::Point(-1.0, 2.0)); // first x-coord needs to be a non-normal value + points.push_back(Gnome::Art::Point(1.0, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); + + canvas_item->property_points() = points; + canvas_item->property_width_pixels() = 1; + canvas_item->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ZeroLine.get(); + canvas_item->property_first_arrowhead() = TRUE; + canvas_item->property_last_arrowhead() = TRUE; + canvas_item->property_arrow_shape_a() = 11.0; + canvas_item->property_arrow_shape_b() = 0.0; + canvas_item->property_arrow_shape_c() = 4.0; + + canvas_item->raise_to_top (); + canvas_item->show (); + + canvas_item->set_data ("regionview", this); + canvas_item->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_feature_line_event), canvas_item, this)); + + feature_lines.push_back (make_pair(0, canvas_item)); + } + + while (feature_lines.size() > analysis_features.size()) { + ArdourCanvas::Line* line = feature_lines.back().second; + feature_lines.pop_back (); + delete line; + } + + AnalysisFeatureList::const_iterator i; + list >::iterator l; + + for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) { + + ArdourCanvas::Points points; + + float *pos = new float; + *pos = trackview.editor().frame_to_pixel (*i); + + points.push_back(Gnome::Art::Point(*pos, 2.0)); // first x-coord needs to be a non-normal value + points.push_back(Gnome::Art::Point(*pos, _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1)); + + (*l).second->property_points() = points; + (*l).second->set_data ("position", pos); + + (*l).first = *i; + } +} + +void +AudioRegionView::update_transient(float /*old_pos*/, float new_pos) +{ + /* Find frame at old pos, calulate new frame then update region transients*/ + list >::iterator l; + + for (l = feature_lines.begin(); l != feature_lines.end(); ++l) { + + /* Line has been updated in drag so we compare to new_pos */ + + float* pos = (float*) (*l).second->get_data ("position"); + + if (rint(new_pos) == rint(*pos)) { + + framepos_t old_frame = (*l).first; + framepos_t new_frame = trackview.editor().pixel_to_frame (new_pos); + + _region->update_transient (old_frame, new_frame); + + break; + } + } +} + +void +AudioRegionView::remove_transient(float pos) +{ + /* Find frame at old pos, calulate new frame then update region transients*/ + list >::iterator l; + + for (l = feature_lines.begin(); l != feature_lines.end(); ++l) { + + /* Line has been updated in drag so we compare to new_pos */ + float *line_pos = (float*) (*l).second->get_data ("position"); + + if (rint(pos) == rint(*line_pos)) { + _region->remove_transient ((*l).first); + break; + } + } +} + +void +AudioRegionView::thaw_after_trim () +{ + RegionView::thaw_after_trim (); + + unhide_envelope (); +}