properly track step edit status in editor & mixer windows

[ardour.git] / gtk2_ardour / editor_imageframe.cc

diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc
index d5d9481b5d2496ad2bfef3055e1847bab0a18e31..bac689b48ff779e30f18f5ddd3319106c0896557 100644 (file)
--- a/gtk2_ardour/editor_imageframe.cc
+++ b/gtk2_ardour/editor_imageframe.cc
@@ -41,6 +41,7 @@
 #include "imageframe_socket_handler.h"
 #include "ardour_image_compositor_socket.h"
 #include "public_editor.h"
+#include "gui_thread.h"
 
 using namespace Gtk;
 using namespace PBD;
@@ -74,7 +75,7 @@ Editor::add_imageframe_time_axis(const string & track_name, void* src)
        }
        else
        {
-               Gtkmm2ext::UI::instance()->call_slot(bind(mem_fun(*this, &Editor::handle_new_imageframe_time_axis_view),track_name, src)) ;
+               Gtkmm2ext::UI::instance()->call_slot (boost::bind (&Editor::handle_new_imageframe_time_axis_view, this,track_name, src));
        }
 }
 
@@ -129,10 +130,10 @@ Editor::scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item)
 void
 Editor::add_imageframe_marker_time_axis(const string & track_name, TimeAxisView* marked_track, void* src)
 {
-       // Can we only bind 2 data Items?
-       // @todo we really want to bind the src attribute too, for the moment tracks can only be added remotely,
+       // Can we only sigc::bind 2 data Items?
+       // @todo we really want to sigc::bind the src attribute too, for the moment tracks can only be added remotely,
        //       so this is not too much of an issue, however will need to be looked at again
-       Gtkmm2ext::UI::instance()->call_slot(sigc::bind(mem_fun(*this, &Editor::handle_new_imageframe_marker_time_axis_view),track_name, marked_track)) ;
+       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&Editor::handle_new_imageframe_marker_time_axis_view, this, track_name, marked_track));
 }
 
 void
@@ -168,11 +169,6 @@ Editor::popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas:
 }
 /* </CMT Additions file="editor.cc"> */
 
-
-
-
-
-
 /* <CMT Additions file="editor_canvas_events.cc"> */
 bool
 Editor::canvas_imageframe_item_view_event (GdkEvent *event, ArdourCanvas::Item* item, ImageFrameView *ifv)
@@ -1092,14 +1088,13 @@ Editor::handle_new_imageframe_time_axis_view(const string & track_name, void* sr
        row[route_display_columns.tv] = iftav;
        route_list_display.get_selection()->select (row);
 
-       iftav->GoingAway.connect(bind(mem_fun(*this, &Editor::remove_route), (TimeAxisView*)iftav)) ;
-       iftav->gui_changed.connect(mem_fun(*this, &Editor::handle_gui_changes)) ;
+       iftav->gui_changed.connect(sigc::mem_fun(*this, &Editor::handle_gui_changes)) ;
 }
 
 void
 Editor::handle_new_imageframe_marker_time_axis_view(const string & track_name, TimeAxisView* marked_track)
 {
-       MarkerTimeAxis* mta = new MarkerTimeAxis (*this, *this->current_session(), *track_canvas, track_name, marked_track) ;
+       MarkerTimeAxis* mta = new MarkerTimeAxis (*this, *this->session(), *track_canvas, track_name, marked_track) ;
        ((ImageFrameTimeAxis*)marked_track)->add_marker_time_axis(mta, this) ;
        track_views.push_back(mta) ;
 
@@ -1108,9 +1103,7 @@ Editor::handle_new_imageframe_marker_time_axis_view(const string & track_name, T
        row[route_display_columns.text] = mta->name();
        row[route_display_columns.tv] = mta;
        route_list_display.get_selection()->select (row);
-
-       mta->GoingAway.connect(bind(mem_fun(*this, &Editor::remove_route), (TimeAxisView*)mta)) ;
- }
+}
 
 
 /* </CMT Additions file="editor_route_list.cc"> */