smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-10 07:26:32 +01:00
Code Issues Projects Releases Wiki Activity

Remove duplicate and always NULL Session peak functions.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3811 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-09-26 19:26:17 +00:00
parent abf64beac6
commit 5e7abcecc4
4 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ardour_ui.cc
View file

@ -194,6 +194,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
mixer = 0;
session = 0;
editor = 0;
engine = 0;
_session_is_new = false;
big_clock_window = 0;
session_selector_window = 0;

12
libs/ardour/ardour/session.h
View file

@ -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 */

2
libs/ardour/audioregion.cc
View file

@ -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:

6
libs/ardour/session.cc
View file

@ -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;