X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsource_factory.h;h=0cf934cfaaa4bbb26a83d022278d4897f471bc83;hb=88c82aeb56c62d9d0c0acff51e360492ad9b8d23;hp=c32b96ae975636d3d740950fd879e0d2fcd592f6;hpb=aae367b63c9b619db1e40f27dc334c6987219481;p=ardour.git

diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h
index c32b96ae97..0cf934cfaa 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,20 +44,31 @@ 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,
-			nframes_t nframes, float sample_rate);
+	                                               samplecnt_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, samplecnt_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, 
-			bool destructive, nframes_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, sampleoffset_t start, samplecnt_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 peak_work_queue_length ();
 	static int setup_peakfile (boost::shared_ptr<Source>, bool async);
 };