projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Obey snap setting for MIDI stuff.
[ardour.git] / gtk2_ardour / editor_imageframe.cc
diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc
index 0e5131bb97d18be7d4cbcab496107e0bafec54a5..eb78fb5c7f7ba9b25943be5a26d49b4b27517120 100644 (file)
--- a/gtk2_ardour/editor_imageframe.cc
+++ b/gtk2_ardour/editor_imageframe.cc
@@ -16,7 +16,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include "imageframe_view.h"
@@ -107,7 +106,7 @@ Editor::scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item)
                x_pos = item->get_position() - offset + (item->get_duration() / 2);
        }
        
-       reposition_x_origin (x_pos);
+       reset_x_origin (x_pos);
 }
 
 void
@@ -122,7 +121,7 @@ Editor::add_imageframe_marker_time_axis(const string & track_name, TimeAxisView*
 void
 Editor::popup_imageframe_edit_menu(int button, int32_t time, ArdourCanvas::Item* ifv, bool with_item)
 {
-       ImageFrameTimeAxis* ifta = dynamic_cast<ImageFrameTimeAxis*>(clicked_trackview) ;
+       ImageFrameTimeAxis* ifta = dynamic_cast<ImageFrameTimeAxis*>(clicked_axisview) ;
        
        if(ifta)
        {
@@ -139,7 +138,7 @@ Editor::popup_imageframe_edit_menu(int button, int32_t time, ArdourCanvas::Item*
 void
 Editor::popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas::Item* ifv, bool with_item)
 {
-       MarkerTimeAxis* mta = dynamic_cast<MarkerTimeAxis*>(clicked_trackview) ;
+       MarkerTimeAxis* mta = dynamic_cast<MarkerTimeAxis*>(clicked_axisview) ;
        
        if(mta)
        {
@@ -186,9 +185,9 @@ Editor::canvas_imageframe_item_view_event (GdkEvent *event, ArdourCanvas::Item*
                case GDK_BUTTON_PRESS:
                case GDK_2BUTTON_PRESS:
                case GDK_3BUTTON_PRESS:
-                       clicked_trackview = &ifv->get_time_axis_view();
+                       clicked_axisview = &ifv->get_time_axis_view();
                        iftag = ifv->get_time_axis_group() ;
-                       dynamic_cast<ImageFrameTimeAxis*>(clicked_trackview)->get_view()->set_selected_imageframe_view(iftag, ifv);
+                       dynamic_cast<ImageFrameTimeAxis*>(clicked_axisview)->get_view()->set_selected_imageframe_view(iftag, ifv);
                        ret = button_press_handler (item, event, ImageFrameItem) ;
                        break ;
                case GDK_BUTTON_RELEASE:
@@ -214,9 +213,9 @@ Editor::canvas_imageframe_start_handle_event (GdkEvent *event, ArdourCanvas::Ite
                case GDK_BUTTON_PRESS:
                case GDK_2BUTTON_PRESS:
                case GDK_3BUTTON_PRESS:
-                       clicked_trackview = &ifv->get_time_axis_view() ;
+                       clicked_axisview = &ifv->get_time_axis_view() ;
                        iftag = ifv->get_time_axis_group() ;
-                       dynamic_cast<ImageFrameTimeAxis*>(clicked_trackview)->get_view()->set_selected_imageframe_view(iftag, ifv);
+                       dynamic_cast<ImageFrameTimeAxis*>(clicked_axisview)->get_view()->set_selected_imageframe_view(iftag, ifv);
                        
                        ret = button_press_handler (item, event, ImageFrameHandleStartItem) ;
                        break ;
@@ -249,9 +248,9 @@ Editor::canvas_imageframe_end_handle_event (GdkEvent *event, ArdourCanvas::Item*
                case GDK_BUTTON_PRESS:
                case GDK_2BUTTON_PRESS:
                case GDK_3BUTTON_PRESS:
-                       clicked_trackview = &ifv->get_time_axis_view() ;
+                       clicked_axisview = &ifv->get_time_axis_view() ;
                        iftag = ifv->get_time_axis_group() ;
-                       dynamic_cast<ImageFrameTimeAxis*>(clicked_trackview)->get_view()->set_selected_imageframe_view(iftag, ifv);
+                       dynamic_cast<ImageFrameTimeAxis*>(clicked_axisview)->get_view()->set_selected_imageframe_view(iftag, ifv);
                        
                        ret = button_press_handler (item, event, ImageFrameHandleEndItem) ;
                        break ;
@@ -282,7 +281,7 @@ Editor::canvas_imageframe_view_event (GdkEvent* event, ArdourCanvas::Item* item,
                case GDK_BUTTON_PRESS:
                case GDK_2BUTTON_PRESS:
                case GDK_3BUTTON_PRESS:
-                       clicked_trackview = ifta ;
+                       clicked_axisview = ifta ;
                        ret = button_press_handler (item, event, ImageFrameTimeAxisItem) ;
                        break ;
                case GDK_BUTTON_RELEASE:
@@ -305,7 +304,7 @@ Editor::canvas_marker_time_axis_view_event (GdkEvent* event, ArdourCanvas::Item*
                case GDK_BUTTON_PRESS:
                case GDK_2BUTTON_PRESS:
                case GDK_3BUTTON_PRESS:
-                       clicked_trackview = mta ;
+                       clicked_axisview = mta ;
                        ret = button_press_handler(item, event, MarkerTimeAxisItem) ;
                        break ;
                case GDK_BUTTON_RELEASE:
@@ -328,8 +327,8 @@ Editor::canvas_markerview_item_view_event (GdkEvent* event, ArdourCanvas::Item*
                case GDK_BUTTON_PRESS:
                case GDK_2BUTTON_PRESS:
                case GDK_3BUTTON_PRESS:
-                       clicked_trackview = &mta->get_time_axis_view() ;
-                       dynamic_cast<MarkerTimeAxis*>(clicked_trackview)->get_view()->set_selected_time_axis_item(mta);
+                       clicked_axisview = &mta->get_time_axis_view() ;
+                       dynamic_cast<MarkerTimeAxis*>(clicked_axisview)->get_view()->set_selected_time_axis_item(mta);
                        ret = button_press_handler(item, event, MarkerViewItem) ;
                        break ;
                case GDK_BUTTON_RELEASE:
@@ -353,8 +352,8 @@ Editor::canvas_markerview_start_handle_event (GdkEvent* event, ArdourCanvas::Ite
                case GDK_BUTTON_PRESS:
                case GDK_2BUTTON_PRESS:
                case GDK_3BUTTON_PRESS:
-                       clicked_trackview = &mta->get_time_axis_view() ;
-                       dynamic_cast<MarkerTimeAxis*>(clicked_trackview)->get_view()->set_selected_time_axis_item(mta) ;
+                       clicked_axisview = &mta->get_time_axis_view() ;
+                       dynamic_cast<MarkerTimeAxis*>(clicked_axisview)->get_view()->set_selected_time_axis_item(mta) ;
                        ret = button_press_handler(item, event, MarkerViewHandleStartItem) ;
                        break ;
                case GDK_BUTTON_RELEASE:
@@ -384,8 +383,8 @@ Editor::canvas_markerview_end_handle_event (GdkEvent* event, ArdourCanvas::Item*
                case GDK_BUTTON_PRESS:
                case GDK_2BUTTON_PRESS:
                case GDK_3BUTTON_PRESS:
-                       clicked_trackview = &mta->get_time_axis_view() ;
-                       dynamic_cast<MarkerTimeAxis*>(clicked_trackview)->get_view()->set_selected_time_axis_item(mta) ;
+                       clicked_axisview = &mta->get_time_axis_view() ;
+                       dynamic_cast<MarkerTimeAxis*>(clicked_axisview)->get_view()->set_selected_time_axis_item(mta) ;
                        ret = button_press_handler(item, event, MarkerViewHandleEndItem) ;
                        break ;
                case GDK_BUTTON_RELEASE:
@@ -423,7 +422,7 @@ Editor::canvas_markerview_end_handle_event (GdkEvent* event, ArdourCanvas::Item*
 void
 Editor::start_imageframe_grab(ArdourCanvas::Item* item, GdkEvent* event)
 {
-       ImageFrameView* ifv = ((ImageFrameTimeAxis*)clicked_trackview)->get_view()->get_selected_imageframe_view() ;
+       ImageFrameView* ifv = ((ImageFrameTimeAxis*)clicked_axisview)->get_view()->get_selected_imageframe_view() ;
        drag_info.copy = false ;
        drag_info.item = item ;
        drag_info.data = ifv ;
@@ -456,7 +455,7 @@ Editor::start_imageframe_grab(ArdourCanvas::Item* item, GdkEvent* event)
 void
 Editor::start_markerview_grab(ArdourCanvas::Item* item, GdkEvent* event)
 {
-       MarkerView* mv = ((MarkerTimeAxis*)clicked_trackview)->get_view()->get_selected_time_axis_item() ;
+       MarkerView* mv = ((MarkerTimeAxis*)clicked_axisview)->get_view()->get_selected_time_axis_item() ;
        drag_info.copy = false ;
        drag_info.item = item ;
        drag_info.data = mv ;
@@ -614,7 +613,7 @@ void
 Editor::imageframe_start_handle_op(ArdourCanvas::Item* item, GdkEvent* event)
 {
        // get the selected item from the parent time axis
-       ImageFrameTimeAxis* ifta = dynamic_cast<ImageFrameTimeAxis*>(clicked_trackview) ;
+       ImageFrameTimeAxis* ifta = dynamic_cast<ImageFrameTimeAxis*>(clicked_axisview) ;
        if(ifta)
        {
                ImageFrameView* ifv = ifta->get_view()->get_selected_imageframe_view() ;
@@ -642,7 +641,7 @@ void
 Editor::imageframe_end_handle_op(ArdourCanvas::Item* item, GdkEvent* event)
 {
        // get the selected item from the parent time axis
-       ImageFrameTimeAxis* ifta = dynamic_cast<ImageFrameTimeAxis*>(clicked_trackview) ;
+       ImageFrameTimeAxis* ifta = dynamic_cast<ImageFrameTimeAxis*>(clicked_axisview) ;
 
        if(ifta)
        {
@@ -839,7 +838,7 @@ Editor::imageframe_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* even
 void
 Editor::markerview_item_start_handle_op(ArdourCanvas::Item* item, GdkEvent* event)
 {
-       MarkerView* mv = reinterpret_cast<MarkerTimeAxis*>(clicked_trackview)->get_view()->get_selected_time_axis_item() ;
+       MarkerView* mv = reinterpret_cast<MarkerTimeAxis*>(clicked_axisview)->get_view()->get_selected_time_axis_item() ;
 
        if (mv == 0)
        {
@@ -862,7 +861,7 @@ Editor::markerview_item_start_handle_op(ArdourCanvas::Item* item, GdkEvent* even
 void
 Editor::markerview_item_end_handle_op(ArdourCanvas::Item* item, GdkEvent* event)
 {
-       MarkerView* mv = reinterpret_cast<MarkerTimeAxis*>(clicked_trackview)->get_view()->get_selected_time_axis_item() ;
+       MarkerView* mv = reinterpret_cast<MarkerTimeAxis*>(clicked_axisview)->get_view()->get_selected_time_axis_item() ;
        if (mv == 0)
        {
                fatal << _("programming error: no MarkerView selected") << endmsg ;
Unnamed repository; edit this file 'description' to name the repository.