comparison 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
comparison
equal deleted inserted replaced
68:cedeab01d4c8 70:716e9d2f91c7
199 m_labeller->setCounterCycleSize(cycle); 199 m_labeller->setCounterCycleSize(cycle);
200 } 200 }
201 201
202 MainWindowBase::~MainWindowBase() 202 MainWindowBase::~MainWindowBase()
203 { 203 {
204 delete m_playTarget; 204 if (m_playTarget) m_playTarget->shutdown();
205 // delete m_playTarget;
205 delete m_playSource; 206 delete m_playSource;
206 delete m_viewManager; 207 delete m_viewManager;
207 delete m_oscQueue; 208 delete m_oscQueue;
208 Profiles::getInstance()->dump(); 209 Profiles::getInstance()->dump();
209 } 210 }
1005 bool someSuccess = false; 1006 bool someSuccess = false;
1006 1007
1007 for (PlaylistFileReader::Playlist::const_iterator i = playlist.begin(); 1008 for (PlaylistFileReader::Playlist::const_iterator i = playlist.begin();
1008 i != playlist.end(); ++i) { 1009 i != playlist.end(); ++i) {
1009 1010
1010 FileOpenStatus status = openAudio(*i, mode); 1011 FileOpenStatus status = openAudio(FileSource(*i, true), mode);
1011 1012
1012 if (status == FileOpenCancelled) { 1013 if (status == FileOpenCancelled) {
1013 return FileOpenCancelled; 1014 return FileOpenCancelled;
1014 } 1015 }
1015 1016