summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk2_ardour/crossfade_view.cc12
-rw-r--r--gtk2_ardour/editor.cc4
-rw-r--r--gtk2_ardour/editor_cursors.cc22
-rw-r--r--gtk2_ardour/ghostregion.cc6
-rw-r--r--gtk2_ardour/imageframe_time_axis_view.cc10
-rw-r--r--gtk2_ardour/regionview.cc86
6 files changed, 70 insertions, 70 deletions
diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc
index f81e95a4a9..e27b055bab 100644
--- a/gtk2_ardour/crossfade_view.cc
+++ b/gtk2_ardour/crossfade_view.cc
@@ -60,12 +60,12 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
_visible = true;
fade_in = new Line (*group);
- fade_in->property_fill_color_rgba().set_value(color_map[cCrossfadeLine]);
- fade_in->property_width_pixels().set_value(1);
+ fade_in->property_fill_color_rgba() = color_map[cCrossfadeLine];
+ fade_in->property_width_pixels() = 1;
fade_out = new Line (*group);
- fade_out->property_fill_color_rgba().set_value(color_map[cCrossfadeLine]);
- fade_out->property_width_pixels().set_value(1);
+ fade_out->property_fill_color_rgba() = color_map[cCrossfadeLine];
+ fade_out->property_width_pixels() = 1;
set_height (get_time_axis_view().height);
@@ -191,7 +191,7 @@ CrossfadeView::redraw_curves ()
p.set_x(i);
p.set_y(2.0 + h - (h * vec[i]));
}
- fade_in->property_points().set_value(*points);
+ fade_in->property_points() = *points;
crossfade.fade_out().get_vector (0, crossfade.length(), vec, npoints);
for (int i = 0, pci = 0; i < npoints; ++i) {
@@ -199,7 +199,7 @@ CrossfadeView::redraw_curves ()
p.set_x(i);
p.set_y(2.0 + h - (h * vec[i]));
}
- fade_out->property_points().set_value(*points);
+ fade_out->property_points() = *points;
delete [] vec;
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 7c7b5ad5bb..f98c340298 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -912,7 +912,7 @@ Editor::initialize_canvas ()
transport_punchin_line->set_property ("y1", 0.0);
transport_punchin_line->set_property ("x2", 0.0);
transport_punchin_line->set_property ("y2", 0.0);
- transport_punchin_line->property_color_rgba().set_value (color_map[cPunchInLine]);
+ transport_punchin_line->property_color_rgba() = color_map[cPunchInLine];
transport_punchin_line->hide ();
transport_punchout_line = new ArdourCanvas::SimpleLine (*time_line_group);
@@ -920,7 +920,7 @@ Editor::initialize_canvas ()
transport_punchout_line->set_property ("y1", 0.0);
transport_punchout_line->set_property ("x2", 0.0);
transport_punchout_line->set_property ("y2", 0.0);
- transport_punchout_line->property_color_rgba().set_value (color_map[cPunchOutLine]);
+ transport_punchout_line->property_color_rgba() = color_map[cPunchOutLine];
transport_punchout_line->hide();
// used to show zoom mode active zooming
diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index 3fd0a561e7..c868530476 100644
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -44,14 +44,14 @@ Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)
// cerr << "set cursor points, nc = " << points->num_points << endl;
- canvas_item.property_points().set_value(points);
- canvas_item.property_fill_color().set_value(color.c_str());
- canvas_item.property_width_pixels().set_value(1);
- canvas_item.property_first_arrowhead().set_value(TRUE);
- canvas_item.property_last_arrowhead().set_value(TRUE);
- canvas_item.property_arrow_shape_a().set_value(11.0);
- canvas_item.property_arrow_shape_b().set_value(0.0);
- canvas_item.property_arrow_shape_c().set_value(9.0);
+ canvas_item.property_points() = points;
+ canvas_item.property_fill_color() = color; //.c_str());
+ canvas_item.property_width_pixels() = 1;
+ 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() = 9.0;
// cerr << "cursor line @ " << canvas_item << endl;
@@ -91,7 +91,7 @@ Editor::Cursor::set_position (jack_nframes_t frame)
points.back().set_x(new_pos);
// cerr << "set cursor2 al points, nc = " << points->num_points << endl;
- canvas_item.property_points().set_value(points);
+ canvas_item.property_points() = points;
canvas_item.raise_to_top();
}
@@ -101,7 +101,7 @@ Editor::Cursor::set_length (double units)
length = units;
points.back().set_x (points.front().get_y() + length);
// cerr << "set cursor3 al points, nc = " << points->num_points << endl;
- canvas_item.property_points().set_value(points);
+ canvas_item.property_points() = points;
}
void
@@ -110,5 +110,5 @@ Editor::Cursor::set_y_axis (double position)
points.front().set_y (position);
points.back().set_x (position + length);
// cerr << "set cursor4 al points, nc = " << points->num_points << endl;
- canvas_item.property_points().set_value(points);
+ canvas_item.property_points() = points;
}
diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index 9747332db6..0a001da0b6 100644
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -42,7 +42,7 @@ void
GhostRegion::set_samples_per_unit (double spu)
{
for (vector<WaveView*>::iterator i = waves.begin(); i != waves.end(); ++i) {
- (*i)->property_samples_per_unit().set_value(spu);
+ (*i)->property_samples_per_unit() = spu;
}
}
@@ -64,8 +64,8 @@ GhostRegion::set_height ()
for (n = 0, i = waves.begin(); i != waves.end(); ++i, ++n) {
gdouble yoff = n * ht;
- (*i)->property_height().set_value(ht);
- (*i)->property_y().set_value(yoff);
+ (*i)->property_height() = ht;
+ (*i)->property_y() = yoff;
}
}
diff --git a/gtk2_ardour/imageframe_time_axis_view.cc b/gtk2_ardour/imageframe_time_axis_view.cc
index 7d4943cf35..e00c399e7f 100644
--- a/gtk2_ardour/imageframe_time_axis_view.cc
+++ b/gtk2_ardour/imageframe_time_axis_view.cc
@@ -55,8 +55,8 @@ ImageFrameTimeAxisView::ImageFrameTimeAxisView (ImageFrameTimeAxis& tv)
region_color = _trackview.color() ;
stream_base_color = color_map[cImageTrackBase] ;
- canvas_rect.property_outline_color_rgba().set_value(color_map[cImageTrackOutline]);
- canvas_rect.property_fill_color_rgba().set_value(stream_base_color);
+ canvas_rect.property_outline_color_rgba() = color_map[cImageTrackOutline];
+ canvas_rect.property_fill_color_rgba() = stream_base_color;
canvas_rect.signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_imageframe_view_event), (ArdourCanvas::Item*) &canvas_rect, &tv));
@@ -111,7 +111,7 @@ ImageFrameTimeAxisView::set_height (gdouble h)
return(-1) ;
}
- canvas_rect.property_y2().set_value(h) ;
+ canvas_rect.property_y2() = h ;
for(ImageFrameGroupList::const_iterator citer = imageframe_groups.begin(); citer != imageframe_groups.end(); ++citer)
@@ -132,8 +132,8 @@ int
ImageFrameTimeAxisView::set_position (gdouble x, gdouble y)
{
- canvas_group.property_x().set_value(x);
- canvas_group.property_y().set_value(y);
+ canvas_group.property_x() = x;
+ canvas_group.property_y() = y;
return 0;
}
diff --git a/gtk2_ardour/regionview.cc b/gtk2_ardour/regionview.cc
index 5ecc8f3e12..1556038aac 100644
--- a/gtk2_ardour/regionview.cc
+++ b/gtk2_ardour/regionview.cc
@@ -111,7 +111,7 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, AudioTimeAxisView
shape.push_back (Gnome::Art::Point (-((sync_mark_width-1)/2), 1));
sync_mark = new ArdourCanvas::Polygon (*group);
- sync_mark->property_points().set_value(shape);
+ sync_mark->property_points() = shape;
sync_mark->set_property ("fill_color_rgba", fill_color);
sync_mark->hide();
@@ -351,7 +351,7 @@ AudioRegionView::region_scale_amplitude_changed ()
for (uint32_t n = 0; n < waves.size(); ++n) {
// force a reload of the cache
- waves[n]->property_data_src().set_value(&region);
+ waves[n]->property_data_src() = &region;
}
}
@@ -380,7 +380,7 @@ AudioRegionView::region_resized (Change what_changed)
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) {
@@ -388,7 +388,7 @@ AudioRegionView::region_resized (Change what_changed)
(*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();
}
}
}
@@ -435,9 +435,9 @@ AudioRegionView::region_muted ()
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];
}
}
}
@@ -515,8 +515,8 @@ AudioRegionView::set_height (gdouble height)
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) {
@@ -634,7 +634,7 @@ AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
(*points)[pi] = (*points)[0];
- fade_in_shape->property_points().set_value(*points);
+ fade_in_shape->property_points() = *points;
delete points;
}
@@ -726,7 +726,7 @@ AudioRegionView::set_samples_per_unit (gdouble spu)
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) {
@@ -757,7 +757,7 @@ void
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;
}
}
@@ -783,9 +783,9 @@ AudioRegionView::set_colors ()
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];
}
}
}
@@ -894,7 +894,7 @@ AudioRegionView::region_sync_changed ()
points[3].set_y(1);
sync_mark->show();
- sync_mark->property_points().set_value(points);
+ sync_mark->property_points() = points;
}
}
@@ -1014,20 +1014,20 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct)
WaveView *wave = new WaveView(*group);
- wave->property_data_src().set_value( (gpointer) &region);
- 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());
+ wave->property_data_src() = (gpointer) &region;
+ 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) &region,
@@ -1193,7 +1193,7 @@ AudioRegionView::set_waveform_shape (WaveformShape shape)
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) {
@@ -1252,18 +1252,18 @@ AudioRegionView::add_ghost (AutomationTimeAxisView& atv)
WaveView *wave = new WaveView(*ghost->group);
- wave->property_data_src().set_value( &region);
- 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());
+ wave->property_data_src() = &region;
+ 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) &region,
@@ -1356,7 +1356,7 @@ AudioRegionView::set_waveview_data_src()
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(&region);
+ waves[n]->property_data_src() = &region;
}
for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
@@ -1364,7 +1364,7 @@ AudioRegionView::set_waveview_data_src()
(*i)->set_duration (unit_length);
for (vector<WaveView*>::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) {
- (*w)->property_data_src().set_value(&region);
+ (*w)->property_data_src() = &region;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 15:07:41 +0000