send control now has working metering, and switches back and forth between busses...

[ardour.git] / gtk2_ardour / editor_imageframe.cc

diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc
index eb78fb5c7f7ba9b25943be5a26d49b4b27517120..5ff1fc64595aabae89604d9567cafca826f5494d 100644 (file)
--- a/gtk2_ardour/editor_imageframe.cc
+++ b/gtk2_ardour/editor_imageframe.cc
@@ -30,7 +30,7 @@
 #include "canvas_impl.h"
 
 #include <gtkmm2ext/gtk_ui.h>
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -95,10 +95,10 @@ void
 Editor::scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item)
 {
        // GTK2FIX
-       //nframes_t offset = static_cast<nframes_t>(frames_per_unit * (edit_hscroll_slider_width/2)) ;
-       nframes_t offset = 0;
+       //nframes64_t offset = static_cast<nframes64_t>(frames_per_unit * (edit_hscroll_slider_width/2)) ;
+       nframes64_t offset = 0;
 
-       nframes_t x_pos = 0 ;
+       nframes64_t x_pos = 0 ;
 
        if (item->get_position() < offset) {
                x_pos = 0 ;
@@ -430,7 +430,8 @@ Editor::start_imageframe_grab(ArdourCanvas::Item* item, GdkEvent* event)
        drag_info.finished_callback = &Editor::timeaxis_item_drag_finished_callback;
        drag_info.last_frame_position = ifv->get_position() ;
  
-       drag_info.last_trackview = &ifv->get_time_axis_view() ;
+       drag_info.source_trackview = &ifv->get_time_axis_view() ;
+       drag_info.dest_trackview = drag_info.source_trackview;
        
        /* this is subtle. raising the regionview itself won't help,
           because raise_to_top() just puts the item on the top of
@@ -442,7 +443,7 @@ Editor::start_imageframe_grab(ArdourCanvas::Item* item, GdkEvent* event)
        */
 
        drag_info.item->raise_to_top();
-       drag_info.last_trackview->canvas_display->raise_to_top();
+       drag_info.source_trackview->canvas_display->raise_to_top();
        //time_line_group->raise_to_top();
        cursor_group->raise_to_top ();
 
@@ -463,7 +464,8 @@ Editor::start_markerview_grab(ArdourCanvas::Item* item, GdkEvent* event)
        drag_info.finished_callback = &Editor::timeaxis_item_drag_finished_callback;
        drag_info.last_frame_position = mv->get_position() ;
 
-       drag_info.last_trackview = &mv->get_time_axis_view() ;
+       drag_info.source_trackview = &mv->get_time_axis_view() ;
+       drag_info.dest_trackview = drag_info.source_trackview;
 
        /* this is subtle. raising the regionview itself won't help,
           because raise_to_top() just puts the item on the top of
@@ -475,7 +477,7 @@ Editor::start_markerview_grab(ArdourCanvas::Item* item, GdkEvent* event)
        */
 
        drag_info.item->raise_to_top();
-       drag_info.last_trackview->canvas_display->raise_to_top();
+       drag_info.source_trackview->canvas_display->raise_to_top();
        //time_line_group->raise_to_top();
        cursor_group->raise_to_top ();
 
@@ -491,14 +493,14 @@ Editor::markerview_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event)
        double cx, cy ;
 
        MarkerView* mv = reinterpret_cast<MarkerView*>(drag_info.data) ;
-       nframes_t pending_region_position ;
-       nframes_t pointer_frame ;
+       nframes64_t pending_region_position ;
+       nframes64_t pointer_frame ;
 
        pointer_frame = event_frame(event, &cx, &cy) ;
 
        snap_to(pointer_frame) ;
 
-       if (pointer_frame > (nframes_t) drag_info.pointer_frame_offset)
+       if (pointer_frame > (nframes64_t) drag_info.pointer_frame_offset)
        {
                pending_region_position = pointer_frame - drag_info.pointer_frame_offset ;
                snap_to(pending_region_position) ;
@@ -539,14 +541,14 @@ Editor::imageframe_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event)
        
        ImageFrameView* ifv = reinterpret_cast<ImageFrameView*>(drag_info.data) ;
        
-       nframes_t pending_region_position;
-       nframes_t pointer_frame;
+       nframes64_t pending_region_position;
+       nframes64_t pointer_frame;
 
        pointer_frame = event_frame(event, &cx, &cy) ;
 
        snap_to(pointer_frame) ;
 
-       if (pointer_frame > (nframes_t) drag_info.pointer_frame_offset)
+       if (pointer_frame > (nframes64_t) drag_info.pointer_frame_offset)
        {
                pending_region_position = pointer_frame - drag_info.pointer_frame_offset ;
                snap_to(pending_region_position) ;
@@ -574,7 +576,7 @@ Editor::imageframe_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event)
 void
 Editor::timeaxis_item_drag_finished_callback(ArdourCanvas::Item*, GdkEvent* event)
 {
-       nframes_t where ;
+       nframes64_t where ;
        TimeAxisViewItem* tavi = reinterpret_cast<TimeAxisViewItem*>(drag_info.data) ;
 
        bool item_x_movement = (drag_info.last_frame_position != tavi->get_position()) ;
@@ -672,9 +674,9 @@ Editor::imageframe_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent*
 {
        ImageFrameView* ifv = reinterpret_cast<ImageFrameView*> (drag_info.data) ;
        
-       nframes_t start = 0 ;
-       nframes_t end = 0 ;
-       nframes_t pointer_frame = event_frame(event) ;
+       nframes64_t start = 0 ;
+       nframes64_t end = 0 ;
+       nframes64_t pointer_frame = event_frame(event) ;
        
        // chekc th eposition of the item is not locked
        if(!ifv->get_position_locked()) {
@@ -691,7 +693,7 @@ Editor::imageframe_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent*
                        }
                        
                        // are we getting bigger or smaller?
-                       nframes_t new_dur_val = end - start ;
+                       nframes64_t new_dur_val = end - start ;
                        
                        // start handle, so a smaller pointer frame increases our component size
                        if(pointer_frame <= drag_info.grab_frame) 
@@ -749,10 +751,10 @@ Editor::imageframe_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* eve
        }
        else
        {
-               nframes_t temp = ifv->get_position() + ifv->get_duration() ;
+               nframes64_t temp = ifv->get_position() + ifv->get_duration() ;
                
-               ifv->set_position((nframes_t) (temp - drag_info.cumulative_x_drag), this) ;
-               ifv->set_duration((nframes_t) drag_info.cumulative_x_drag, this) ;
+               ifv->set_position((nframes64_t) (temp - drag_info.cumulative_x_drag), this) ;
+               ifv->set_duration((nframes64_t) drag_info.cumulative_x_drag, this) ;
        }
 }
 
@@ -761,10 +763,10 @@ Editor::imageframe_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* ev
 {
        ImageFrameView* ifv = reinterpret_cast<ImageFrameView *> (drag_info.data) ;
        
-       nframes_t start = 0 ;
-       nframes_t end = 0 ;
-       nframes_t pointer_frame = event_frame(event) ;
-       nframes_t new_dur_val = 0 ;
+       nframes64_t start = 0 ;
+       nframes64_t end = 0 ;
+       nframes64_t pointer_frame = event_frame(event) ;
+       nframes64_t new_dur_val = 0 ;
 
        snap_to(pointer_frame) ;
        
@@ -826,7 +828,7 @@ Editor::imageframe_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* even
        }
        else
        {
-               nframes_t new_duration = (nframes_t)drag_info.cumulative_x_drag ;
+               nframes64_t new_duration = (nframes64_t)drag_info.cumulative_x_drag ;
                if((new_duration <= ifv->get_max_duration()) && (new_duration >= ifv->get_min_duration()))
                {
                        ifv->set_duration(new_duration, this) ;
@@ -886,9 +888,9 @@ Editor::markerview_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent*
 {
        MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
        
-       nframes_t start = 0 ;
-       nframes_t end = 0 ;
-       nframes_t pointer_frame = event_frame(event) ;
+       nframes64_t start = 0 ;
+       nframes64_t end = 0 ;
+       nframes64_t pointer_frame = event_frame(event) ;
        
        // chekc th eposition of the item is not locked
        if(!mv->get_position_locked())
@@ -909,7 +911,7 @@ Editor::markerview_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent*
                        }
                        
                        // are we getting bigger or smaller?
-                       nframes_t new_dur_val = end - start ;
+                       nframes64_t new_dur_val = end - start ;
                        
                        if(pointer_frame <= drag_info.grab_frame)
                        {
@@ -966,10 +968,10 @@ Editor::markerview_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* eve
        }
        else
        {
-               nframes_t temp = mv->get_position() + mv->get_duration() ;
+               nframes64_t temp = mv->get_position() + mv->get_duration() ;
                
-               mv->set_position((nframes_t) (temp - drag_info.cumulative_x_drag), this) ;
-               mv->set_duration((nframes_t) drag_info.cumulative_x_drag, this) ;
+               mv->set_position((nframes64_t) (temp - drag_info.cumulative_x_drag), this) ;
+               mv->set_duration((nframes64_t) drag_info.cumulative_x_drag, this) ;
        }
 }
 
@@ -978,10 +980,10 @@ Editor::markerview_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* ev
 {
        MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
        
-       nframes_t start = 0 ;
-       nframes_t end = 0 ;
-       nframes_t pointer_frame = event_frame(event) ;
-       nframes_t new_dur_val = 0 ;
+       nframes64_t start = 0 ;
+       nframes64_t end = 0 ;
+       nframes64_t pointer_frame = event_frame(event) ;
+       nframes64_t new_dur_val = 0 ;
 
        snap_to(pointer_frame) ;
        
@@ -1006,7 +1008,7 @@ Editor::markerview_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* ev
                {
                        // we cant extend beyond the item we are marking
                        ImageFrameView* marked_item = mv->get_marked_item() ;
-                       nframes_t marked_end = marked_item->get_position() + marked_item->get_duration() ;
+                       nframes64_t marked_end = marked_item->get_position() + marked_item->get_duration() ;
                        
                        if(mv->get_max_duration_active() && (new_dur_val > mv->get_max_duration()))
                        {
@@ -1060,7 +1062,7 @@ Editor::markerview_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* even
        }
        else
        {
-               nframes_t new_duration = (nframes_t)drag_info.cumulative_x_drag ;
+               nframes64_t new_duration = (nframes64_t)drag_info.cumulative_x_drag ;
                mv->set_duration(new_duration, this) ;
        }
 }
@@ -1080,7 +1082,7 @@ void
 Editor::handle_new_imageframe_time_axis_view(const string & track_name, void* src)
 {
        ImageFrameTimeAxis* iftav ;
-       iftav = new ImageFrameTimeAxis(track_name, *this, *session, track_canvas) ;
+       iftav = new ImageFrameTimeAxis(track_name, *this, *session, *track_canvas) ;
        iftav->set_time_axis_name(track_name, this) ;
        track_views.push_back(iftav) ;
 
@@ -1097,7 +1099,7 @@ Editor::handle_new_imageframe_time_axis_view(const string & track_name, void* sr
 void
 Editor::handle_new_imageframe_marker_time_axis_view(const string & track_name, TimeAxisView* marked_track)
 {
-       MarkerTimeAxis* mta = new MarkerTimeAxis (*this, *this->current_session(), track_canvas, track_name, marked_track) ;
+       MarkerTimeAxis* mta = new MarkerTimeAxis (*this, *this->current_session(), *track_canvas, track_name, marked_track) ;
        ((ImageFrameTimeAxis*)marked_track)->add_marker_time_axis(mta, this) ;
        track_views.push_back(mta) ;