ardour/livetrax
13
0
Fork 0
Code

fix region drag across tracks that auto-partitioned the receiving playlist

Browse Source 
Confusion caused during nutempo development when a boolean related to nick_m's old
"for music" concept ended up becoming the "auto_partition" argument instead
This commit is contained in:
Paul Davis 2022-09-24 14:27:15 -06:00
parent 7e5fe695d0
commit fba4a5ff73
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk2_ardour/editor_drag.cc
View File

@ -1809,15 +1809,10 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const changed_t
RegionView* new_view; RegionView* new_view;
if (i->view == _primary && !_x_constrained) { if (i->view == _primary && !_x_constrained) {
new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, last_position, new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, last_position,
modified_playlists, true); modified_playlists);
} else { } else {
if (i->view->region()->position_time_domain() == Temporal::AudioTime) { new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where,
new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where,
modified_playlists); modified_playlists);
} else {
new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where,
modified_playlists, true);
}
} }
if (new_view != 0) { if (new_view != 0) {
@ -1945,16 +1940,10 @@ RegionMoveDrag::finished_no_copy (
RegionView* new_view; RegionView* new_view;
if (rv == _primary && !_x_constrained) { if (rv == _primary && !_x_constrained) {
new_view = insert_region_into_playlist ( new_view = insert_region_into_playlist (
RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, last_position,modified_playlists, true); RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, last_position,modified_playlists);
} else { } else {
if (rv->region()->position_time_domain() == Temporal::AudioTime) { new_view = insert_region_into_playlist (
RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, modified_playlists);
new_view = insert_region_into_playlist (
RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, modified_playlists);
} else {
new_view = insert_region_into_playlist (
RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, modified_playlists, true);
}
} }
if (new_view == 0) { if (new_view == 0) {
@ -2126,8 +2115,7 @@ RegionMoveDrag::insert_region_into_playlist (
RouteTimeAxisView* dest_rtv, RouteTimeAxisView* dest_rtv,
layer_t dest_layer, layer_t dest_layer,
timepos_t const & where, timepos_t const & where,
PlaylistSet& modified_playlists, PlaylistSet& modified_playlists
bool for_music
) )
{ {
boost::shared_ptr<Playlist> dest_playlist = dest_rtv->playlist (); boost::shared_ptr<Playlist> dest_playlist = dest_rtv->playlist ();
@ -2148,7 +2136,7 @@ RegionMoveDrag::insert_region_into_playlist (
/* cannot freeze because we need the new region announcements */ /* cannot freeze because we need the new region announcements */
} }
dest_playlist->add_region (region, where, 1.0, for_music); dest_playlist->add_region (region, where, 1.0);
if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) { if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) {
dest_playlist->set_layer (region, dest_layer); dest_playlist->set_layer (region, dest_layer);

3
gtk2_ardour/editor_drag.h
View File

@ -513,8 +513,7 @@ private:
RouteTimeAxisView*, RouteTimeAxisView*,
ARDOUR::layer_t, ARDOUR::layer_t,
Temporal::timepos_t const &, Temporal::timepos_t const &,
PlaylistSet&, PlaylistSet&
bool for_music = false
); );
void remove_region_from_playlist ( void remove_region_from_playlist (