allow to include solo,mute buttons on meterbridge

[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 427bf10a5639d663a988a01402f768ce43e723a3..c94f783b445f51fba4b9fa1505459e3e42bb1f9b 100644 (file)
--- 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;
@@ -42,25 +44,25 @@ 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> createReadable 
+       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 
+       static boost::shared_ptr<Source> createWritable
                (DataType type, Session&,
-                const std::string& path, const std::string& origin,
+                const std::string& path, 
                 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 std::string& name,
+       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);