X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_imageframe.cc;h=752e43a5859fa49e6716be8d70241e17d24bb63e;hb=e80ccbfc8b3a572e517cd9932e5f260e41a5dff7;hp=4b0601fceacbcee650257c492c5bfd386f2ac5ed;hpb=f450df300c9c057141a4caf79ff6dbfbf58492d9;p=ardour.git diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc index 4b0601fcea..752e43a585 100644 --- a/gtk2_ardour/editor_imageframe.cc +++ b/gtk2_ardour/editor_imageframe.cc @@ -113,10 +113,10 @@ void Editor::scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) { // GTK2FIX - //nframes64_t offset = static_cast(frames_per_unit * (edit_hscroll_slider_width/2)) ; - nframes64_t offset = 0; + //framepos_t offset = static_cast(frames_per_unit * (edit_hscroll_slider_width/2)) ; + framepos_t offset = 0; - nframes64_t x_pos = 0 ; + framepos_t x_pos = 0 ; if (item->get_position() < offset) { x_pos = 0 ; @@ -169,11 +169,6 @@ Editor::popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas: } /* */ - - - - - /* */ bool Editor::canvas_imageframe_item_view_event (GdkEvent *event, ArdourCanvas::Item* item, ImageFrameView *ifv) @@ -494,14 +489,14 @@ Editor::markerview_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event) double cx, cy ; MarkerView* mv = reinterpret_cast(drag_info.data) ; - nframes64_t pending_region_position ; - nframes64_t pointer_frame ; + framepos_t pending_region_position ; + framepos_t pointer_frame ; pointer_frame = event_frame(event, &cx, &cy) ; snap_to(pointer_frame) ; - if (pointer_frame > (nframes64_t) drag_info.pointer_frame_offset) + if (pointer_frame > (framepos_t) drag_info.pointer_frame_offset) { pending_region_position = pointer_frame - drag_info.pointer_frame_offset ; snap_to(pending_region_position) ; @@ -542,14 +537,14 @@ Editor::imageframe_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event) ImageFrameView* ifv = reinterpret_cast(drag_info.data) ; - nframes64_t pending_region_position; - nframes64_t pointer_frame; + framepos_t pending_region_position; + framepos_t pointer_frame; pointer_frame = event_frame(event, &cx, &cy) ; snap_to(pointer_frame) ; - if (pointer_frame > (nframes64_t) drag_info.pointer_frame_offset) + if (pointer_frame > (framepos_t) drag_info.pointer_frame_offset) { pending_region_position = pointer_frame - drag_info.pointer_frame_offset ; snap_to(pending_region_position) ; @@ -577,7 +572,7 @@ Editor::imageframe_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event) void Editor::timeaxis_item_drag_finished_callback(ArdourCanvas::Item*, GdkEvent* event) { - nframes64_t where ; + framepos_t where ; TimeAxisViewItem* tavi = reinterpret_cast(drag_info.data) ; bool item_x_movement = (drag_info.last_frame_position != tavi->get_position()) ; @@ -675,9 +670,9 @@ Editor::imageframe_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* { ImageFrameView* ifv = reinterpret_cast (drag_info.data) ; - nframes64_t start = 0 ; - nframes64_t end = 0 ; - nframes64_t pointer_frame = event_frame(event) ; + framepos_t start = 0 ; + framepos_t end = 0 ; + framepos_t pointer_frame = event_frame(event) ; // chekc th eposition of the item is not locked if(!ifv->get_position_locked()) { @@ -694,7 +689,7 @@ Editor::imageframe_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* } // are we getting bigger or smaller? - nframes64_t new_dur_val = end - start ; + framepos_t new_dur_val = end - start ; // start handle, so a smaller pointer frame increases our component size if(pointer_frame <= drag_info.grab_frame) @@ -752,10 +747,10 @@ Editor::imageframe_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* eve } else { - nframes64_t temp = ifv->get_position() + ifv->get_duration() ; + framepos_t temp = ifv->get_position() + ifv->get_duration() ; - ifv->set_position((nframes64_t) (temp - drag_info.cumulative_x_drag), this) ; - ifv->set_duration((nframes64_t) drag_info.cumulative_x_drag, this) ; + ifv->set_position((framepos_t) (temp - drag_info.cumulative_x_drag), this) ; + ifv->set_duration((framepos_t) drag_info.cumulative_x_drag, this) ; } } @@ -764,10 +759,10 @@ Editor::imageframe_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* ev { ImageFrameView* ifv = reinterpret_cast (drag_info.data) ; - nframes64_t start = 0 ; - nframes64_t end = 0 ; - nframes64_t pointer_frame = event_frame(event) ; - nframes64_t new_dur_val = 0 ; + framepos_t start = 0 ; + framepos_t end = 0 ; + framepos_t pointer_frame = event_frame(event) ; + framepos_t new_dur_val = 0 ; snap_to(pointer_frame) ; @@ -829,7 +824,7 @@ Editor::imageframe_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* even } else { - nframes64_t new_duration = (nframes64_t)drag_info.cumulative_x_drag ; + framepos_t new_duration = (framepos_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) ; @@ -889,9 +884,9 @@ Editor::markerview_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* { MarkerView* mv = reinterpret_cast (drag_info.data) ; - nframes64_t start = 0 ; - nframes64_t end = 0 ; - nframes64_t pointer_frame = event_frame(event) ; + framepos_t start = 0 ; + framepos_t end = 0 ; + framepos_t pointer_frame = event_frame(event) ; // chekc th eposition of the item is not locked if(!mv->get_position_locked()) @@ -912,7 +907,7 @@ Editor::markerview_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* } // are we getting bigger or smaller? - nframes64_t new_dur_val = end - start ; + framepos_t new_dur_val = end - start ; if(pointer_frame <= drag_info.grab_frame) { @@ -969,10 +964,10 @@ Editor::markerview_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* eve } else { - nframes64_t temp = mv->get_position() + mv->get_duration() ; + framepos_t temp = mv->get_position() + mv->get_duration() ; - mv->set_position((nframes64_t) (temp - drag_info.cumulative_x_drag), this) ; - mv->set_duration((nframes64_t) drag_info.cumulative_x_drag, this) ; + mv->set_position((framepos_t) (temp - drag_info.cumulative_x_drag), this) ; + mv->set_duration((framepos_t) drag_info.cumulative_x_drag, this) ; } } @@ -981,10 +976,10 @@ Editor::markerview_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* ev { MarkerView* mv = reinterpret_cast (drag_info.data) ; - nframes64_t start = 0 ; - nframes64_t end = 0 ; - nframes64_t pointer_frame = event_frame(event) ; - nframes64_t new_dur_val = 0 ; + framepos_t start = 0 ; + framepos_t end = 0 ; + framepos_t pointer_frame = event_frame(event) ; + framepos_t new_dur_val = 0 ; snap_to(pointer_frame) ; @@ -1009,7 +1004,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() ; - nframes64_t marked_end = marked_item->get_position() + marked_item->get_duration() ; + framepos_t marked_end = marked_item->get_position() + marked_item->get_duration() ; if(mv->get_max_duration_active() && (new_dur_val > mv->get_max_duration())) { @@ -1063,7 +1058,7 @@ Editor::markerview_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* even } else { - nframes64_t new_duration = (nframes64_t)drag_info.cumulative_x_drag ; + framepos_t new_duration = (framepos_t)drag_info.cumulative_x_drag ; mv->set_duration(new_duration, this) ; } } @@ -1093,7 +1088,6 @@ Editor::handle_new_imageframe_time_axis_view(const string & track_name, void* sr row[route_display_columns.tv] = iftav; route_list_display.get_selection()->select (row); - iftav->GoingAway.connect (*this, boost::bind (&Editor::remove_route, this, (TimeAxisView*)iftav), gui_context()); iftav->gui_changed.connect(sigc::mem_fun(*this, &Editor::handle_gui_changes)) ; } @@ -1109,9 +1103,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_display.get_selection()->select (row); - - mta->GoingAway.connect (*this, boost::bind (&Editor::remove_route, this, (TimeAxisView*)mta), gui_context()); - } +} /* */