smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

fix crash recovery: add new constructors to SndFileSource, AudioFileSource, add a new SourceFactory method and finally tweak

Browse source 
AudioDiskstream::use_pending_capture_data() to create both the required whole-file and the in-playlist regions
This commit is contained in:
Paul Davis 2014-06-10 10:07:04 -04:00
parent 74bc0c8468
commit b660bc8ae9
8 changed files with 131 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
libs/ardour/source_factory.cc
View file

@ -341,6 +341,39 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat
return boost::shared_ptr<Source> ();
}
boost::shared_ptr<Source>
SourceFactory::createForRecovery (DataType type, Session& s, const std::string& path, int chn)
{
/* this might throw failed_constructor(), which is OK */
if (type == DataType::AUDIO) {
Source* src = new SndFileSource (s, path, chn);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
// boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, false)) {
return boost::shared_ptr<Source>();
}
// no analysis data - this is still basically a new file (we
// crashed while recording.
// always announce these files
SourceCreated (ret);
return ret;
} else if (type == DataType::MIDI) {
error << _("Recovery attempted on a MIDI file - not implemented") << endmsg;
}
return boost::shared_ptr<Source> ();
}
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)