Add load_session to profiling.

[ardour.git] / gtk2_ardour / imageframe_view.cc

diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc
index 366c56e5e512b912ad9231bc2fa56734cd4d7272..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());
 }
 
 /**
@@ -169,9 +169,9 @@ ImageFrameView::~ImageFrameView()
  * @return true if the position change was a success, false otherwise
  */
 bool
-ImageFrameView::set_position(nframes64_t pos, void* src, double* delta)
+ImageFrameView::set_position(framepos_t pos, void* src, double* delta)
 {
-       nframes64_t old_pos = frame_position;
+       framepos_t old_pos = frame_position;
 
        // do the standard stuff
        bool ret = TimeAxisViewItem::set_position(pos, src, delta);
@@ -183,7 +183,7 @@ ImageFrameView::set_position(nframes64_t pos, void* src, double* delta)
                {
                        // calculate the offset of the marker
                        MarkerView* mv = (MarkerView*)*i;
-                       nframes64_t marker_old_pos = mv->get_position();
+                       framepos_t marker_old_pos = mv->get_position();
 
                        mv->set_position(pos + (marker_old_pos - old_pos), src);
                }
@@ -200,7 +200,7 @@ ImageFrameView::set_position(nframes64_t pos, void* src, double* delta)
  * @return true if the duration change was succesful, false otherwise
  */
 bool
-ImageFrameView::set_duration(nframes64_t dur, void* src)
+ImageFrameView::set_duration(framepos_t dur, void* src)
 {
        /* do the standard stuff */
        bool ret = TimeAxisViewItem::set_duration(dur, src);