smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-02 11:49:33 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Reworked range selection according to PRD

Browse source 
[Details] Eliminated range selection relation to track header selection
Made range drag with region cut/copy reversible
Fixed bugs

Still to do with range selection: shift+click support, Enable Group Edit operation
This commit is contained in:
GZharun 2014-12-04 14:59:26 +02:00
parent 5d4d42b1fa
commit 930b87d8e1
10 changed files with 102 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

40
gtk2_ardour/route_time_axis.cc
View file

@ -1454,12 +1454,13 @@ RouteTimeAxisView::fade_range (TimeSelection& selection)
vector<Command*> cmds;
playlist->rdiff (cmds);
_session->add_commands (cmds);
_session->add_command (new StatefulDiffCommand (playlist));
}
void
RouteTimeAxisView::cut_copy_range (Selection& selection, bool copy, Selection& new_items)
RouteTimeAxisView::cut_copy_region_from_range (Selection& selection, bool copy, Selection& new_items)
{
new_items.clear();
@ -1498,11 +1499,18 @@ RouteTimeAxisView::cut_copy_range (Selection& selection, bool copy, Selection& n
new_items.set (what_we_got);
if (Config->get_edit_mode() == Ripple)
playlist->ripple(time.start(), -time.length(), NULL);
vector<Command*> cmds;
playlist->rdiff (cmds);
_session->add_commands (cmds);
_session->add_command (new StatefulDiffCommand (playlist));
}
}
}
void
RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
{
@ -1526,8 +1534,8 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
}
}
playlist->clear_changes ();
playlist->clear_owned_changes ();
playlist->clear_changes ();
playlist->clear_owned_changes ();
switch (op) {
case Delete:
@ -1536,11 +1544,11 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
playlist->ripple(time.start(), -time.length(), NULL);
// no need to exclude any regions from rippling here
vector<Command*> cmds;
playlist->rdiff (cmds);
_session->add_commands (cmds);
_session->add_command (new StatefulDiffCommand (playlist));
vector<Command*> cmds;
playlist->rdiff (cmds);
_session->add_commands (cmds);
_session->add_command (new StatefulDiffCommand (playlist));
}
break;
@ -1551,11 +1559,11 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
playlist->ripple(time.start(), -time.length(), NULL);
// no need to exclude any regions from rippling here
vector<Command*> cmds;
playlist->rdiff (cmds);
_session->add_commands (cmds);
vector<Command*> cmds;
playlist->rdiff (cmds);
_session->add_commands (cmds);
_session->add_command (new StatefulDiffCommand (playlist));
_session->add_command (new StatefulDiffCommand (playlist));
}
break;
case Copy:
@ -1570,10 +1578,12 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
playlist->ripple(time.start(), -time.length(), NULL);
// no need to exclude any regions from rippling here
vector<Command*> cmds;
playlist->rdiff (cmds);
vector<Command*> cmds;
playlist->rdiff (cmds);
_session->add_commands (cmds);
_session->add_command (new StatefulDiffCommand (playlist));
_session->add_command (new StatefulDiffCommand (playlist));
what_we_got->release ();
}
break;