Remove duplicate and always NULL Session peak functions.

git-svn-id: svn://localhost/ardour2/branches/3.0@3811 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index a9dbc01db131cf9cec30b31aa9d98b4cbf8cd6a0..af0d8e6fe18e038f864096db74de321cb06816d7 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -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;

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 83e3200224efd5092b82eb0c3db13e03d1f1f016..b6d8f1510145304ce1ca655d27920714e214b888 100644 (file)
--- 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 2b6b87d06188f72e9f5e7a01804ec2da35c5d78e..477c479de8ad11bc38cd4a9e653bdc2bb19c6a81 100644 (file)
--- 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 30f93f9646ea9433c998b0a068c9296ab7aed799..7698fc3dbc08e57accf6e5e4e8c03dd92b0781bf 100644 (file)
--- 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;