jack: initialize JackData in jack_initDriver()

Over the lifetime of the jack AudioOutput object, we want a single valid JackData object, so we can persistently store data there (configuration etc.). Allocate JackData in jack_initDriver(). After that, we can safely remove all audioOutput->data==NULL checks (and replace them with assertions).

jack: initialize JackData in jack_initDriver()
806a9f02 · Max Kellermann · 83215bf9 · 806a9f02
Commit 806a9f02 authored Aug 26, 2008 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

audioOutput_jack.c src/audioOutputs/audioOutput_jack.c +2 -6

No files found.
--- a/src/audioOutputs/audioOutput_jack.c
+++ b/src/audioOutputs/audioOutput_jack.c
@@ -205,7 +205,7 @@ static int jack_initDriver(AudioOutput *audioOutput, ConfigParam *param)
 	int val;
 	char *cp = NULL;

-	audioOutput->data = NULL;
+	audioOutput->data = newJackData();

 	DEBUG("jack_initDriver (pid=%d)\n", getpid());
 	if ( ! param ) return 0;
@@ -345,11 +345,7 @@ static int jack_openDevice(AudioOutput *audioOutput)
 {
 	JackData *jd = audioOutput->data;

-	if ( !jd ) {
-		DEBUG("connect!\n");
-		jd = newJackData();
-		audioOutput->data = jd;
-	}
+	assert(jd != NULL);

 	if (jd->client == NULL && connect_jack(audioOutput) < 0) {
 		freeJackClient(jd);