X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=51a016d2c3b8e7bab058573264a7389ec9640e58;hb=4336bb25d739cd007811ccd0298a15acc5e20787;hp=c52d71c780cd9bbd829f8e7c35ce9707bd32e099;hpb=c83389b8ec5fef9553a401e6123b7e55702af9e2;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index c52d71c780..51a016d2c3 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -27,7 +27,6 @@ #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" @@ -74,6 +73,7 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView , 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) @@ -91,6 +91,7 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView , 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) @@ -107,11 +108,11 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other) , 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; @@ -129,11 +130,11 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt , 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; @@ -165,7 +166,9 @@ 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; } @@ -181,21 +184,25 @@ AudioRegionView::init (Gdk::Color const & 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); - + 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 (); @@ -222,7 +229,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,9 +240,15 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) reset_width_dependent_items (_pixel_width); 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)); + 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)); - fade_out_handle->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_handle_event), fade_out_handle, 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 (); @@ -251,6 +265,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; @@ -264,31 +286,34 @@ AudioRegionView::audio_region() const } void -AudioRegionView::region_changed (Change what_changed) +AudioRegionView::region_changed (const PropertyChange& what_changed) { - ENSURE_GUI_THREAD (*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 @@ -305,40 +330,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); + 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 { - 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,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); + 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 { - 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,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); } } @@ -357,7 +366,7 @@ AudioRegionView::region_scale_amplitude_changed () void AudioRegionView::region_renamed () { - Glib::ustring str = RegionView::make_name (); + std::string str = RegionView::make_name (); if (audio_region()->speed_mismatch (trackview.session()->frame_rate())) { str = string ("*") + str; @@ -372,26 +381,43 @@ 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; - if (what_changed & Change (StartChanged|LengthChanged)) { + interesting_stuff.add (ARDOUR::Properties::start); + interesting_stuff.add (ARDOUR::Properties::length); + + 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) { - if((agr = dynamic_cast(*i)) != 0) { + 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(); + } + } } } @@ -406,22 +432,25 @@ AudioRegionView::reset_width_dependent_items (double pixel_width) } 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) { + (*l).second->property_x1() = trackview.editor().frame_to_pixel (*i); + (*l).second->property_x2() = trackview.editor().frame_to_pixel (*i); + } + reset_fade_shapes (); } @@ -465,27 +494,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 { @@ -493,16 +518,32 @@ AudioRegionView::set_height (gdouble height) gain_line->show (); } } - gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE - 2)); + + gain_line->set_height ((uint32_t) rint (height - NAME_HIGHLIGHT_SIZE) - 2); } manage_zero_line (); reset_fade_shapes (); + + /* Update hights for any active feature lines */ + list >::iterator l; + + for (l = feature_lines.begin(); l != feature_lines.end(); ++l) { + (*l).second->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1; + } + + if (fade_position_line) { + 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 (name_pixbuf) { name_pixbuf->raise_to_top(); } - } void @@ -532,11 +573,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; @@ -544,10 +585,12 @@ 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; @@ -557,17 +600,11 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width) return; } - double handle_center; - handle_center = pwidth; + double const 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; + /* 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; if (pwidth < 5) { fade_in_shape->hide(); @@ -581,10 +618,10 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width) 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; } @@ -615,17 +652,19 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width) 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; @@ -633,10 +672,12 @@ AudioRegionView::reset_fade_out_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; @@ -646,17 +687,13 @@ 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; - } + double const handle_center = (_region->length() - width) / samples_per_unit; - fade_out_handle->property_x1() = handle_center - 3.0; - fade_out_handle->property_x2() = handle_center + 3.0; + /* 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 */ @@ -673,20 +710,20 @@ 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))); } @@ -706,7 +743,9 @@ AudioRegionView::reset_fade_out_shape_width (nframes_t width) 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,12 +779,9 @@ 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 @@ -769,20 +805,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) { @@ -843,11 +865,11 @@ 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; @@ -857,6 +879,16 @@ AudioRegionView::create_waves () 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()) { @@ -868,7 +900,7 @@ AudioRegionView::create_waves () // cerr << "\tchannel " << n << endl; if (wait_for_data) { - if (audio_region()->audio_source(n)->peaks_ready (boost::bind (&AudioRegionView::peaks_ready_handler, this, n), data_ready_connection, gui_context())) { + 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 { @@ -890,7 +922,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; @@ -964,7 +996,8 @@ 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 (!zero_line) { @@ -981,7 +1014,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/) void AudioRegionView::peaks_ready_handler (uint32_t which) { - Gtkmm2ext::UI::instance()->call_slot (boost::bind (&AudioRegionView::create_one_wave, this, 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; } @@ -1003,7 +1036,7 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev) 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; @@ -1017,6 +1050,10 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev) gain_line->view_to_model_coord (x, y); + /* 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(); @@ -1155,7 +1192,7 @@ AudioRegionView::add_ghost (TimeAxisView& tv) 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) { @@ -1186,42 +1223,38 @@ AudioRegionView::add_ghost (TimeAxisView& tv) ghost->set_colors(); ghosts.push_back (ghost); - ghost->CatchDeletion.connect (*this, ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); - 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); } } @@ -1285,11 +1318,12 @@ 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); + if (fill_opacity) { + frame->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), fill_opacity); + } else { + frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(); + } for (vector::iterator w = waves.begin(); w != waves.end(); ++w) { if (_region->muted()) { @@ -1301,8 +1335,7 @@ AudioRegionView::set_frame_color () } } 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); + frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); for (vector::iterator w = waves.begin(); w != waves.end(); ++w) { if (_region->muted()) { @@ -1313,8 +1346,11 @@ AudioRegionView::set_frame_color () } } } 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); + if (fill_opacity) { + frame->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_FrameBase.get(), fill_opacity); + } else { + frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameBase.get(); + } for (vector::iterator w = waves.begin(); w != waves.end(); ++w) { if (_region->muted()) { @@ -1365,6 +1401,114 @@ AudioRegionView::update_coverage_frames (LayerDisplay d) { RegionView::update_coverage_frames (d); - fade_in_handle->raise_to_top (); - fade_out_handle->raise_to_top (); + 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::SimpleLine* l = new ArdourCanvas::SimpleLine (*group); + l->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get(); + feature_lines.push_back (make_pair(0, l)); + } + + while (feature_lines.size() > analysis_features.size()) { + ArdourCanvas::SimpleLine *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) { + (*l).first = *i; + (*l).second->property_x1() = trackview.editor().frame_to_pixel (*i); + (*l).second->property_x2() = trackview.editor().frame_to_pixel (*i); + (*l).second->property_y1() = 2; + (*l).second->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1; + (*l).second->set_data("regionview", this); + (*l).second->show (); + (*l).second->raise_to_top (); + + (*l).second->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_feature_line_event), (*l).second, this)); + } +} + +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) { + /* Simple line x1 has been updated in drag so we compare to new_pos */ + if (rint(new_pos) == rint((*l).second->property_x1())) { + + 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) { + /* Simple line x1 has been updated in drag so we compare to new_pos */ + if (rint(pos) == rint((*l).second->property_x1())) { + _region->remove_transient ((*l).first); + break; + } + } +} + +void +AudioRegionView::thaw_after_trim () +{ + RegionView::thaw_after_trim (); + + unhide_envelope (); }