Merge branch 'renderer' of https://github.com/PaulBatchelor/lmms

include/Mixer.h

@@ -153,7 +153,7 @@ public:
 		}
 	} ;
 
-	void initDevices();
+	void initDevices( bool renderOnly );
 	void clear();
 
 

src/core/Engine.cpp

@@ -66,7 +66,7 @@ void LmmsCore::init( bool renderOnly )
 	s_projectJournal->setJournalling( true );
 
 	emit engine->initProgress(tr("Opening audio and midi devices"));
-	s_mixer->initDevices();
+	s_mixer->initDevices( renderOnly );
 
 	PresetPreviewPlayHandle::init();
 	s_dummyTC = new DummyTrackContainer;

src/core/Mixer.cpp

@@ -201,10 +201,18 @@ Mixer::~Mixer()
 
 
 
-void Mixer::initDevices()
+void Mixer::initDevices( bool renderOnly )
 {
-	m_audioDev = tryAudioDevices();
-	m_midiClient = tryMidiClients();
+	bool success_ful = false;
+	if( renderOnly ) {
+		m_audioDev = new AudioDummy( success_ful, this );
+		m_audioDevName = AudioDummy::name();
+		m_midiClient = new MidiDummy;
+		m_midiClientName = MidiDummy::name();
+	} else {
+		m_audioDev = tryAudioDevices();
+		m_midiClient = tryMidiClients();
+	}
 }