mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

(JACK) Get rid of configuration.h dependency

Browse Source
This commit is contained in:
twinaphex 2020-02-12 17:13:47 +01:00
parent ec53a400a7
commit 7eb41e7057
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/drivers/jack.c
View File

@ -26,7 +26,6 @@
#include <rthreads/rthreads.h>
#include "../../retroarch.h"
#include "../../configuration.h"
#include "../../verbosity.h"
#define FRAMES(x) (x / (sizeof(float) * 2))
@ -97,13 +96,13 @@ static void shutdown_cb(void *data)
#endif
}
static int parse_ports(char **dest_ports, const char **jports)
static int parse_ports(const char *audio_device,
char **dest_ports, const char **jports)
{
int i;
char *save = NULL;
int parsed = 0;
settings_t *settings = config_get_ptr();
char *audio_device_cpy = strdup(settings->arrays.audio_device);
char *audio_device_cpy = strdup(audio_device);
const char *con = strtok_r(audio_device_cpy, ",", &save);
if (con)
@ -146,7 +145,8 @@ static size_t find_buffersize(jack_t *jd, int latency, unsigned out_rate)
return buffer_frames * sizeof(jack_default_audio_sample_t);
}
static void *ja_init(const char *device, unsigned rate, unsigned latency,
static void *ja_init(const char *device,
unsigned rate, unsigned latency,
unsigned block_frames,
unsigned *new_rate)
{
@ -203,7 +203,7 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency,
}
}
parsed = parse_ports(dest_ports, jports);
parsed = parse_ports(device, dest_ports, jports);
if (jack_activate(jd->client) < 0)
{