First stage of options rework.

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

diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index 53389976598699089d5c216be4e4dd385b650e13..544b04e1c742afc60d4134e37f41629117c9adee 100644 (file)
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -18,23 +18,24 @@
     $Id$
 */
 
-#include <pbd/error.h>
-#include <pbd/convert.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/stacktrace.h>
-
-#include <ardour/source_factory.h>
-#include <ardour/sndfilesource.h>
-#include <ardour/silentfilesource.h>
-#include <ardour/configuration.h>
-#include <ardour/smf_source.h>
+#include "pbd/error.h"
+#include "pbd/convert.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/stacktrace.h"
+
+#include "ardour/source_factory.h"
+#include "ardour/sndfilesource.h"
+#include "ardour/silentfilesource.h"
+#include "ardour/rc_configuration.h"
+#include "ardour/smf_source.h"
+#include "ardour/session.h"
 
 #ifdef  HAVE_COREAUDIO
 #define USE_COREAUDIO_FOR_FILES
 #endif
 
 #ifdef USE_COREAUDIO_FOR_FILES
-#include <ardour/coreaudiosource.h>
+#include "ardour/coreaudiosource.h"
 #endif
 
 
@@ -52,7 +53,7 @@ std::list<boost::weak_ptr<AudioSource> > SourceFactory::files_with_peaks;
 static void 
 peak_thread_work ()
 {
-       PBD::ThreadCreated (pthread_self(), string ("peakbuilder-") + to_string (pthread_self(), std::dec));
+       PBD::notify_gui_about_thread_creation (pthread_self(), string ("peakbuilder-") + to_string (pthread_self(), std::dec));
 
        while (true) {
 
@@ -129,10 +130,12 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
        DataType type = DataType::AUDIO;
        const XMLProperty* prop = node.property("type");
 
-       if (prop) {
-               type = DataType(prop->value());
+       if (!prop) {
+               return boost::shared_ptr<Source>();
        }
 
+       type = DataType (prop->value());
+
        if (type == DataType::AUDIO) {
 
                try {
@@ -177,7 +180,8 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 }
 
 boost::shared_ptr<Source>
-SourceFactory::createReadable (DataType type, Session& s, string path, int chn, AudioFileSource::Flag flags, bool announce, bool defer_peaks)
+SourceFactory::createReadable (DataType type, Session& s, const string& path, bool embedded,
+               int chn, Source::Flag flags, bool announce, bool defer_peaks)
 {
        if (type == DataType::AUDIO) {
 
@@ -185,7 +189,7 @@ SourceFactory::createReadable (DataType type, Session& s, string path, int chn,
                        
                        try {
                                
-                               boost::shared_ptr<Source> ret (new SndFileSource (s, path, chn, flags));
+                               boost::shared_ptr<Source> ret (new SndFileSource (s, path, embedded, chn, flags));
                                
                                if (setup_peakfile (ret, defer_peaks)) {
                                        return boost::shared_ptr<Source>();
@@ -201,7 +205,7 @@ SourceFactory::createReadable (DataType type, Session& s, string path, int chn,
                        catch (failed_constructor& err) {
 #ifdef USE_COREAUDIO_FOR_FILES
                                
-                               boost::shared_ptr<Source> ret (new CoreAudioSource (s, path, chn, flags));
+                               boost::shared_ptr<Source> ret (new CoreAudioSource (s, path, embedded, chn, flags));
                                if (setup_peakfile (ret, defer_peaks)) {
                                        return boost::shared_ptr<Source>();
                                }
@@ -222,8 +226,7 @@ SourceFactory::createReadable (DataType type, Session& s, string path, int chn,
        
        } else if (type == DataType::MIDI) {
                
-               // FIXME: flags?
-               boost::shared_ptr<Source> ret (new SMFSource (s, path, SMFSource::Flag(0)));
+               boost::shared_ptr<Source> ret (new SMFSource (s, path, embedded, SMFSource::Flag(0)));
                
                if (announce) {
                        SourceCreated (ret);
@@ -237,18 +240,19 @@ SourceFactory::createReadable (DataType type, Session& s, string path, int chn,
 }
 
 boost::shared_ptr<Source>
-SourceFactory::createWritable (DataType type, Session& s, std::string path, bool destructive, nframes_t rate, bool announce, bool defer_peaks)
+SourceFactory::createWritable (DataType type, Session& s, const std::string& path, bool embedded,
+               bool destructive, nframes_t rate, bool announce, bool defer_peaks)
 {
        /* this might throw failed_constructor(), which is OK */
        
        if (type == DataType::AUDIO) {
-               boost::shared_ptr<Source> ret (new SndFileSource 
-                                              (s, path, 
-                                               Config->get_native_file_data_format(),
-                                               Config->get_native_file_header_format(),
-                                               rate,
-                                               (destructive ? AudioFileSource::Flag (SndFileSource::default_writable_flags | AudioFileSource::Destructive) :
-                                                SndFileSource::default_writable_flags)));      
+               boost::shared_ptr<Source> ret (new SndFileSource (s, path, embedded,
+                               s.config.get_native_file_data_format(),
+                               s.config.get_native_file_header_format(),
+                               rate,
+                               (destructive
+                                       ? Source::Flag (SndFileSource::default_writable_flags | Source::Destructive)
+                                       : SndFileSource::default_writable_flags)));     
 
                if (setup_peakfile (ret, defer_peaks)) {
                        return boost::shared_ptr<Source>();
@@ -263,7 +267,7 @@ SourceFactory::createWritable (DataType type, Session& s, std::string path, bool
 
        } else if (type == DataType::MIDI) {
 
-               boost::shared_ptr<Source> ret (new SMFSource (s, path));
+               boost::shared_ptr<Source> ret (new SMFSource (s, path, embedded, Source::Flag(0)));
        
                // no analysis data - this is a new file
                
@@ -276,3 +280,4 @@ SourceFactory::createWritable (DataType type, Session& s, std::string path, bool
 
        return boost::shared_ptr<Source> ();
 }
+