Don't restore audio device during exporting (LMMS#4083)

Fixes deadlock on multi-track export with SDL
sdasda7777 · Mar 2, 2018 · bd45599 · bd45599
1 parent 3dd18b4
commit bd45599
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/include/Mixer.h b/include/Mixer.h
@@ -175,6 +175,7 @@ class EXPORT Mixer : public QObject
  void setAudioDevice( AudioDevice * _dev,
  const struct qualitySettings & _qs,
  bool _needs_fifo );
+ void storeAudioDevice();
  void restoreAudioDevice();
  inline AudioDevice * audioDev()
  {

diff --git a/include/ProjectRenderer.h b/include/ProjectRenderer.h
@@ -88,7 +88,6 @@ public slots:
 
  AudioFileDevice * m_fileDev;
  Mixer::qualitySettings m_qualitySettings;
- Mixer::qualitySettings m_oldQualitySettings;
 
  volatile int m_progress;
  volatile bool m_abort;

diff --git a/include/RenderManager.h b/include/RenderManager.h
@@ -65,6 +65,7 @@ private slots:
  void restoreMutedState();
 
  const Mixer::qualitySettings m_qualitySettings;
+ const Mixer::qualitySettings m_oldQualitySettings;
  const OutputSettings m_outputSettings;
  ProjectRenderer::ExportFileFormats m_format;
  QString m_outputPath;

diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp
@@ -579,8 +579,6 @@ void Mixer::setAudioDevice( AudioDevice * _dev )
 {
  stopProcessing();
 
- m_oldAudioDev = m_audioDev;
-
  if( _dev == NULL )
  {
  printf( "param _dev == NULL in Mixer::setAudioDevice(...). "
@@ -608,7 +606,6 @@ void Mixer::setAudioDevice( AudioDevice * _dev,
  stopProcessing();
 
  m_qualitySettings = _qs;
- m_oldAudioDev = m_audioDev;
 
  if( _dev == NULL )
  {
@@ -630,6 +627,17 @@ void Mixer::setAudioDevice( AudioDevice * _dev,
 
 
 
+void Mixer::storeAudioDevice()
+{
+ if( !m_oldAudioDev )
+ {
+ m_oldAudioDev = m_audioDev;
+ }
+}
+
+
+
+
 void Mixer::restoreAudioDevice()
 {
  if( m_oldAudioDev != NULL )

diff --git a/src/core/ProjectRenderer.cpp b/src/core/ProjectRenderer.cpp
@@ -77,7 +77,6 @@ ProjectRenderer::ProjectRenderer( const Mixer::qualitySettings & qualitySettings
  QThread( Engine::mixer() ),
  m_fileDev( NULL ),
  m_qualitySettings( qualitySettings ),
- m_oldQualitySettings( Engine::mixer()->currentQualitySettings() ),
  m_progress( 0 ),
  m_abort( false )
 {
@@ -103,8 +102,6 @@ ProjectRenderer::ProjectRenderer( const Mixer::qualitySettings & qualitySettings
 
 ProjectRenderer::~ProjectRenderer()
 {
- Engine::mixer()->restoreAudioDevice(); // also deletes audio-dev
- Engine::mixer()->changeQuality( m_oldQualitySettings );
 }
 
 

diff --git a/src/core/RenderManager.cpp b/src/core/RenderManager.cpp
@@ -37,16 +37,22 @@ RenderManager::RenderManager(
  ProjectRenderer::ExportFileFormats fmt,
  QString outputPath) :
  m_qualitySettings(qualitySettings),
+ m_oldQualitySettings( Engine::mixer()->currentQualitySettings() ),
  m_outputSettings(outputSettings),
  m_format(fmt),
  m_outputPath(outputPath),
  m_activeRenderer(NULL)
 {
+ Engine::mixer()->storeAudioDevice();
 }
 
 RenderManager::~RenderManager()
 {
  delete m_activeRenderer;
+ m_activeRenderer = NULL;
+
+ Engine::mixer()->restoreAudioDevice(); // Also deletes audio dev.
+ Engine::mixer()->changeQuality( m_oldQualitySettings );
 }
 
 void RenderManager::abortProcessing()