On 03/22/2013 08:17 PM, Tanu Kaskinen wrote: > On Fri, 2013-03-22 at 19:43 +0100, David Henningsson wrote: >> On 03/22/2013 07:00 PM, Tanu Kaskinen wrote: >>> On Fri, 2013-03-22 at 15:37 +0100, David Henningsson wrote: >>>> It checks all files in the mixer/paths directory and checks >>>> - that the file can be parsed without errors >>>> - that the file is actually shipped in the makefile >>>> >>>> Signed-off-by: David Henningsson <david.henningsson at canonical.com> >>>> --- >>>> >>>> After I realized that my previous headset-mic patch did not event ship the new file, >>>> I also realized I might do the same mistake again. >>>> >>>> I guess this could be enhanced later with checking that profile-sets do not point >>>> to non-existent paths etc, but this will do for now. I've pushed this and the two other alsa-mixer patches, after fixing the first patch to actually ship the headset mic path. (And timeout + strlist_free in this patch.) >>>> +static const char *get_default_paths_dir(void) { >>>> + if (pa_run_from_build_tree()) >>>> + return PA_BUILDDIR "/modules/alsa/mixer/paths/"; >>> >>> This doesn't work if the build directory is different from the source >>> directory. Instead of PA_BUILDDIR, this should use PA_SRCDIR, which >>> doesn't currently exist, but it should be possible to add it. >> >> It is copy-pasted from existing pulseaudio code (in alsa-mixer.c, IIRC). >> If you fix it there, feel free to do so here to. > > OK. > >> But I do an out-of-source build normally (according to Colin's old but >> excellent instructions), and my test worked siccessfully. I do remember >> though that Colin's instructions include making some related symlink. > > I tried this: > > mkdir build > cd build > ../configure > make check > > This test failed. Referencing: http://colin.guthr.ie/2010/09/compiling-and-running-pulseaudio-from-git/ Which has a line saying: ln -s ../../../src/modules/alsa/mixer share/pulseaudio/alsa-mixer -- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic