mirror of
https://github.com/mpv-player/mpv
synced 2024-11-14 22:48:35 +01:00
name suboption for jack to set client name
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16254 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
550726e11c
commit
7ddba02880
@ -1902,6 +1902,9 @@ audio output through JACK (Jack Audio Connection Kit)
|
||||
.RSs
|
||||
.IPs port=<name>
|
||||
Connects to the ports with the given name (default: physical ports).
|
||||
.IPs name=<client name>
|
||||
Client name that is passed to JACK (default: MPlayer [<PID>]).
|
||||
Useful if you want to have certain connections established automatically.
|
||||
.IPs (no)estimate
|
||||
Estimate the audio delay, supposed to make the video playback smoother
|
||||
(default: enabled).
|
||||
|
@ -207,6 +207,8 @@ static void print_help ()
|
||||
"\nOptions:\n"
|
||||
" port=<port name>\n"
|
||||
" Connects to the given ports instead of the default physical ones\n"
|
||||
" name=<client name>\n"
|
||||
" Client name to pass to JACK\n"
|
||||
" estimate\n"
|
||||
" Estimates the amount of data in buffers (experimental)\n");
|
||||
}
|
||||
@ -214,9 +216,10 @@ static void print_help ()
|
||||
static int init(int rate, int channels, int format, int flags) {
|
||||
const char **matching_ports = NULL;
|
||||
char *port_name = NULL;
|
||||
char client_name[40];
|
||||
char *client_name = NULL;
|
||||
opt_t subopts[] = {
|
||||
{"port", OPT_ARG_MSTRZ, &port_name, NULL},
|
||||
{"name", OPT_ARG_MSTRZ, &client_name, NULL},
|
||||
{"estimate", OPT_ARG_BOOL, &estimate, NULL},
|
||||
{NULL}
|
||||
};
|
||||
@ -231,7 +234,10 @@ static int init(int rate, int channels, int format, int flags) {
|
||||
mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] Invalid number of channels: %i\n", channels);
|
||||
goto err_out;
|
||||
}
|
||||
if (!client_name) {
|
||||
client_name = (char *)malloc(40);
|
||||
sprintf(client_name, "MPlayer [%d]", getpid());
|
||||
}
|
||||
client = jack_client_new(client_name);
|
||||
if (!client) {
|
||||
mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] cannot open server\n");
|
||||
@ -286,11 +292,13 @@ static int init(int rate, int channels, int format, int flags) {
|
||||
ao_data.outburst = CHUNK_SIZE;
|
||||
free(matching_ports);
|
||||
free(port_name);
|
||||
free(client_name);
|
||||
return 1;
|
||||
|
||||
err_out:
|
||||
free(matching_ports);
|
||||
free(port_name);
|
||||
free(client_name);
|
||||
if (client)
|
||||
jack_client_close(client);
|
||||
free(buffer);
|
||||
|
Loading…
Reference in New Issue
Block a user