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

[ardour.git] / gtk2_ardour / editor_imageframe.cc

diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc
index e9021a7a1c2ce09d61c6412d5e47bf7224f096cf..6b8691b09fe2d2f6b7ef50abd0d95d2a77a29e76 100644 (file)
--- a/gtk2_ardour/editor_imageframe.cc
+++ b/gtk2_ardour/editor_imageframe.cc
@@ -44,6 +44,7 @@
 #include "public_editor.h"
 
 using namespace Gtk;
+using namespace PBD;
 
 /* <CMT Additions file="editor.cc"> */
 
@@ -75,9 +76,9 @@ Editor::connect_to_image_compositor()
        }
 
        // XXX should really put this somewhere safe
-       std::string host_ip = "127.0.0.1" ;
+       const char * host_ip = "127.0.0.1" ;
        
-       bool retcode = image_socket_listener->connect(host_ip,ardourvis::DEFAULT_PORT) ;
+       bool retcode = image_socket_listener->connect(host_ip, ardourvis::DEFAULT_PORT) ;
        
        if(retcode == false)
        {
@@ -633,8 +634,6 @@ Editor::imageframe_start_handle_op(ArdourCanvas::Item* item, GdkEvent* event)
                drag_info.motion_callback = &Editor::imageframe_start_handle_trim_motion ;
                drag_info.finished_callback = &Editor::imageframe_start_handle_end_trim ;
                
-               flush_track_canvas() ;
-               
                start_grab(event) ;
                
                show_verbose_time_cursor(ifv->get_position(), 10) ;
@@ -665,8 +664,6 @@ Editor::imageframe_end_handle_op(ArdourCanvas::Item* item, GdkEvent* event)
                drag_info.motion_callback = &Editor::imageframe_end_handle_trim_motion ;
                drag_info.finished_callback = &Editor::imageframe_end_handle_end_trim ;
 
-               flush_track_canvas() ;
-
                start_grab(event, trimmer_cursor) ;
 
                show_verbose_time_cursor(ifv->get_position() + ifv->get_duration(), 10) ;
@@ -760,8 +757,6 @@ Editor::imageframe_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* eve
                ifv->set_position((jack_nframes_t) (temp - drag_info.cumulative_x_drag), this) ;
                ifv->set_duration((jack_nframes_t) drag_info.cumulative_x_drag, this) ;
        }
-
-       flush_track_canvas() ;
 }
 
 void
@@ -840,8 +835,6 @@ Editor::imageframe_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* even
                        ifv->set_duration(new_duration, this) ;
                }
        }
-
-       flush_track_canvas ();
 }
 
 
@@ -865,8 +858,6 @@ Editor::markerview_item_start_handle_op(ArdourCanvas::Item* item, GdkEvent* even
        drag_info.motion_callback = &Editor::markerview_start_handle_trim_motion ;
        drag_info.finished_callback = &Editor::markerview_start_handle_end_trim ;
 
-       flush_track_canvas() ;
-
        start_grab(event, trimmer_cursor) ;
 }
 
@@ -889,8 +880,6 @@ Editor::markerview_item_end_handle_op(ArdourCanvas::Item* item, GdkEvent* event)
        drag_info.motion_callback = &Editor::markerview_end_handle_trim_motion ;
        drag_info.finished_callback = &Editor::markerview_end_handle_end_trim ;
        
-       flush_track_canvas () ;
-
        start_grab(event, trimmer_cursor) ;
 }
 
@@ -985,8 +974,6 @@ Editor::markerview_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* eve
                mv->set_position((jack_nframes_t) (temp - drag_info.cumulative_x_drag), this) ;
                mv->set_duration((jack_nframes_t) drag_info.cumulative_x_drag, this) ;
        }
-
-       flush_track_canvas() ;
 }
 
 void
@@ -1079,8 +1066,6 @@ Editor::markerview_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* even
                jack_nframes_t new_duration = (jack_nframes_t)drag_info.cumulative_x_drag ;
                mv->set_duration(new_duration, this) ;
        }
-
-       flush_track_canvas() ;
 }
 
 
@@ -1106,7 +1091,7 @@ Editor::handle_new_imageframe_time_axis_view(const string & track_name, void* sr
 
        row[route_display_columns.text] = iftav->name();
        row[route_display_columns.tv] = iftav;
-       route_list.get_selection()->select (row);
+       route_list_display.get_selection()->select (row);
 
        iftav->GoingAway.connect(bind(mem_fun(*this, &Editor::remove_route), (TimeAxisView*)iftav)) ;
        iftav->gui_changed.connect(mem_fun(*this, &Editor::handle_gui_changes)) ;
@@ -1123,7 +1108,7 @@ Editor::handle_new_imageframe_marker_time_axis_view(const string & track_name, T
 
        row[route_display_columns.text] = mta->name();
        row[route_display_columns.tv] = mta;
-       route_list.get_selection()->select (row);
+       route_list_display.get_selection()->select (row);
 
        mta->GoingAway.connect(bind(mem_fun(*this, &Editor::remove_route), (TimeAxisView*)mta)) ;
  }