Remove unused method in RouteTimeAxisView. Fix bug with switching to layered region...

[ardour.git] / libs / ardour / panner.cc

diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index bd6d05a0b4feb435f55df50428b129ba50bd0328..f43741300a6d7df8f846a22b07697ae295d55d60 100644 (file)
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -465,7 +465,7 @@ EqualPowerStereoPanner::get_state (void)
 }
 
 XMLNode&
-EqualPowerStereoPanner::state (bool full_state)
+EqualPowerStereoPanner::state (bool /*full_state*/)
 {
        XMLNode* root = new XMLNode ("StreamPanner");
        char buf[64];
@@ -623,9 +623,9 @@ Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co
 }
 
 void
-Multi2dPanner::distribute_automated (AudioBuffer& src, BufferSet& obufs, 
-                                    nframes_t start, nframes_t end, nframes_t nframes,
-                                    pan_t** buffers)
+Multi2dPanner::distribute_automated (AudioBuffer& /*src*/, BufferSet& /*obufs*/, 
+                                    nframes_t /*start*/, nframes_t /*end*/, nframes_t /*nframes*/,
+                                    pan_t** /*buffers*/)
 {
        if (_muted) {
                return;
@@ -643,7 +643,7 @@ Multi2dPanner::factory (Panner& p, Evoral::Parameter param)
 }
 
 int
-Multi2dPanner::load (istream& in, string path, uint32_t& linecnt)
+Multi2dPanner::load (istream& /*in*/, string /*path*/, uint32_t& /*linecnt*/)
 {
        return 0;
 }
@@ -655,7 +655,7 @@ Multi2dPanner::get_state (void)
 }
 
 XMLNode&
-Multi2dPanner::state (bool full_state)
+Multi2dPanner::state (bool /*full_state*/)
 {
        XMLNode* root = new XMLNode ("StreamPanner");
        char buf[64];
@@ -1379,7 +1379,7 @@ Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes
                        if (inbufs.count().n_audio() > 0) {
                                BufferSet::audio_iterator i = inbufs.audio_begin();
                                for (++i; i != inbufs.audio_end(); ++i) {
-                                       dst.accumulate_from(*i, nframes);
+                                       dst.merge_from(*i, nframes);
                                }
                        }
 
@@ -1456,7 +1456,7 @@ Panner::run (BufferSet& inbufs, BufferSet& outbufs, sframes_t start_frame, sfram
                // accumulate starting with the second
                BufferSet::audio_iterator i = inbufs.audio_begin();
                for (++i; i != inbufs.audio_end(); ++i) {
-                       dst.accumulate_from(*i, nframes);
+                       dst.merge_from(*i, nframes);
                }
 
                return;