Fix inconsistent controllable Lua binding names

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

diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index 7ef7ae12d1b64944354ace0356bd57771d7bd898..8be55a8986559064890584d3b7412f451b2af920 100644 (file)
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -22,7 +22,6 @@
 #include "libardour-config.h"
 #endif
 
-#include "pbd/boost_debug.h"
 #include "pbd/error.h"
 #include "pbd/convert.h"
 #include "pbd/pthread_utils.h"
@@ -30,6 +29,7 @@
 
 #include "ardour/audioplaylist.h"
 #include "ardour/audio_playlist_source.h"
+#include "ardour/boost_debug.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_playlist_source.h"
 #include "ardour/source.h"
@@ -44,7 +44,7 @@
 #endif
 
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -134,7 +134,7 @@ SourceFactory::setup_peakfile (boost::shared_ptr<Source> s, bool async)
 }
 
 boost::shared_ptr<Source>
-SourceFactory::createSilent (Session& s, const XMLNode& node, framecnt_t nframes, float sr)
+SourceFactory::createSilent (Session& s, const XMLNode& node, samplecnt_t nframes, float sr)
 {
        Source* src = new SilentFileSource (s, node, nframes, sr);
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
@@ -150,7 +150,7 @@ boost::shared_ptr<Source>
 SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 {
        DataType type = DataType::AUDIO;
-       const XMLProperty* prop = node.property("type");
+       XMLProperty const * prop = node.property("type");
 
        if (prop) {
                type = DataType (prop->value());
@@ -164,7 +164,7 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 
                        try {
                                boost::shared_ptr<AudioPlaylistSource> ap (new AudioPlaylistSource (s, node));
-                               
+
                                if (setup_peakfile (ap, true)) {
                                        return boost::shared_ptr<Source>();
                                }
@@ -220,15 +220,18 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
                        }
                }
        } else if (type == DataType::MIDI) {
-               boost::shared_ptr<SMFSource> src (new SMFSource (s, node));
-               Source::Lock lock(src->mutex());
-               src->load_model (lock, true);
+               try {
+                       boost::shared_ptr<SMFSource> src (new SMFSource (s, node));
+                       Source::Lock lock(src->mutex());
+                       src->load_model (lock, true);
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
-               // boost_debug_shared_ptr_mark_interesting (src, "Source");
+                       // boost_debug_shared_ptr_mark_interesting (src, "Source");
 #endif
-               src->check_for_analysis_data_on_disk ();
-               SourceCreated (src);
-               return src;
+                       src->check_for_analysis_data_on_disk ();
+                       SourceCreated (src);
+                       return src;
+               } catch (...) {
+               }
        }
 
        return boost::shared_ptr<Source>();
@@ -239,7 +242,7 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path,
                               int chn, Source::Flag flags, bool announce, bool defer_peaks)
 {
        if (type == DataType::AUDIO) {
-               
+
                if (!(flags & Destructive)) {
 
                        try {
@@ -289,18 +292,21 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path,
 
        } else if (type == DataType::MIDI) {
 
-               boost::shared_ptr<SMFSource> src (new SMFSource (s, path));
-               Source::Lock lock(src->mutex());
-               src->load_model (lock, true);
+               try {
+                       boost::shared_ptr<SMFSource> src (new SMFSource (s, path));
+                       Source::Lock lock(src->mutex());
+                       src->load_model (lock, true);
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
-               // boost_debug_shared_ptr_mark_interesting (src, "Source");
+                       // boost_debug_shared_ptr_mark_interesting (src, "Source");
 #endif
 
-               if (announce) {
-                       SourceCreated (src);
-               }
+                       if (announce) {
+                               SourceCreated (src);
+                       }
 
-               return src;
+                       return src;
+               } catch (...) {
+               }
 
        }
 
@@ -308,8 +314,8 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path,
 }
 
 boost::shared_ptr<Source>
-SourceFactory::createWritable (DataType type, Session& s, const std::string& path, 
-                              bool destructive, framecnt_t rate, bool announce, bool defer_peaks)
+SourceFactory::createWritable (DataType type, Session& s, const std::string& path,
+                              bool destructive, samplecnt_t rate, bool announce, bool defer_peaks)
 {
        /* this might throw failed_constructor(), which is OK */
 
@@ -339,22 +345,27 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat
 
        } else if (type == DataType::MIDI) {
                 // XXX writable flags should belong to MidiSource too
-               boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SndFileSource::default_writable_flags));
-               assert (src->writable ());
+               try {
+                       boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SndFileSource::default_writable_flags));
+
+                       assert (src->writable ());
 
-               Source::Lock lock(src->mutex());
-               src->load_model (lock, true);
+                       Source::Lock lock(src->mutex());
+                       src->load_model (lock, true);
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
-               // boost_debug_shared_ptr_mark_interesting (src, "Source");
+                       // boost_debug_shared_ptr_mark_interesting (src, "Source");
 #endif
 
-               // no analysis data - this is a new file
+                       // no analysis data - this is a new file
 
-               if (announce) {
-                       SourceCreated (src);
-               }
-               return src;
+                       if (announce) {
+                               SourceCreated (src);
+                       }
 
+                       return src;
+
+               } catch (...) {
+               }
        }
 
        return boost::shared_ptr<Source> ();
@@ -395,7 +406,7 @@ SourceFactory::createForRecovery (DataType type, Session& s, const std::string&
 
 boost::shared_ptr<Source>
 SourceFactory::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)
+                                  uint32_t chn, sampleoffset_t start, samplecnt_t len, bool copy, bool defer_peaks)
 {
        if (type == DataType::AUDIO) {
                try {
@@ -455,4 +466,3 @@ SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr<
 
        return boost::shared_ptr<Source>();
 }
-