Index: gtk2_ardour/editor_drag.cc =================================================================== --- gtk2_ardour/editor_drag.cc (revision 7741) +++ gtk2_ardour/editor_drag.cc (working copy) @@ -2265,12 +2265,13 @@ { Drag::start_grab (event, cursor); - AudioRegionView* a = dynamic_cast (_primary); - boost::shared_ptr const r = a->audio_region (); + AudioRegionView* arv = dynamic_cast (_primary); + boost::shared_ptr const r = arv->audio_region (); _pointer_frame_offset = grab_frame() - ((nframes64_t) r->fade_in()->back()->when + r->position()); _editor->show_verbose_duration_cursor (r->position(), r->position() + r->fade_in()->back()->when, 10); + arv->show_fade_line((nframes64_t) r->fade_in()->back()->when); } void @@ -2299,6 +2300,7 @@ } tmp->reset_fade_in_shape_width (fade_length); + tmp->show_fade_line((nframes64_t) fade_length); } _editor->show_verbose_duration_cursor (region->position(), region->position() + fade_length, 10); @@ -2340,6 +2342,7 @@ tmp->audio_region()->set_fade_in_length (fade_length); tmp->audio_region()->set_fade_in_active (true); + tmp->hide_fade_line(); XMLNode &after = alist->get_state(); _editor->session()->add_command(new MementoCommand(*alist.get(), &before, &after)); @@ -2359,6 +2362,7 @@ } tmp->reset_fade_in_shape_width (tmp->audio_region()->fade_in()->back()->when); + tmp->hide_fade_line(); } } @@ -2373,11 +2377,13 @@ { Drag::start_grab (event, cursor); - AudioRegionView* a = dynamic_cast (_primary); - boost::shared_ptr r = a->audio_region (); + AudioRegionView* arv = dynamic_cast (_primary); + boost::shared_ptr r = arv->audio_region (); _pointer_frame_offset = grab_frame() - (r->length() - (nframes64_t) r->fade_out()->back()->when + r->position()); _editor->show_verbose_duration_cursor (r->last_frame() - r->fade_out()->back()->when, r->last_frame(), 10); + + arv->show_fade_line(r->length() - r->fade_out()->back()->when); } void @@ -2408,6 +2414,7 @@ } tmp->reset_fade_out_shape_width (fade_length); + tmp->show_fade_line(region->length() - fade_length); } _editor->show_verbose_duration_cursor (region->last_frame() - fade_length, region->last_frame(), 10); @@ -2451,6 +2458,7 @@ tmp->audio_region()->set_fade_out_length (fade_length); tmp->audio_region()->set_fade_out_active (true); + tmp->hide_fade_line(); XMLNode &after = alist->get_state(); _editor->session()->add_command(new MementoCommand(*alist.get(), &before, &after)); @@ -2470,6 +2478,7 @@ } tmp->reset_fade_out_shape_width (tmp->audio_region()->fade_out()->back()->when); + tmp->hide_fade_line(); } } Index: gtk2_ardour/audio_region_view.h =================================================================== --- gtk2_ardour/audio_region_view.h (revision 7741) +++ gtk2_ardour/audio_region_view.h (working copy) @@ -102,7 +102,10 @@ void reset_fade_in_shape_width (nframes_t); void reset_fade_out_shape_width (nframes_t); - + + void show_fade_line(nframes64_t pos); + void hide_fade_line(); + void set_fade_visibility (bool); void update_coverage_frames (LayerDisplay); @@ -139,6 +142,7 @@ ArdourCanvas::Polygon* fade_out_shape; ArdourCanvas::SimpleRect* fade_in_handle; ///< fade in handle, or 0 ArdourCanvas::SimpleRect* fade_out_handle; ///< fade out handle, or 0 + ArdourCanvas::SimpleLine* fade_position_line; AudioRegionGainLine * gain_line; @@ -158,7 +162,7 @@ void region_resized (const PBD::PropertyChange&); void region_muted (); void region_scale_amplitude_changed (); - void region_renamed (); + void region_renamed (); void create_one_wave (uint32_t, bool); void manage_zero_line (); Index: gtk2_ardour/editor_mouse.cc =================================================================== --- gtk2_ardour/editor_mouse.cc (revision 7741) +++ gtk2_ardour/editor_mouse.cc (working copy) @@ -1633,8 +1605,7 @@ if (mouse_mode == MouseObject && !internal_editing()) { ArdourCanvas::SimpleRect *rect = dynamic_cast (item); if (rect) { - rect->property_fill_color_rgba() = 0; - rect->property_outline_pixels() = 1; + rect->property_fill_color_rgba() = 0xBBBBBBAA; } track_canvas->get_window()->set_cursor (*fade_in_cursor); } @@ -1644,8 +1615,7 @@ if (mouse_mode == MouseObject && !internal_editing()) { ArdourCanvas::SimpleRect *rect = dynamic_cast (item); if (rect) { - rect->property_fill_color_rgba() = 0; - rect->property_outline_pixels() = 1; + rect->property_fill_color_rgba() = 0xBBBBBBAA; } track_canvas->get_window()->set_cursor (*fade_out_cursor); } Index: gtk2_ardour/audio_region_view.cc =================================================================== --- gtk2_ardour/audio_region_view.cc (revision 7741) +++ gtk2_ardour/audio_region_view.cc (working copy) @@ -73,6 +73,7 @@ , 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) @@ -90,6 +91,7 @@ , 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) @@ -106,6 +108,7 @@ , 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) @@ -127,6 +130,7 @@ , 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) @@ -195,6 +199,13 @@ 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 (); @@ -329,11 +340,11 @@ if (audio_region()->fade_in_active()) { 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; - fade_in_shape->property_outline_color_rgba() = RGBA_TO_UINT(180,180,180,190); // FIXME make a themeable colour +// fade_in_shape->property_outline_color_rgba() = RGBA_TO_UINT(180,180,180,190); // FIXME make a themeable colour } 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(45,45,45,150); // FIXME make a themeable colour +// fade_in_shape->property_outline_color_rgba() = RGBA_TO_UINT(45,45,45,150); // FIXME make a themeable colour } } @@ -347,11 +358,13 @@ if (audio_region()->fade_out_active()) { 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; - fade_out_shape->property_outline_color_rgba() = RGBA_TO_UINT(180,180,180,200); // FIXME make a themeable colour + //fade_out_shape->property_outline_color_rgba() = RGBA_TO_UINT(180,180,180,200); // FIXME make a themeable colour + } 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(45,45,45,200); // FIXME make a themeable colour + //fade_out_shape->property_outline_color_rgba() = RGBA_TO_UINT(45,45,45,200); // FIXME make a themeable colour + } } @@ -436,20 +449,14 @@ } 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(); @@ -589,6 +596,7 @@ width = std::max ((nframes_t) 64, width); Points* points; + double pwidth = width / samples_per_unit; uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth); double h; @@ -603,7 +611,7 @@ handle_center = pwidth; if (handle_center > 7.0) { - handle_center -= 3.0; + handle_center -= 2.0; } else { handle_center = 3.0; } @@ -626,7 +634,7 @@ 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; } @@ -694,7 +702,7 @@ handle_center = (_region->length() - width) / samples_per_unit; if (handle_center > 7.0) { - handle_center -= 3.0; + handle_center -= 2.0; } else { handle_center = 3.0; } @@ -717,7 +725,7 @@ 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; } @@ -730,7 +738,7 @@ 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))); } @@ -1428,7 +1436,24 @@ editor->show_all(); } + void +AudioRegionView::show_fade_line (nframes64_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();