diff options
| author | David Robillard <d@drobilla.net> | 2006-06-15 01:34:54 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-15 01:34:54 +0000 |
| commit | b5db1f624d347c8865c27fdae23bf4595be372d2 (patch) | |
| tree | 19d57731a87490c8de9773b64ee7ba76d244dc73 /gtk2_ardour/editor_ops.cc | |
| parent | a8f44b1556e68f4cf28bd52e6de7359581a1ec45 (diff) | |
Merged with trunk revision 600
git-svn-id: svn://localhost/ardour2/branches/midi@601 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index acf205d06f..39b2843756 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -36,9 +36,7 @@ #include <ardour/session.h> #include <ardour/audioplaylist.h> #include <ardour/audioregion.h> -#include <ardour/diskstream.h> -#include <ardour/filesource.h> -#include <ardour/externalsource.h> +#include <ardour/audio_diskstream.h> #include <ardour/utils.h> #include <ardour/location.h> #include <ardour/named_selection.h> @@ -122,9 +120,9 @@ Editor::set_meter_hold (int32_t cnt) void Editor::set_meter_falloff (int intval) { - float val; + float val = 0.0f; /* off */ std::string str; - cerr << "set_meter_falloff () called: intval = " << intval << endl; + Config->set_meter_falloff_off(false); Config->set_meter_falloff_slowest(false); Config->set_meter_falloff_slow(false); |