diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-24 17:40:10 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-24 17:40:10 +0000 |
commit | 04fc56bfca157f51063c2a5e9e0c518db3375dcd (patch) | |
tree | 545aa62bd05f2314be8affcd1781dcb8faf86074 | |
parent | 3ff9964885eee5f7654e5ae562cadfaa1e998fe9 (diff) |
advance compiling to the p*.cc point
git-svn-id: svn://localhost/trunk/ardour2@109 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/axis_view.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/marker_time_axis_view.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/marker_view.cc | 22 | ||||
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 3 |
4 files changed, 15 insertions, 14 deletions
diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h index 93c4f4870f..e0ad68e5c9 100644 --- a/gtk2_ardour/axis_view.h +++ b/gtk2_ardour/axis_view.h @@ -34,7 +34,7 @@ namespace ARDOUR { * AxisView defines the abstract base class for time-axis trackviews and routes. * */ -class AxisView : public sigc::trackable +class AxisView : public virtual sigc::trackable { public: /** diff --git a/gtk2_ardour/marker_time_axis_view.cc b/gtk2_ardour/marker_time_axis_view.cc index cad7df186d..c1374c4f96 100644 --- a/gtk2_ardour/marker_time_axis_view.cc +++ b/gtk2_ardour/marker_time_axis_view.cc @@ -64,7 +64,7 @@ MarkerTimeAxisView::MarkerTimeAxisView(MarkerTimeAxis& tv) canvas_rect->set_property ("outline_color_rgba", color_map[cMarkerTrackOutline]); canvas_rect->set_property ("fill_color_rgba", stream_base_color); - canvas_rect->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_marker_time_axis_view_event), canvas_rect, &_trackview)); + canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_marker_time_axis_view_event), canvas_rect, &_trackview)); _samples_per_unit = _trackview.editor.get_current_zoom() ; diff --git a/gtk2_ardour/marker_view.cc b/gtk2_ardour/marker_view.cc index 8ccc3d8c12..d73440ad54 100644 --- a/gtk2_ardour/marker_view.cc +++ b/gtk2_ardour/marker_view.cc @@ -48,14 +48,14 @@ sigc::signal<void,MarkerView*> MarkerView::GoingAway; * @param duration the duration of this item */ MarkerView::MarkerView(ArdourCanvas::Group *parent, - TimeAxisView* tv, - ImageFrameView* marked, - double spu, - Gdk::Color& basic_color, - std::string mark_type, - std::string mark_id, - jack_nframes_t start, - jack_nframes_t duration) + TimeAxisView* tv, + ImageFrameView* marked, + double spu, + Gdk::Color& basic_color, + std::string mark_type, + std::string mark_id, + jack_nframes_t start, + jack_nframes_t duration) : TimeAxisViewItem(mark_id, *parent,*tv,spu,basic_color,start,duration) { mark_type_text = mark_type ; @@ -66,9 +66,9 @@ MarkerView::MarkerView(ArdourCanvas::Group *parent, // hook up our canvas events - frame_handle_start->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_markerview_start_handle_event), frame_handle_start, this)); - frame_handle_end->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_markerview_end_handle_event), frame_handle_end, this));; - group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_markerview_item_view_event, this), group, this)); + frame_handle_start->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_start_handle_event), frame_handle_start, this)); + frame_handle_end->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_end_handle_event), frame_handle_end, this)); + group->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_item_view_event), group, this)); set_position(start, this) ; set_duration(duration, this) ; diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index f37076aaa3..0329c6e800 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1131,7 +1131,8 @@ MixerStrip::setup_comment_editor () comment_area.set_name ("MixerTrackCommentArea"); comment_area.set_editable (true); - comment_area.changed.connect (mem_fun(*this, &MixerStrip::comment_edited)); + // GTK2FIX + // comment_area.changed.connect (mem_fun(*this, &MixerStrip::comment_edited)); // GTK2FIX // comment_area.signal_button_release_event().connect_after (ptr_fun (do_not_propagate)); comment_area.show (); |