diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2006-11-03 04:27:58 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2006-11-03 04:27:58 +0000 |
| commit | d2d243ad08cb9588411ea85c8d08f1d19f427dc3 (patch) | |
| tree | ad306fb33c6f76609af48ea6a0a31873115ed5da /libs | |
| parent | 45d35d0732e18501762dc7c9bc87b519c2590447 (diff) | |
Fixed snapshot dialog annoyance.
Hilight current snapshot in snapshot list with asterisks.
Crash fix in sndfilesource dtor from brianahr. Thanks!
Fixed COREAUDIO compilation.
git-svn-id: svn://localhost/ardour2/trunk@1066 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/sndfilesource.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/source_factory.cc | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 17e45c11d7..378b62ea04 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -179,6 +179,8 @@ SndFileSource::init (string idstr) string::size_type pos; string file; + // lets try to keep the object initalizations here at the top + xfade_buf = 0; interleave_buf = 0; interleave_bufsize = 0; sf = 0; @@ -213,7 +215,7 @@ SndFileSource::init (string idstr) if (destructive()) { xfade_buf = new Sample[xfade_frames]; timeline_position = header_position_offset; - } + } AudioFileSource::HeaderPositionOffsetChanged.connect (mem_fun (*this, &SndFileSource::handle_header_position_change)); } diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 9a3902147b..d83533ca09 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -122,16 +122,14 @@ SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag f } else { - catch (failed_constructor& err) { - boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags)); - if (setup_peakfile (ret)) { - return boost::shared_ptr<Source>(); - } - if (announce) { - SourceCreated (ret); - } - return ret; + boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags)); + if (setup_peakfile (ret)) { + return boost::shared_ptr<Source>(); + } + if (announce) { + SourceCreated (ret); } + return ret; } return boost::shared_ptr<Source>(); |