projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NO-OP; Backport changes from Mixbus branch
[ardour.git]
/
gtk2_ardour
/
editor_items.h
diff --git
a/gtk2_ardour/editor_items.h
b/gtk2_ardour/editor_items.h
index aa68f37720769af3ff4a09361271c956d353ab4d..79a94df340a200e32ba4b09ca8da3dc2f6a1756d 100644
(file)
--- a/
gtk2_ardour/editor_items.h
+++ b/
gtk2_ardour/editor_items.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2000-2007 Paul Davis
+ Copyright (C) 2000-2007 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-23,16
+23,20
@@
enum ItemType {
RegionItem,
StreamItem,
enum ItemType {
RegionItem,
StreamItem,
+ WaveItem,
PlayheadCursorItem,
MarkerItem,
MarkerBarItem,
RangeMarkerBarItem,
PlayheadCursorItem,
MarkerItem,
MarkerBarItem,
RangeMarkerBarItem,
+ CdMarkerBarItem,
+ VideoBarItem,
TransportMarkerBarItem,
SelectionItem,
ControlPointItem,
GainLineItem,
AutomationLineItem,
MeterMarkerItem,
TransportMarkerBarItem,
SelectionItem,
ControlPointItem,
GainLineItem,
AutomationLineItem,
MeterMarkerItem,
+ TempoCurveItem,
TempoMarkerItem,
MeterBarItem,
TempoBarItem,
TempoMarkerItem,
MeterBarItem,
TempoBarItem,
@@
-43,24
+47,25
@@
enum ItemType {
AutomationTrackItem,
FadeInItem,
FadeInHandleItem,
AutomationTrackItem,
FadeInItem,
FadeInHandleItem,
+ FadeInTrimHandleItem,
FadeOutItem,
FadeOutHandleItem,
FadeOutItem,
FadeOutHandleItem,
-
-#ifdef WITH_CMT
- MarkerViewItem,
- MarkerTimeAxisItem,
- MarkerViewHandleStartItem,
- MarkerViewHandleEndItem,
- ImageFrameItem,
- ImageFrameTimeAxisItem,
- ImageFrameHandleStartItem,
- ImageFrameHandleEndItem,
-#endif
-
+ FadeOutTrimHandleItem,
+ NoteItem,
+ FeatureLineItem,
+ LeftFrameHandle,
+ RightFrameHandle,
+ StartCrossFadeItem,
+ EndCrossFadeItem,
CrossfadeViewItem,
CrossfadeViewItem,
-
+ TimecodeRulerItem,
+ MinsecRulerItem,
+ BBTRulerItem,
+ SamplesRulerItem,
+ DropZoneItem,
+
/* don't remove this */
/* don't remove this */
-
+
NoItem
};
NoItem
};