bool
Editor::track_canvas_scroll (GdkEventScroll* ev)
{
- nframes64_t xdelta;
+ framepos_t xdelta;
int direction = ev->direction;
retry:
case GDK_SCROLL_RIGHT:
xdelta = (current_page_frames() / 8);
- if (max_frames - xdelta > leftmost_frame) {
+ if (max_framepos - xdelta > leftmost_frame) {
reset_x_origin (leftmost_frame + xdelta);
} else {
- reset_x_origin (max_frames - current_page_frames());
+ reset_x_origin (max_framepos - current_page_frames());
}
break;
clicked_regionview = 0;
clicked_control_point = 0;
clicked_axisview = tv;
- clicked_routeview = dynamic_cast<RouteTimeAxisView*>(tv);
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
ret = button_press_handler (item, event, StreamItem);
break;
case GDK_LEAVE_NOTIFY:
set_entered_track (0);
break;
-
+
default:
break;
}
break;
case GDK_ENTER_NOTIFY:
+ set_entered_regionview (rv);
ret = enter_handler (item, event, FadeInHandleItem);
break;
case GDK_LEAVE_NOTIFY:
+ set_entered_regionview (0);
ret = leave_handler (item, event, FadeInHandleItem);
break;
break;
case GDK_ENTER_NOTIFY:
+ set_entered_regionview (rv);
ret = enter_handler (item, event, FadeOutHandleItem);
break;
case GDK_LEAVE_NOTIFY:
+ set_entered_regionview (0);
ret = leave_handler (item, event, FadeOutHandleItem);
break;
case GDK_BUTTON_PRESS:
clicked_crossfadeview = xfv;
clicked_axisview = &clicked_crossfadeview->get_time_axis_view();
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
if (event->button.button == 3) {
return button_press_handler (item, event, CrossfadeViewItem);
}
perspective. XXX change this ??
*/
+ ItemType type;
+
+ if (item->get_data ("isleft")) {
+ type = LeftFrameHandle;
+ } else {
+ type = RightFrameHandle;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
clicked_control_point = 0;
clicked_axisview = &clicked_regionview->get_time_axis_view();
clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
- ret = button_press_handler (item, event, RegionViewNameHighlight);
+ ret = button_press_handler (item, event, type);
break;
case GDK_BUTTON_RELEASE:
- ret = button_release_handler (item, event, RegionViewNameHighlight);
+ ret = button_release_handler (item, event, type);
break;
case GDK_MOTION_NOTIFY:
ret = motion_handler (item, event);
break;
case GDK_ENTER_NOTIFY:
- ret = enter_handler (item, event, RegionViewNameHighlight);
+ set_entered_regionview (rv);
+ ret = enter_handler (item, event, type);
break;
case GDK_LEAVE_NOTIFY:
- ret = leave_handler (item, event, RegionViewNameHighlight);
+ set_entered_regionview (0);
+ ret = leave_handler (item, event, type);
break;
default:
break;
case GDK_MOTION_NOTIFY:
motion_handler (item, event);
- ret = true; // force this to avoid progagating the event into the regionview
+ ret = true; // force this to avoid progagating the event into the regionview
break;
case GDK_ENTER_NOTIFY:
+ set_entered_regionview (rv);
ret = enter_handler (item, event, RegionViewNameHighlight);
break;
case GDK_LEAVE_NOTIFY:
+ set_entered_regionview (0);
ret = leave_handler (item, event, RegionViewNameHighlight);
break;
ret = motion_handler (item, event);
break;
case GDK_ENTER_NOTIFY:
+ set_entered_regionview (rv);
ret = enter_handler (item, event, RegionViewName);
break;
case GDK_LEAVE_NOTIFY:
+ set_entered_regionview (0);
ret = leave_handler (item, event, RegionViewName);
break;
return ret;
}
+bool
+Editor::canvas_feature_line_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView*)
+{
+ bool ret = false;
+
+ switch (event->type) {
+ case GDK_BUTTON_PRESS:
+ case GDK_2BUTTON_PRESS:
+ case GDK_3BUTTON_PRESS:
+ clicked_regionview = 0;
+ clicked_control_point = 0;
+ clicked_axisview = 0;
+ clicked_routeview = 0; //dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+ ret = button_press_handler (item, event, FeatureLineItem);
+ break;
+
+ case GDK_BUTTON_RELEASE:
+ ret = button_release_handler (item, event, FeatureLineItem);
+ break;
+
+ case GDK_MOTION_NOTIFY:
+ ret = motion_handler (item, event);
+ break;
+
+ case GDK_ENTER_NOTIFY:
+ ret = enter_handler (item, event, FeatureLineItem);
+ break;
+
+ case GDK_LEAVE_NOTIFY:
+ ret = leave_handler (item, event, FeatureLineItem);
+ break;
+
+ default:
+ break;
+ }
+
+ return ret;
+}
+
bool
Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item, Marker* /*marker*/)
{
double px;
double py;
- nframes64_t const pos = event_frame (&event, &px, &py);
+ framepos_t const pos = event_frame (&event, &px, &py);
std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);
if (tv.first == 0) {