*** NEW CODING POLICY ***
[ardour.git] / libs / ardour / source_factory.cc
index 804d4a4d474c0e2c414ec393c7f1a108b5a6a032..d6ce7ba033482b6219fccbd8c4cbbb77cdcf54ac 100644 (file)
     $Id$
 */
 
-#include <pbd/error.h>
-#include <pbd/convert.h>
-#include <pbd/pthread_utils.h>
-
-#include <ardour/source_factory.h>
-#include <ardour/sndfilesource.h>
-#include <ardour/silentfilesource.h>
-#include <ardour/configuration.h>
-#include <ardour/smf_source.h>
-
-#ifdef HAVE_COREAUDIO
-#include <ardour/coreaudiosource.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/configuration.h"
+#include "ardour/smf_source.h"
+
+#ifdef  HAVE_COREAUDIO
+#define USE_COREAUDIO_FOR_FILES
 #endif
 
+#ifdef USE_COREAUDIO_FOR_FILES
+#include "ardour/coreaudiosource.h"
+#endif
+
+
 #include "i18n.h"
 
 using namespace ARDOUR;
@@ -46,7 +52,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) {
 
@@ -68,6 +74,7 @@ peak_thread_work ()
                if (!as) {
                        continue;
                }
+
                as->setup_peakfile ();
        }
 }
@@ -122,54 +129,44 @@ 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>();
        }
 
-       if (type == DataType::AUDIO) {
+       type = DataType (prop->value());
 
-#ifdef HAVE_COREAUDIO
+       if (type == DataType::AUDIO) {
 
                try {
-                       boost::shared_ptr<Source> ret (new CoreAudioSource (s, node));
-
+                       
+                       boost::shared_ptr<Source> ret (new SndFileSource (s, node));
                        if (setup_peakfile (ret, defer_peaks)) {
                                return boost::shared_ptr<Source>();
                        }
-
                        ret->check_for_analysis_data_on_disk ();
                        SourceCreated (ret);
                        return ret;
                } 
-
-
+               
                catch (failed_constructor& err) {
 
+#ifdef USE_COREAUDIO_FOR_FILES
+               
                        /* this is allowed to throw */
-
-                       boost::shared_ptr<Source> ret (new SndFileSource (s, node));
-
+                       
+                       boost::shared_ptr<Source> ret (new CoreAudioSource (s, node));
+                       
                        if (setup_peakfile (ret, defer_peaks)) {
                                return boost::shared_ptr<Source>();
                        }
-
+                       
                        ret->check_for_analysis_data_on_disk ();
                        SourceCreated (ret);
                        return ret;
-               }
 #else
-               /* this is allowed to throw */
-
-               boost::shared_ptr<Source> ret (new SndFileSource (s, node));
-
-               if (setup_peakfile (ret, defer_peaks)) {
-                       return boost::shared_ptr<Source>();
-               }
-
-               ret->check_for_analysis_data_on_disk ();
-               SourceCreated (ret);
-               return ret;
+                       throw; // rethrow 
 #endif
+               }
 
        } else if (type == DataType::MIDI) {
                boost::shared_ptr<Source> ret (new SMFSource (s, node));
@@ -182,80 +179,79 @@ 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) {
-       
-#ifdef HAVE_COREAUDIO
-               try {
-                       boost::shared_ptr<Source> ret (new CoreAudioSource (s, path, chn, flags));
-
-                       if (setup_peakfile (ret, defer_peaks)) {
-                               return boost::shared_ptr<Source>();
-                       }
 
-                       ret->check_for_analysis_data_on_disk ();
-                       if (announce) {
-                               SourceCreated (ret);
-                       }
-                       return ret;
-               }
-               
-               catch (failed_constructor& err) {
-                       boost::shared_ptr<Source> ret (new SndFileSource (s, path, chn, flags));
-                       if (setup_peakfile (ret, defer_peaks)) {
-                               return boost::shared_ptr<Source>();
+               if (!(flags & Destructive)) {
+                       
+                       try {
+                               
+                               boost::shared_ptr<Source> ret (new SndFileSource (s, path, embedded, chn, flags));
+                               
+                               if (setup_peakfile (ret, defer_peaks)) {
+                                       return boost::shared_ptr<Source>();
+                               }
+                               
+                               ret->check_for_analysis_data_on_disk ();
+                               if (announce) {
+                                       SourceCreated (ret);
+                               }
+                               return ret;
                        }
-                       ret->check_for_analysis_data_on_disk ();
-                       if (announce) {
-                               SourceCreated (ret);
-                       }
-                       return ret;
-               }
+                       
+                       catch (failed_constructor& err) {
+#ifdef USE_COREAUDIO_FOR_FILES
+                               
+                               boost::shared_ptr<Source> ret (new CoreAudioSource (s, path, embedded, chn, flags));
+                               if (setup_peakfile (ret, defer_peaks)) {
+                                       return boost::shared_ptr<Source>();
+                               }
+                               ret->check_for_analysis_data_on_disk ();
+                               if (announce) {
+                                       SourceCreated (ret);
+                               }
+                               return ret;
+                               
 #else
-               boost::shared_ptr<Source> ret (new SndFileSource (s, path, chn, flags));
-
-               if (setup_peakfile (ret, defer_peaks)) {
-                       return boost::shared_ptr<Source>();
-               }
+                               throw; // rethrow
+#endif
+                       }
 
-               ret->check_for_analysis_data_on_disk ();
-               if (announce) {
-                       SourceCreated (ret);
+               } else {
+                       // eh?
                }
-
-               return ret;
-#endif
-               
+       
        } else if (type == DataType::MIDI) {
-
-               // FIXME: flags?
-               boost::shared_ptr<Source> ret (new SMFSource (s, path, SMFSource::Flag(0)));
-
-               ret->check_for_analysis_data_on_disk ();
+               
+               boost::shared_ptr<Source> ret (new SMFSource (s, path, embedded, SMFSource::Flag(0)));
+               
                if (announce) {
                        SourceCreated (ret);
                }
 
                return ret;
+
        }
 
        return boost::shared_ptr<Source>();
 }
 
 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,
+                               Config->get_native_file_data_format(),
+                               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>();
@@ -270,7 +266,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
                
@@ -283,3 +279,4 @@ SourceFactory::createWritable (DataType type, Session& s, std::string path, bool
 
        return boost::shared_ptr<Source> ();
 }
+