r228@gwythaint (orig r768): fugalh | 2006-08-09 08:14:55 -0600

[ardour.git] / gtk2_ardour / imageframe_view.cc

diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc
index 68a404936f82407b42c83471e1a0493074ec115a..ac17a7cc1a2bf8d13b1b0739c053289450d5406e 100644 (file)
--- a/gtk2_ardour/imageframe_view.cc
+++ b/gtk2_ardour/imageframe_view.cc
@@ -56,7 +56,7 @@ sigc::signal<void,ImageFrameView*> ImageFrameView::GoingAway;
  * @param height the width of the origianl rgb_data image data
  * @param num_channels the number of color channels within rgb_data
  */
-ImageFrameView::ImageFrameView(std::string item_id,
+ImageFrameView::ImageFrameView(const string & item_id,
        ArdourCanvas::Group *parent,
        ImageFrameTimeAxis* tv,
        ImageFrameTimeAxisGroup* item_group,
@@ -172,16 +172,15 @@ delete imageframe;
  * @return true if the position change was a success, false otherwise
  */
 bool
-ImageFrameView::set_position(jack_nframes_t pos, void* src)
+ImageFrameView::set_position(jack_nframes_t pos, void* src, double* delta)
 {
        jack_nframes_t old_pos = frame_position ;
        
        // do the standard stuff
-       bool ret = TimeAxisViewItem::set_position(pos, src) ;
+       bool ret = TimeAxisViewItem::set_position(pos, src, delta) ;
 
        // everything went ok with the standard stuff?
-       if(ret)
-       {
+       if (ret) {
                /* move each of our associated markers with this ImageFrameView */
                for (MarkerViewList::iterator i = marker_view_list.begin(); i != marker_view_list.end(); ++i)
                {
@@ -271,11 +270,11 @@ ImageFrameView::set_height (gdouble h)
        frame_handle_start->raise_to_top();
        frame_handle_end->raise_to_top();
  
-       name_text->set_property ("y", h - TimeAxisViewItem::NAME_Y_OFFSET);
-       frame->set_property ("y2", h);
+       name_text->property_y() = h - TimeAxisViewItem::NAME_Y_OFFSET;
+       frame->property_y2() = h;
 
-       name_highlight->set_property ("y1", (gdouble) h - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE);
-       name_highlight->set_property ("y2", (gdouble) h - 1.0);
+       name_highlight->property_y1() = (gdouble) h - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE;
+       name_highlight->property_y2() = (gdouble) h - 1.0;
 }
 
 
@@ -307,7 +306,7 @@ ImageFrameView::add_marker_view_item(MarkerView* item, void* src)
  * @return the removed marker item
  */
 MarkerView*
-ImageFrameView::remove_named_marker_view_item(std::string markerId, void* src)
+ImageFrameView::remove_named_marker_view_item(const string & markerId, void* src)
 {
        MarkerView* mv = 0 ;
        MarkerViewList::iterator i = marker_view_list.begin() ;
@@ -359,11 +358,11 @@ ImageFrameView::remove_marker_view_item(MarkerView* mv, void* src)
  * @param markId the id/name of the item to search for
  */
 bool
-ImageFrameView::has_marker_view_item(std::string mname)
+ImageFrameView::has_marker_view_item(const string & mname)
 {
        bool result = false ;
        
-       for (MarkerViewList::iterator ci = marker_view_list.begin(); ci != marker_view_list.end(); ++ci)
+       for (MarkerViewList::const_iterator ci = marker_view_list.begin(); ci != marker_view_list.end(); ++ci)
        {
                if (((MarkerView*)*ci)->get_item_name() == mname)
                {