projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move butler methods from Session to Butler.
[ardour.git]
/
libs
/
ardour
/
audio_diskstream.cc
diff --git
a/libs/ardour/audio_diskstream.cc
b/libs/ardour/audio_diskstream.cc
index aa002130f88b5609bb50ff88511d1424c5960797..661ddf139e48005bde9f3186d2ccb40882695204 100644
(file)
--- a/
libs/ardour/audio_diskstream.cc
+++ b/
libs/ardour/audio_diskstream.cc
@@
-37,24
+37,25
@@
#include "pbd/enumwriter.h"
#include "pbd/stacktrace.h"
#include "pbd/enumwriter.h"
#include "pbd/stacktrace.h"
-#include "ardour/ardour.h"
-#include "ardour/audioengine.h"
#include "ardour/analyser.h"
#include "ardour/analyser.h"
+#include "ardour/ardour.h"
+#include "ardour/audio_buffer.h"
#include "ardour/audio_diskstream.h"
#include "ardour/audio_diskstream.h"
-#include "ardour/
utils
.h"
-#include "ardour/
configuration
.h"
+#include "ardour/
audio_port
.h"
+#include "ardour/
audioengine
.h"
#include "ardour/audiofilesource.h"
#include "ardour/audiofilesource.h"
-#include "ardour/send.h"
-#include "ardour/region_factory.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioplaylist.h"
-#include "ardour/playlist_factory.h"
-#include "ardour/cycle_timer.h"
#include "ardour/audioregion.h"
#include "ardour/audioregion.h"
-#include "ardour/audio_port.h"
-#include "ardour/source_factory.h"
-#include "ardour/audio_buffer.h"
-#include "ardour/session.h"
+#include "ardour/butler.h"
+#include "ardour/configuration.h"
+#include "ardour/cycle_timer.h"
#include "ardour/io.h"
#include "ardour/io.h"
+#include "ardour/playlist_factory.h"
+#include "ardour/region_factory.h"
+#include "ardour/send.h"
+#include "ardour/session.h"
+#include "ardour/source_factory.h"
+#include "ardour/utils.h"
#include "i18n.h"
#include <locale.h>
#include "i18n.h"
#include <locale.h>
@@
-2065,10
+2066,9
@@
AudioDiskstream::set_align_style_from_io ()
int
AudioDiskstream::add_channel_to (boost::shared_ptr<ChannelList> c, uint32_t how_many)
{
int
AudioDiskstream::add_channel_to (boost::shared_ptr<ChannelList> c, uint32_t how_many)
{
-
while (how_many--) {
while (how_many--) {
- c->push_back (new ChannelInfo(_session.audio_diskstream_buffer_size(), speed_buffer_size, wrap_buffer_size));
- interpolation.add_channel_to (_session.audio_diskstream_buffer_size(), speed_buffer_size);
+ c->push_back (new ChannelInfo(_session.
butler()->
audio_diskstream_buffer_size(), speed_buffer_size, wrap_buffer_size));
+ interpolation.add_channel_to (_session.
butler()->
audio_diskstream_buffer_size(), speed_buffer_size);
}
_n_channels.set(DataType::AUDIO, c->size());
}
_n_channels.set(DataType::AUDIO, c->size());