diff options
author | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
commit | bb457bb960c5bd7ed538f9d31477293415739f68 (patch) | |
tree | 84324a63b87c03589cd165b9e474296eaebb4772 /libs/ardour/audiofilesource.cc | |
parent | 73dd9d37e7d715e0d78c0e51569968f9494dac7f (diff) |
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audiofilesource.cc')
-rw-r--r-- | libs/ardour/audiofilesource.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index 1284dd343b..81ad45e08a 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -135,18 +135,15 @@ AudioFileSource::removable () const int AudioFileSource::init (ustring pathstr, bool must_exist) { - bool is_new = false; - _length = 0; timeline_position = 0; _peaks_built = false; - file_is_new = false; - if (!find (pathstr, must_exist, is_new, _channel)) { + if (!find (pathstr, must_exist, file_is_new, _channel)) { throw non_existent_source (); } - if (is_new && must_exist) { + if (file_is_new && must_exist) { return -1; } |