From 4f2566ad507a0a4f72c27f67c8c3ff0080c2f0f0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 21 May 2020 04:21:00 +0200
Subject: [PATCH] (JACK) Query audio device from settings struct again

---
 audio/drivers/jack.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/audio/drivers/jack.c b/audio/drivers/jack.c
index fd68cc8600..053d62b654 100644
--- a/audio/drivers/jack.c
+++ b/audio/drivers/jack.c
@@ -25,6 +25,7 @@
 #include <boolean.h>
 #include <rthreads/rthreads.h>
 
+#include "../../configuration.h"
 #include "../../retroarch.h"
 #include "../../verbosity.h"
 
@@ -96,13 +97,13 @@ static void shutdown_cb(void *data)
 #endif
 }
 
-static int parse_ports(const char *audio_device,
-      char **dest_ports, const char **jports)
+static int parse_ports(char **dest_ports, const char **jports)
 {
    int i;
    char           *save   = NULL;
    int           parsed   = 0;
-   char *audio_device_cpy = strdup(audio_device);
+   settings_t *settings   = config_get_ptr();
+   char *audio_device_cpy = strdup(settings->arrays.audio_device);
    const char      *con   = strtok_r(audio_device_cpy, ",", &save);
 
    if (con)
@@ -203,7 +204,7 @@ static void *ja_init(const char *device,
       }
    }
 
-   parsed = parse_ports(device, dest_ports, jports);
+   parsed = parse_ports(dest_ports, jports);
 
    if (jack_activate(jd->client) < 0)
    {