diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-16 20:16:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-16 20:16:57 +0000 |
| commit | 99aa8c6338e47b41143f799fdcb35d1699548076 (patch) | |
| tree | a61140fd331b49a408894f00dcb8976cbb6543b8 /gtk2_ardour/route_time_axis.h | |
| parent | 4b848856ebc2856bf7ab10a000cc88bdd3bc4a4a (diff) | |
rename join regions op as combine regions; save and restore nested playlists, sources, regions; add undo/redo for combine; fixup peakfile use/discovery
git-svn-id: svn://localhost/ardour2/branches/3.0@9528 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_time_axis.h')
| -rw-r--r-- | gtk2_ardour/route_time_axis.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index d596de3df7..b06b56fc67 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -94,7 +94,7 @@ public: /* Editing operations */ void cut_copy_clear (Selection&, Editing::CutCopyOp); bool paste (ARDOUR::framepos_t, float times, Selection&, size_t nth); - void join_regions (); + void combine_regions (); void toggle_automation_track (const Evoral::Parameter& param); /* The editor calls these when mapping an operation across multiple tracks */ |