Mercurial > hg > svapp

diff framework/MainWindowBase.cpp @ 71:a8acc7841d70 1.2-stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merge r884 from trunk
author Chris Cannam
date Fri, 30 Nov 2007 17:36:14 +0000
parents 7b71da2d0631
children ef8a3028c711 22bf057ea151
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp	Thu Nov 29 17:16:02 2007 +0000
+++ b/framework/MainWindowBase.cpp	Fri Nov 30 17:36:14 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;