#include "pbd/stacktrace.h"
-#include "ardour/audio_diskstream.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/region_factory.h"
#include "control_point.h"
#include "canvas_impl.h"
#include "simplerect.h"
-#include "interactive-item.h"
#include "editor_drag.h"
#include "midi_time_axis.h"
#include "editor_regions.h"
#include "i18n.h"
-using namespace sigc;
using namespace std;
using namespace ARDOUR;
using namespace PBD;
bool
Editor::track_canvas_scroll (GdkEventScroll* ev)
{
- int x, y;
- double wx, wy;
nframes64_t xdelta;
int direction = ev->direction;
- Gnome::Canvas::Item* item = track_canvas->get_item_at(ev->x, ev->y);
- InteractiveItem* interactive_item = dynamic_cast<InteractiveItem*>(item);
- if (interactive_item) {
- return interactive_item->on_event(reinterpret_cast<GdkEvent*>(ev));
- }
-
retry:
switch (direction) {
case GDK_SCROLL_UP:
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
- //if (ev->state == GDK_CONTROL_MASK) {
- /* XXX
- the ev->x will be out of step with the canvas
- if we're in mid zoom, so we have to get the damn mouse
- pointer again
- */
- track_canvas->get_pointer (x, y);
- track_canvas->window_to_world (x, y, wx, wy);
-
- GdkEvent event;
- event.type = GDK_BUTTON_RELEASE;
- event.button.x = wx;
- event.button.y = wy;
-
- nframes64_t where = event_frame (&event, 0, 0);
- temporal_zoom_to_frame (false, where);
+ temporal_zoom_step (false);
return true;
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
direction = GDK_SCROLL_LEFT;
case GDK_SCROLL_DOWN:
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
- //if (ev->state == GDK_CONTROL_MASK) {
- track_canvas->get_pointer (x, y);
- track_canvas->window_to_world (x, y, wx, wy);
-
- GdkEvent event;
- event.type = GDK_BUTTON_RELEASE;
- event.button.x = wx;
- event.button.y = wy;
-
- nframes64_t where = event_frame (&event, 0, 0);
- temporal_zoom_to_frame (true, where);
+ temporal_zoom_step (true);
return true;
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
direction = GDK_SCROLL_RIGHT;
Editor::track_canvas_scroll_event (GdkEventScroll *event)
{
track_canvas->grab_focus();
- track_canvas_scroll (event);
- return false;
+ return track_canvas_scroll (event);
}
bool
bool
Editor::track_canvas_button_release_event (GdkEventButton *event)
{
- if (_drag) {
- _drag->end_grab ((GdkEvent*) event);
- delete _drag;
- _drag = 0;
+ if (_drags->active ()) {
+ _drags->end_grab ((GdkEvent*) event);
}
return false;
}
return false;
}
-
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
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;
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);
}
if (atv->is_audio_track()) {
boost::shared_ptr<AudioPlaylist> pl;
- if ((pl = boost::dynamic_pointer_cast<AudioPlaylist> (atv->get_diskstream()->playlist())) != 0) {
+ if ((pl = boost::dynamic_pointer_cast<AudioPlaylist> (atv->track()->playlist())) != 0) {
Playlist::RegionList* rl = pl->regions_at (event_frame (event));
if (!rl->empty()) {
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:
ret = button_release_handler (item, event, RegionViewNameHighlight);
break;
case GDK_MOTION_NOTIFY:
- ret = motion_handler (item, event);
+ motion_handler (item, event);
+ 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 *rv)
+{
+ 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*/)
{
/* assume we're dragging with button 1 */
event.motion.state = Gdk::BUTTON1_MASK;
- if (_drag == 0) {
+ if (!_drags->active ()) {
double px;
double py;
boost::shared_ptr<Region> region = _regions->get_dragged_region ();
+ if (!region) {
+ return true;
+ }
+
boost::shared_ptr<Region> region_copy = RegionFactory::create (region);
if (boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 &&
return true;
}
- _drag = new RegionInsertDrag (this, region_copy, rtav, pos);
- _drag->start_grab (&event);
+ _drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event);
}
- _drag->motion_handler (&event, false);
+ _drags->motion_handler (&event, false);
return true;
}
projects / ardour.git / blobdiff