Use URIs to identify plugin-presets

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

diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index 76975354cbc9dded29d0de2df11f9f70158c4f5e..e2115644086db3684c46bc1c3f4f3ce2262f5274 100644 (file)
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -22,7 +22,6 @@
 #include "libardour-config.h"
 #endif
 
-#include "pbd/boost_debug.h"
 #include "pbd/error.h"
 #include "pbd/convert.h"
 #include "pbd/pthread_utils.h"
@@ -30,6 +29,7 @@
 
 #include "ardour/audioplaylist.h"
 #include "ardour/audio_playlist_source.h"
+#include "ardour/boost_debug.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_playlist_source.h"
 #include "ardour/source.h"
@@ -44,7 +44,7 @@
 #endif
 
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -134,7 +134,7 @@ SourceFactory::setup_peakfile (boost::shared_ptr<Source> s, bool async)
 }
 
 boost::shared_ptr<Source>
-SourceFactory::createSilent (Session& s, const XMLNode& node, framecnt_t nframes, float sr)
+SourceFactory::createSilent (Session& s, const XMLNode& node, samplecnt_t nframes, float sr)
 {
        Source* src = new SilentFileSource (s, node, nframes, sr);
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
@@ -150,7 +150,7 @@ boost::shared_ptr<Source>
 SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 {
        DataType type = DataType::AUDIO;
-       const XMLProperty* prop = node.property("type");
+       XMLProperty const * prop = node.property("type");
 
        if (prop) {
                type = DataType (prop->value());
@@ -309,7 +309,7 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path,
 
 boost::shared_ptr<Source>
 SourceFactory::createWritable (DataType type, Session& s, const std::string& path,
-                              bool destructive, framecnt_t rate, bool announce, bool defer_peaks)
+                              bool destructive, samplecnt_t rate, bool announce, bool defer_peaks)
 {
        /* this might throw failed_constructor(), which is OK */
 
@@ -395,7 +395,7 @@ SourceFactory::createForRecovery (DataType type, Session& s, const std::string&
 
 boost::shared_ptr<Source>
 SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr<Playlist> p, const PBD::ID& orig, const std::string& name,
-                                  uint32_t chn, frameoffset_t start, framecnt_t len, bool copy, bool defer_peaks)
+                                  uint32_t chn, sampleoffset_t start, samplecnt_t len, bool copy, bool defer_peaks)
 {
        if (type == DataType::AUDIO) {
                try {