remove debugging output

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 875fd4cdf39e32bd95b205f2ed879e984e7b2c5a..e9fcb9112ef0fa905b70576664f0bf3befb6c82e 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -334,7 +334,7 @@ Marker::setup_line ()
                        _line = new ArdourCanvas::Line (group);
                        _line->set_outline_color (ARDOUR_UI::config()->canvasvar_EditPoint.get());
 
-                       _line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this));
+                       _line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
                }
 
                 /* work out where to start the line from so that it extends from the top of the canvas */
@@ -369,7 +369,7 @@ Marker::canvas_height_set (double h)
 ArdourCanvas::Item&
 Marker::the_item() const
 {
-       return *mark;
+       return *group;
 }
 
 void
@@ -512,7 +512,7 @@ TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, gui
          _tempo (temp)
 {
        set_position (_tempo.frame());
-       group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), mark, this));
+       group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), group, this));
 }
 
 TempoMarker::~TempoMarker ()
@@ -527,7 +527,7 @@ MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, gui
          _meter (m)
 {
        set_position (_meter.frame());
-       group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_meter_marker_event), mark, this));
+       group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_meter_marker_event), group, this));
 }
 
 MeterMarker::~MeterMarker ()

diff --git a/libs/canvas/root_group.cc b/libs/canvas/root_group.cc
index b8637d9988d95bd1f7a71f744190d2a2fbad2c67..a9e0aae77fcf8973f05bcdb47add1bc262808a0c 100644 (file)
--- a/libs/canvas/root_group.cc
+++ b/libs/canvas/root_group.cc
@@ -18,7 +18,6 @@ RootGroup::compute_bounding_box () const
        Group::compute_bounding_box ();
 
        if (_bounding_box) {
-               cerr << "!!!!! requesting canvas size " << _bounding_box.get() << endl;
                _canvas->request_size (Duple (_bounding_box.get().width (), _bounding_box.get().height ()));
        }
 }