#include <cstdlib>
#include <cmath>
+#include <pbd/stacktrace.h>
+
#include <ardour/audio_diskstream.h>
#include <ardour/audioplaylist.h>
#include "crossfade_view.h"
#include "audio_time_axis.h"
#include "region_gain_line.h"
-#include "automation_gain_line.h"
-#include "automation_pan_line.h"
+#include "automation_line.h"
#include "automation_time_axis.h"
-#include "redirect_automation_line.h"
+#include "automation_line.h"
+#include "control_point.h"
#include "canvas_impl.h"
#include "simplerect.h"
double wx, wy;
switch (ev->direction) {
- case GDK_SCROLL_DOWN:
+ case GDK_SCROLL_UP:
if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
//if (ev->state == GDK_CONTROL_MASK) {
/* XXX
event.button.y = wy;
nframes_t where = event_frame (&event, 0, 0);
- temporal_zoom_to_frame (true, where);
+ temporal_zoom_to_frame (false, where);
return true;
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
if (!current_stepping_trackview) {
return true;
}
break;
- case GDK_SCROLL_UP:
+ case GDK_SCROLL_DOWN:
if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
//if (ev->state == GDK_CONTROL_MASK) {
track_canvas.get_pointer (x, y);
event.button.y = wy;
nframes_t where = event_frame (&event, 0, 0);
- temporal_zoom_to_frame (false, where);
+ temporal_zoom_to_frame (true, where);
return true;
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
if (!current_stepping_trackview) {
}
bool
-Editor::track_canvas_event (GdkEvent *event, ArdourCanvas::Item* item)
+Editor::track_canvas_scroll_event (GdkEventScroll *event)
{
- gint x, y;
-
- /* this is the handler for events that are not handled by
- items.
- */
-
- switch (event->type) {
- case GDK_MOTION_NOTIFY:
- /* keep those motion events coming */
- track_canvas.get_pointer (x, y);
- return track_canvas_motion (event);
-
- case GDK_BUTTON_PRESS:
- track_canvas.grab_focus();
- break;
-
- case GDK_BUTTON_RELEASE:
- switch (event->button.button) {
- case 4:
- case 5:
- button_release_handler (item, event, NoItem);
- break;
- }
- break;
+ track_canvas.grab_focus();
+ track_canvas_scroll (event);
+ return false;
+}
- case GDK_SCROLL:
- track_canvas.grab_focus();
- track_canvas_scroll (&event->scroll);
- break;
+bool
+Editor::track_canvas_button_press_event (GdkEventButton *event)
+{
+ track_canvas.grab_focus();
+ return false;
+}
- default:
- break;
+bool
+Editor::track_canvas_button_release_event (GdkEventButton *event)
+{
+ if (drag_info.item) {
+ end_grab (drag_info.item, (GdkEvent*) event);
}
+ return false;
+}
- return FALSE;
+bool
+Editor::track_canvas_motion_notify_event (GdkEventMotion *event)
+{
+ int x, y;
+ /* keep those motion events coming */
+ track_canvas.get_pointer (x, y);
+ return false;
}
bool
default:
break;
}
-
return ret;
}
bool
Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView *rv)
{
- gint ret = FALSE;
+ bool ret = false;
+
+ if (!rv->sensitive ()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_3BUTTON_PRESS:
clicked_regionview = rv;
clicked_control_point = 0;
- clicked_trackview = &rv->get_time_axis_view();
- clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+ clicked_axisview = &rv->get_time_axis_view();
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
ret = button_press_handler (item, event, RegionItem);
break;
case GDK_3BUTTON_PRESS:
clicked_regionview = 0;
clicked_control_point = 0;
- clicked_trackview = tv;
- clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(tv);
+ clicked_axisview = tv;
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(tv);
ret = button_press_handler (item, event, StreamItem);
break;
Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item, AutomationTimeAxisView *atv)
{
bool ret = false;
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_3BUTTON_PRESS:
clicked_regionview = 0;
clicked_control_point = 0;
- clicked_trackview = atv;
- clicked_audio_trackview = 0;
+ clicked_axisview = atv;
+ clicked_routeview = 0;
ret = button_press_handler (item, event, AutomationTrackItem);
break;
{
/* we handle only button 3 press/release events */
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
clicked_regionview = rv;
clicked_control_point = 0;
- clicked_trackview = &rv->get_time_axis_view();
- clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+ clicked_axisview = &rv->get_time_axis_view();
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
if (event->button.button == 3) {
return button_press_handler (item, event, FadeInItem);
}
{
bool ret = false;
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
case GDK_3BUTTON_PRESS:
clicked_regionview = rv;
clicked_control_point = 0;
- clicked_trackview = &rv->get_time_axis_view();
- clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+ clicked_axisview = &rv->get_time_axis_view();
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
ret = button_press_handler (item, event, FadeInHandleItem);
break;
{
/* we handle only button 3 press/release events */
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
clicked_regionview = rv;
clicked_control_point = 0;
- clicked_trackview = &rv->get_time_axis_view();
- clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+ clicked_axisview = &rv->get_time_axis_view();
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
if (event->button.button == 3) {
return button_press_handler (item, event, FadeOutItem);
}
{
bool ret = false;
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
case GDK_3BUTTON_PRESS:
clicked_regionview = rv;
clicked_control_point = 0;
- clicked_trackview = &rv->get_time_axis_view();
- clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+ clicked_axisview = &rv->get_time_axis_view();
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
ret = button_press_handler (item, event, FadeOutHandleItem);
break;
switch (event->type) {
case GDK_BUTTON_PRESS:
clicked_crossfadeview = xfv;
- clicked_trackview = &clicked_crossfadeview->get_time_axis_view();
+ clicked_axisview = &clicked_crossfadeview->get_time_axis_view();
if (event->button.button == 3) {
return button_press_handler (item, event, CrossfadeViewItem);
}
}
+ /* XXX do not forward double clicks */
+
+ if (event->type == GDK_2BUTTON_PRESS) {
+ return false;
+ }
/* proxy for the upper most regionview */
RegionView* rv = atv->view()->find_view (rl->front());
- /* proxy */
-
delete rl;
+ /* proxy */
+
return canvas_region_view_event (event, rv->get_canvas_group(), rv);
}
+
+ delete rl;
}
}
}
bool
Editor::canvas_control_point_event (GdkEvent *event, ArdourCanvas::Item* item, ControlPoint* cp)
{
- ItemType type;
-
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
case GDK_3BUTTON_PRESS:
clicked_control_point = cp;
- clicked_trackview = &cp->line.trackview;
- clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+ clicked_axisview = &cp->line().trackview;
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
clicked_regionview = 0;
break;
break;
}
- if (dynamic_cast<AudioRegionGainLine*> (&cp->line) != 0) {
- type = GainControlPointItem;
- } else if (dynamic_cast<AutomationGainLine*> (&cp->line) != 0) {
- type = GainAutomationControlPointItem;
- } else if (dynamic_cast<AutomationPanLine*> (&cp->line) != 0) {
- type = PanAutomationControlPointItem;
- } else if (dynamic_cast<RedirectAutomationLine*> (&cp->line) != 0) {
- type = RedirectAutomationControlPointItem;
- } else {
- return false;
- }
-
- return typed_event (item, event, type);
+ return typed_event (item, event, ControlPointItem);
}
bool
if (dynamic_cast<AudioRegionGainLine*> (al) != 0) {
type = GainLineItem;
- } else if (dynamic_cast<AutomationGainLine*> (al) != 0) {
- type = GainAutomationLineItem;
- } else if (dynamic_cast<AutomationPanLine*> (al) != 0) {
- type = PanAutomationLineItem;
- } else if (dynamic_cast<RedirectAutomationLine*> (al) != 0) {
- type = RedirectAutomationLineItem;
} else {
- return false;
+ type = AutomationLineItem;
}
return typed_event (item, event, type);
{
bool ret = false;
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
case GDK_3BUTTON_PRESS:
clicked_regionview = rv;
clicked_control_point = 0;
- clicked_trackview = &clicked_regionview->get_time_axis_view();
- clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+ clicked_axisview = &clicked_regionview->get_time_axis_view();
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
ret = button_press_handler (item, event, RegionViewNameHighlight);
break;
case GDK_BUTTON_RELEASE:
{
bool ret = false;
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
case GDK_3BUTTON_PRESS:
clicked_regionview = rv;
clicked_control_point = 0;
- clicked_trackview = &clicked_regionview->get_time_axis_view();
- clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+ clicked_axisview = &clicked_regionview->get_time_axis_view();
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
ret = button_press_handler (item, event, RegionViewName);
break;
case GDK_BUTTON_RELEASE:
return typed_event (item, event, PlayheadCursorItem);
}
-bool
-Editor::canvas_edit_cursor_event (GdkEvent *event, ArdourCanvas::Item* item)
-{
- return typed_event (item, event, EditCursorItem);
-}
-
bool
Editor::canvas_zoom_rect_event (GdkEvent *event, ArdourCanvas::Item* item)
{
projects / ardour.git / blobdiff