add EPA stuff from 2.X

[ardour.git] / libs / pbd / sndfile_manager.cc

diff --git a/libs/pbd/sndfile_manager.cc b/libs/pbd/sndfile_manager.cc
index 5637de26eeadf72f65bd7078e7c6d84950b605ac..5f08e634d68592ef07a4e9663992982c342c07be 100644 (file)
--- a/libs/pbd/sndfile_manager.cc
+++ b/libs/pbd/sndfile_manager.cc
@@ -69,6 +69,7 @@ SndFileDescriptor::close ()
 {
        /* we must have a lock on the FileManager's mutex */
 
+       assert (_sndfile);
        sf_close (_sndfile);
        _sndfile = 0;
 }
@@ -86,7 +87,7 @@ SndFileDescriptor::open ()
 {
        /* we must have a lock on the FileManager's mutex */
        
-       _sndfile = sf_open (_name.c_str(), _writeable ? SFM_RDWR : SFM_READ, _info);
+       _sndfile = sf_open (_path.c_str(), _writeable ? SFM_RDWR : SFM_READ, _info);
        return (_sndfile == 0);
 }