Merge branch 'master' of git.ardour.org:ardour/ardour

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

diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h
index c5d5a410e9bc94213cb758b87a3799368fb7c077..387a40aff32326443a7d0d9e775f99050d0b7659 100644 (file)
--- a/libs/ardour/ardour/source_factory.h
+++ b/libs/ardour/ardour/source_factory.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,9 +22,10 @@
 
 #include <string>
 #include <stdint.h>
-#include <sigc++/sigc++.h>
 #include <boost/shared_ptr.hpp>
 
+#include <glibmm/threads.h>
+
 #include "ardour/source.h"
 
 class XMLNode;
@@ -33,27 +34,35 @@ namespace ARDOUR {
 
 class Session;
 class AudioSource;
+class Playlist;
 
 class SourceFactory {
   public:
        static void init ();
 
-       static sigc::signal<void,boost::shared_ptr<Source> > SourceCreated;
+       static PBD::Signal1<void,boost::shared_ptr<Source> > SourceCreated;
 
        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);
+                                                      framecnt_t nframes, float sample_rate);
+
+       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> 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> createReadable (DataType type, Session&,
-                       const std::string& path, bool embedded,
-                       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 embedded,
-                       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, 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);