Mercurial > hg > svapp
diff framework/MainWindowBase.cpp @ 70:716e9d2f91c7
* Skip ID3 block when reading MP3 files (so long as ID3 support is included)
* Show progress when retrieving audio file from playlist
* Avoid -- but do not actually fix -- segmentation fault on exit. I am
totally stumped at the moment about why both the PA and JACK audio targets
should crash when properly shut down. For the moment, we just don't shut
them down...
* Fix incorrect behaviour (introduced on Friday as part of a different fix)
when replacing main model in situation where no current main model exists
author | Chris Cannam |
---|---|
date | Fri, 30 Nov 2007 17:31:09 +0000 |
parents | 7b71da2d0631 |
children | ef8a3028c711 22bf057ea151 |
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp Thu Nov 29 17:10:53 2007 +0000 +++ b/framework/MainWindowBase.cpp Fri Nov 30 17:31:09 2007 +0000 @@ -201,7 +201,8 @@ MainWindowBase::~MainWindowBase() { - delete m_playTarget; + if (m_playTarget) m_playTarget->shutdown(); +// delete m_playTarget; delete m_playSource; delete m_viewManager; delete m_oscQueue; @@ -1007,7 +1008,7 @@ for (PlaylistFileReader::Playlist::const_iterator i = playlist.begin(); i != playlist.end(); ++i) { - FileOpenStatus status = openAudio(*i, mode); + FileOpenStatus status = openAudio(FileSource(*i, true), mode); if (status == FileOpenCancelled) { return FileOpenCancelled;