initial commit of hand merging, plus getting "ancient" waf script to work correctly

1 files changed, 19 insertions, 27 deletions

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 90e6147763..3ef5bf4870 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -23,6 +23,9 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
+#include "canvas/line_set.h"
+#include "canvas/rectangle.h"
+
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
 #include "ardour/midi_track.h"
@@ -32,10 +35,8 @@
 #include "ardour/smf_source.h"
 
 #include "ardour_ui.h"
-#include "canvas-simplerect.h"
 #include "global_signals.h"
 #include "gui_thread.h"
-#include "lineset.h"
 #include "midi_region_view.h"
 #include "midi_streamview.h"
 #include "midi_time_axis.h"
@@ -45,7 +46,6 @@
 #include "region_view.h"
 #include "rgb_macros.h"
 #include "selection.h"
-#include "simplerect.h"
 #include "utils.h"
 
 #include "i18n.h"
@@ -68,20 +68,15 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
 	, _updates_suspended (false)
 {
 	/* use a group dedicated to MIDI underlays. Audio underlays are not in this group. */
-	midi_underlay_group = new ArdourCanvas::Group (*_canvas_group);
+	midi_underlay_group = new ArdourCanvas::Group (_canvas_group);
 	midi_underlay_group->lower_to_bottom();
 
 	/* put the note lines in the timeaxisview's group, so it
-	   can be put below ghost regions from MIDI underlays*/
-	_note_lines = new ArdourCanvas::LineSet(*_canvas_group,
-	                                        ArdourCanvas::LineSet::Horizontal);
-
-	_note_lines->property_x1() = 0;
-	_note_lines->property_y1() = 0;
-	_note_lines->property_x2() = DBL_MAX;
-	_note_lines->property_y2() = 0;
+	   can be put below ghost regions from MIDI underlays
+	*/
+	_note_lines = new ArdourCanvas::LineSet (_canvas_group);
 
-	_note_lines->signal_event().connect(
+	_note_lines->Event().connect(
 		sigc::bind(sigc::mem_fun(_trackview.editor(),
 		                         &PublicEditor::canvas_stream_view_event),
 		           _note_lines, &_trackview));
@@ -113,7 +108,7 @@ MidiStreamView::create_region_view (boost::shared_ptr<Region> r, bool /*wfd*/, b
 	}
 
 	RegionView* region_view = new MidiRegionView (_canvas_group, _trackview, region,
-	                                              _samples_per_unit, region_color);
+	                                              _frames_per_pixel, region_color);
 
 	region_view->init (region_color, false);
 
@@ -277,7 +272,7 @@ void
 MidiStreamView::update_contents_height ()
 {
 	StreamView::update_contents_height();
-	_note_lines->property_y2() = child_height ();
+	_note_lines->set_height (child_height ());
 
 	apply_note_range (lowest_note(), highest_note(), true);
 }
@@ -303,7 +298,7 @@ MidiStreamView::draw_note_lines()
 	for (int i = lowest_note(); i <= highest_note(); ++i) {
 		y = floor(note_to_y(i));
 
-		_note_lines->add_line(prev_y, 1.0, ARDOUR_UI::config()->canvasvar_PianoRollBlackOutline.get());
+		_note_lines->add (prev_y, 1.0, ARDOUR_UI::config()->canvasvar_PianoRollBlackOutline.get());
 
 		switch (i % 12) {
 		case 1:
@@ -319,9 +314,9 @@ MidiStreamView::draw_note_lines()
 		}
 
 		if (i == highest_note()) {
-			_note_lines->add_line(y, prev_y - y, color);
+			_note_lines->add (y, prev_y - y, color);
 		} else {
-			_note_lines->add_line(y + 1.0, prev_y - y - 1.0, color);
+			_note_lines->add (y + 1.0, prev_y - y - 1.0, color);
 		}
 
 		prev_y = y;
@@ -490,13 +485,10 @@ MidiStreamView::setup_rec_box ()
 
 			fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
 
-			ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*_canvas_group);
-			rec_rect->property_x1() = xstart;
-			rec_rect->property_y1() = 1.0;
-			rec_rect->property_x2() = xend;
-			rec_rect->property_y2() = (double) _trackview.current_height() - 1;
-			rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
-			rec_rect->property_fill_color_rgba() = fill_color;
+			ArdourCanvas::Rectangle * rec_rect = new ArdourCanvas::Rectangle (_canvas_group);
+			rec_rect->set (ArdourCanvas::Rect (xstart, 1, xend, _trackview.current_height() - 1));
+			rec_rect->set_outline_color (ARDOUR_UI::config()->canvasvar_RecordingRect.get());
+			rec_rect->set_fill_color (fill_color);
 			rec_rect->lower_to_bottom();
 
 			RecBoxInfo recbox;
@@ -568,9 +560,9 @@ MidiStreamView::color_handler ()
 	draw_note_lines ();
 
 	if (_trackview.is_midi_track()) {
-		canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
+		canvas_rect->set_fill_color (ARDOUR_UI::config()->canvasvar_MidiTrackBase.get());
 	} else {
-		canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();;
+		canvas_rect->set_fill_color (ARDOUR_UI::config()->canvasvar_MidiBusBase.get());
 	}
 }