ardour/livetrax
13
0
Fork 0
Code

only set the exact musical position of the primary region for move/copy drag.

Browse Source
This commit is contained in:
nick_m 2016-12-13 04:33:58 +11:00
parent a4d8cc2e04
commit 44e8181c36
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gtk2_ardour/editor_drag.cc
View File

@ -1293,8 +1293,15 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move)
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(rv); MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(rv);
const boost::shared_ptr<const Region> original = rv->region(); const boost::shared_ptr<const Region> original = rv->region();
boost::shared_ptr<Region> region_copy = RegionFactory::create (original, true boost::shared_ptr<Region> region_copy;
, current_music_divisor (original->position(), event->button.state));
if (rv == _primary) {
region_copy = RegionFactory::create (original, true
, current_music_divisor (original->position(), event->button.state));
} else {
region_copy = RegionFactory::create (original, true, 0);
}
/* need to set this so that the drop zone code can work. This doesn't /* need to set this so that the drop zone code can work. This doesn't
actually put the region into the playlist, but just sets a weak pointer actually put the region into the playlist, but just sets a weak pointer
to it. to it.
@ -1516,8 +1523,14 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed
} }
if (dest_rtv != 0) { if (dest_rtv != 0) {
RegionView* new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, RegionView* new_view;
modified_playlists, current_music_divisor (where, ev_state)); if (i->view == _primary) {
new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where,
modified_playlists, current_music_divisor (where, ev_state));
} else {
new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where,
modified_playlists, 0);
}
if (new_view != 0) { if (new_view != 0) {
new_views.push_back (new_view); new_views.push_back (new_view);
@ -1624,11 +1637,18 @@ RegionMoveDrag::finished_no_copy (
if (changed_tracks) { if (changed_tracks) {
/* insert into new playlist */ /* insert into new playlist */
RegionView* new_view;
RegionView* new_view = insert_region_into_playlist ( if (rv == _primary) {
RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, new_view = insert_region_into_playlist (
modified_playlists, current_music_divisor (where, ev_state) RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where,
); modified_playlists, current_music_divisor (where, ev_state)
);
} else {
new_view = insert_region_into_playlist (
RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where,
modified_playlists, 0
);
}
if (new_view == 0) { if (new_view == 0) {
++i; ++i;
@ -1686,8 +1706,11 @@ RegionMoveDrag::finished_no_copy (
if (r.second) { if (r.second) {
playlist->freeze (); playlist->freeze ();
} }
if (rv == _primary) {
rv->region()->set_position (where, current_music_divisor (where, ev_state)); rv->region()->set_position (where, current_music_divisor (where, ev_state));
} else {
rv->region()->set_position (where, 0);
}
_editor->session()->add_command (new StatefulDiffCommand (rv->region())); _editor->session()->add_command (new StatefulDiffCommand (rv->region()));
} }