#include "streamview.h"
#include "regionview.h"
#include "audio_time_axis.h"
-#include "canvas-simplerect.h"
-#include "canvas-simpleline.h"
-#include "canvas-waveview.h"
+#include "simplerect.h"
+#include "simpleline.h"
+#include "waveview.h"
#include "public_editor.h"
#include "region_editor.h"
#include "region_gain_line.h"
using namespace sigc;
using namespace ARDOUR;
using namespace Editing;
+using namespace ArdourCanvas;
static const int32_t sync_mark_width = 9;
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,
Gdk::Color& basic_color,
bool wfw)
- : TimeAxisViewItem (r.name(), parent, tv, spu, basic_color, r.position(), r.length(),
+ : TimeAxisViewItem (r.name(), *parent, tv, spu, basic_color, r.position(), r.length(),
TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText|
TimeAxisViewItem::ShowNameHighlight|
TimeAxisViewItem::ShowFrame)),
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 (-((sync_mark_width-1)/2), 1));
- shape->push_back (Gnome::Art::Point ((sync_mark_width - 1)/2, 1));
- shape->push_back (Gnome::Art::Point (0, sync_mark_width - 1));
- shape->push_back (Gnome::Art::Point (-((sync_mark_width-1)/2), 1));
+ shape.push_back (Gnome::Art::Point (-((sync_mark_width-1)/2), 1));
+ shape.push_back (Gnome::Art::Point ((sync_mark_width - 1)/2, 1));
+ 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->set_property ("points", 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();
- gnome_canvas_points_unref (shape->gobj());
- 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));
- gtk_signal_connect (GTK_OBJECT(group), "event",
- GTK_SIGNAL_FUNC (PublicEditor::canvas_region_view_event),
- this);
- gtk_signal_connect (GTK_OBJECT(name_highlight), "event",
- GTK_SIGNAL_FUNC (PublicEditor::canvas_region_view_name_highlight_event),
- this);
-
- gtk_signal_connect (GTK_OBJECT(name_text), "event",
- GTK_SIGNAL_FUNC (PublicEditor::canvas_region_view_name_event),
- this);
-
- gtk_signal_connect (GTK_OBJECT(fade_in_shape), "event",
- GTK_SIGNAL_FUNC (PublicEditor::canvas_fade_in_event),
- this);
-
- gtk_signal_connect (GTK_OBJECT(fade_in_handle), "event",
- GTK_SIGNAL_FUNC (PublicEditor::canvas_fade_in_handle_event),
- this);
-
- gtk_signal_connect (GTK_OBJECT(fade_out_shape), "event",
- GTK_SIGNAL_FUNC ( PublicEditor::canvas_fade_out_event),
- this);
-
- gtk_signal_connect_object (GTK_OBJECT(fade_out_handle), "event",
- GTK_SIGNAL_FUNC ( PublicEditor::canvas_fade_out_handle_event),
- 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
- gnome_canvas_item_set (waves[n], "data_src", ®ion, NULL);
+ waves[n]->property_data_src() = ®ion;
}
}
reset_width_dependent_items (unit_length);
for (uint32_t n = 0; n < waves.size(); ++n) {
- gnome_canvas_item_set (waves[n], "region_start", (guint32) region.start(), NULL);
+ 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<GnomeCanvasItem*>::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) {
- gnome_canvas_item_set ((*w), "region_start", region.start(), NULL);
+ for (vector<WaveView*>::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) {
+ (*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()) {
- gnome_canvas_item_set (waves[n], "wave_color", color_map[cMutedWaveForm], NULL);
+ waves[n]->property_wave_color() = color_map[cMutedWaveForm];
} else {
- gnome_canvas_item_set (waves[n], "wave_color", color_map[cWaveForm], NULL);
+ waves[n]->property_wave_color() = color_map[cWaveForm];
}
}
}
gdouble yoff = n * (ht+1);
- gnome_canvas_item_set (waves[n], "height", ht, NULL);
- gnome_canvas_item_set (waves[n], "y", yoff + 2, NULL);
+ 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();
width = std::max ((jack_nframes_t) 64, width);
- GnomeCanvasPoints* points;
+ Points* points;
double pwidth = width / samples_per_unit;
uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth);
double h;
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();
double xdelta = pwidth/npoints;
for (pi = 0, pc = 0; pc < npoints; ++pc) {
- points->coords[pi++] = 1 + (pc * xdelta);
- points->coords[pi++] = 2 + (h - (curve[pc] * h));
+ (*points)[pi].set_x(1 + (pc * xdelta));
+ (*points)[pi++].set_y(2 + (h - (curve[pc] * h)));
}
/* fold back */
- points->coords[pi++] = pwidth;
- points->coords[pi++] = 2;
+ (*points)[pi].set_x(pwidth);
+ (*points)[pi++].set_y(2);
- points->coords[pi++] = 1;
- points->coords[pi++] = 2;
+ (*points)[pi].set_x(1);
+ (*points)[pi++].set_y(2);
/* connect the dots ... */
- points->coords[pi++] = points->coords[0];
- points->coords[pi] = points->coords[1];
+ (*points)[pi] = (*points)[0];
- fade_in_shape->set_property ("points", points);
- gnome_canvas_points_unref (points);
+ fade_in_shape->property_points() = *points;
+ delete points;
}
void
width = std::max ((jack_nframes_t) 64, width);
- GnomeCanvasPoints* points;
+ Points* points;
double pwidth = width / samples_per_unit;
uint32_t npoints = std::min (gdk_screen_width(), (int) pwidth);
double h;
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->coords[pi++] = _pixel_width - 1 - pwidth + (pc*xdelta);
- points->coords[pi++] = 2 + (h - (curve[pc] * h));
+ (*points)[pi] = _pixel_width - 1 - pwidth + (pc*xdelta);
+ (*points)[pi++] = 2 + (h - (curve[pc] * h));
}
/* fold back */
- points->coords[pi++] = _pixel_width;
- points->coords[pi++] = h;
+ (*points)[pi] = _pixel_width;
+ (*points)[pi++] = h;
- points->coords[pi++] = _pixel_width;
- points->coords[pi++] = 2;
+ (*points)[pi] = _pixel_width;
+ (*points)[pi++] = 2;
/* connect the dots ... */
- points->coords[pi++] = points->coords[0];
- points->coords[pi] = points->coords[1];
+ (*points)[pi] = (*points)[0];
- fade_out_shape->set_property ("points", points);
- gnome_canvas_points_unref (points);
+ fade_out_shape->property_points() = *points;
+ delete points;
}
void
TimeAxisViewItem::set_samples_per_unit (spu);
for (uint32_t n=0; n < waves.size(); ++n) {
- gnome_canvas_item_set (waves[n], "samples_per_unit", spu, NULL);
+ 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) {
- gnome_canvas_item_set (waves[n], "amplitude_above_axis", spp, NULL);
+ 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()) {
- gnome_canvas_item_set (waves[n], "wave_color", color_map[cMutedWaveForm], NULL);
+ waves[n]->property_wave_color() = color_map[cMutedWaveForm];
} else {
- gnome_canvas_item_set (waves[n], "wave_color", color_map[cWaveForm], NULL);
+ waves[n]->property_wave_color() = color_map[cWaveForm];
}
}
}
/* lets do it */
- GtkArg args[1];
- GnomeCanvasPoints* points;
-
- args[0].name = X_("points");
+ Points points;
- sync_mark->get (X_("points"), &points);
+ points = sync_mark->property_points().get_value();
double offset = sync_offset / samples_per_unit;
- points->coords[0] = offset - ((sync_mark_width-1)/2);
- points->coords[1] = 1;
+ points[0].set_x(offset - ((sync_mark_width-1)/2));
+ points[0].set_y(1);
- points->coords[2] = offset + (sync_mark_width-1)/2;
- points->coords[3] = 1;
+ points[1].set_x(offset + (sync_mark_width-1)/2);
+ points[1].set_y(1);
- points->coords[4] = offset;
- points->coords[5] = sync_mark_width - 1;
+ points[2].set_x(offset);
+ points[2].set_y(sync_mark_width - 1);
- points->coords[6] = offset - ((sync_mark_width-1)/2);
- points->coords[7] = 1;
+ points[3].set_x(offset - ((sync_mark_width-1)/2));
+ points[3].set_y(1);
sync_mark->show();
- sync_mark->set_property ("points", points);
+ sync_mark->property_points() = points;
- gnome_canvas_points_unref (points);
}
}
}
if (((_flags & WaveformVisible) != yn)) {
if (yn) {
for (uint32_t n=0; n < waves.size(); ++n) {
- gnome_canvas_item_show (waves[n]);
+ waves[n]->show();
}
_flags |= WaveformVisible;
} else {
for (uint32_t n=0; n < waves.size(); ++n) {
- gnome_canvas_item_hide (waves[n]);
+ waves[n]->hide();
}
_flags &= ~WaveformVisible;
}
break;
}
- wave_caches.push_back (gnome_canvas_waveview_cache_new ());
+ wave_caches.push_back (WaveView::create_cache ());
if (wait_for_waves) {
if (region.source(n).peaks_ready (bind (mem_fun(*this, &AudioRegionView::peaks_ready_handler), n))) {
}
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 ();
}
}
}
gdouble yoff = which * ht;
- GnomeCanvasItem *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);
+ WaveView *wave = new WaveView(*group);
+
+ 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();
+// 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);
if (!(_flags & WaveformVisible)) {
- gnome_canvas_item_hide (wave);
+ wave->hide();
}
/* note: calling this function is serialized by the lock
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<GnomeCanvasItem *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
- gnome_canvas_item_set ((*wave), "rectified", (gboolean) yn, NULL);
+ for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
+ (*wave)->property_rectified() = yn;
}
if (zero_line) {
break;
}
- GnomeCanvasItem *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);
+ WaveView *wave = new WaveView(*ghost->group);
+
+ 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();
+ // 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);
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
- gnome_canvas_item_set (waves[n], "data_src", ®ion, NULL);
+ waves[n]->property_data_src() = ®ion;
}
for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
(*i)->set_duration (unit_length);
- for (vector<GnomeCanvasItem*>::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) {
- gnome_canvas_item_set ((*w), "data_src", ®ion, NULL);
+ for (vector<WaveView*>::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) {
+ (*w)->property_data_src() = ®ion;
}
}
projects / ardour.git / blobdiff