mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-14 06:59:53 -05:00
catch up with trunk HEAD (i.e. 2118:2213)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2214 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
106ddb9211
commit
ecf6439661
24 changed files with 545 additions and 216 deletions
|
|
@ -486,7 +486,7 @@ static void get_autoload_info_callback(pa_context *c, const pa_autoload_info *i,
|
|||
i->name,
|
||||
i->type == PA_AUTOLOAD_SINK ? "sink" : "source",
|
||||
i->module,
|
||||
i->argument);
|
||||
i->argument ? i->argument : "");
|
||||
}
|
||||
|
||||
static void simple_callback(pa_context *c, int success, void *userdata) {
|
||||
|
|
|
|||
|
|
@ -2307,7 +2307,11 @@ fail:
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef sun
|
||||
int ioctl(int fd, int request, ...) {
|
||||
#else
|
||||
int ioctl(int fd, unsigned long request, ...) {
|
||||
#endif
|
||||
fd_info *i;
|
||||
va_list args;
|
||||
void *argp;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue