aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-08-26 08:27:15 +0200
committerMax Kellermann <max@duempel.org>2008-08-26 08:27:15 +0200
commit806a9f02a10310be5aa8fba16ae87a647b28952a (patch)
tree16f33ae6176b7fd02b55b2e6ec022fc93fddeb39 /src
parent83215bf9cea1d73ef81489fe1499348ee85df53a (diff)
downloadmpd-806a9f02a10310be5aa8fba16ae87a647b28952a.tar.gz
mpd-806a9f02a10310be5aa8fba16ae87a647b28952a.tar.xz
mpd-806a9f02a10310be5aa8fba16ae87a647b28952a.zip
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).
Diffstat (limited to '')
-rw-r--r--src/audioOutputs/audioOutput_jack.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/audioOutputs/audioOutput_jack.c b/src/audioOutputs/audioOutput_jack.c
index 47997df01..9fc52055f 100644
--- 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);