Mercurial > hg > svapp
comparison framework/MainWindowBase.cpp @ 71:a8acc7841d70 1.2-stable
* Merge r884 from trunk
author | Chris Cannam |
---|---|
date | Fri, 30 Nov 2007 17:36:14 +0000 |
parents | 7b71da2d0631 |
children | ef8a3028c711 22bf057ea151 |
comparison
equal
deleted
inserted
replaced
69:1a7d804c9f8d | 71:a8acc7841d70 |
---|---|
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 |