mirrors/alsa-tools
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-tools.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

hdajackretask: Fix killing PulseAudio on newer PulseAudio versions

Browse source 
The standard configuration directory for PulseAudio has changed,
I think since 3.0. Adjust the directory lookup mechanism to match.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
David Henningsson 2013-06-13 16:26:43 +02:00 • committed by Jaroslav Kysela
parent 472c414744
commit 772fbde91c
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hdajackretask/apply-changes.c
View file

@ -97,7 +97,20 @@ gboolean run_sudo_script(const gchar* script_name, GError** err)
static gchar* get_pulseaudio_client_conf() static gchar* get_pulseaudio_client_conf()
{ {
return g_strdup_printf("%s/.pulse/client.conf", g_get_home_dir()); /* Reference: See src/pulsecore/core-util.c in pulseaudio */
gchar* fname;
gchar* dir = g_strdup_printf("%s/.pulse", g_get_home_dir());
if (access(dir, F_OK) < 0) {
const gchar* xch = g_getenv("XDG_CONFIG_HOME");
g_free(dir);
if (xch)
dir = g_strdup_printf("%s/pulse", xch);
else
dir = g_strdup_printf("%s/.config/pulse", g_get_home_dir());
}
fname = g_strdup_printf("%s/client.conf", dir);
g_free(dir);
return fname;
} }
static gboolean kill_pulseaudio(gboolean* was_killed, int card, GError** err) static gboolean kill_pulseaudio(gboolean* was_killed, int card, GError** err)