packaging tweaks for OS X

[ardour.git] / gtk2_ardour / imageframe_time_axis_view.cc

diff --git a/gtk2_ardour/imageframe_time_axis_view.cc b/gtk2_ardour/imageframe_time_axis_view.cc
index 88cdbd53cc6ff2b88ca88b6e20399696928938c7..8df7a9161230ff641fb43e31a56414c37647cd74 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis_view.cc
+++ b/gtk2_ardour/imageframe_time_axis_view.cc
@@ -66,6 +66,8 @@ ImageFrameTimeAxisView::ImageFrameTimeAxisView (ImageFrameTimeAxis& tv)
 
        selected_imageframe_group = 0 ;
        selected_imageframe_view = 0 ;
+
+       ImageFrameTimeAxisGroup::CatchDeletion.connect (*this, boost::bind (&ImageFrameTimeAxisView::remove_imageframe_group, this, _1), gui_context());
 }
 
 /**
@@ -211,12 +213,8 @@ ImageFrameTimeAxisView::add_imageframe_group(std::string group_id, void* src)
        else
        {
                iftag = new ImageFrameTimeAxisGroup(*this, group_id) ;
-
                imageframe_groups.push_front(iftag) ;
-
-               iftag->GoingAway.connect(sigc::bind(sigc::mem_fun(*this,&ImageFrameTimeAxisView::remove_imageframe_group), iftag, (void*)this)) ;
-
-                ImageFrameGroupAdded(iftag, src) ; /* EMIT_SIGNAL */
+               ImageFrameGroupAdded(iftag, src) ; /* EMIT_SIGNAL */
        }
 
        return(iftag) ;
@@ -408,9 +406,8 @@ ImageFrameTimeAxisView::get_selected_imageframe_view() const
 void
 ImageFrameTimeAxisView::set_imageframe_duration_sec(double sec)
 {
-       if(selected_imageframe_group && selected_imageframe_view)
-       {
-               selected_imageframe_view->set_duration((nframes_t) (sec * _trackview.editor.current_session()->frame_rate()), this) ;
+       if (selected_imageframe_group && selected_imageframe_view) {
+               selected_imageframe_view->set_duration ((sec * _trackview.editor.session()->frame_rate()), this);
        }
 }