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);
delete *i;
}
- for (list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) {
+ for (list<std::pair<framepos_t, ArdourCanvas::Line*> >::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;
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);
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 ();
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;
}
/* hide transient lines that extend beyond the region end */
-
- list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
+
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::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();
+ if (l->first > _region->length() - 1) {
+ l->second->hide();
+ } else {
+ l->second->show();
}
}
}
AnalysisFeatureList analysis_features = _region->transients();
AnalysisFeatureList::const_iterator i;
- list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
+
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::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);
+
+ 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 ();
reset_fade_shapes ();
/* Update hights for any active feature lines */
- list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
-
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::iterator l;
+
for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
- (*l).second->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1;
- }
+
+ 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) {
+
+ 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
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;
/* 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;
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();
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;
return;
}
- double handle_center;
- handle_center = (_region->length() - width) / samples_per_unit;
+ double const handle_center = (_region->length() - width) / samples_per_unit;
- if (handle_center > 7.0) {
- handle_center -= 2.0;
- } else {
- handle_center = 3.0;
- }
-
- 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 */
{
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
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;
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();
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<Trimmable>());
+ trackview.editor().set_current_movable (boost::shared_ptr<Movable>());
+
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);
}
}
fill_opacity = 0;
}
- uint32_t r,g,b,a;
+ TimeAxisViewItem::set_frame_color ();
+
+ uint32_t wc;
+ uint32_t fc;
- if (_selected && should_show_selection) {
- UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), &r, &g, &b, &a);
- frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a);
-
- for (vector<ArdourCanvas::WaveView*>::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();
- }
- }
+ if (_selected) {
+ wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get(), MUTED_ALPHA);
+ 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<ArdourCanvas::WaveView*>::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<ArdourCanvas::WaveView*>::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<ArdourCanvas::WaveView*>::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
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);
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));
+
+ 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::SimpleLine *line = feature_lines.back().second;
+ ArdourCanvas::Line* line = feature_lines.back().second;
feature_lines.pop_back ();
delete line;
}
AnalysisFeatureList::const_iterator i;
- list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
-
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::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 ();
+
+ ArdourCanvas::Points points;
+
+ float *pos = new float;
+ *pos = trackview.editor().frame_to_pixel (*i);
- (*l).second->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_feature_line_event), (*l).second, this));
+ 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;
}
}
AudioRegionView::update_transient(float /*old_pos*/, float new_pos)
{
/* Find frame at old pos, calulate new frame then update region transients*/
- list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::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);
+
+ /* 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);
AudioRegionView::remove_transient(float pos)
{
/* Find frame at old pos, calulate new frame then update region transients*/
- list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
+ list<std::pair<framepos_t, ArdourCanvas::Line*> >::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);
+
+ /* 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 ();
+}
projects / ardour.git / blobdiff