X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsource_factory.h;h=614fdce7b19deeda12d905cb8122af47a307c2e6;hb=c96ec968c7bb4b1d7c358f522a49b0685c022920;hp=c5994027cede972167206e64f013f91e8dd232e7;hpb=73192bc1a7ea55fa1864dc3826845b15c00dd2ec;p=ardour.git

diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h
index c5994027ce..614fdce7b1 100644
--- a/libs/ardour/ardour/source_factory.h
+++ b/libs/ardour/ardour/source_factory.h
@@ -24,6 +24,8 @@
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
 
+#include <glibmm/threads.h>
+
 #include "ardour/source.h"
 
 class XMLNode;
@@ -32,8 +34,9 @@ namespace ARDOUR {
 
 class Session;
 class AudioSource;
+class Playlist;
 
-class SourceFactory {
+class LIBARDOUR_API SourceFactory {
   public:
 	static void init ();
 
@@ -41,18 +44,28 @@ class SourceFactory {
 
 	static boost::shared_ptr<Source> create (Session&, const XMLNode& node, bool async = false);
 	static boost::shared_ptr<Source> createSilent (Session&, const XMLNode& node,
-                                                       framecnt_t nframes, float sample_rate);
+	                                               framecnt_t nframes, float sample_rate);
+
+	static boost::shared_ptr<Source> createExternal
+		(DataType type, Session&,
+		 const std::string& path, 
+		 int chn, Source::Flag flags, bool announce = true, bool async = false);
+
+	static boost::shared_ptr<Source> createWritable
+		(DataType type, Session&,
+		 const std::string& path, 
+		 bool destructive, framecnt_t rate, bool announce = true, bool async = false);
+
 
-	static boost::shared_ptr<Source> createReadable (DataType type, Session&,
-			const std::string& path, 
-			int chn, Source::Flag flags, bool announce = true, bool async = false);
+	static boost::shared_ptr<Source> createForRecovery
+		(DataType type, Session&, const std::string& path, int chn);
 
-	static boost::shared_ptr<Source> createWritable (DataType type, Session&,
-                        const std::string& path, const std::string& origin,
-			bool destructive, framecnt_t rate, bool announce = true, bool async = false);
+	static boost::shared_ptr<Source> 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);
 
-	static Glib::Cond*                               PeaksToBuild;
-	static Glib::StaticMutex                         peak_building_lock;
+        static Glib::Threads::Cond                       PeaksToBuild;
+        static Glib::Threads::Mutex                      peak_building_lock;
 	static std::list< boost::weak_ptr<AudioSource> > files_with_peaks;
 
 	static int setup_peakfile (boost::shared_ptr<Source>, bool async);