sigc::signal<void,AudioRegionView*> AudioRegionView::AudioRegionViewGoingAway;
-AudioRegionView::AudioRegionView (Gnome::Canvas::Group *parent, AudioTimeAxisView &tv,
+AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, AudioTimeAxisView &tv,
AudioRegion& r,
double spu,
double amplitude_above_axis,
region (r)
{
- Gnome::Canvas::Points shape;
+ ArdourCanvas::Points shape;
XMLNode *node;
editor = 0;
create_waves ();
- gtk_object_set_data (GTK_OBJECT(name_highlight), "regionview", this);
- gtk_object_set_data (GTK_OBJECT(name_text), "regionview", this);
+ name_highlight->set_data ("regionview", this);
+ name_text->set_data ("regionview", this);
- // shape = new Gnome::Canvas::Points ();
+ // shape = new ArdourCanvas::Points ();
/* an equilateral triangle */
shape.push_back (Gnome::Art::Point (0, sync_mark_width - 1));
shape.push_back (Gnome::Art::Point (-((sync_mark_width-1)/2), 1));
- sync_mark = new Gnome::Canvas::Polygon (*group);
- sync_mark->property_points().set_value(shape);
- sync_mark->set_property ("fill_color_rgba", fill_color);
+ sync_mark = new ArdourCanvas::Polygon (*group);
+ sync_mark->property_points() = shape;
+ sync_mark->property_fill_color_rgba() = fill_color;
sync_mark->hide();
- fade_in_shape = new Gnome::Canvas::Polygon (*group);
- fade_in_shape->set_property ("fill_color_rgba", fade_color);
+ fade_in_shape = new ArdourCanvas::Polygon (*group);
+ fade_in_shape->property_fill_color_rgba() = fade_color;
fade_in_shape->set_data ("regionview", this);
- fade_out_shape = new Gnome::Canvas::Polygon (*group);
- fade_out_shape->set_property ("fill_color_rgba", fade_color);
+ fade_out_shape = new ArdourCanvas::Polygon (*group);
+ 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);
-
-
- fade_in_handle = new Gnome::Canvas::SimpleRect (*group);
- fade_in_handle->set_property ("fill_color_rgba", RGBA_TO_UINT(r,g,b,0));
- fade_in_handle->set_property ("outline_pixels", 0);
- fade_in_handle->set_property ("y1", 2.0);
- fade_in_handle->set_property ("y2", 7.0);
-
- fade_in_handle->set_data ("regionview", this);
+ uint32_t r,g,b,a;
+ UINT_TO_RGBA(fill_color,&r,&g,&b,&a);
- fade_out_handle = new Gnome::Canvas::SimpleRect (*group);
- fade_out_handle->set_property ("fill_color_rgba", RGBA_TO_UINT(r,g,b,0));
- fade_out_handle->set_property ("outline_pixels", 0);
- fade_out_handle->set_property ("y1", 2.0);
- fade_out_handle->set_property ("y2", 7.0);
- gtk_object_set_data (GTK_OBJECT(fade_out_handle), "regionview", this);
+ 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_outline_pixels() = 0;
+ fade_in_handle->property_y1() = 2.0;
+ fade_in_handle->property_y2() = 7.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_outline_pixels() = 0;
+ fade_out_handle->property_y1() = 2.0;
+ fade_out_handle->property_y2() = 7.0;
+
+ fade_out_handle->set_data ("regionview", this);
}
string foo = region.name();
foo += ':';
foo += "gain";
- gain_line = new AudioRegionGainLine (foo, tv.session(), *this, &group, region.envelope(),
- PublicEditor::canvas_control_point_event,
- PublicEditor::canvas_line_event);
+ gain_line = new AudioRegionGainLine (foo, tv.session(), *this, *group, region.envelope());
if (!(_flags & EnvelopeVisible)) {
gain_line->hide ();
region.StateChanged.connect (mem_fun(*this, &AudioRegionView::region_changed));
- group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::UNC (PublicEditor::canvas_region_view_event)), group, this));
- region_view_name_highlight->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_region_view_name_highlight_event), region_view_name_highlight, this));
- fade_in_shape->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_fade_in_event), fade_in_shape, this));
-
- fade_in_handle->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_fade_in_handle_event), fade_in_handle, this));
- fade_out_shape->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_fade_out_event)), fade_out_shape, this));
- fade_out_handle->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_fade_out_handle_event), fade_out_handle, this));
+ group->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this));
+ name_highlight->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this));
+ fade_in_shape->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_event), fade_in_shape, this));
+ fade_in_handle->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_in_handle_event), fade_in_handle, this));
+ fade_out_shape->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_event), fade_out_shape, this));
+ fade_out_handle->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_fade_out_handle_event), fade_out_handle, this));
set_colors ();
/* XXX sync mark drag? */
-
}
AudioRegionView::~AudioRegionView ()
}
gint
-AudioRegionView::_lock_toggle (Gnome::Canvas::Item* item, GdkEvent* ev, void* arg)
+AudioRegionView::_lock_toggle (ArdourCanvas::Item* item, GdkEvent* ev, void* arg)
{
switch (ev->type) {
case GDK_BUTTON_RELEASE:
if (region.fade_in_active()) {
col = RGBA_TO_UINT(r,g,b,120);
- fade_in_shape->set_property ("fill_color_rgba", col);
- fade_in_shape->set_property ("width_pixels", 0);
- fade_in_shape->set_property ("outline_color_rgba", RGBA_TO_UINT(r,g,b,0));
+ 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);
} else {
col = RGBA_TO_UINT(r,g,b,0);
- fade_in_shape->set_property ("fill_color_rgba", col);
- fade_in_shape->set_property ("width_pixels", 1);
- fade_in_shape->set_property ("outline_color_rgba", RGBA_TO_UINT(r,g,b,255));
+ fade_in_shape->property_fill_color_rgba() = col;
+ fade_in_shape->property_width_pixels() = 1;
+ fade_in_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,255);
}
}
if (region.fade_out_active()) {
col = RGBA_TO_UINT(r,g,b,120);
- fade_out_shape->set_property ("fill_color_rgba", col);
- fade_out_shape->set_property ("width_pixels", 0);
- fade_out_shape->set_property ("outline_color_rgba", RGBA_TO_UINT(r,g,b,0));
+ 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);
} else {
col = RGBA_TO_UINT(r,g,b,0);
- fade_out_shape->set_property ("fill_color_rgba", col);
- fade_out_shape->set_property ("width_pixels", 1);
- fade_out_shape->set_property ("outline_color_rgba", RGBA_TO_UINT(r,g,b,255));
+ fade_out_shape->property_fill_color_rgba() = col;
+ fade_out_shape->property_width_pixels() = 1;
+ fade_out_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,255);
}
}
for (uint32_t n = 0; n < waves.size(); ++n) {
// force a reload of the cache
- waves[n]->property_data_src().set_value(®ion);
+ waves[n]->property_data_src() = ®ion;
}
}
reset_width_dependent_items (unit_length);
for (uint32_t n = 0; n < waves.size(); ++n) {
- waves[n]->property_region_start().set_value(region.start());
+ waves[n]->property_region_start() = region.start();
}
for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
(*i)->set_duration (unit_length);
for (vector<WaveView*>::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) {
- (*w)->property_region_start().set_value(region.start());
+ (*w)->property_region_start() = region.start();
}
}
}
_pixel_width = pixel_width;
if (zero_line) {
- zero_line->set_property ("x2", pixel_width - 1.0);
+ zero_line->property_x2() = pixel_width - 1.0;
}
if (pixel_width <= 6.0) {
for (uint32_t n=0; n < waves.size(); ++n) {
if (region.muted()) {
- waves[n]->property_wave_color().set_value(color_map[cMutedWaveForm]);
+ waves[n]->property_wave_color() = color_map[cMutedWaveForm];
} else {
- waves[n]->property_wave_color().set_value(color_map[cWaveForm]);
+ waves[n]->property_wave_color() = color_map[cWaveForm];
}
}
}
gdouble yoff = n * (ht+1);
- waves[n]->property_height().set_value(ht);
- waves[n]->property_y().set_value(yoff + 2);
+ waves[n]->property_height() = ht;
+ waves[n]->property_y() = yoff + 2;
}
if ((height/wcnt) < NAME_HIGHLIGHT_SIZE) {
if (_height >= 100) {
gdouble wave_midpoint = (_height - NAME_HIGHLIGHT_SIZE) / 2.0;
- zero_line->set_property ("y1", wave_midpoint);
- zero_line->set_property ("y2", wave_midpoint);
+ zero_line->property_y1() = wave_midpoint;
+ zero_line->property_y2() = wave_midpoint;
zero_line->show();
} else {
zero_line->hide();
handle_center = 3.0;
}
- fade_in_handle->set_property ("x1", handle_center - 3.0);
- fade_in_handle->set_property ("x2", handle_center + 3.0);
+ fade_in_handle->property_x1() = handle_center - 3.0;
+ fade_in_handle->property_x2() = handle_center + 3.0;
if (pwidth < 5) {
fade_in_shape->hide();
(*points)[pi] = (*points)[0];
- fade_in_shape->property_points().set_value(*points);
+ fade_in_shape->property_points() = *points;
delete points;
}
handle_center = 3.0;
}
- fade_out_handle->set_property ("x1", handle_center - 3.0);
- fade_out_handle->set_property ("x2", handle_center + 3.0);
+ fade_out_handle->property_x1() = handle_center - 3.0;
+ fade_out_handle->property_x2() = handle_center + 3.0;
/* don't show shape if its too small */
double xdelta = pwidth/npoints;
for (pi = 0, pc = 0; pc < npoints; ++pc) {
- (*points)[pi] = _pixel_width - 1 - pwidth + (pc*xdelta);
- (*points)[pi++] = 2 + (h - (curve[pc] * h));
+ (*points)[pi].set_x(_pixel_width - 1 - pwidth + (pc*xdelta));
+ (*points)[pi++].set_y(2 + (h - (curve[pc] * h)));
}
/* fold back */
- (*points)[pi] = _pixel_width;
- (*points)[pi++] = h;
+ (*points)[pi].set_x(_pixel_width);
+ (*points)[pi++].set_y(h);
- (*points)[pi] = _pixel_width;
- (*points)[pi++] = 2;
+ (*points)[pi].set_x(_pixel_width);
+ (*points)[pi++].set_y(2);
/* connect the dots ... */
(*points)[pi] = (*points)[0];
- fade_out_shape->set_property ("points", *points);
+ fade_out_shape->property_points() = *points;
delete points;
}
TimeAxisViewItem::set_samples_per_unit (spu);
for (uint32_t n=0; n < waves.size(); ++n) {
- waves[n]->property_samples_per_unit().set_value(spu);
+ waves[n]->property_samples_per_unit() = spu;
}
for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
AudioRegionView::set_amplitude_above_axis (gdouble spp)
{
for (uint32_t n=0; n < waves.size(); ++n) {
- waves[n]->property_amplitude_above_axis().set_value(spp);
+ waves[n]->property_amplitude_above_axis() = spp;
}
}
TimeAxisViewItem::set_colors ();
gain_line->set_line_color (region.envelope_active() ? color_map[cGainLine] : color_map[cGainLineInactive]);
- sync_mark->set_property ("fill_color_rgba", fill_color);
+ sync_mark->property_fill_color_rgba() = fill_color;
for (uint32_t n=0; n < waves.size(); ++n) {
if (region.muted()) {
- waves[n]->property_wave_color().set_value(color_map[cMutedWaveForm]);
+ waves[n]->property_wave_color() = color_map[cMutedWaveForm];
} else {
- waves[n]->property_wave_color().set_value(color_map[cWaveForm]);
+ waves[n]->property_wave_color() = color_map[cWaveForm];
}
}
}
Points points;
- points = sync_mark->property_points().get_value();
+ //points = sync_mark->property_points().get_value();
double offset = sync_offset / samples_per_unit;
-
- points[0].set_x(offset - ((sync_mark_width-1)/2));
- points[0].set_y(1);
-
- points[1].set_x(offset + (sync_mark_width-1)/2);
- points[1].set_y(1);
-
- points[2].set_x(offset);
- points[2].set_y(sync_mark_width - 1);
-
- points[3].set_x(offset - ((sync_mark_width-1)/2));
- points[3].set_y(1);
-
+ points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1));
+ points.push_back (Gnome::Art::Point (offset + ((sync_mark_width-1)/2), 1));
+ points.push_back (Gnome::Art::Point (offset, sync_mark_width - 1));
+ points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1));
+ sync_mark->property_points().set_value (points);
sync_mark->show();
- sync_mark->property_points().set_value(points);
}
}
}
if (create_zero_line) {
- zero_line = new Gnome::Canvas::Line (*group);
- zero_line->set_property ("x1", (gdouble) 1.0);
- zero_line->set_property ("x2", (gdouble) (region.length() / samples_per_unit) - 1.0);
- zero_line->set_property ("color_rgba", (guint) color_map[cZeroLine]);
+ 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) color_map[cZeroLine];
manage_zero_line ();
}
}
uint32_t nchans = atv.get_diskstream()->n_channels();
uint32_t n;
uint32_t nwaves = std::min (nchans, region.n_channels());
-
gdouble ht;
+
if (trackview.height < NAME_HIGHLIGHT_SIZE) {
ht = ((trackview.height) / (double) nchans);
} else {
ht = ((trackview.height - NAME_HIGHLIGHT_SIZE) / (double) nchans);
}
+
gdouble yoff = which * ht;
WaveView *wave = new WaveView(*group);
- wave->property_data_src().set_value( (gpointer) ®ion);
- wave->property_cache().set_value( wave_caches[which]);
- wave->property_cache_updater().set_value( (gboolean) true);
- wave->property_channel().set_value( (guint32) which);
- wave->property_length_function().set_value( (gpointer) region_length_from_c);
- wave->property_sourcefile_length_function().set_value((gpointer) sourcefile_length_from_c);
- wave->property_peak_function().set_value( (gpointer) region_read_peaks_from_c);
- wave->property_x().set_value( 0.0);
- wave->property_y().set_value( yoff);
- wave->property_height().set_value( (double) ht);
- wave->property_samples_per_unit().set_value( samples_per_unit);
- wave->property_amplitude_above_axis().set_value( _amplitude_above_axis);
- wave->property_wave_color().set_value(region.muted() ? color_map[cMutedWaveForm] : color_map[cWaveForm]);
- wave->property_region_start().set_value(region.start());
-// WaveView *wave = gnome_canvas_item_new (GNOME_CANVAS_GROUP(group),
-// gnome_canvas_waveview_get_type (),
-// "data_src", (gpointer) ®ion,
-// "cache", wave_caches[which],
-// "cache_updater", (gboolean) true,
-// "channel", (guint32) which,
-// "length_function", (gpointer) region_length_from_c,
-// "sourcefile_length_function",(gpointer) sourcefile_length_from_c,
-// "peak_function", (gpointer) region_read_peaks_from_c,
-// "x", 0.0,
-// "y", yoff,
-// "height", (double) ht,
-// "samples_per_unit", samples_per_unit,
-// "amplitude_above_axis", _amplitude_above_axis,
-// "wave_color", (guint32) (region.muted() ? color_map[cMutedWaveForm] : color_map[cWaveForm]),
-// "region_start",(guint32) region.start(),
-// NULL);
-
+ wave->property_data_src() = (gpointer) ®ion;
+ wave->property_cache() = wave_caches[which];
+ wave->property_cache_updater() = true;
+ wave->property_channel() = which;
+ wave->property_length_function() = (gpointer) region_length_from_c;
+ wave->property_sourcefile_length_function() = (gpointer) sourcefile_length_from_c;
+ wave->property_peak_function() = (gpointer) region_read_peaks_from_c;
+ wave->property_x() = 0.0;
+ wave->property_y() = yoff;
+ wave->property_height() = (double) ht;
+ wave->property_samples_per_unit() = samples_per_unit;
+ wave->property_amplitude_above_axis() = _amplitude_above_axis;
+ wave->property_wave_color() = region.muted() ? color_map[cMutedWaveForm] : color_map[cWaveForm];
+ wave->property_region_start() = region.start();
+
if (!(_flags & WaveformVisible)) {
wave->hide();
}
tmp_waves.clear ();
if (!zero_line) {
- zero_line = new Gnome::Canvas::Line (*group);
- zero_line->set_property ("x1", (gdouble) 1.0);
- zero_line->set_property ("x2", (gdouble) (region.length() / samples_per_unit) - 1.0);
- zero_line->set_property ("color_rgba", (guint) color_map[cZeroLine]);
+ 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) color_map[cZeroLine];
manage_zero_line ();
}
}
}
void
-AudioRegionView::add_gain_point_event (Gnome::Canvas::Item *item, GdkEvent *ev)
+AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
{
double x, y;
}
void
-AudioRegionView::remove_gain_point_event (Gnome::Canvas::Item *item, GdkEvent *ev)
+AudioRegionView::remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
{
ControlPoint *cp = reinterpret_cast<ControlPoint *> (item->get_data ("control_point"));
region.envelope().erase (cp->model);
if (yn != (bool) (_flags & WaveformRectified)) {
for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
- (*wave)->property_rectified().set_value(yn);
+ (*wave)->property_rectified() = yn;
}
if (zero_line) {
WaveView *wave = new WaveView(*ghost->group);
- wave->property_data_src().set_value( ®ion);
- wave->property_cache().set_value( wave_caches[n]);
- wave->property_cache_updater().set_value(false);
- wave->property_channel().set_value(n);
- wave->property_length_function().set_value((gpointer)region_length_from_c);
- wave->property_sourcefile_length_function().set_value((gpointer) sourcefile_length_from_c);
- wave->property_peak_function().set_value( (gpointer) region_read_peaks_from_c);
- wave->property_x().set_value( 0.0);
- wave->property_samples_per_unit().set_value( samples_per_unit);
- wave->property_amplitude_above_axis().set_value( _amplitude_above_axis);
- wave->property_wave_color().set_value(color_map[cGhostTrackWave]);
- wave->property_region_start().set_value(region.start());
- // WaveView *wave = gnome_canvas_item_new (GNOME_CANVAS_GROUP(ghost->group),
- // gnome_canvas_waveview_get_type (),
- // "data_src", (gpointer) ®ion,
- // "cache", wave_caches[n],
- // "cache_updater", (gboolean) false,
- // "channel", (guint32) n,
- // "length_function", (gpointer) region_length_from_c,
- // "sourcefile_length_function",(gpointer) sourcefile_length_from_c,
- // "peak_function", (gpointer) region_read_peaks_from_c,
- // "x", 0.0,
- // "samples_per_unit", samples_per_unit,
- // "amplitude_above_axis", _amplitude_above_axis,
- // "wave_color", color_map[cGhostTrackWave],
- // "region_start", (guint32) region.start(),
- // NULL);
+ wave->property_data_src() = ®ion;
+ wave->property_cache() = wave_caches[n];
+ wave->property_cache_updater() = false;
+ wave->property_channel() = n;
+ wave->property_length_function() = (gpointer)region_length_from_c;
+ wave->property_sourcefile_length_function() = (gpointer) sourcefile_length_from_c;
+ wave->property_peak_function() = (gpointer) region_read_peaks_from_c;
+ wave->property_x() = 0.0;
+ wave->property_samples_per_unit() = samples_per_unit;
+ wave->property_amplitude_above_axis() = _amplitude_above_axis;
+ wave->property_wave_color() = color_map[cGhostTrackWave];
+ wave->property_region_start() = region.start();
-
ghost->waves.push_back(wave);
}
UINT_TO_RGBA(fade_color,&r,&g,&b,&a);
a=255;
- fade_in_handle->set_property ("fill_color_rgba", RGBA_TO_UINT(r,g,b,a));
- fade_out_handle->set_property ("fill_color_rgba", RGBA_TO_UINT(r,g,b,a));
+ 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);
}
void
UINT_TO_RGBA(fade_color,&r,&g,&b,&a);
a=0;
- fade_in_handle->set_property ("fill_color_rgba", RGBA_TO_UINT(r,g,b,a));
- fade_out_handle->set_property ("fill_color_rgba", RGBA_TO_UINT(r,g,b,a));
+ 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);
}
void
for (uint32_t n = 0; n < waves.size(); ++n) {
// TODO: something else to let it know the channel
- waves[n]->property_data_src().set_value(®ion);
+ waves[n]->property_data_src() = ®ion;
}
for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
(*i)->set_duration (unit_length);
for (vector<WaveView*>::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) {
- (*w)->property_data_src().set_value(®ion);
+ (*w)->property_data_src() = ®ion;
}
}
projects / ardour.git / blobdiff