diff options
author | Carl Hetherington <carl@carlh.net> | 2009-06-10 21:58:25 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-06-10 21:58:25 +0000 |
commit | 52fc310cfb540f9fd7d459453cbbaaa4bde47e9e (patch) | |
tree | 3e3d575da2576656d26aa710d216405b8415875a /libs/ardour | |
parent | 2efc80da175cf6879c2a9904930f9be8381baf3d (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')
-rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/types.h | 12 | ||||
-rw-r--r-- | libs/ardour/globals.cc | 2 |
3 files changed, 17 insertions, 0 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 1a4c49fe64..d74778b67f 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -141,6 +141,9 @@ CONFIG_VARIABLE (bool, name_new_markers, "name-new-markers", false) CONFIG_VARIABLE (bool, rubberbanding_snaps_to_grid, "rubberbanding-snaps-to-grid", false) CONFIG_VARIABLE (long, font_scale, "font-scale", 102400) CONFIG_VARIABLE (std::string, default_session_parent_dir, "default-session-parent-dir", "~") +CONFIG_VARIABLE (bool, show_waveforms, "show-waveforms", true) +CONFIG_VARIABLE (WaveformScale, waveform_scale, "waveform-scale", Linear) +CONFIG_VARIABLE (WaveformShape, waveform_shape, "waveform-shape", Traditional) /* denormal management */ diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index cdec0c5fab..b5e53d494e 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -436,6 +436,16 @@ namespace ARDOUR { class Bundle; typedef std::vector<boost::shared_ptr<Bundle> > BundleList; + enum WaveformScale { + Linear, + Logarithmic + }; + + enum WaveformShape { + Traditional, + Rectified + }; + } // namespace ARDOUR std::istream& operator>>(std::istream& o, ARDOUR::SampleFormat& sf); @@ -452,6 +462,8 @@ std::istream& operator>>(std::istream& o, ARDOUR::ShuttleBehaviour& sf); std::istream& operator>>(std::istream& o, ARDOUR::ShuttleUnits& sf); std::istream& operator>>(std::istream& o, ARDOUR::SmpteFormat& sf); std::istream& operator>>(std::istream& o, ARDOUR::DenormalModel& sf); +std::istream& operator>>(std::istream& o, ARDOUR::WaveformScale& sf); +std::istream& operator>>(std::istream& o, ARDOUR::WaveformShape& sf); using ARDOUR::nframes_t; 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); } |