X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=51a016d2c3b8e7bab058573264a7389ec9640e58;hb=4336bb25d739cd007811ccd0298a15acc5e20787;hp=eea828937943e44a1601c8faf557cf14560a5120;hpb=18b99c1f440c8ee25c350f415407b649938273da;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index eea8289379..51a016d2c3 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -185,17 +185,14 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) fade_out_shape->set_data ("regionview", this); if (!_recregion) { - 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_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); @@ -272,7 +269,7 @@ AudioRegionView::~AudioRegionView () delete *i; } - for (list >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) { + for (list >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) { delete ((*i).second); } @@ -292,7 +289,7 @@ void AudioRegionView::region_changed (const PropertyChange& what_changed) { ENSURE_GUI_THREAD (*this, &AudioRegionView::region_changed, what_changed); - // cerr << "AudioRegionView::region_changed() called" << endl; + // cerr << "AudioRegionView::region_changed() called" << endl; RegionView::region_changed (what_changed); @@ -300,7 +297,7 @@ AudioRegionView::region_changed (const PropertyChange& what_changed) region_scale_amplitude_changed (); } if (what_changed.contains (ARDOUR::Properties::fade_in)) { - fade_in_changed (); + fade_in_changed (); } if (what_changed.contains (ARDOUR::Properties::fade_out)) { fade_out_changed (); @@ -369,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; @@ -411,7 +408,7 @@ AudioRegionView::region_resized (const PropertyChange& what_changed) /* hide transient lines that extend beyond the region end */ - list >::iterator l; + list >::iterator l; for (l = feature_lines.begin(); l != feature_lines.end(); ++l) { if ((*l).first > _region->length()- 1){ @@ -447,7 +444,7 @@ AudioRegionView::reset_width_dependent_items (double pixel_width) AnalysisFeatureList analysis_features = _region->transients(); AnalysisFeatureList::const_iterator i; - list >::iterator l; + 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); @@ -529,12 +526,21 @@ AudioRegionView::set_height (gdouble height) reset_fade_shapes (); /* Update hights for any active feature lines */ - list >::iterator l; + 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(); } @@ -567,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; @@ -579,11 +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; @@ -593,17 +600,11 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width) return; } - double handle_center; - handle_center = pwidth; - - if (handle_center > 7.0) { - handle_center -= 2.0; - } else { - handle_center = 3.0; - } + double const handle_center = pwidth; - 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(); @@ -659,11 +660,11 @@ AudioRegionView::reset_fade_in_shape_width (nframes_t width) void AudioRegionView::reset_fade_out_shape () { - reset_fade_out_shape_width ((nframes_t) audio_region()->fade_out()->back()->when); + reset_fade_out_shape_width ((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; @@ -671,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; @@ -684,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 -= 2.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 */ @@ -780,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 @@ -1040,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; @@ -1054,9 +1050,9 @@ 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. - */ + /* 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(); @@ -1233,34 +1229,32 @@ AudioRegionView::add_ghost (TimeAxisView& tv) void 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 && !internal_editing) { - 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, 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); } } @@ -1324,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()) { @@ -1340,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()) { @@ -1352,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()) { @@ -1424,7 +1421,7 @@ AudioRegionView::show_region_editor () void -AudioRegionView::show_fade_line (nframes64_t pos) +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); @@ -1457,7 +1454,7 @@ AudioRegionView::transients_changed () } AnalysisFeatureList::const_iterator i; - list >::iterator l; + 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; @@ -1477,14 +1474,14 @@ 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; + 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())) { - nframes64_t old_frame = (*l).first; - nframes64_t new_frame = trackview.editor().pixel_to_frame (new_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); @@ -1497,7 +1494,7 @@ void AudioRegionView::remove_transient(float pos) { /* Find frame at old pos, calulate new frame then update region transients*/ - list >::iterator l; + 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 */ @@ -1507,3 +1504,11 @@ AudioRegionView::remove_transient(float pos) } } } + +void +AudioRegionView::thaw_after_trim () +{ + RegionView::thaw_after_trim (); + + unhide_envelope (); +}