MCP: latest patch from Rodrigo:

[ardour.git] / gtk2_ardour / imageframe_view.cc

diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc
index 04dde574c6968a9fb6871a45e5b0f943d36e517a..9b9a8c2bdbf094c7772fe968aae2907c5b637211 100644 (file)
--- a/gtk2_ardour/imageframe_view.cc
+++ b/gtk2_ardour/imageframe_view.cc
@@ -60,8 +60,8 @@ ImageFrameView::ImageFrameView(const string & item_id,
        ImageFrameTimeAxisGroup* item_group,
        double spu,
        Gdk::Color& basic_color,
-       nframes_t start,
-       nframes_t duration,
+       framepos_t start,
+       framecnt_t duration,
        unsigned char* rgb_data,
        uint32_t width,
        uint32_t height,
@@ -104,7 +104,7 @@ ImageFrameView::ImageFrameView(const string & item_id,
        set_position(start, this);
        set_duration(duration, this);
 
-       MarkerView::CatchDeletion.connect (*this, ui_bind (&ImageFrameView::remove_marker_view_item, this, _1), gui_context());
+       MarkerView::CatchDeletion.connect (*this, boost::bind (&ImageFrameView::remove_marker_view_item, this, _1), gui_context());
 }
 
 /**