diff options
| author | David Robillard <d@drobilla.net> | 2008-09-26 19:26:17 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-09-26 19:26:17 +0000 |
| commit | 5e7abcecc485cabbc0f2ce866f64ea966e4312f5 (patch) | |
| tree | 012f3d6f22ef9cfb00af81f5b46dc0cd3c975a1c /libs | |
| parent | abf64beac66bf340b52b7d29e881536d444d13d6 (diff) | |
Remove duplicate and always NULL Session peak functions.
git-svn-id: svn://localhost/ardour2/branches/3.0@3811 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/session.h | 12 | ||||
| -rw-r--r-- | libs/ardour/audioregion.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 6 |
3 files changed, 1 insertions, 19 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 83e3200224..b6d8f15101 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -962,18 +962,6 @@ class Session : public PBD::StatefulDestructible void* ptr, float opt); - typedef float (*compute_peak_t) (Sample *, nframes_t, float); - typedef void (*find_peaks_t) (Sample *, nframes_t, float *, float*); - typedef void (*apply_gain_to_buffer_t) (Sample *, nframes_t, float); - typedef void (*mix_buffers_with_gain_t) (Sample *, Sample *, nframes_t, float); - typedef void (*mix_buffers_no_gain_t) (Sample *, Sample *, nframes_t); - - static compute_peak_t compute_peak; - static find_peaks_t find_peaks; - static apply_gain_to_buffer_t apply_gain_to_buffer; - static mix_buffers_with_gain_t mix_buffers_with_gain; - static mix_buffers_no_gain_t mix_buffers_no_gain; - static sigc::signal<void> SendFeedback; /* Controllables */ diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 2b6b87d061..477c479de8 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -473,7 +473,7 @@ AudioRegion::_read_at (const SourceList& srcs, nframes_t limit, } } } else if (_scale_amplitude != 1.0f) { - Session::apply_gain_to_buffer (mixdown_buffer, to_read, _scale_amplitude); + ARDOUR::apply_gain_to_buffer (mixdown_buffer, to_read, _scale_amplitude); } merge: diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 30f93f9646..7698fc3dbc 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -102,12 +102,6 @@ static const int CPU_CACHE_ALIGN = 16; /* arguably 32 on most arches, but it mat bool Session::_disable_all_loaded_plugins = false; -Session::compute_peak_t Session::compute_peak = 0; -Session::find_peaks_t Session::find_peaks = 0; -Session::apply_gain_to_buffer_t Session::apply_gain_to_buffer = 0; -Session::mix_buffers_with_gain_t Session::mix_buffers_with_gain = 0; -Session::mix_buffers_no_gain_t Session::mix_buffers_no_gain = 0; - sigc::signal<void,std::string> Session::Dialog; sigc::signal<int> Session::AskAboutPendingState; sigc::signal<int,nframes_t,nframes_t> Session::AskAboutSampleRateMismatch; |