projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
expose SessionConfiguration as lua bindings
[ardour.git]
/
libs
/
ardour
/
ardour
/
audio_diskstream.h
diff --git
a/libs/ardour/ardour/audio_diskstream.h
b/libs/ardour/ardour/audio_diskstream.h
index f48204d7ab25c47a8332bab5c350baed16bd1dc4..21a178946800529f6a31411187af2a3be3bb3f0e 100644
(file)
--- a/
libs/ardour/ardour/audio_diskstream.h
+++ b/
libs/ardour/ardour/audio_diskstream.h
@@
-209,9
+209,8
@@
class LIBARDOUR_API AudioDiskstream : public Diskstream
/* The two central butler operations */
int do_flush (RunContext context, bool force = false);
/* The two central butler operations */
int do_flush (RunContext context, bool force = false);
- int do_refill () { return _do_refill(_mixdown_buffer, _gain_buffer); }
+ int do_refill () { return _do_refill(_mixdown_buffer, _gain_buffer
, 0
); }
- int do_refill_with_alloc ();
int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
framepos_t& start, framecnt_t cnt,
int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
framepos_t& start, framecnt_t cnt,
@@
-245,12
+244,11
@@
class LIBARDOUR_API AudioDiskstream : public Diskstream
bool prep_record_enable ();
bool prep_record_disable ();
bool prep_record_enable ();
bool prep_record_disable ();
-
+
// Working buffers for do_refill (butler thread)
static void allocate_working_buffers();
static void free_working_buffers();
// Working buffers for do_refill (butler thread)
static void allocate_working_buffers();
static void free_working_buffers();
- static size_t _working_buffers_size;
static Sample* _mixdown_buffer;
static gain_t* _gain_buffer;
static Sample* _mixdown_buffer;
static gain_t* _gain_buffer;
@@
-258,9
+256,12
@@
class LIBARDOUR_API AudioDiskstream : public Diskstream
SerializedRCUManager<ChannelList> channels;
SerializedRCUManager<ChannelList> channels;
+ protected:
+ int _do_refill_with_alloc (bool one_chunk_only);
+
/* really */
private:
/* really */
private:
- int _do_refill (Sample *mixdown_buffer, float *gain_buffer);
+ int _do_refill (Sample *mixdown_buffer, float *gain_buffer
, framecnt_t fill_level
);
int add_channel_to (boost::shared_ptr<ChannelList>, uint32_t how_many);
int remove_channel_from (boost::shared_ptr<ChannelList>, uint32_t how_many);
int add_channel_to (boost::shared_ptr<ChannelList>, uint32_t how_many);
int remove_channel_from (boost::shared_ptr<ChannelList>, uint32_t how_many);