diff options
| author | Hans Fugal <hans@fugal.net> | 2006-06-22 23:40:55 +0000 |
|---|---|---|
| committer | Hans Fugal <hans@fugal.net> | 2006-06-22 23:40:55 +0000 |
| commit | 7ff370e79895d7eb293e7214689b791bd98415fb (patch) | |
| tree | d36f88880be2925593984ee43e73283af48a0119 /gtk2_ardour/editor_ops.cc | |
| parent | fd742b30fa1071c44d053cf4676149641f977a35 (diff) | |
Merging from trunk
git-svn-id: svn://localhost/ardour2/branches/undo@638 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index acf205d06f..d3845dd26b 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> @@ -66,6 +64,7 @@ using namespace std; using namespace ARDOUR; +using namespace PBD; using namespace sigc; using namespace Gtk; using namespace Editing; @@ -122,9 +121,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); |