Remove references to connection manager from the build.

[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 7d4943cf354c59e8fead88b76cca7a0a0e52a5a6..a57db60a38212e137fc980bed155b391ade00b9a 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis_view.cc
+++ b/gtk2_ardour/imageframe_time_axis_view.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <algorithm>
@@ -33,6 +32,7 @@
 #include "public_editor.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
+#include "ardour_ui.h"
 
 #include "i18n.h"
 
@@ -50,13 +50,13 @@ using namespace Editing;
 ImageFrameTimeAxisView::ImageFrameTimeAxisView (ImageFrameTimeAxis& tv)
        : _trackview (tv),
          canvas_group (*_trackview.canvas_display),
-         canvas_rect (canvas_group, 0.0, 0.0, 1000000.0, tv.height)
+         canvas_rect (canvas_group, 0.0, 0.0, 1000000.0, tv.current_height())
 {
        region_color = _trackview.color() ;
-       stream_base_color = color_map[cImageTrackBase] ;
+       stream_base_color = ARDOUR_UI::config()->canvasvar_ImageTrack.get() ;
 
-       canvas_rect.property_outline_color_rgba().set_value(color_map[cImageTrackOutline]);
-       canvas_rect.property_fill_color_rgba().set_value(stream_base_color);
+       canvas_rect.property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_ImageTrack.get();
+       canvas_rect.property_fill_color_rgba() = stream_base_color;
 
        canvas_rect.signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_imageframe_view_event), (ArdourCanvas::Item*) &canvas_rect, &tv));
 
@@ -111,7 +111,7 @@ ImageFrameTimeAxisView::set_height (gdouble h)
                return(-1) ;
        }
        
-       canvas_rect.property_y2().set_value(h) ;
+       canvas_rect.property_y2() = h ;
 
 
        for(ImageFrameGroupList::const_iterator citer = imageframe_groups.begin(); citer != imageframe_groups.end(); ++citer)
@@ -132,8 +132,8 @@ int
 ImageFrameTimeAxisView::set_position (gdouble x, gdouble y)
 
 {
-       canvas_group.property_x().set_value(x);
-       canvas_group.property_y().set_value(y);
+       canvas_group.property_x() = x;
+       canvas_group.property_y() = y;
 
        return 0;
 }
@@ -365,11 +365,11 @@ ImageFrameTimeAxisView::set_selected_imageframe_view(ImageFrameTimeAxisGroup* if
        
        if(selected_imageframe_view)
        {
-               selected_imageframe_view->set_selected(false, this) ;
+               selected_imageframe_view->set_selected(false) ;
        }
        
        selected_imageframe_view = ifv ;
-       selected_imageframe_view->set_selected(true, this) ;
+       selected_imageframe_view->set_selected(true) ;
 }
 
 /**
@@ -386,7 +386,7 @@ ImageFrameTimeAxisView::clear_selected_imageframe_item(bool clear_group)
        
        if(selected_imageframe_view)
        {
-               selected_imageframe_view->set_selected(false, this) ;
+               selected_imageframe_view->set_selected(false) ;
        }
        selected_imageframe_view = 0 ;
 }
@@ -410,7 +410,7 @@ ImageFrameTimeAxisView::set_imageframe_duration_sec(double sec)
 {
        if(selected_imageframe_group && selected_imageframe_view)
        {
-               selected_imageframe_view->set_duration((jack_nframes_t) (sec * _trackview.editor.current_session()->frame_rate()), this) ;
+               selected_imageframe_view->set_duration((nframes_t) (sec * _trackview.editor.current_session()->frame_rate()), this) ;
        }
 }