summaryrefslogtreecommitdiff
path: root/libs/ardour/globals.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-06-10 21:58:25 +0000
committerCarl Hetherington <carl@carlh.net>2009-06-10 21:58:25 +0000
commit52fc310cfb540f9fd7d459453cbbaaa4bde47e9e (patch)
tree3e3d575da2576656d26aa710d216405b8415875a /libs/ardour/globals.cc
parent2efc80da175cf6879c2a9904930f9be8381baf3d (diff)
Make waveform show / scale / shape a global option in the prefs dialog to clean things up a bit. Options to make exceptions for individual tracks could be re-added, if people want them.
git-svn-id: svn://localhost/ardour2/branches/3.0@5160 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/globals.cc')
-rw-r--r--libs/ardour/globals.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 1e17b3aeb9..a501e65931 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -606,4 +606,6 @@ std::istream& operator>>(std::istream& o, ShuttleBehaviour& var) { return int_to
std::istream& operator>>(std::istream& o, ShuttleUnits& var) { return int_to_type<ShuttleUnits> (o, var); }
std::istream& operator>>(std::istream& o, SmpteFormat& var) { return int_to_type<SmpteFormat> (o, var); }
std::istream& operator>>(std::istream& o, DenormalModel& var) { return int_to_type<DenormalModel> (o, var); }
+std::istream& operator>>(std::istream& o, WaveformScale& var) { return int_to_type<WaveformScale> (o, var); }
+std::istream& operator>>(std::istream& o, WaveformShape& var) { return int_to_type<WaveformShape> (o, var); }