smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

Account for the fact that CursorDrag only ever drags the playhead. Fix playhead misbehaviour when you start a drag from outside it.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8327 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-12-22 23:16:39 +00:00
parent 9eca7915e2
commit 039adb4c6b
2 changed files with 30 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

65
gtk2_ardour/editor_drag.cc
View file

@ -1981,9 +1981,6 @@ CursorDrag::CursorDrag (Editor* e, ArdourCanvas::Item* i, bool s)
_stop (s) _stop (s)
{ {
DEBUG_TRACE (DEBUG::Drags, "New CursorDrag\n"); DEBUG_TRACE (DEBUG::Drags, "New CursorDrag\n");
_cursor = reinterpret_cast<EditorCursor*> (_item->get_data ("cursor"));
assert (_cursor);
} }
void void
@ -1992,45 +1989,35 @@ CursorDrag::start_grab (GdkEvent* event, Gdk::Cursor* c)
Drag::start_grab (event, c); Drag::start_grab (event, c);
if (!_stop) { if (!_stop) {
framepos_t where = _editor->event_frame (event, 0, 0); framepos_t where = _editor->event_frame (event, 0, 0);
_editor->snap_to_with_modifier (where, event); _editor->snap_to_with_modifier (where, event);
_editor->playhead_cursor->set_position (where); _editor->playhead_cursor->set_position (where);
} }
if (_cursor == _editor->playhead_cursor) { _editor->_dragging_playhead = true;
_editor->_dragging_playhead = true;
Session* s = _editor->session (); Session* s = _editor->session ();
if (s) { if (s) {
if (_was_rolling && _stop) { if (_was_rolling && _stop) {
s->request_stop (); s->request_stop ();
} }
if (s->is_auditioning()) { if (s->is_auditioning()) {
s->cancel_audition (); s->cancel_audition ();
} }
s->request_suspend_timecode_transmission (); s->request_suspend_timecode_transmission ();
if (s->timecode_transmission_suspended ()) { if (s->timecode_transmission_suspended ()) {
framepos_t const f = _editor->playhead_cursor->current_frame; framepos_t const f = _editor->playhead_cursor->current_frame;
s->send_mmc_locate (f); s->send_mmc_locate (f);
s->send_full_time_code (f); s->send_full_time_code (f);
}
} }
} }
_editor->show_verbose_time_cursor (_cursor->current_frame, 10); _editor->show_verbose_time_cursor (_editor->playhead_cursor->current_frame, 10);
}
void
CursorDrag::setup_pointer_frame_offset ()
{
_pointer_frame_offset = raw_grab_frame() - _cursor->current_frame;
} }
void void
@ -2042,12 +2029,12 @@ CursorDrag::motion (GdkEvent* event, bool)
return; return;
} }
_cursor->set_position (adjusted_frame); _editor->playhead_cursor->set_position (adjusted_frame);
_editor->show_verbose_time_cursor (_cursor->current_frame, 10); _editor->show_verbose_time_cursor (_editor->playhead_cursor->current_frame, 10);
Session* s = _editor->session (); Session* s = _editor->session ();
if (s && _item == &_editor->playhead_cursor->canvas_item && s->timecode_transmission_suspended ()) { if (s && s->timecode_transmission_suspended ()) {
framepos_t const f = _editor->playhead_cursor->current_frame; framepos_t const f = _editor->playhead_cursor->current_frame;
s->send_mmc_locate (f); s->send_mmc_locate (f);
s->send_full_time_code (f); s->send_full_time_code (f);
@ -2057,7 +2044,7 @@ CursorDrag::motion (GdkEvent* event, bool)
#ifdef GTKOSX #ifdef GTKOSX
_editor->update_canvas_now (); _editor->update_canvas_now ();
#endif #endif
_editor->UpdateAllTransportClocks (_cursor->current_frame); _editor->UpdateAllTransportClocks (_editor->playhead_cursor->current_frame);
} }
void void
@ -2071,13 +2058,11 @@ CursorDrag::finished (GdkEvent* event, bool movement_occurred)
motion (event, false); motion (event, false);
if (_item == &_editor->playhead_cursor->canvas_item) { Session* s = _editor->session ();
Session* s = _editor->session (); if (s) {
if (s) { s->request_locate (_editor->playhead_cursor->current_frame, _was_rolling);
s->request_locate (_editor->playhead_cursor->current_frame, _was_rolling); _editor->_pending_locate_request = true;
_editor->_pending_locate_request = true; s->request_resume_timecode_transmission ();
s->request_resume_timecode_transmission ();
}
} }
} }
@ -2089,7 +2074,7 @@ CursorDrag::aborted ()
_editor->_dragging_playhead = false; _editor->_dragging_playhead = false;
} }
_cursor->set_position (adjusted_frame (grab_frame (), 0, false)); _editor->playhead_cursor->set_position (adjusted_frame (grab_frame (), 0, false));
} }
FadeInDrag::FadeInDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<RegionView*> const & v) FadeInDrag::FadeInDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<RegionView*> const & v)

6
gtk2_ardour/editor_drag.h
View file

@ -570,7 +570,7 @@ private:
}; };
/** Drag of a cursor */ /** Drag of the playhead cursor */
class CursorDrag : public Drag class CursorDrag : public Drag
{ {
public: public:
@ -593,12 +593,8 @@ public:
return false; return false;
} }
void setup_pointer_frame_offset ();
private: private:
EditorCursor* _cursor; ///< cursor being dragged
bool _stop; ///< true to stop the transport on starting the drag, otherwise false bool _stop; ///< true to stop the transport on starting the drag, otherwise false
}; };
/** Region fade-in drag */ /** Region fade-in drag */