summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2018-07-03 15:38:30 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2018-07-03 15:38:30 -0400
commit0ff671b1a36e83a126a3e0189f74f3f3650a1220 (patch)
tree6a8311818a35ed89323efdc64612d0f50409911e
parent20328f2929a47b19f5ee84cf9c764a1f98039475 (diff)
reverse velocity display related commits
-rw-r--r--libs/ardour/ardour/types.h4
-rw-r--r--libs/ardour/ardour/types_convert.h2
-rw-r--r--libs/ardour/enums.cc2
3 files changed, 1 insertions, 7 deletions
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index fbe98a0022..f6831c9e8a 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -503,10 +503,6 @@ namespace ARDOUR {
AutoConnectMaster = 0x2
};
- enum VelocityDisplayOption {
- NoteBars = 0x1
- };
-
enum TracksAutoNamingRule {
UseDefaultNames = 0x1,
NameAfterDriver = 0x2
diff --git a/libs/ardour/ardour/types_convert.h b/libs/ardour/ardour/types_convert.h
index 76d54d7b9a..8317614989 100644
--- a/libs/ardour/ardour/types_convert.h
+++ b/libs/ardour/ardour/types_convert.h
@@ -73,8 +73,6 @@ DEFINE_ENUM_CONVERT(ARDOUR::WaveformShape)
DEFINE_ENUM_CONVERT(ARDOUR::VUMeterStandard)
DEFINE_ENUM_CONVERT(ARDOUR::MeterLineUp)
-DEFINE_ENUM_CONVERT(ARDOUR::VelocityDisplayOption)
-
DEFINE_ENUM_CONVERT(ARDOUR::MidiPortFlags)
DEFINE_ENUM_CONVERT(MusicalMode::Type)
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index f8aa53c212..cfd3bcc119 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -138,7 +138,7 @@ setup_enum_writer ()
PresentationInfo::Flag _PresentationInfo_Flag;
MusicalMode::Type mode;
MidiPortFlags _MidiPortFlags;
-
+
#define REGISTER(e) enum_writer.register_distinct (typeid(e).name(), i, s); i.clear(); s.clear()
#define REGISTER_BITS(e) enum_writer.register_bits (typeid(e).name(), i, s); i.clear(); s.clear()
#define REGISTER_ENUM(e) i.push_back (e); s.push_back (#e)