github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-08-24 07:21:49 +02:00
Code Releases Activity

ao_pulse: move format setting into a function

Browse Source 
No real functional changes.
This commit is contained in:
wm4 2016-01-05 19:34:34 +01:00
parent 172ce98433
commit 8fda7247ff
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
audio/out/ao_pulse.c
View File

@ -376,22 +376,8 @@ fail:
return -1; return -1;
} }
static int init(struct ao *ao) static bool set_format(struct ao *ao, pa_format_info *format)
{ {
struct pa_channel_map map;
pa_proplist *proplist = NULL;
pa_format_info *format = NULL;
struct priv *priv = ao->priv;
char *sink = priv->cfg_sink && priv->cfg_sink[0] ? priv->cfg_sink : ao->device;
if (pa_init_boilerplate(ao) < 0)
return -1;
pa_threaded_mainloop_lock(priv->mainloop);
if (!(format = pa_format_info_new()))
goto unlock_and_fail;
ao->format = af_fmt_from_planar(ao->format); ao->format = af_fmt_from_planar(ao->format);
format->encoding = map_digital_format(ao->format); format->encoding = map_digital_format(ao->format);
@ -411,8 +397,29 @@ static int init(struct ao *ao)
pa_format_info_set_sample_format(format, fmt_map->pa_format); pa_format_info_set_sample_format(format, fmt_map->pa_format);
} }
struct pa_channel_map map;
if (!select_chmap(ao, &map)) if (!select_chmap(ao, &map))
goto unlock_and_fail; return false;
pa_format_info_set_rate(format, ao->samplerate);
pa_format_info_set_channels(format, ao->channels.num);
pa_format_info_set_channel_map(format, &map);
return pa_format_info_valid(format);
}
static int init(struct ao *ao)
{
pa_proplist *proplist = NULL;
pa_format_info *format = NULL;
struct priv *priv = ao->priv;
char *sink = priv->cfg_sink && priv->cfg_sink[0] ? priv->cfg_sink : ao->device;
if (pa_init_boilerplate(ao) < 0)
return -1;
pa_threaded_mainloop_lock(priv->mainloop);
if (!(proplist = pa_proplist_new())) { if (!(proplist = pa_proplist_new())) {
MP_ERR(ao, "Failed to allocate proplist\n"); MP_ERR(ao, "Failed to allocate proplist\n");
@ -420,11 +427,10 @@ static int init(struct ao *ao)
} }
(void)pa_proplist_sets(proplist, PA_PROP_MEDIA_ICON_NAME, ao->client_name); (void)pa_proplist_sets(proplist, PA_PROP_MEDIA_ICON_NAME, ao->client_name);
pa_format_info_set_rate(format, ao->samplerate); if (!(format = pa_format_info_new()))
pa_format_info_set_channels(format, ao->channels.num); goto unlock_and_fail;
pa_format_info_set_channel_map(format, &map);
if (!pa_format_info_valid(format)) { if (!set_format(ao, format)) {
MP_ERR(ao, "Invalid audio format\n"); MP_ERR(ao, "Invalid audio format\n");
goto unlock_and_fail; goto unlock_and_fail;
} }