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)
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)
{
}
-
-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<AudioRegion> other_region)
: RegionView (other, boost::shared_ptr<Region> (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;
XMLNode *node;
_amplitude_above_axis = 1.0;
- zero_line = 0;
_flags = 0;
if ((node = _region->extra_xml ("GUI")) != 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;
delete *i;
}
- for (list<std::pair<framepos_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;
}
}
}
-
+
/* hide transient lines that extend beyond the region end */
-
- list<std::pair<framepos_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();
}
}
}
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 || _height < 5.0 || !trackview.session()->config.get_show_region_fades()) {
fade_in_handle->hide();
}
else {
fade_in_handle->show();
- fade_out_handle->show();
+ fade_out_handle->show();
}
}
AnalysisFeatureList analysis_features = _region->transients();
AnalysisFeatureList::const_iterator i;
- list<std::pair<framepos_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 ();
}
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<std::pair<framepos_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;
}
}
}
-void
-AudioRegionView::manage_zero_line ()
-{
- if (!zero_line) {
- return;
- }
-
- 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();
- }
-}
-
void
AudioRegionView::reset_fade_shapes ()
{
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);
/* all waves created, don't hook into peaks ready anymore */
delete _data_ready_connections[which];
_data_ready_connections[which] = 0;
-
-#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
}
}
gain_line->view_to_model_coord (x, y);
- /* XXX STATEFUL: can't convert to stateful diff until we
+ /* XXX STATEFUL: can't convert to stateful diff until we
can represent automation data with it.
*/
(*wave)->property_rectified() = yn;
}
- if (zero_line) {
- if (yn) {
- zero_line->hide();
- } else {
- zero_line->show();
- }
- }
-
if (yn) {
_flags |= WaveformRectified;
} else {
fill_opacity = 0;
}
- if (_selected) {
- 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();
- }
+ TimeAxisViewItem::set_frame_color ();
- 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();
- }
- }
+ 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) {
- frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
-
- 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 {
- 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<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
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<framepos_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) {
+
+ 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;
- (*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));
}
}
AudioRegionView::update_transient(float /*old_pos*/, float new_pos)
{
/* Find frame at old pos, calulate new frame then update region transients*/
- list<std::pair<framepos_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())) {
-
+
+ /* 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;
}
}
AudioRegionView::remove_transient(float pos)
{
/* Find frame at old pos, calulate new frame then update region transients*/
- list<std::pair<framepos_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;
}
}
projects / ardour.git / blobdiff