summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/audio_diskstream.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-03-16 04:09:03 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-03-16 04:09:03 +0000
commitbca0450c188cdac82fbc74d05b5d72aff9115646 (patch)
tree688870950203e270b1dbc9baf975daa4c6d0d56c /libs/ardour/ardour/audio_diskstream.h
parent0b7a7cba788c20d9554ab8aa5b38bacf16e72ab6 (diff)
possible fix for crash while adding new tracks
git-svn-id: svn://localhost/ardour2/trunk@1603 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audio_diskstream.h')
-rw-r--r--libs/ardour/ardour/audio_diskstream.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index 1da8903a41..cb70903d13 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -212,7 +212,7 @@ class AudioDiskstream : public Diskstream
int do_flush (Session::RunContext context, bool force = false);
int do_refill () { return _do_refill(_mixdown_buffer, _gain_buffer); }
- int do_refill_with_alloc();
+ int do_refill_with_alloc ();
int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
nframes_t& start, nframes_t cnt,
@@ -251,14 +251,14 @@ class AudioDiskstream : public Diskstream
static Sample* _mixdown_buffer;
static gain_t* _gain_buffer;
- // Uh, /really/ private? (there should probably be less friends of Diskstream)
- int _do_refill (Sample *mixdown_buffer, float *gain_buffer);
-
-
std::vector<boost::shared_ptr<AudioFileSource> > capturing_sources;
typedef vector<ChannelInfo> ChannelList;
ChannelList channels;
+
+ /* really */
+ private:
+ int _do_refill (Sample *mixdown_buffer, float *gain_buffer);
};
} // namespace ARDOUR