mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
merge 3.0 from 2.0-ongoing@3243
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
9aa8af5a28
commit
cb41314642
100 changed files with 17534 additions and 4036 deletions
|
|
@ -39,6 +39,7 @@
|
|||
#define EDITPOINT(a) /*empty*/
|
||||
#define WAVEFORMSCALE(a) /*empty*/
|
||||
#define WAVEFORMSHAPE(a) /*empty*/
|
||||
#define INSERTTIMEOPT(a) /*empty*/
|
||||
|
||||
namespace Editing {
|
||||
|
||||
|
|
@ -202,6 +203,18 @@ enum WaveformShape {
|
|||
#undef WAVEFORMSHAPE
|
||||
#define WAVEFORMSHAPE(a) /*empty*/
|
||||
|
||||
|
||||
// INSERTTIMEOPT
|
||||
#undef INSERTTIMEOPT
|
||||
#define INSERTTIMEOPT(a) a,
|
||||
enum InsertTimeOption {
|
||||
#include "editing_syms.h"
|
||||
};
|
||||
|
||||
#undef INSERTTIMEOPT
|
||||
#define INSERTTIMEOPT(a) /*empty*/
|
||||
|
||||
|
||||
/////////////////////
|
||||
// These don't need their state saved. yet...
|
||||
enum CutCopyOp {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue