fix import/embed of multichannel audiofiles, as per #1433

git-svn-id: svn://localhost/ardour2/trunk@1386 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/ardour.rc.in b/ardour.rc.in
index a8c8b74bfd3513acef0ce94db6ccfe48e1eb9085..ab34ae29d4dbcf5ca857ddfc7bf620c704e4ff2e 100644 (file)
--- a/ardour.rc.in
+++ b/ardour.rc.in
@@ -31,7 +31,7 @@
     <Option name="quieten-at-speed" value="1.000000"/>
     <Option name="use-vst" value="yes"/>
     <Option name="use-tranzport" value="yes"/>
-    <Option name="destructive-xfade-msecs" value="500"/>
+    <Option name="destructive-xfade-msecs" value="20"/>
   </Config>
   <extra>
     <Keyboard edit-button="3" edit-modifier="4" delete-button="3" delete-modifier="1" snap-modifier="32"/>

diff --git a/gtk2_ardour/ardour.bindings b/gtk2_ardour/ardour.bindings
index 1297a982666b0153073b2a89258901a98144a17f..537ae9c60d193224662bf178c0234329ca40e208 100644 (file)
--- a/gtk2_ardour/ardour.bindings
+++ b/gtk2_ardour/ardour.bindings
@@ -70,9 +70,9 @@
 (gtk_accel_path "<Actions>/Editor/editor-paste" "<Control>v")
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-down" "Page_Down")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-smpte-minutes" "")
+; (gtk_accel_path "<Actions>/Main/FlushWastebasket" "")
 (gtk_accel_path "<Actions>/Editor/normalize-region" "n")
 (gtk_accel_path "<Actions>/Editor/nudge-forward" "KP_Add")
-; (gtk_accel_path "<Actions>/Main/FlushWastebasket" "")
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionEndinFile" "")
 ; (gtk_accel_path "<Actions>/Editor/ToggleMeasureVisibility" "")
 ; (gtk_accel_path "<Actions>/Zoom/zoom-focus-center" "")
@@ -99,6 +99,7 @@
 ; (gtk_accel_path "<Actions>/Editor/addExternalAudioAsTapeTrack" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/paste" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte25" "")
+; (gtk_accel_path "<Actions>/options/RegionEquivalentsOverlap" "")
 ; (gtk_accel_path "<Actions>/Main/MeteringFallOffRate" "")
 ; (gtk_accel_path "<Actions>/options/UseHardwareMonitoring" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte24" "")
@@ -174,6 +175,7 @@
 ; (gtk_accel_path "<Actions>/options/MeterFalloffMedium" "")
 (gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "f")
 ; (gtk_accel_path "<Actions>/Main/SaveTemplate" "")
+(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<Control>uparrow")
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionStartinFile" "")
 ; (gtk_accel_path "<Actions>/options/GainReduceFastTransport" "")
 ; (gtk_accel_path "<Actions>/Common/ToggleInspector" "")
@@ -213,6 +215,7 @@
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-gain" "g")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-frame" "")
 ; (gtk_accel_path "<Actions>/Editor/SnapTo" "")
+(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<Control>downarrow")
 ; (gtk_accel_path "<Actions>/Editor/Crossfades" "")
 ; (gtk_accel_path "<Actions>/Editor/PullupPlus4" "")
 (gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "KP_Enter")
@@ -257,8 +260,6 @@
 ; (gtk_accel_path "<Actions>/Main/Snapshot" "")
 ; (gtk_accel_path "<Actions>/Transport/ToggleVideoSync" "")
 (gtk_accel_path "<Actions>/Transport/ToggleRoll" "space")
-(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<Ctrl>uparrow")
-(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<Ctrl>downarrow")
 ; (gtk_accel_path "<Actions>/RegionList/SortBySourceFilesystem" "")
 (gtk_accel_path "<Actions>/Common/ToggleColorManager" "<Alt>c")
 ; (gtk_accel_path "<Actions>/Common/About" "")

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 2fdc3d42deb54e9bc1c0f288d417298faae5a25d..ba5b9a1ce115f9cc38a470e3686f2afb54f2a377 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -737,7 +737,7 @@ AudioRegionView::create_waves ()
        for (uint32_t n = 0; n < nchans; ++n) {
                tmp_waves.push_back (0);
        }
-       
+
        for (uint32_t n = 0; n < nchans; ++n) {
                
                if (n >= audio_region()->n_channels()) {
@@ -828,7 +828,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct)
                        break;
                }
        }
-       
+
        if (n == nwaves && waves.empty()) {
                /* all waves are ready */
                tmp_waves.resize(nwaves);

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 7067d9dce09a735a9079fca959f300caa1da3e82..2a8f2a4516be50f23efd52cb1fdb7832c9af7be8 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -130,6 +130,8 @@ Editor::do_embed (vector<ustring> paths, bool split, ImportMode mode, AudioTrack
        vector<ustring>::iterator a;
 
        for (a = paths.begin(); a != paths.end(); ) {
+
+               cerr << "Considering embed of " << (*a) << endl;
        
                Glib::ustring path = *a;
                Glib::ustring pair_base;
@@ -264,12 +266,12 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
        boost::shared_ptr<AudioFileSource> source;
        SourceList sources;
        boost::shared_ptr<AudioRegion> region;
-       string idspec;
        string linked_path;
        SoundFileInfo finfo;
        ustring region_name;
        uint32_t input_chan = 0;
        uint32_t output_chan = 0;
+       int ret = 0;
 
        track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
        ARDOUR_UI::instance()->flush_pending ();
@@ -301,7 +303,7 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
                
                if (!AudioFileSource::get_soundfile_info (path, finfo, error_msg)) {
                        error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), selection, error_msg ) << endmsg;
-                       return 0;
+                       goto out;
                }
                
                if (check_sample_rate  && (finfo.samplerate != (int) session->frame_rate())) {
@@ -311,27 +313,47 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
                                choices.push_back (_("Cancel entire import"));
                                choices.push_back (_("Don't embed it"));
                                choices.push_back (_("Embed all without questions"));
+                       
+                               Gtkmm2ext::Choice rate_choice (
+                                       string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
+                                       choices, false);
+                               
+                               int resx = rate_choice.run ();
+                               
+                               switch (resx) {
+                               case 0: /* stop a multi-file import */
+                               case 1: /* don't import this one */
+                                       ret = -1;
+                                       goto out;
+                               case 2: /* do it, and the rest without asking */
+                                       check_sample_rate = false;
+                                       break;
+                               case 3: /* do it */
+                                       break;
+                               default:
+                                       ret = -2;
+                                       goto out;
+                               }
                        } else {
                                choices.push_back (_("Cancel"));
-                       }
-                       
-                       choices.push_back (_("Embed it anyway"));
+                               choices.push_back (_("Embed it anyway"));
                        
-                       Gtkmm2ext::Choice rate_choice (
-                               string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
-                               choices, false);
-                       
-                       switch (rate_choice.run()) {
-                       case 0: /* stop a multi-file import */
-                       case 1: /* don't import this one */
-                               return -1;
-                       case 2: /* do it, and the rest without asking */
-                               check_sample_rate = false;
-                               break;
-                       case 3: /* do it */
-                               break;
-                       default:
-                               return -2;
+                               Gtkmm2ext::Choice rate_choice (
+                                       string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
+                                       choices, false);
+                               
+                               int resx = rate_choice.run ();
+                               
+                               switch (resx) {
+                               case 0: /* don't import */
+                                       ret = -1;
+                                       goto out;
+                               case 1: /* do it */
+                                       break;
+                               default:
+                                       ret = -2;
+                                       goto out;
+                               }
                        }
                }
                
@@ -341,18 +363,16 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
                /* make the proper number of channels in the region */
                
                input_chan += finfo.channels;
-       
+
                for (int n = 0; n < finfo.channels; ++n)
                {
-                       idspec = path;
-                       idspec += string_compose(":%1", n);
-                       
                        try {
                                source = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable 
-                                                                                      (*session, idspec, 
+                                                                                      (*session, path,  n,
                                                                                        (mode == ImportAsTapeTrack ? 
                                                                                         AudioFileSource::Destructive : 
                                                                                         AudioFileSource::Flag (0))));
+
                                sources.push_back(source);
                        } 
                        
@@ -377,7 +397,7 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
        
        region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (sources, 0, sources[0]->length(), region_name, 0,
                                                                                  Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
-       
+
        if (Config->get_output_auto_connect() & AutoConnectMaster) {
                output_chan = (session->master_out() ? session->master_out()->n_inputs() : input_chan);
        } else {
@@ -388,7 +408,7 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
        
   out:
        track_canvas.get_window()->set_cursor (*current_canvas_cursor);
-       return 0;
+       return ret;
 }
 
 int

diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 57ab02e3a336e83ccc4de8eb5125a20dd9e23be3..8b4b3c140ce2bdac761cc0f2bfd3214770f2d6c5 100644 (file)
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -208,7 +208,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
                
                        
                        try {
-                               fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (*session, path, AudioFileSource::Flag (0)));
+                               fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (*session, path, false, session->frame_rate()));
                        }
                        
                        catch (failed_constructor& err) {
@@ -256,6 +256,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
        
        for (vector<boost::shared_ptr<AudioFileSource> >::iterator src = sources.begin(); src != sources.end(); ++src) {
                (*src)->update_header (0, *now, tnow);
+               (*src)->mark_immutable ();
        }
 
        return true;
@@ -339,7 +340,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
                path = s;
                
                try {
-                       fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (*session, path, AudioFileSource::Flag (0)));
+                       fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (*session, path, false, session->frame_rate()));
                }
                
                catch (failed_constructor& err) {
@@ -412,8 +413,9 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
        time (&tnow);
        now = localtime (&tnow);
 
-       for (uint32_t n=0; n < channels; ++n) {
-               sources[n]->update_header (0, *now, tnow);
+       for (vector<boost::shared_ptr<AudioFileSource> >::iterator s = sources.begin(); s != sources.end(); ++s) {
+               (*s)->update_header (0, *now, tnow);
+               (*s)->mark_immutable ();
                // do we need to ref it again?
        }
        

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index a90f9289a80dbd1c74ebedbd1f7338d109de28bb..cb91fcba6b752b093bb4c4c92b0f67f633b2d507 100644 (file)
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -197,7 +197,7 @@ SoundFileBox::play_btn_clicked ()
                
                for (int n = 0; n < sf_info.channels; ++n) {
                        try {
-                               afs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (*_session, path+":"+string_compose("%1", n), AudioFileSource::Flag (0)));
+                               afs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (*_session, path, n, AudioFileSource::Flag (0)));
                                srclist.push_back(afs);
 
                        } catch (failed_constructor& err) {

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 2133136e689be13c8945382933d7d1314cd1ddc4..f91f78f6d961586573e4e2b6ad5ba691dc8b499b 100644 (file)
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -101,6 +101,10 @@ class AudioFileSource : public AudioSource {
        bool destructive() const { return (_flags & Destructive); }
        virtual bool set_destructive (bool yn) { return false; }
 
+       Flag flags() const { return _flags; }
+
+       void mark_immutable ();
+
        /* this should really be protected, but C++ is getting stricter
           and creating slots from protected member functions is starting
           to cause issues.
@@ -125,12 +129,12 @@ class AudioFileSource : public AudioSource {
 
        int init (string idstr, bool must_exist);
 
-       uint16_t       channel;
        string        _path;
        Flag          _flags;
        string        _take_id;
        int64_t       timeline_position;
        bool           file_is_new;
+       uint16_t       channel;
 
        bool          _is_embedded;
        static bool determine_embeddedness(string path);

diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index bd69c78e180d29ec1285d6bdcd8d409bc9da2b59..63c50d7cfb7bd22cf34a0b69dfdc2bd29af76d1c 100644 (file)
--- a/libs/ardour/ardour/coreaudiosource.h
+++ b/libs/ardour/ardour/coreaudiosource.h
@@ -29,7 +29,7 @@ namespace ARDOUR {
 class CoreAudioSource : public AudioFileSource {
   public:
        CoreAudioSource (ARDOUR::Session&, const XMLNode&);
-       CoreAudioSource (ARDOUR::Session&, const string& path_plus_channel, Flag);
+       CoreAudioSource (ARDOUR::Session&, const string& path, int chn, Flag);
        ~CoreAudioSource ();
 
        float sample_rate() const;

diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 1d07f6888ded2a1e064b4e91f3c92a5eb2d3419c..a5000a4b63dcf4adc15243527e59fe4d2ee7040b 100644 (file)
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -31,7 +31,7 @@ class SndFileSource : public AudioFileSource {
   public:
        /* constructor to be called for existing external-to-session files */
 
-       SndFileSource (Session&, std::string path, Flag flags);
+       SndFileSource (Session&, std::string path, int chn, Flag flags);
 
        /* constructor to be called for new in-session files */
 
@@ -78,7 +78,7 @@ class SndFileSource : public AudioFileSource {
        mutable float *interleave_buf;
        mutable nframes_t interleave_bufsize;
 
-       void init (string str);
+       void init ();
        int open();
        void close();
        int setup_broadcast_info (nframes_t when, struct tm&, time_t);

diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h
index 6cb262a29918145c9a58abf75c11c8c52d8aad1a..207015a2530af5aa0e980d64c38927776705e5c7 100644 (file)
--- a/libs/ardour/ardour/source_factory.h
+++ b/libs/ardour/ardour/source_factory.h
@@ -22,7 +22,7 @@ class SourceFactory {
        static boost::shared_ptr<Source> create (Session&, const XMLNode& node);
 
        // MIDI sources will have to be hacked in here somehow
-       static boost::shared_ptr<Source> createReadable (Session&, std::string idstr, AudioFileSource::Flag flags, bool announce = true);
+       static boost::shared_ptr<Source> createReadable (Session&, std::string path, int chn, AudioFileSource::Flag flags, bool announce = true);
        static boost::shared_ptr<Source> createWritable (Session&, std::string name, bool destructive, nframes_t rate, bool announce = true);
 
   private:

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 95fc0d27667f8a03e07e6d28c78398129ff0bced..b74f6b370f396a12e3fa85a2404a8b1a04b65893 100644 (file)
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -63,20 +63,22 @@ uint64_t           AudioFileSource::header_position_offset = 0;
 /* XXX maybe this too */
 char   AudioFileSource::bwf_serial_number[13] = "000000000000";
 
-AudioFileSource::AudioFileSource (Session& s, string idstr, Flag flags)
-       : AudioSource (s, idstr), _flags (flags)
+AudioFileSource::AudioFileSource (Session& s, string path, Flag flags)
+       : AudioSource (s, path), _flags (flags),
+         channel (0)
 {
        /* constructor used for existing external to session files. file must exist already */
-       _is_embedded = AudioFileSource::determine_embeddedness (idstr);
+       _is_embedded = AudioFileSource::determine_embeddedness (path);
 
-       if (init (idstr, true)) {
+       if (init (path, true)) {
                throw failed_constructor ();
        }
 
 }
 
 AudioFileSource::AudioFileSource (Session& s, std::string path, Flag flags, SampleFormat samp_format, HeaderFormat hdr_format)
-       : AudioSource (s, path), _flags (flags)
+       : AudioSource (s, path), _flags (flags),
+         channel (0)
 {
        /* constructor used for new internal-to-session files. file cannot exist */
        _is_embedded = false;
@@ -88,6 +90,7 @@ AudioFileSource::AudioFileSource (Session& s, std::string path, Flag flags, Samp
 
 AudioFileSource::AudioFileSource (Session& s, const XMLNode& node)
        : AudioSource (s, node), _flags (Flag (Writable|CanRename))
+          /* channel is set in set_state() */
 {
        /* constructor used for existing internal-to-session files. file must exist */
 
@@ -195,7 +198,10 @@ XMLNode&
 AudioFileSource::get_state ()
 {
        XMLNode& root (AudioSource::get_state());
-       root.add_property ("flags", enum_2_string (_flags));
+       char buf[32];
+       root.add_property (X_("flags"), enum_2_string (_flags));
+       snprintf (buf, sizeof (buf), "%d", channel);
+       root.add_property (X_("channel"), buf);
        return root;
 }
 
@@ -209,15 +215,18 @@ AudioFileSource::set_state (const XMLNode& node)
        }
 
        if ((prop = node.property (X_("flags"))) != 0) {
-
                _flags = Flag (string_2_enum (prop->value(), _flags));
-
        } else {
-
                _flags = Flag (0);
 
        }
 
+       if ((prop = node.property (X_("channel"))) != 0) {
+               channel = atoi (prop->value());
+       } else {
+               channel = 0;
+       }
+
        if ((prop = node.property (X_("name"))) != 0) {
                _is_embedded = AudioFileSource::determine_embeddedness (prop->value());
        } else {
@@ -527,7 +536,7 @@ bool
 AudioFileSource::is_empty (Session& s, string path)
 {
        bool ret = false;
-       boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (s, path, NoPeakFile, false));
+       boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (s, path, 0, NoPeakFile, false));
 
        if (afs) {
                ret = (afs->length() == 0);
@@ -568,3 +577,9 @@ AudioFileSource::safe_file_extension(string file)
 #endif // HAVE_COREAUDIO
                file.rfind(".voc") == string::npos);
 }
+
+void
+AudioFileSource::mark_immutable ()
+{
+       _flags = Flag (_flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy|CanRename));
+}

diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc
index e38a34e378a779bd80d5d3580f98f39cb5df02f2..572fd9ef81eb8502ac16043e654afc77823a87bf 100644 (file)
--- a/libs/ardour/coreaudiosource.cc
+++ b/libs/ardour/coreaudiosource.cc
@@ -34,33 +34,22 @@ using namespace PBD;
 CoreAudioSource::CoreAudioSource (Session& s, const XMLNode& node)
        : AudioFileSource (s, node)
 {
-       init (_name);
+       init ();
 }
 
-CoreAudioSource::CoreAudioSource (Session& s, const string& idstr, Flag flags)
-       : AudioFileSource(s, idstr, flags)
+CoreAudioSource::CoreAudioSource (Session& s, const string& path, int chn, Flag flags)
+       : AudioFileSource(s, path, flags),
 {
-       init (idstr);
+       channel = chn;
+       init ();
 }
 
 void 
-CoreAudioSource::init (string idstr)
+CoreAudioSource::init ()
 {
-       string::size_type pos;
-
        tmpbuf = 0;
        tmpbufsize = 0;
 
-       _name = idstr;
-
-       if ((pos = idstr.find_last_of (':')) == string::npos) {
-               channel = 0;
-               _path = idstr;
-       } else {
-               channel = atoi (idstr.substr (pos+1).c_str());
-               _path = idstr.substr (0, pos);
-       }
-
        cerr << "CoreAudioSource::init() " << name() << endl;
        
        /* note that we temporarily truncated _id at the colon */

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 0b668607ddef590ced74a35e8c3d61c71db60ccb..9b09f45ee88368a2529e605909ae39459cce20d9 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1738,6 +1738,10 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                                
                                track->set_control_outs (cports);
                        }
+
+                       // assert (current_thread != RT_thread)
+                       
+                       track->audio_diskstream()->non_realtime_input_change();
                        
                        track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes));
                        track->set_remote_control_id (control_id);

diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index fa2f432ee6b507f09d9d75ceb1d8dd8fa2de094e..850aa6bc6c6a0b001cfd59e29b3145f25bda20ff 100644 (file)
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -48,30 +48,34 @@ const AudioFileSource::Flag SndFileSource::default_writable_flags = AudioFileSou
 SndFileSource::SndFileSource (Session& s, const XMLNode& node)
        : AudioFileSource (s, node)
 {
-       init (_name);
+       init ();
+
+       cerr << "SndFileSource @ " << _path << " channel = " << channel << endl;
 
        if (open()) {
                throw failed_constructor ();
        }
 }
 
-SndFileSource::SndFileSource (Session& s, string idstr, Flag flags)
-                                       /* files created this way are never writable or removable */
-       : AudioFileSource (s, idstr, Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy)))
+SndFileSource::SndFileSource (Session& s, string path, int chn, Flag flags)
+          /* files created this way are never writable or removable */
+       : AudioFileSource (s, path, Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy)))
 {
-       init (idstr);
+       channel = chn;
+
+       init ();
 
        if (open()) {
                throw failed_constructor ();
        }
 }
 
-SndFileSource::SndFileSource (Session& s, string idstr, SampleFormat sfmt, HeaderFormat hf, nframes_t rate, Flag flags)
-       : AudioFileSource (s, idstr, flags, sfmt, hf)
+SndFileSource::SndFileSource (Session& s, string path, SampleFormat sfmt, HeaderFormat hf, nframes_t rate, Flag flags)
+       : AudioFileSource (s, path, flags, sfmt, hf)
 {
        int fmt = 0;
 
-       init (idstr);
+       init ();
 
        /* this constructor is used to construct new files, not open
           existing ones.
@@ -174,9 +178,8 @@ SndFileSource::SndFileSource (Session& s, string idstr, SampleFormat sfmt, Heade
 }
 
 void 
-SndFileSource::init (string idstr)
+SndFileSource::init ()
 {
-       string::size_type pos;
        string file;
 
        // lets try to keep the object initalizations here at the top
@@ -186,20 +189,10 @@ SndFileSource::init (string idstr)
        sf = 0;
        _broadcast_info = 0;
 
-       string tmp_name;
-
-       if ((pos = idstr.find_last_of (':')) == string::npos) {
-               channel = 0;
-               tmp_name = idstr;
-       } else {
-               channel = atoi (idstr.substr (pos+1).c_str());
-               tmp_name = idstr.substr (0, pos);
-       }
-
        if (is_embedded()) {
-               _name = tmp_name;
+               _name = _path;
        } else {
-               _name = Glib::path_get_basename (tmp_name);
+               _name = Glib::path_get_basename (_path);
        }
 
        /* although libsndfile says we don't need to set this,
@@ -385,6 +378,7 @@ nframes_t
 SndFileSource::nondestructive_write_unlocked (Sample *data, nframes_t cnt)
 {
        if (!writable()) {
+               warning << string_compose (_("attempt to write a non-writable audio file source (%1)"), _path) << endmsg;
                return 0;
        }
 
@@ -440,6 +434,7 @@ SndFileSource::destructive_write_unlocked (Sample* data, nframes_t cnt)
        nframes_t old_file_pos;
 
        if (!writable()) {
+               warning << string_compose (_("attempt to write a non-writable audio file source (%1)"), _path) << endmsg;
                return 0;
        }
 
@@ -563,6 +558,7 @@ int
 SndFileSource::flush_header ()
 {
        if (!writable() || (sf == 0)) {
+               warning << string_compose (_("attempt to flush a non-writable audio file source (%1)"), _path) << endmsg;
                return -1;
        }
        return (sf_command (sf, SFC_UPDATE_HEADER_NOW, 0, 0) != SF_TRUE);
@@ -572,6 +568,7 @@ int
 SndFileSource::setup_broadcast_info (nframes_t when, struct tm& now, time_t tnow)
 {
        if (!writable()) {
+               warning << string_compose (_("attempt to store broadcast info in a non-writable audio file source (%1)"), _path) << endmsg;
                return -1;
        }
 

diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index 9b8382c39fbe0c0f207ff43f83ad32f72af870a9..2cbd7624be982853330e4553633670c1728a73d0 100644 (file)
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -97,12 +97,12 @@ SourceFactory::create (Session& s, const XMLNode& node)
 
 #ifdef HAVE_COREAUDIO
 boost::shared_ptr<Source>
-SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag flags, bool announce)
+SourceFactory::createReadable (Session& s, string path, int chn, AudioFileSource::Flag flags, bool announce)
 {
        if (!(flags & Destructive)) {
 
                try {
-                       boost::shared_ptr<Source> ret (new CoreAudioSource (s, idstr, flags));
+                       boost::shared_ptr<Source> ret (new CoreAudioSource (s, path, chn, flags));
                        if (setup_peakfile (ret)) {
                                return boost::shared_ptr<Source>();
                        }
@@ -113,7 +113,7 @@ SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag f
                }
                
                catch (failed_constructor& err) {
-                       boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags));
+                       boost::shared_ptr<Source> ret (new SndFileSource (s, path, chn, flags));
                        if (setup_peakfile (ret)) {
                                return boost::shared_ptr<Source>();
                        }
@@ -125,7 +125,7 @@ SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag f
 
        } else {
 
-               boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags));
+               boost::shared_ptr<Source> ret (new SndFileSource (s, path, chn, flags));
                if (setup_peakfile (ret)) {
                        return boost::shared_ptr<Source>();
                }
@@ -141,9 +141,9 @@ SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag f
 #else
 
 boost::shared_ptr<Source>
-SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag flags, bool announce)
+SourceFactory::createReadable (Session& s, string path, int chn, AudioFileSource::Flag flags, bool announce)
 {
-       boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags));
+       boost::shared_ptr<Source> ret (new SndFileSource (s, path, chn, flags));
 
        if (setup_peakfile (ret)) {
                return boost::shared_ptr<Source>();