Merge branch 'master' into windows

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

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 476682158f86d179e446619a2657628e39ccd35d..428a5e52744b36e8df4e88472bceb8ff138faa92 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -94,10 +94,6 @@
 
 #include "i18n.h"
 
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
 namespace ARDOUR {
 class MidiSource;
 class Processor;
@@ -4174,11 +4170,18 @@ Session::get_silent_buffers (ChanCount count)
 }
 
 BufferSet&
-Session::get_scratch_buffers (ChanCount count)
+Session::get_scratch_buffers (ChanCount count, bool silence)
 {
-       return ProcessThread::get_scratch_buffers (count);
+       return ProcessThread::get_scratch_buffers (count, silence);
 }
 
+BufferSet&
+Session::get_route_buffers (ChanCount count, bool silence)
+{
+       return ProcessThread::get_route_buffers (count, silence);
+}
+
+
 BufferSet&
 Session::get_mix_buffers (ChanCount count)
 {
@@ -4427,7 +4430,7 @@ Session::end_time_changed (framepos_t old)
 std::vector<std::string>
 Session::source_search_path (DataType type) const
 {
-       SearchPath sp;
+       Searchpath sp;
 
        if (session_dirs.size() == 1) {
                switch (type) {
@@ -4465,10 +4468,10 @@ Session::source_search_path (DataType type) const
 
        switch (type) {
        case DataType::AUDIO:
-               sp += SearchPath(config.get_audio_search_path ());
+               sp += Searchpath(config.get_audio_search_path ());
                break;
        case DataType::MIDI:
-               sp += SearchPath(config.get_midi_search_path ());
+               sp += Searchpath(config.get_midi_search_path ());
                break;
        }
 
@@ -4478,7 +4481,7 @@ Session::source_search_path (DataType type) const
 void
 Session::ensure_search_path_includes (const string& path, DataType type)
 {
-       SearchPath sp;
+       Searchpath sp;
 
        if (path == ".") {
                return;
@@ -4486,10 +4489,10 @@ Session::ensure_search_path_includes (const string& path, DataType type)
 
        switch (type) {
        case DataType::AUDIO:
-               sp += SearchPath(config.get_audio_search_path ());
+               sp += Searchpath(config.get_audio_search_path ());
                break;
        case DataType::MIDI:
-               sp += SearchPath (config.get_midi_search_path ());
+               sp += Searchpath (config.get_midi_search_path ());
                break;
        }