[pulseaudio-commits] r1418 - in /trunk/src: daemon/ modules/ pulse/ pulsecore/ tests/ utils/
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Thu Jan 4 05:43:47 PST 2007
Author: ossman
Date: Thu Jan 4 14:43:45 2007
New Revision: 1418
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1418&root=3Dpulseaudio&vi=
ew=3Drev
Log:
Huge trailing whitespace cleanup. Let's keep the tree pure from here on,
mmmkay?
Modified:
trunk/src/daemon/caps.c
trunk/src/daemon/caps.h
trunk/src/daemon/cmdline.c
trunk/src/daemon/cmdline.h
trunk/src/daemon/cpulimit.c
trunk/src/daemon/cpulimit.h
trunk/src/daemon/daemon-conf.c
trunk/src/daemon/daemon-conf.h
trunk/src/daemon/dumpmodules.c
trunk/src/daemon/main.c
trunk/src/modules/alsa-util.c
trunk/src/modules/alsa-util.h
trunk/src/modules/dbus-util.c
trunk/src/modules/dbus-util.h
trunk/src/modules/module-alsa-sink.c
trunk/src/modules/module-alsa-source.c
trunk/src/modules/module-cli.c
trunk/src/modules/module-combine.c
trunk/src/modules/module-detect.c
trunk/src/modules/module-esound-compat-spawnfd.c
trunk/src/modules/module-esound-compat-spawnpid.c
trunk/src/modules/module-esound-sink.c
trunk/src/modules/module-hal-detect.c
trunk/src/modules/module-jack-sink.c
trunk/src/modules/module-jack-source.c
trunk/src/modules/module-lirc.c
trunk/src/modules/module-match.c
trunk/src/modules/module-mmkbd-evdev.c
trunk/src/modules/module-native-protocol-fd.c
trunk/src/modules/module-null-sink.c
trunk/src/modules/module-oss-mmap.c
trunk/src/modules/module-oss.c
trunk/src/modules/module-pipe-sink.c
trunk/src/modules/module-pipe-source.c
trunk/src/modules/module-protocol-stub.c
trunk/src/modules/module-rescue-streams.c
trunk/src/modules/module-sine.c
trunk/src/modules/module-solaris.c
trunk/src/modules/module-tunnel.c
trunk/src/modules/module-volume-restore.c
trunk/src/modules/module-waveout.c
trunk/src/modules/module-x11-bell.c
trunk/src/modules/module-x11-publish.c
trunk/src/modules/module-zeroconf-publish.c
trunk/src/modules/oss-util.c
trunk/src/modules/oss-util.h
trunk/src/pulse/browser.c
trunk/src/pulse/browser.h
trunk/src/pulse/cdecl.h
trunk/src/pulse/channelmap.c
trunk/src/pulse/channelmap.h
trunk/src/pulse/client-conf-x11.c
trunk/src/pulse/client-conf.c
trunk/src/pulse/context.c
trunk/src/pulse/context.h
trunk/src/pulse/def.h
trunk/src/pulse/error.c
trunk/src/pulse/error.h
trunk/src/pulse/glib-mainloop.c
trunk/src/pulse/glib-mainloop.h
trunk/src/pulse/internal.h
trunk/src/pulse/introspect.c
trunk/src/pulse/introspect.h
trunk/src/pulse/mainloop-api.c
trunk/src/pulse/mainloop-api.h
trunk/src/pulse/mainloop-signal.c
trunk/src/pulse/mainloop-signal.h
trunk/src/pulse/mainloop.c
trunk/src/pulse/mainloop.h
trunk/src/pulse/operation.c
trunk/src/pulse/operation.h
trunk/src/pulse/pulseaudio.h
trunk/src/pulse/sample.c
trunk/src/pulse/sample.h
trunk/src/pulse/scache.c
trunk/src/pulse/scache.h
trunk/src/pulse/simple.c
trunk/src/pulse/simple.h
trunk/src/pulse/stream.c
trunk/src/pulse/stream.h
trunk/src/pulse/subscribe.c
trunk/src/pulse/subscribe.h
trunk/src/pulse/thread-mainloop.c
trunk/src/pulse/thread-mainloop.h
trunk/src/pulse/timeval.c
trunk/src/pulse/timeval.h
trunk/src/pulse/utf8.c
trunk/src/pulse/utf8.h
trunk/src/pulse/util.c
trunk/src/pulse/util.h
trunk/src/pulse/volume.c
trunk/src/pulse/volume.h
trunk/src/pulse/xmalloc.c
trunk/src/pulse/xmalloc.h
trunk/src/pulsecore/anotify.c
trunk/src/pulsecore/anotify.h
trunk/src/pulsecore/atomic.h
trunk/src/pulsecore/authkey-prop.c
trunk/src/pulsecore/authkey-prop.h
trunk/src/pulsecore/authkey.c
trunk/src/pulsecore/authkey.h
trunk/src/pulsecore/autoload.c
trunk/src/pulsecore/autoload.h
trunk/src/pulsecore/avahi-wrap.c
trunk/src/pulsecore/avahi-wrap.h
trunk/src/pulsecore/cli-command.c
trunk/src/pulsecore/cli-command.h
trunk/src/pulsecore/cli-text.c
trunk/src/pulsecore/cli-text.h
trunk/src/pulsecore/cli.c
trunk/src/pulsecore/cli.h
trunk/src/pulsecore/client.c
trunk/src/pulsecore/client.h
trunk/src/pulsecore/conf-parser.c
trunk/src/pulsecore/core-def.h
trunk/src/pulsecore/core-error.c
trunk/src/pulsecore/core-error.h
trunk/src/pulsecore/core-scache.c
trunk/src/pulsecore/core-scache.h
trunk/src/pulsecore/core-subscribe.c
trunk/src/pulsecore/core-subscribe.h
trunk/src/pulsecore/core-util.c
trunk/src/pulsecore/core-util.h
trunk/src/pulsecore/core.c
trunk/src/pulsecore/core.h
trunk/src/pulsecore/creds.h
trunk/src/pulsecore/dynarray.c
trunk/src/pulsecore/dynarray.h
trunk/src/pulsecore/endianmacros.h
trunk/src/pulsecore/esound.h
trunk/src/pulsecore/flist.c
trunk/src/pulsecore/flist.h
trunk/src/pulsecore/g711.h
trunk/src/pulsecore/gccmacro.h
trunk/src/pulsecore/hashmap.c
trunk/src/pulsecore/hashmap.h
trunk/src/pulsecore/hook-list.c
trunk/src/pulsecore/hook-list.h
trunk/src/pulsecore/idxset.c
trunk/src/pulsecore/idxset.h
trunk/src/pulsecore/inet_ntop.c
trunk/src/pulsecore/inet_pton.c
trunk/src/pulsecore/iochannel.c
trunk/src/pulsecore/iochannel.h
trunk/src/pulsecore/ioline.c
trunk/src/pulsecore/ioline.h
trunk/src/pulsecore/ipacl.c
trunk/src/pulsecore/ipacl.h
trunk/src/pulsecore/llist.h
trunk/src/pulsecore/log.c
trunk/src/pulsecore/log.h
trunk/src/pulsecore/mcalign.c
trunk/src/pulsecore/mcalign.h
trunk/src/pulsecore/memblock.c
trunk/src/pulsecore/memblock.h
trunk/src/pulsecore/memblockq.c
trunk/src/pulsecore/memblockq.h
trunk/src/pulsecore/memchunk.c
trunk/src/pulsecore/memchunk.h
trunk/src/pulsecore/modargs.c
trunk/src/pulsecore/modargs.h
trunk/src/pulsecore/modinfo.c
trunk/src/pulsecore/modinfo.h
trunk/src/pulsecore/module.c
trunk/src/pulsecore/module.h
trunk/src/pulsecore/mutex-posix.c
trunk/src/pulsecore/mutex-win32.c
trunk/src/pulsecore/mutex.h
trunk/src/pulsecore/namereg.c
trunk/src/pulsecore/namereg.h
trunk/src/pulsecore/native-common.h
trunk/src/pulsecore/once-posix.c
trunk/src/pulsecore/once-win32.c
trunk/src/pulsecore/once.h
trunk/src/pulsecore/packet.c
trunk/src/pulsecore/packet.h
trunk/src/pulsecore/parseaddr.c
trunk/src/pulsecore/parseaddr.h
trunk/src/pulsecore/pdispatch.c
trunk/src/pulsecore/pdispatch.h
trunk/src/pulsecore/pid.c
trunk/src/pulsecore/pid.h
trunk/src/pulsecore/pipe.c
trunk/src/pulsecore/pipe.h
trunk/src/pulsecore/play-memblockq.c
trunk/src/pulsecore/play-memblockq.h
trunk/src/pulsecore/play-memchunk.c
trunk/src/pulsecore/play-memchunk.h
trunk/src/pulsecore/poll.c
trunk/src/pulsecore/poll.h
trunk/src/pulsecore/props.c
trunk/src/pulsecore/props.h
trunk/src/pulsecore/protocol-cli.c
trunk/src/pulsecore/protocol-cli.h
trunk/src/pulsecore/protocol-esound.c
trunk/src/pulsecore/protocol-esound.h
trunk/src/pulsecore/protocol-http.c
trunk/src/pulsecore/protocol-http.h
trunk/src/pulsecore/protocol-native.c
trunk/src/pulsecore/protocol-native.h
trunk/src/pulsecore/protocol-simple.c
trunk/src/pulsecore/protocol-simple.h
trunk/src/pulsecore/pstream-util.c
trunk/src/pulsecore/pstream-util.h
trunk/src/pulsecore/pstream.c
trunk/src/pulsecore/pstream.h
trunk/src/pulsecore/queue.c
trunk/src/pulsecore/queue.h
trunk/src/pulsecore/random.c
trunk/src/pulsecore/random.h
trunk/src/pulsecore/refcnt.h
trunk/src/pulsecore/resampler.c
trunk/src/pulsecore/resampler.h
trunk/src/pulsecore/sample-util.c
trunk/src/pulsecore/sample-util.h
trunk/src/pulsecore/sconv-s16be.c
trunk/src/pulsecore/sconv-s16be.h
trunk/src/pulsecore/sconv-s16le.c
trunk/src/pulsecore/sconv-s16le.h
trunk/src/pulsecore/sconv.c
trunk/src/pulsecore/sconv.h
trunk/src/pulsecore/shm.c
trunk/src/pulsecore/shm.h
trunk/src/pulsecore/sink-input.c
trunk/src/pulsecore/sink-input.h
trunk/src/pulsecore/sink.c
trunk/src/pulsecore/sink.h
trunk/src/pulsecore/sioman.c
trunk/src/pulsecore/sioman.h
trunk/src/pulsecore/socket-client.c
trunk/src/pulsecore/socket-client.h
trunk/src/pulsecore/socket-server.c
trunk/src/pulsecore/socket-server.h
trunk/src/pulsecore/socket-util.c
trunk/src/pulsecore/socket-util.h
trunk/src/pulsecore/sound-file-stream.c
trunk/src/pulsecore/sound-file-stream.h
trunk/src/pulsecore/sound-file.c
trunk/src/pulsecore/sound-file.h
trunk/src/pulsecore/source-output.c
trunk/src/pulsecore/source-output.h
trunk/src/pulsecore/source.c
trunk/src/pulsecore/source.h
trunk/src/pulsecore/strbuf.c
trunk/src/pulsecore/strbuf.h
trunk/src/pulsecore/strlist.c
trunk/src/pulsecore/strlist.h
trunk/src/pulsecore/tagstruct.c
trunk/src/pulsecore/tagstruct.h
trunk/src/pulsecore/thread-posix.c
trunk/src/pulsecore/thread-win32.c
trunk/src/pulsecore/thread.h
trunk/src/pulsecore/tokenizer.c
trunk/src/pulsecore/tokenizer.h
trunk/src/pulsecore/x11prop.c
trunk/src/pulsecore/x11wrap.c
trunk/src/pulsecore/x11wrap.h
trunk/src/tests/channelmap-test.c
trunk/src/tests/cpulimit-test.c
trunk/src/tests/flist-test.c
trunk/src/tests/get-binary-name-test.c
trunk/src/tests/hook-list-test.c
trunk/src/tests/interpol-test.c
trunk/src/tests/ipacl-test.c
trunk/src/tests/mainloop-test.c
trunk/src/tests/mcalign-test.c
trunk/src/tests/memblock-test.c
trunk/src/tests/memblockq-test.c
trunk/src/tests/pacat-simple.c
trunk/src/tests/parec-simple.c
trunk/src/tests/strlist-test.c
trunk/src/tests/sync-playback.c
trunk/src/tests/thread-mainloop-test.c
trunk/src/tests/thread-test.c
trunk/src/tests/utf8-test.c
trunk/src/tests/voltest.c
trunk/src/utils/pabrowse.c
trunk/src/utils/pacat.c
trunk/src/utils/pacmd.c
trunk/src/utils/pactl.c
trunk/src/utils/padsp.c
trunk/src/utils/paplay.c
trunk/src/utils/pax11publish.c
Modified: trunk/src/daemon/caps.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/caps.c?rev=3D1=
418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/daemon/caps.c (original)
+++ trunk/src/daemon/caps.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -50,7 +50,7 @@
/* Drop root rights when called SUID root */
void pa_drop_root(void) {
uid_t uid =3D getuid();
- =
+
if (uid =3D=3D 0 || geteuid() !=3D 0)
return;
=
@@ -96,13 +96,13 @@
if (cap_set_proc(caps) < 0)
goto fail;
=
- pa_log_info("dropped capabilities successfully."); =
- =
+ pa_log_info("dropped capabilities successfully.");
+
r =3D 0;
=
fail:
cap_free (caps);
- =
+
return r;
}
=
@@ -124,12 +124,12 @@
pa_log("failed to drop capabilities: %s", pa_cstrerror(errno));
goto fail;
}
- =
+
r =3D 0;
=
fail:
cap_free (caps);
- =
+
return r;
}
=
Modified: trunk/src/daemon/caps.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/caps.h?rev=3D1=
418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/daemon/caps.h (original)
+++ trunk/src/daemon/caps.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/daemon/cmdline.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cmdline.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/daemon/cmdline.c (original)
+++ trunk/src/daemon/cmdline.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -100,7 +100,7 @@
e++;
else
e =3D argv0;
- =
+
printf("%s [options]\n\n"
"COMMANDS:\n"
" -h, --help Show this help\n"
@@ -124,7 +124,7 @@
" --scache-idle-time=3DSECS Unload autoloaded sa=
mples when idle and\n"
" this time passed\n"
" --log-level[=3DLEVEL] Increase or set verb=
osity level\n"
- " -v Increase the verbosity=
level\n" =
+ " -v Increase the verbosity=
level\n"
" --log-target=3D{auto,syslog,stderr} Specify the log targ=
et\n"
" -p, --dl-search-path=3DPATH Set the search path =
for dynamic shared\n"
" objects (plugins)\n"
@@ -143,7 +143,7 @@
" -F, --file=3DFILENAME Run the specified sc=
ript\n"
" -C Open a command line on=
the running TTY\n"
" after startup\n\n"
- =
+
" -n Don't load default scr=
ipt file\n", e);
}
=
@@ -156,7 +156,7 @@
=
if (conf->script_commands)
pa_strbuf_puts(buf, conf->script_commands);
- =
+
while ((c =3D getopt_long(argc, argv, "L:F:ChDnp:kv", long_options, NU=
LL)) !=3D -1) {
switch (c) {
case ARG_HELP:
@@ -184,21 +184,21 @@
case ARG_CHECK:
conf->cmd =3D PA_CMD_CHECK;
break;
- =
+
case ARG_LOAD:
case 'L':
pa_strbuf_printf(buf, "load-module %s\n", optarg);
break;
- =
+
case ARG_FILE:
case 'F':
pa_strbuf_printf(buf, ".include %s\n", optarg);
break;
- =
+
case 'C':
pa_strbuf_puts(buf, "load-module module-cli exit_on_eof=3D=
1\n");
break;
- =
+
case ARG_DAEMONIZE:
case 'D':
if ((conf->daemonize =3D optarg ? pa_parse_boolean(optarg)=
: 1) < 0) {
@@ -226,7 +226,7 @@
if (conf->log_level < PA_LOG_LEVEL_MAX-1)
conf->log_level++;
}
- =
+
break;
=
case ARG_HIGH_PRIORITY:
@@ -249,13 +249,13 @@
goto fail;
}
break;
- =
+
case 'p':
case ARG_DL_SEARCH_PATH:
pa_xfree(conf->dl_search_path);
conf->dl_search_path =3D *optarg ? pa_xstrdup(optarg) : NU=
LL;
break;
- =
+
case 'n':
pa_xfree(conf->default_script_file);
conf->default_script_file =3D NULL;
@@ -307,7 +307,7 @@
goto fail;
}
break;
- =
+
default:
goto fail;
}
@@ -322,12 +322,12 @@
}
=
*d =3D optind;
- =
+
return 0;
- =
+
fail:
if (buf)
pa_strbuf_free(buf);
- =
+
return -1;
}
Modified: trunk/src/daemon/cmdline.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cmdline.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/daemon/cmdline.h (original)
+++ trunk/src/daemon/cmdline.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/daemon/cpulimit.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cpulimit.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/daemon/cpulimit.c (original)
+++ trunk/src/daemon/cpulimit.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -80,7 +80,7 @@
static struct sigaction sigaction_prev;
=
/* Nonzero after pa_cpu_limit_init() */
-static int installed =3D 0; =
+static int installed =3D 0;
=
/* The current state of operation */
static enum {
@@ -131,24 +131,24 @@
snprintf(t, sizeof(t), "Using %0.1f%% CPU\n", (double)CPUTIME_INTE=
RVAL_SOFT/(now-last_time)*100);
write_err(t);
#endif
- =
+
if (CPUTIME_INTERVAL_SOFT >=3D ((now-last_time)*(double)CPUTIME_PE=
RCENT/100)) {
static const char c =3D 'X';
=
write_err("Soft CPU time limit exhausted, terminating.\n");
- =
+
/* Try a soft cleanup */
write(the_pipe[1], &c, sizeof(c));
phase =3D PHASE_SOFT;
reset_cpu_time(CPUTIME_INTERVAL_HARD);
- =
+
} else {
=
/* Everything's fine */
reset_cpu_time(CPUTIME_INTERVAL_SOFT);
last_time =3D now;
}
- =
+
} else if (phase =3D=3D PHASE_SOFT) {
write_err("Hard CPU time limit exhausted, terminating forcibly.\n"=
);
_exit(1); /* Forced exit */
@@ -167,7 +167,7 @@
int pa_cpu_limit_init(pa_mainloop_api *m) {
struct sigaction sa;
assert(m && !api && !io_event && the_pipe[0] =3D=3D -1 && the_pipe[1] =
=3D=3D -1 && !installed);
- =
+
time(&last_time);
=
/* Prepare the main loop pipe */
@@ -191,7 +191,7 @@
sa.sa_handler =3D signal_handler;
sigemptyset(&sa.sa_mask);
sa.sa_flags =3D SA_RESTART;
- =
+
if (sigaction(SIGXCPU, &sa, &sigaction_prev) < 0) {
pa_cpu_limit_done();
return -1;
@@ -200,7 +200,7 @@
installed =3D 1;
=
reset_cpu_time(CPUTIME_INTERVAL_SOFT);
- =
+
return 0;
}
=
Modified: trunk/src/daemon/cpulimit.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cpulimit.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/daemon/cpulimit.h (original)
+++ trunk/src/daemon/cpulimit.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/daemon/daemon-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon-conf.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/daemon/daemon-conf.c (original)
+++ trunk/src/daemon/daemon-conf.c Thu Jan 4 14:43:45 2007
@@ -231,7 +231,7 @@
int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
int r =3D -1;
FILE *f =3D NULL;
- =
+
pa_config_item table[] =3D {
{ "daemonize", pa_config_parse_bool, NULL },
{ "fail", pa_config_parse_bool, NULL },
@@ -266,7 +266,7 @@
#endif
{ NULL, NULL, NULL },
};
- =
+
table[0].data =3D &c->daemonize;
table[1].data =3D &c->fail;
table[2].data =3D &c->high_priority;
@@ -301,8 +301,8 @@
table[24].data =3D &c->rlimit_memlock;
#endif
#endif
- =
- =
+
+
pa_xfree(c->config_file);
c->config_file =3D NULL;
=
@@ -316,11 +316,11 @@
}
=
r =3D f ? pa_config_parse(c->config_file, f, table, NULL) : 0;
- =
+
finish:
if (f)
fclose(f);
- =
+
return r;
}
=
@@ -354,7 +354,7 @@
pa_strbuf_printf(s, "### Read from configuration file: %s ###\n", =
c->config_file);
=
assert(c->log_level <=3D PA_LOG_LEVEL_MAX);
- =
+
pa_strbuf_printf(s, "daemonize =3D %i\n", !!c->daemonize);
pa_strbuf_printf(s, "fail =3D %i\n", !!c->fail);
pa_strbuf_printf(s, "high-priority =3D %i\n", !!c->high_priority);
@@ -385,6 +385,6 @@
pa_strbuf_printf(s, "rlimit-memlock =3D %li\n", c->rlimit_memlock.is_s=
et ? (long int) c->rlimit_memlock.value : -1);
#endif
#endif
- =
+
return pa_strbuf_tostring_free(s);
}
Modified: trunk/src/daemon/daemon-conf.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon-conf.h?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/daemon/daemon-conf.h (original)
+++ trunk/src/daemon/daemon-conf.h Thu Jan 4 14:43:45 2007
@@ -66,7 +66,7 @@
pa_log_level_t log_level;
int resample_method;
char *config_file;
- =
+
#ifdef HAVE_SYS_RESOURCE_H
pa_rlimit rlimit_as, rlimit_core, rlimit_data, rlimit_fsize, rlimit_no=
file, rlimit_stack;
#ifdef RLIMIT_NPROC
@@ -76,7 +76,7 @@
pa_rlimit rlimit_memlock;
#endif
#endif
- =
+
} pa_daemon_conf;
=
/* Allocate a new structure and fill it with sane defaults */
Modified: trunk/src/daemon/dumpmodules.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/dumpmodules.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/daemon/dumpmodules.c (original)
+++ trunk/src/daemon/dumpmodules.c Thu Jan 4 14:43:45 2007
@@ -45,14 +45,14 @@
static void long_info(const char *name, const char *path, pa_modinfo *i) {
static int nl =3D 0;
assert(name && i);
- =
+
if (nl)
printf("\n");
=
nl =3D 1;
=
printf("Name: %s\n", name);
- =
+
if (!i->description && !i->version && !i->author && !i->usage)
printf("No module information available\n");
else {
@@ -65,14 +65,14 @@
if (i->usage)
printf("Usage: %s\n", i->usage);
}
- =
+
if (path)
printf("Path: %s\n", path);
}
=
static void show_info(const char *name, const char *path, void (*info)(con=
st char *name, const char *path, pa_modinfo*i)) {
pa_modinfo *i;
- =
+
if ((i =3D pa_modinfo_get_by_name(path ? path : name))) {
info(name, path, i);
pa_modinfo_free(i);
@@ -86,10 +86,10 @@
=
for (l =3D lt_preloaded_symbols; l->name; l++) {
char buf[64], *e;
- =
+
if (l->address)
continue;
- =
+
snprintf(buf, sizeof(buf), "%s", l->name);
if ((e =3D strrchr(buf, '.')))
*e =3D 0;
@@ -112,7 +112,7 @@
=
if (is_preloaded(e))
return 0;
- =
+
show_info(e, path, c->log_level >=3D PA_LOG_INFO ? long_info : short_i=
nfo);
return 0;
}
@@ -127,20 +127,20 @@
=
for (l =3D lt_preloaded_symbols; l->name; l++) {
char buf[64], *e;
- =
+
if (l->address)
continue;
=
if (strlen(l->name) <=3D sizeof(PREFIX)-1 || strncmp(l->name, =
PREFIX, sizeof(PREFIX)-1))
continue;
- =
+
snprintf(buf, sizeof(buf), "%s", l->name);
if ((e =3D strrchr(buf, '.')))
*e =3D 0;
- =
+
show_info(buf, NULL, c->log_level >=3D PA_LOG_INFO ? long_info=
: short_info);
}
- =
+
lt_dlforeachfile(NULL, callback, c);
}
}
Modified: trunk/src/daemon/main.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/main.c?rev=3D1=
418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/daemon/main.c (original)
+++ trunk/src/daemon/main.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -125,7 +125,7 @@
pa_module_load(userdata, "module-cli", NULL);
break;
#endif
- =
+
#ifdef SIGUSR2
case SIGUSR2:
pa_module_load(userdata, "module-cli-protocol-unix", NULL);
@@ -170,7 +170,7 @@
/* This function is called only in system-wide mode. It creates a
* runtime dir in /var/run/ with proper UID/GID and drops privs
* afterwards. */
- =
+
if (!(pw =3D getpwnam(PA_SYSTEM_USER))) {
pa_log("Failed to find user '%s'.", PA_SYSTEM_USER);
return -1;
@@ -197,7 +197,7 @@
pa_log("Failed to create '%s': %s", PA_SYSTEM_RUNTIME_PATH, pa_cst=
rerror(errno));
return -1;
}
- =
+
if (initgroups(PA_SYSTEM_USER, gr->gr_gid) !=3D 0) {
pa_log("Failed to change group list: %s", pa_cstrerror(errno));
return -1;
@@ -265,7 +265,7 @@
/* This function is called only when the daemon is started in
* per-user mode. We create the runtime directory somewhere in
* /tmp/ with the current UID/GID */
- =
+
if (pa_make_secure_dir(fn, 0700, (uid_t)-1, (gid_t)-1) < 0) {
pa_log("Failed to create '%s': %s", fn, pa_cstrerror(errno));
return -1;
@@ -311,7 +311,7 @@
pa_daemon_conf *conf =3D NULL;
pa_mainloop *mainloop =3D NULL;
=
- char *s; =
+ char *s;
int r, retval =3D 1, d =3D 0;
int daemon_pipe[2] =3D { -1, -1 };
int suid_root, real_root;
@@ -333,7 +333,7 @@
#ifdef HAVE_GETUID
real_root =3D getuid() =3D=3D 0;
suid_root =3D !real_root && geteuid() =3D=3D 0;
- =
+
if (suid_root && (pa_own_uid_in_group(PA_REALTIME_GROUP, &gid) <=3D 0 =
|| gid >=3D 1000)) {
pa_log_warn("WARNING: called SUID root, but not in group '"PA_REAL=
TIME_GROUP"'.");
pa_drop_root();
@@ -342,9 +342,9 @@
real_root =3D 0;
suid_root =3D 0;
#endif
- =
+
LTDL_SET_PRELOADED_SYMBOLS();
- =
+
r =3D lt_dlinit();
assert(r =3D=3D 0);
=
@@ -356,11 +356,11 @@
#endif
=
pa_random_seed();
- =
+
pa_log_set_ident("pulseaudio");
- =
+
conf =3D pa_daemon_conf_new();
- =
+
if (pa_daemon_conf_load(conf, NULL) < 0)
goto finish;
=
@@ -429,9 +429,9 @@
pa_log("failed to kill daemon.");
else
retval =3D 0;
- =
- goto finish;
- =
+
+ goto finish;
+
default:
assert(conf->cmd =3D=3D PA_CMD_DAEMON);
}
@@ -457,7 +457,7 @@
pa_log("failed to create pipe.");
goto finish;
}
- =
+
if ((child =3D fork()) < 0) {
pa_log("fork() failed: %s", pa_cstrerror(errno));
goto finish;
@@ -478,7 +478,7 @@
pa_log("daemon startup failed.");
else
pa_log_info("daemon startup successful.");
- =
+
goto finish;
}
=
@@ -517,7 +517,7 @@
#ifdef SIGTSTP
signal(SIGTSTP, SIG_IGN);
#endif
- =
+
#ifdef TIOCNOTTY
if ((tty_fd =3D open("/dev/tty", O_RDWR)) >=3D 0) {
ioctl(tty_fd, TIOCNOTTY, (char*) 0);
@@ -528,13 +528,13 @@
=
chdir("/");
umask(0022);
- =
+
if (conf->system_instance) {
if (change_user() < 0)
goto finish;
} else if (create_runtime_dir() < 0)
goto finish;
- =
+
if (conf->use_pid_file) {
if (pa_pid_file_create() < 0) {
pa_log("pa_pid_file_create() failed.");
@@ -551,7 +551,7 @@
#ifdef HAVE_SYS_RESOURCE_H
set_all_rlimits(conf);
#endif
- =
+
#ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN);
#endif
@@ -580,7 +580,7 @@
#ifdef SIGHUP
pa_signal_new(SIGHUP, signal_callback, c);
#endif
- =
+
#ifdef OS_IS_WIN32
timer =3D pa_mainloop_get_api(mainloop)->time_new(
pa_mainloop_get_api(mainloop), pa_gettimeofday(&tv), message_cb, N=
ULL);
@@ -596,7 +596,7 @@
r =3D pa_cpu_limit_init(pa_mainloop_get_api(mainloop));
assert(r =3D=3D 0);
}
- =
+
buf =3D pa_strbuf_new();
if (conf->default_script_file)
r =3D pa_cli_command_execute_file(c, conf->default_script_file, bu=
f, &conf->fail);
@@ -605,7 +605,7 @@
r =3D pa_cli_command_execute(c, conf->script_commands, buf, &conf-=
>fail);
pa_log_error("%s", s =3D pa_strbuf_tostring_free(buf));
pa_xfree(s);
- =
+
if (r < 0 && conf->fail) {
pa_log("failed to initialize daemon.");
#ifdef HAVE_FORK
@@ -652,11 +652,11 @@
=
if (!conf->no_cpu_limit)
pa_cpu_limit_done();
- =
+
pa_signal_done();
- =
+
pa_log_info("Daemon terminated.");
- =
+
finish:
=
if (mainloop)
@@ -667,7 +667,7 @@
=
if (valid_pid_file)
pa_pid_file_remove();
- =
+
close_pipe(daemon_pipe);
=
#ifdef OS_IS_WIN32
@@ -675,6 +675,6 @@
#endif
=
lt_dlexit();
- =
+
return retval;
}
Modified: trunk/src/modules/alsa-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/alsa-util.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/alsa-util.c (original)
+++ trunk/src/modules/alsa-util.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -270,7 +270,7 @@
};
=
int i, ret;
- =
+
assert(pcm_handle);
assert(f);
=
@@ -290,12 +290,12 @@
=
if ((ret =3D snd_pcm_hw_params_set_format(pcm_handle, hwparams, format=
_trans[*f])) >=3D 0)
return ret;
- =
+
try_auto:
=
for (i =3D 0; try_order[i] !=3D PA_SAMPLE_INVALID; i++) {
*f =3D try_order[i];
- =
+
if ((ret =3D snd_pcm_hw_params_set_format(pcm_handle, hwparams, fo=
rmat_trans[*f])) >=3D 0)
return ret;
}
@@ -312,14 +312,14 @@
unsigned int c =3D ss->channels;
pa_sample_format_t f =3D ss->format;
snd_pcm_hw_params_t *hwparams;
- =
+
assert(pcm_handle);
assert(ss);
assert(periods);
assert(period_size);
=
buffer_size =3D *periods * *period_size;
- =
+
if ((ret =3D snd_pcm_hw_params_malloc(&hwparams)) < 0 ||
(ret =3D snd_pcm_hw_params_any(pcm_handle, hwparams)) < 0 ||
(ret =3D snd_pcm_hw_params_set_rate_resample(pcm_handle, hwparams,=
0)) < 0 ||
@@ -359,25 +359,25 @@
pa_log_warn("device doesn't support sample format %s, changed to %=
s.", pa_sample_format_to_string(ss->format), pa_sample_format_to_string(f));
ss->format =3D f;
}
- =
+
if ((ret =3D snd_pcm_prepare(pcm_handle)) < 0)
goto finish;
=
if ((ret =3D snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size)=
) < 0 ||
(ret =3D snd_pcm_hw_params_get_period_size(hwparams, period_size, =
NULL)) < 0)
goto finish;
- =
+
assert(buffer_size > 0);
assert(*period_size > 0);
*periods =3D buffer_size / *period_size;
assert(*periods > 0);
- =
+
ret =3D 0;
- =
+
finish:
if (hwparams)
snd_pcm_hw_params_free(hwparams);
- =
+
return ret;
}
=
@@ -419,7 +419,7 @@
=
if (fallback) {
snd_mixer_selem_id_set_name(sid, fallback);
- =
+
if (!(elem =3D snd_mixer_find_selem(mixer, sid)))
pa_log_warn("Cannot find fallback mixer control \"%s\".", =
snd_mixer_selem_id_get_name(sid));
}
Modified: trunk/src/modules/alsa-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/alsa-util.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/alsa-util.h (original)
+++ trunk/src/modules/alsa-util.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/modules/dbus-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/dbus-util.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/dbus-util.c (original)
+++ trunk/src/modules/dbus-util.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/modules/dbus-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/dbus-util.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/dbus-util.h (original)
+++ trunk/src/modules/dbus-util.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/modules/module-alsa-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-s=
ink.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-alsa-sink.c (original)
+++ trunk/src/modules/module-alsa-sink.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -95,13 +95,13 @@
=
static void clear_up(struct userdata *u) {
assert(u);
- =
+
if (u->sink) {
pa_sink_disconnect(u->sink);
pa_sink_unref(u->sink);
u->sink =3D NULL;
}
- =
+
if (u->pcm_fdl)
pa_alsa_fdlist_free(u->pcm_fdl);
if (u->mixer_fdl)
@@ -113,7 +113,7 @@
snd_mixer_close(u->mixer_handle);
u->mixer_handle =3D NULL;
}
- =
+
if (u->pcm_handle) {
snd_pcm_drop(u->pcm_handle);
snd_pcm_close(u->pcm_handle);
@@ -126,7 +126,7 @@
assert(u);
=
pa_log_info("*** ALSA-XRUN (playback) ***");
- =
+
if ((ret =3D snd_pcm_prepare(u->pcm_handle)) < 0) {
pa_log("snd_pcm_prepare() failed: %s", snd_strerror(-ret));
=
@@ -142,11 +142,11 @@
assert(u);
=
update_usage(u);
- =
+
for (;;) {
pa_memchunk *memchunk =3D NULL;
snd_pcm_sframes_t frames;
- =
+
if (u->memchunk.memblock)
memchunk =3D &u->memchunk;
else {
@@ -155,7 +155,7 @@
else
memchunk =3D &u->memchunk;
}
- =
+
assert(memchunk->memblock && memchunk->memblock->data && memchunk-=
>length && memchunk->memblock->length && (memchunk->length % u->frame_size)=
=3D=3D 0);
=
if ((frames =3D snd_pcm_writei(u->pcm_handle, (uint8_t*) memchunk-=
>memblock->data + memchunk->index, memchunk->length / u->frame_size)) < 0) {
@@ -165,7 +165,7 @@
if (frames =3D=3D -EPIPE) {
if (xrun_recovery(u) < 0)
return;
- =
+
continue;
}
=
@@ -187,7 +187,7 @@
memchunk->index =3D memchunk->length =3D 0;
}
}
- =
+
break;
}
}
@@ -229,7 +229,7 @@
struct userdata *u =3D s->userdata;
snd_pcm_sframes_t frames;
int err;
- =
+
assert(s && u && u->sink);
=
if ((err =3D snd_pcm_delay(u->pcm_handle, &frames)) < 0) {
@@ -292,14 +292,14 @@
=
for (i =3D 0; i < s->hw_volume.channels; i++) {
long alsa_vol;
- =
+
assert(snd_mixer_selem_has_playback_channel(u->mixer_elem, i));
=
vol =3D s->hw_volume.values[i];
=
if (vol > PA_VOLUME_NORM)
vol =3D PA_VOLUME_NORM;
- =
+
alsa_vol =3D (long) roundf(((float) vol * (u->hw_volume_max - u->h=
w_volume_min)) / PA_VOLUME_NORM) + u->hw_volume_min;
=
if ((err =3D snd_mixer_selem_set_playback_volume(u->mixer_elem, i,=
alsa_vol)) < 0)
@@ -367,7 +367,7 @@
const char *name;
char *name_buf =3D NULL;
int namereg_fail;
- =
+
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
pa_log("failed to parse module arguments");
goto fail;
@@ -380,7 +380,7 @@
}
=
frame_size =3D pa_frame_size(&ss);
- =
+
/* Fix latency to 100ms */
periods =3D 8;
fragsize =3D pa_bytes_per_second(&ss)/128;
@@ -390,11 +390,11 @@
goto fail;
}
period_size =3D fragsize/frame_size;
- =
+
u =3D pa_xnew0(struct userdata, 1);
m->userdata =3D u;
u->module =3D m;
- =
+
snd_config_update_free_global();
if ((err =3D snd_pcm_open(&u->pcm_handle, dev =3D pa_modargs_get_value=
(ma, "device", DEFAULT_DEVICE), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK))=
< 0) {
pa_log("Error opening PCM device %s: %s", dev, snd_strerror(err));
@@ -415,7 +415,7 @@
if (ss.channels !=3D map.channels)
/* Seems ALSA didn't like the channel number, so let's fix the cha=
nnel map */
pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA);
- =
+
if ((err =3D snd_mixer_open(&u->mixer_handle, 0)) < 0) {
pa_log("Error opening mixer: %s", snd_strerror(err));
goto fail;
@@ -486,7 +486,7 @@
snd_mixer_elem_set_callback_private(u->mixer_elem, u);
} else
u->mixer_fdl =3D NULL;
- =
+
u->frame_size =3D frame_size;
u->fragment_size =3D period_size * frame_size;
=
@@ -499,7 +499,7 @@
=
u->memchunk.memblock =3D NULL;
u->memchunk.index =3D u->memchunk.length =3D 0;
- =
+
ret =3D 0;
=
/* Get initial mixer settings */
@@ -507,21 +507,21 @@
u->sink->get_hw_volume(u->sink);
if (u->sink->get_hw_mute)
u->sink->get_hw_mute(u->sink);
- =
+
finish:
=
pa_xfree(name_buf);
- =
+
if (ma)
pa_modargs_free(ma);
=
if (pcm_info)
snd_pcm_info_free(pcm_info);
- =
+
return ret;
=
fail:
- =
+
if (u)
pa__done(c, m);
=
@@ -541,7 +541,7 @@
pa_memblock_unref(u->memchunk.memblock);
if (u->silence.memblock)
pa_memblock_unref(u->silence.memblock);
- =
+
pa_xfree(u);
}
=
Modified: trunk/src/modules/module-alsa-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-s=
ource.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-alsa-source.c (original)
+++ trunk/src/modules/module-alsa-source.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -96,13 +96,13 @@
=
static void clear_up(struct userdata *u) {
assert(u);
- =
+
if (u->source) {
pa_source_disconnect(u->source);
pa_source_unref(u->source);
u->source =3D NULL;
}
- =
+
if (u->pcm_fdl)
pa_alsa_fdlist_free(u->pcm_fdl);
if (u->mixer_fdl)
@@ -114,7 +114,7 @@
snd_mixer_close(u->mixer_handle);
u->mixer_handle =3D NULL;
}
- =
+
if (u->pcm_handle) {
snd_pcm_drop(u->pcm_handle);
snd_pcm_close(u->pcm_handle);
@@ -127,7 +127,7 @@
assert(u);
=
pa_log_info("*** ALSA-XRUN (capture) ***");
- =
+
if ((ret =3D snd_pcm_prepare(u->pcm_handle)) < 0) {
pa_log("snd_pcm_prepare() failed: %s", snd_strerror(-ret));
=
@@ -144,17 +144,17 @@
assert(u);
=
update_usage(u);
- =
+
for (;;) {
pa_memchunk post_memchunk;
snd_pcm_sframes_t frames;
size_t l;
- =
+
if (!u->memchunk.memblock) {
u->memchunk.memblock =3D pa_memblock_new(u->source->core->memp=
ool, u->memchunk.length =3D u->fragment_size);
u->memchunk.index =3D 0;
}
- =
+
assert(u->memchunk.memblock);
assert(u->memchunk.length);
assert(u->memchunk.memblock->data);
@@ -164,11 +164,11 @@
if ((frames =3D snd_pcm_readi(u->pcm_handle, (uint8_t*) u->memchun=
k.memblock->data + u->memchunk.index, u->memchunk.length / u->frame_size)) =
< 0) {
if (frames =3D=3D -EAGAIN)
return;
- =
+
if (frames =3D=3D -EPIPE) {
if (xrun_recovery(u) < 0)
return;
- =
+
continue;
}
=
@@ -180,7 +180,7 @@
}
=
l =3D frames * u->frame_size;
- =
+
post_memchunk =3D u->memchunk;
post_memchunk.length =3D l;
=
@@ -188,13 +188,13 @@
=
u->memchunk.index +=3D l;
u->memchunk.length -=3D l;
- =
+
if (u->memchunk.length =3D=3D 0) {
pa_memblock_unref(u->memchunk.memblock);
u->memchunk.memblock =3D NULL;
u->memchunk.index =3D u->memchunk.length =3D 0;
}
- =
+
break;
}
}
@@ -223,7 +223,7 @@
u->source->get_hw_volume(u->source);
if (u->source->get_hw_mute)
u->source->get_hw_mute(u->source);
- =
+
pa_subscription_post(u->source->core,
PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE,
u->source->index);
@@ -256,14 +256,14 @@
=
for (i =3D 0;i < s->hw_volume.channels;i++) {
long set_vol;
- =
+
assert(snd_mixer_selem_has_capture_channel(u->mixer_elem, i));
- =
+
if ((err =3D snd_mixer_selem_get_capture_volume(u->mixer_elem, i, =
&vol)) < 0)
goto fail;
=
set_vol =3D (long) roundf(((float) s->hw_volume.values[i] * (u->hw=
_volume_max - u->hw_volume_min)) / PA_VOLUME_NORM) + u->hw_volume_min;
- =
+
/* Try to avoid superfluous volume changes */
if (set_vol !=3D vol)
s->hw_volume.values[i] =3D (pa_volume_t) roundf(((float) (vol =
- u->hw_volume_min) * PA_VOLUME_NORM) / (u->hw_volume_max - u->hw_volume_mi=
n));
@@ -361,7 +361,7 @@
const char *name;
char *name_buf =3D NULL;
int namereg_fail;
- =
+
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
pa_log("failed to parse module arguments");
goto fail;
@@ -378,17 +378,17 @@
/* Fix latency to 100ms */
periods =3D 12;
fragsize =3D pa_bytes_per_second(&ss)/128;
- =
+
if (pa_modargs_get_value_u32(ma, "fragments", &periods) < 0 || pa_moda=
rgs_get_value_u32(ma, "fragment_size", &fragsize) < 0) {
pa_log("failed to parse buffer metrics");
goto fail;
}
period_size =3D fragsize/frame_size;
- =
+
u =3D pa_xnew0(struct userdata, 1);
m->userdata =3D u;
u->module =3D m;
- =
+
snd_config_update_free_global();
if ((err =3D snd_pcm_open(&u->pcm_handle, dev =3D pa_modargs_get_value=
(ma, "device", DEFAULT_DEVICE), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK)) =
< 0) {
pa_log("Error opening PCM device %s: %s", dev, snd_strerror(err));
@@ -427,7 +427,7 @@
name =3D name_buf =3D pa_sprintf_malloc("alsa_input.%s", dev);
namereg_fail =3D 0;
}
- =
+
if (!(u->source =3D pa_source_new(c, __FILE__, name, namereg_fail, &ss=
, &map))) {
pa_log("Failed to create source object");
goto fail;
@@ -490,7 +490,7 @@
u->memchunk.index =3D u->memchunk.length =3D 0;
=
snd_pcm_start(u->pcm_handle);
- =
+
ret =3D 0;
=
/* Get initial mixer settings */
@@ -507,11 +507,11 @@
=
if (pcm_info)
snd_pcm_info_free(pcm_info);
- =
+
return ret;
=
fail:
- =
+
if (u)
pa__done(c, m);
=
@@ -526,10 +526,10 @@
return;
=
clear_up(u);
- =
+
if (u->memchunk.memblock)
pa_memblock_unref(u->memchunk.memblock);
- =
+
pa_xfree(u);
}
=
Modified: trunk/src/modules/module-cli.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-cli.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-cli.c (original)
+++ trunk/src/modules/module-cli.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -48,7 +48,7 @@
=
static void eof_and_unload_cb(pa_cli*c, void *userdata) {
pa_module *m =3D userdata;
- =
+
assert(c);
assert(m);
=
@@ -68,7 +68,7 @@
pa_iochannel *io;
pa_modargs *ma;
int exit_on_eof =3D 0;
- =
+
assert(c);
assert(m);
=
@@ -81,7 +81,7 @@
pa_log("failed to parse module arguments.");
goto fail;
}
- =
+
if (pa_modargs_get_value_boolean(ma, "exit_on_eof", &exit_on_eof) < 0)=
{
pa_log("exit_on_eof=3D expects boolean argument.");
goto fail;
@@ -102,7 +102,7 @@
pa_cli_set_eof_callback(m->userdata, exit_on_eof ? eof_and_exit_cb : e=
of_and_unload_cb, m);
=
pa_modargs_free(ma);
- =
+
return 0;
=
fail:
Modified: trunk/src/modules/module-combine.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-combin=
e.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-combine.c (original)
+++ trunk/src/modules/module-combine.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -91,7 +91,7 @@
struct output *master;
pa_time_event *time_event;
uint32_t adjust_time;
- =
+
PA_LLIST_HEAD(struct output, outputs);
};
=
@@ -110,9 +110,9 @@
=
for (o =3D u->outputs; o; o =3D o->next) {
uint32_t sink_latency =3D o->sink_input->sink ? pa_sink_get_latenc=
y(o->sink_input->sink) : 0;
- =
+
o->total_latency =3D sink_latency + pa_sink_input_get_latency(o->s=
ink_input);
- =
+
if (sink_latency > max_sink_latency)
max_sink_latency =3D sink_latency;
=
@@ -123,14 +123,14 @@
assert(min_total_latency !=3D (pa_usec_t) -1);
=
target_latency =3D max_sink_latency > min_total_latency ? max_sink_lat=
ency : min_total_latency;
- =
+
pa_log_info("[%s] target latency is %0.0f usec.", u->sink->name, (floa=
t) target_latency);
=
base_rate =3D u->sink->sample_spec.rate;
=
for (o =3D u->outputs; o; o =3D o->next) {
- uint32_t r =3D base_rate; =
- =
+ uint32_t r =3D base_rate;
+
if (o->total_latency < target_latency)
r -=3D (uint32_t) (((((double) target_latency - o->total_laten=
cy))/u->adjust_time)*r/ 1000000);
else if (o->total_latency > target_latency)
@@ -151,7 +151,7 @@
assert(u && u->sink);
=
update_usage(u);
- =
+
if (pa_sink_render(u->sink, RENDER_SIZE, &chunk) < 0)
return;
=
@@ -179,10 +179,10 @@
=
if (pa_memblockq_peek(o->memblockq, chunk) >=3D 0)
return 0;
- =
+
/* Try harder */
request_memblock(o->userdata);
- =
+
return pa_memblockq_peek(o->memblockq, chunk);
}
=
@@ -204,7 +204,7 @@
static pa_usec_t sink_input_get_latency_cb(pa_sink_input *i) {
struct output *o =3D i->userdata;
assert(i && o && o->sink_input);
- =
+
return pa_bytes_to_usec(pa_memblockq_get_length(o->memblockq), &i->sam=
ple_spec);
}
=
@@ -220,11 +220,11 @@
static void sink_notify(pa_sink *s) {
struct userdata *u;
struct output *o;
- =
+
assert(s);
u =3D s->userdata;
assert(u);
- =
+
for (o =3D u->outputs; o; o =3D o->next)
pa_sink_notify(o->sink_input->sink);
}
@@ -233,12 +233,12 @@
struct output *o =3D NULL;
char t[256];
pa_sink_input_new_data data;
- =
+
assert(u && sink && u->sink);
- =
+
o =3D pa_xmalloc(sizeof(struct output));
o->userdata =3D u;
- =
+
o->counter =3D 0;
o->memblockq =3D pa_memblockq_new(
0,
@@ -258,7 +258,7 @@
pa_sink_input_new_data_set_sample_spec(&data, &u->sink->sample_spec);
pa_sink_input_new_data_set_channel_map(&data, &u->sink->channel_map);
data.module =3D u->module;
- =
+
if (!(o->sink_input =3D pa_sink_input_new(u->core, &data, PA_SINK_INPU=
T_VARIABLE_RATE)))
goto fail;
=
@@ -267,7 +267,7 @@
o->sink_input->drop =3D sink_input_drop_cb;
o->sink_input->kill =3D sink_input_kill_cb;
o->sink_input->userdata =3D o;
- =
+
PA_LLIST_PREPEND(struct output, u->outputs, o);
u->n_outputs++;
return o;
@@ -282,7 +282,7 @@
=
if (o->memblockq)
pa_memblockq_free(o->memblockq);
- =
+
pa_xfree(o);
}
=
@@ -302,17 +302,17 @@
static void clear_up(struct userdata *u) {
struct output *o;
assert(u);
- =
+
if (u->time_event) {
u->core->mainloop->time_free(u->time_event);
u->time_event =3D NULL;
}
- =
+
while ((o =3D u->outputs))
output_free(o);
=
u->master =3D NULL;
- =
+
if (u->sink) {
pa_sink_disconnect(u->sink);
pa_sink_unref(u->sink);
@@ -331,7 +331,7 @@
int resample_method =3D -1;
pa_sample_spec ss;
pa_channel_map map;
- =
+
assert(c && m);
=
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
@@ -345,7 +345,7 @@
goto fail;
}
}
- =
+
u =3D pa_xnew(struct userdata, 1);
m->userdata =3D u;
u->sink =3D NULL;
@@ -361,7 +361,7 @@
pa_log("failed to parse adjust_time value");
goto fail;
}
- =
+
if (!(master_name =3D pa_modargs_get_value(ma, "master", NULL)) || !(s=
laves =3D pa_modargs_get_value(ma, "slaves", NULL))) {
pa_log("no master or slave sinks specified");
goto fail;
@@ -392,7 +392,7 @@
pa_log("channel map and sample specification don't match.");
goto fail;
}
- =
+
if (!(u->sink =3D pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "s=
ink_name", DEFAULT_SINK_NAME), 0, &ss, &map))) {
pa_log("failed to create sink");
goto fail;
@@ -403,16 +403,16 @@
u->sink->get_latency =3D sink_get_latency_cb;
u->sink->notify =3D sink_notify;
u->sink->userdata =3D u;
- =
+
if (!(u->master =3D output_new(u, master_sink, resample_method))) {
pa_log("failed to create master sink input on sink '%s'.", u->sink=
->name);
goto fail;
}
- =
+
split_state =3D NULL;
while ((n =3D pa_split(slaves, ",", &split_state))) {
pa_sink *slave_sink;
- =
+
if (!(slave_sink =3D pa_namereg_get(c, n, PA_NAMEREG_SINK, 1))) {
pa_log("invalid slave sink '%s'", n);
goto fail;
@@ -425,7 +425,7 @@
goto fail;
}
}
- =
+
if (u->n_outputs <=3D 1)
pa_log_warn("WARNING: no slave sinks specified.");
=
@@ -434,13 +434,13 @@
tv.tv_sec +=3D u->adjust_time;
u->time_event =3D c->mainloop->time_new(c->mainloop, &tv, time_cal=
lback, u);
}
- =
+
pa_modargs_free(ma);
- return 0; =
+ return 0;
=
fail:
pa_xfree(n);
- =
+
if (ma)
pa_modargs_free(ma);
=
Modified: trunk/src/modules/module-detect.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-detect=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-detect.c (original)
+++ trunk/src/modules/module-detect.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -58,7 +58,7 @@
=
if (errno !=3D ENOENT)
pa_log_error("open(\"/proc/asound/devices\") failed: %s", pa_c=
strerror(errno));
- =
+
return -1;
}
=
@@ -66,7 +66,7 @@
char line[64], args[64];
unsigned device, subdevice;
int is_sink;
- =
+
if (!fgets(line, sizeof(line), f))
break;
=
@@ -81,7 +81,7 @@
=
if (just_one && is_sink && n_sink >=3D 1)
continue;
- =
+
if (just_one && !is_sink && n_source >=3D 1)
continue;
=
@@ -105,7 +105,7 @@
}
=
fclose(f);
- =
+
return n;
}
#endif
@@ -114,7 +114,7 @@
static int detect_oss(pa_core *c, int just_one) {
FILE *f;
int n =3D 0, b =3D 0;
- =
+
if (!(f =3D fopen("/dev/sndstat", "r")) &&
!(f =3D fopen("/proc/sndstat", "r")) &&
!(f =3D fopen("/proc/asound/oss/sndstat", "r"))) {
@@ -128,7 +128,7 @@
while (!feof(f)) {
char line[64], args[64];
unsigned device;
- =
+
if (!fgets(line, sizeof(line), f))
break;
=
@@ -141,20 +141,20 @@
=
if (line[0] =3D=3D 0)
break;
- =
+
if (sscanf(line, "%u: ", &device) =3D=3D 1) {
if (device =3D=3D 0)
snprintf(args, sizeof(args), "device=3D/dev/dsp");
else
snprintf(args, sizeof(args), "device=3D/dev/dsp%u", device=
);
- =
+
if (!pa_module_load(c, "module-oss", args))
continue;
- =
+
} else if (sscanf(line, "pcm%u: ", &device) =3D=3D 1) {
/* FreeBSD support, the devices are named /dev/dsp0.0, dsp0.1 =
and so on */
snprintf(args, sizeof(args), "device=3D/dev/dsp%u.0", device);
- =
+
if (!pa_module_load(c, "module-oss", args))
continue;
}
@@ -219,7 +219,7 @@
"just-one",
NULL
};
- =
+
assert(c);
assert(m);
=
@@ -227,14 +227,14 @@
pa_log("Failed to parse module arguments");
goto fail;
}
- =
+
if (pa_modargs_get_value_boolean(ma, "just-one", &just_one) < 0) {
pa_log("just_one=3D expects a boolean argument.");
goto fail;
}
=
#if HAVE_ALSA
- if ((n =3D detect_alsa(c, just_one)) <=3D 0) =
+ if ((n =3D detect_alsa(c, just_one)) <=3D 0)
#endif
#if HAVE_OSS
if ((n =3D detect_oss(c, just_one)) <=3D 0)
@@ -251,7 +251,7 @@
}
=
pa_log_info("loaded %i modules.", n);
- =
+
/* We were successful and can unload ourselves now. */
pa_module_unload_request(m);
=
@@ -262,7 +262,7 @@
fail:
if (ma)
pa_modargs_free(ma);
- =
+
return -1;
}
=
Modified: trunk/src/modules/module-esound-compat-spawnfd.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-esound=
-compat-spawnfd.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Dd=
iff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-esound-compat-spawnfd.c (original)
+++ trunk/src/modules/module-esound-compat-spawnfd.c Thu Jan 4 14:43:45 20=
07
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/modules/module-esound-compat-spawnpid.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-esound=
-compat-spawnpid.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3D=
diff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-esound-compat-spawnpid.c (original)
+++ trunk/src/modules/module-esound-compat-spawnpid.c Thu Jan 4 14:43:45 2=
007
@@ -1,17 +1,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/modules/module-esound-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-esound=
-sink.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-esound-sink.c (original)
+++ trunk/src/modules/module-esound-sink.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -69,7 +69,7 @@
=
void *write_data;
size_t write_length, write_index;
- =
+
void *read_data;
size_t read_length, read_index;
=
@@ -135,7 +135,7 @@
=
u->write_index +=3D r;
assert(u->write_index <=3D u->write_length);
- =
+
if (u->write_index =3D=3D u->write_length) {
free(u->write_data);
u->write_data =3D NULL;
@@ -143,13 +143,13 @@
}
} else if (u->state =3D=3D STATE_RUNNING) {
pa_module_set_used(u->module, pa_sink_used_by(u->sink));
- =
+
if (!u->memchunk.length)
if (pa_sink_render(u->sink, 8192, &u->memchunk) < 0)
return 0;
=
assert(u->memchunk.memblock && u->memchunk.length);
- =
+
if ((r =3D pa_iochannel_write(u->io, (uint8_t*) u->memchunk.memblo=
ck->data + u->memchunk.index, u->memchunk.length)) < 0) {
pa_log("write() failed: %s", pa_cstrerror(errno));
return -1;
@@ -157,13 +157,13 @@
=
u->memchunk.index +=3D r;
u->memchunk.length -=3D r;
- =
+
if (u->memchunk.length <=3D 0) {
pa_memblock_unref(u->memchunk.memblock);
u->memchunk.memblock =3D NULL;
}
}
- =
+
return 0;
}
=
@@ -191,7 +191,7 @@
assert(u->read_length >=3D sizeof(int32_t));
u->read_index =3D 0;
u->read_length =3D sizeof(int32_t);
- =
+
break;
=
case STATE_LATENCY: {
@@ -220,10 +220,10 @@
pa_xfree(u->read_data);
u->read_data =3D NULL;
u->read_index =3D u->read_length =3D 0;
- =
+
break;
}
- =
+
default:
abort();
}
@@ -233,18 +233,18 @@
=
static int do_read(struct userdata *u) {
assert(u);
- =
+
if (!pa_iochannel_is_readable(u->io))
return 0;
- =
+
if (u->state =3D=3D STATE_AUTH || u->state =3D=3D STATE_LATENCY) {
ssize_t r;
- =
+
if (!u->read_data)
return 0;
- =
+
assert(u->read_index < u->read_length);
- =
+
if ((r =3D pa_iochannel_read(u->io, (uint8_t*) u->read_data + u->r=
ead_index, u->read_length - u->read_index)) <=3D 0) {
pa_log("read() failed: %s", r < 0 ? pa_cstrerror(errno) : "EOF=
");
cancel(u);
@@ -265,7 +265,7 @@
assert(u);
=
u->core->mainloop->defer_enable(u->defer_event, 0);
- =
+
if (do_read(u) < 0 || do_write(u) < 0)
cancel(u);
}
@@ -304,13 +304,13 @@
=
pa_socket_client_unref(u->client);
u->client =3D NULL;
- =
+
if (!io) {
pa_log("connection failed: %s", pa_cstrerror(errno));
cancel(u);
return;
}
- =
+
u->io =3D io;
pa_iochannel_set_callback(u->io, io_callback, u);
}
@@ -321,9 +321,9 @@
pa_sample_spec ss;
pa_modargs *ma =3D NULL;
char *t;
- =
+
assert(c && m);
- =
+
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
pa_log("failed to parse module arguments");
goto fail;
@@ -340,7 +340,7 @@
pa_log("esound sample type support is limited to mono/stereo and U=
8 or S16NE sample data");
goto fail;
}
- =
+
u =3D pa_xmalloc0(sizeof(struct userdata));
u->core =3D c;
u->module =3D m;
@@ -378,7 +378,7 @@
=
/* Reserve space for the response */
u->read_data =3D pa_xmalloc(u->read_length =3D sizeof(int32_t));
- =
+
u->sink->notify =3D notify_cb;
u->sink->get_latency =3D get_latency_cb;
u->sink->userdata =3D u;
@@ -392,15 +392,15 @@
u->defer_event =3D c->mainloop->defer_new(c->mainloop, defer_callback,=
u);
c->mainloop->defer_enable(u->defer_event, 0);
=
- =
+
pa_modargs_free(ma);
- =
+
return 0;
=
fail:
if (ma)
pa_modargs_free(ma);
- =
+
pa__done(c, m);
=
return -1;
@@ -415,13 +415,13 @@
=
u->module =3D NULL;
cancel(u);
- =
+
if (u->memchunk.memblock)
pa_memblock_unref(u->memchunk.memblock);
=
if (u->client)
pa_socket_client_unref(u->client);
- =
+
pa_xfree(u->read_data);
pa_xfree(u->write_data);
=
Modified: trunk/src/modules/module-hal-detect.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-hal-de=
tect.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-hal-detect.c (original)
+++ trunk/src/modules/module-hal-detect.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -58,7 +58,7 @@
#endif
#ifdef HAVE_OSS
CAP_OSS,
-#endif =
+#endif
CAP_MAX
} capability_t;
=
@@ -181,7 +181,7 @@
module_name =3D "module-alsa-source";
snprintf(args, sizeof(args), "device=3Dhw:%u source_name=3Dalsa_in=
put.%s", card, strip_udi(udi));
}
- =
+
return pa_module_load(u->core, module_name, args);
}
=
@@ -198,7 +198,7 @@
type =3D libhal_device_get_property_string(ctx, udi, "oss.type", error=
);
if (!type || dbus_error_is_set(error))
return FALSE;
- =
+
if (!strcmp(type, "pcm")) {
char *e;
=
Modified: trunk/src/modules/module-jack-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-jack-s=
ink.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-jack-sink.c (original)
+++ trunk/src/modules/module-jack-sink.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -75,7 +75,7 @@
=
pthread_mutex_t mutex;
pthread_cond_t cond;
- =
+
void * buffer[PA_CHANNELS_MAX];
jack_nframes_t frames_requested;
int quit_requested;
@@ -100,7 +100,7 @@
=
static void stop_sink(struct userdata *u) {
assert (u);
- =
+
jack_client_close(u->client);
u->client =3D NULL;
u->core->mainloop->io_free(u->io_event);
@@ -114,7 +114,7 @@
static void io_event_cb(pa_mainloop_api *m, pa_io_event *e, int fd, pa_io_=
event_flags_t flags, void *userdata) {
struct userdata *u =3D userdata;
char x;
- =
+
assert(m);
assert(e);
assert(flags =3D=3D PA_IO_EVENT_INPUT);
@@ -122,39 +122,39 @@
assert(u->pipe_fds[0] =3D=3D fd);
=
pa_read(fd, &x, 1, &u->pipe_fd_type);
- =
+
if (u->quit_requested) {
stop_sink(u);
u->quit_requested =3D 0;
return;
}
- =
+
pthread_mutex_lock(&u->mutex);
=
if (u->frames_requested > 0) {
unsigned fs;
jack_nframes_t frame_idx;
pa_memchunk chunk;
- =
+
fs =3D pa_frame_size(&u->sink->sample_spec);
=
pa_sink_render_full(u->sink, u->frames_requested * fs, &chunk);
=
for (frame_idx =3D 0; frame_idx < u->frames_requested; frame_idx +=
+) {
unsigned c;
- =
+
for (c =3D 0; c < u->channels; c++) {
float *s =3D ((float*) ((uint8_t*) chunk.memblock->data + =
chunk.index)) + (frame_idx * u->channels) + c;
float *d =3D ((float*) u->buffer[c]) + frame_idx;
- =
+
*d =3D *s;
}
}
- =
+
pa_memblock_unref(chunk.memblock);
=
u->frames_requested =3D 0;
- =
+
pthread_cond_signal(&u->cond);
}
=
@@ -183,36 +183,36 @@
=
if (jack_transport_query(u->client, NULL) =3D=3D JackTransportRolling)=
{
unsigned c;
- =
+
pthread_mutex_lock(&u->mutex);
- =
+
u->frames_requested =3D nframes;
- =
+
for (c =3D 0; c < u->channels; c++) {
u->buffer[c] =3D jack_port_get_buffer(u->port[c], nframes);
assert(u->buffer[c]);
}
- =
+
request_render(u);
- =
+
pthread_cond_wait(&u->cond, &u->mutex);
=
u->frames_in_buffer =3D nframes;
u->timestamp =3D jack_get_current_transport_frame(u->client);
- =
+
pthread_mutex_unlock(&u->mutex);
}
- =
+
return 0;
}
=
static pa_usec_t sink_get_latency_cb(pa_sink *s) {
struct userdata *u;
jack_nframes_t n, l, d;
- =
+
assert(s);
u =3D s->userdata;
- =
+
if (jack_transport_query(u->client, NULL) !=3D JackTransportRolling)
return 0;
=
@@ -226,7 +226,7 @@
=
if (d >=3D l)
return 0;
- =
+
return pa_bytes_to_usec((l - d) * pa_frame_size(&s->sample_spec), &s->=
sample_spec);
}
=
@@ -246,12 +246,12 @@
unsigned i;
const char **ports =3D NULL, **p;
char *t;
- =
+
assert(c);
assert(m);
=
jack_set_error_function(jack_error_func);
- =
+
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
pa_log("failed to parse module arguments.");
goto fail;
@@ -261,7 +261,7 @@
pa_log("failed to parse connect=3D argument.");
goto fail;
}
- =
+
server_name =3D pa_modargs_get_value(ma, "server_name", NULL);
client_name =3D pa_modargs_get_value(ma, "client_name", "PulseAudio");
=
@@ -274,28 +274,28 @@
=
pthread_mutex_init(&u->mutex, NULL);
pthread_cond_init(&u->cond, NULL);
- =
+
if (pipe(u->pipe_fds) < 0) {
pa_log("pipe() failed: %s", pa_cstrerror(errno));
goto fail;
}
=
pa_make_nonblock_fd(u->pipe_fds[1]);
- =
+
if (!(u->client =3D jack_client_open(client_name, server_name ? JackSe=
rverName : JackNullOption, &status, server_name))) {
pa_log("jack_client_open() failed.");
goto fail;
}
=
ports =3D jack_get_ports(u->client, NULL, NULL, JackPortIsPhysical|Jac=
kPortIsInput);
- =
+
channels =3D 0;
for (p =3D ports; *p; p++)
channels++;
=
if (!channels)
channels =3D c->default_sample_spec.channels;
- =
+
if (pa_modargs_get_value_u32(ma, "channels", &channels) < 0 || channel=
s <=3D 0 || channels >=3D PA_CHANNELS_MAX) {
pa_log("failed to parse channels=3D argument.");
goto fail;
@@ -306,7 +306,7 @@
pa_log("failed to parse channel_map=3D argument.");
goto fail;
}
- =
+
pa_log_info("Successfully connected as '%s'", jack_get_client_name(u->=
client));
=
ss.channels =3D u->channels =3D channels;
@@ -350,7 +350,7 @@
}
=
pa_log_info("connecting %s to %s", jack_port_name(u->port[i]),=
*p);
- =
+
if (jack_connect(u->client, jack_port_name(u->port[i]), *p)) {
pa_log("failed to connect %s to %s, leaving unconnected.",=
jack_port_name(u->port[i]), *p);
break;
@@ -360,10 +360,10 @@
}
=
u->io_event =3D c->mainloop->io_new(c->mainloop, u->pipe_fds[0], PA_IO=
_EVENT_INPUT, io_event_cb, u);
- =
+
free(ports);
pa_modargs_free(ma);
- =
+
return 0;
=
fail:
@@ -371,7 +371,7 @@
pa_modargs_free(ma);
=
free(ports);
- =
+
pa__done(c, m);
=
return -1;
Modified: trunk/src/modules/module-jack-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-jack-s=
ource.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-jack-source.c (original)
+++ trunk/src/modules/module-jack-source.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -75,7 +75,7 @@
=
pthread_mutex_t mutex;
pthread_cond_t cond;
- =
+
void * buffer[PA_CHANNELS_MAX];
jack_nframes_t frames_posted;
int quit_requested;
@@ -100,7 +100,7 @@
=
static void stop_source(struct userdata *u) {
assert (u);
- =
+
jack_client_close(u->client);
u->client =3D NULL;
u->core->mainloop->io_free(u->io_event);
@@ -114,39 +114,39 @@
static void io_event_cb(pa_mainloop_api *m, pa_io_event *e, int fd, pa_io_=
event_flags_t flags, void *userdata) {
struct userdata *u =3D userdata;
char x;
- =
+
assert(m);
assert(flags =3D=3D PA_IO_EVENT_INPUT);
assert(u);
assert(u->pipe_fds[0] =3D=3D fd);
=
pa_read(fd, &x, 1, &u->pipe_fd_type);
- =
+
if (u->quit_requested) {
stop_source(u);
u->quit_requested =3D 0;
return;
}
- =
+
pthread_mutex_lock(&u->mutex);
=
if (u->frames_posted > 0) {
unsigned fs;
jack_nframes_t frame_idx;
pa_memchunk chunk;
- =
+
fs =3D pa_frame_size(&u->source->sample_spec);
=
chunk.memblock =3D pa_memblock_new(u->core->mempool, chunk.length =
=3D u->frames_posted * fs);
chunk.index =3D 0;
- =
+
for (frame_idx =3D 0; frame_idx < u->frames_posted; frame_idx ++) {
unsigned c;
- =
+
for (c =3D 0; c < u->channels; c++) {
float *s =3D ((float*) u->buffer[c]) + frame_idx;
float *d =3D ((float*) ((uint8_t*) chunk.memblock->data + =
chunk.index)) + (frame_idx * u->channels) + c;
- =
+
*d =3D *s;
}
}
@@ -155,7 +155,7 @@
pa_memblock_unref(chunk.memblock);
=
u->frames_posted =3D 0;
- =
+
pthread_cond_signal(&u->cond);
}
=
@@ -184,36 +184,36 @@
=
if (jack_transport_query(u->client, NULL) =3D=3D JackTransportRolling)=
{
unsigned c;
- =
+
pthread_mutex_lock(&u->mutex);
- =
+
u->frames_posted =3D nframes;
- =
+
for (c =3D 0; c < u->channels; c++) {
u->buffer[c] =3D jack_port_get_buffer(u->port[c], nframes);
assert(u->buffer[c]);
}
- =
+
request_post(u);
- =
+
pthread_cond_wait(&u->cond, &u->mutex);
=
u->frames_in_buffer =3D nframes;
u->timestamp =3D jack_get_current_transport_frame(u->client);
- =
+
pthread_mutex_unlock(&u->mutex);
}
- =
+
return 0;
}
=
static pa_usec_t source_get_latency_cb(pa_source *s) {
struct userdata *u;
jack_nframes_t n, l, d;
- =
+
assert(s);
u =3D s->userdata;
- =
+
if (jack_transport_query(u->client, NULL) !=3D JackTransportRolling)
return 0;
=
@@ -224,7 +224,7 @@
=
d =3D n - u->timestamp;
l =3D jack_port_get_total_latency(u->client, u->port[0]);
- =
+
return pa_bytes_to_usec((l + d) * pa_frame_size(&s->sample_spec), &s->=
sample_spec);
}
=
@@ -244,12 +244,12 @@
unsigned i;
const char **ports =3D NULL, **p;
char *t;
- =
+
assert(c);
assert(m);
=
jack_set_error_function(jack_error_func);
- =
+
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
pa_log("failed to parse module arguments.");
goto fail;
@@ -259,7 +259,7 @@
pa_log("failed to parse connect=3D argument.");
goto fail;
}
- =
+
server_name =3D pa_modargs_get_value(ma, "server_name", NULL);
client_name =3D pa_modargs_get_value(ma, "client_name", "PulseAudio");
=
@@ -272,28 +272,28 @@
=
pthread_mutex_init(&u->mutex, NULL);
pthread_cond_init(&u->cond, NULL);
- =
+
if (pipe(u->pipe_fds) < 0) {
pa_log("pipe() failed: %s", pa_cstrerror(errno));
goto fail;
}
=
pa_make_nonblock_fd(u->pipe_fds[1]);
- =
+
if (!(u->client =3D jack_client_open(client_name, server_name ? JackSe=
rverName : JackNullOption, &status, server_name))) {
pa_log("jack_client_open() failed.");
goto fail;
}
=
ports =3D jack_get_ports(u->client, NULL, NULL, JackPortIsPhysical|Jac=
kPortIsOutput);
- =
+
channels =3D 0;
for (p =3D ports; *p; p++)
channels++;
=
if (!channels)
channels =3D c->default_sample_spec.channels;
- =
+
if (pa_modargs_get_value_u32(ma, "channels", &channels) < 0 || channel=
s <=3D 0 || channels >=3D PA_CHANNELS_MAX) {
pa_log("failed to parse channels=3D argument.");
goto fail;
@@ -304,7 +304,7 @@
pa_log("failed to parse channel_map=3D argument.");
goto fail;
}
- =
+
pa_log_info("Successfully connected as '%s'", jack_get_client_name(u->=
client));
=
ss.channels =3D u->channels =3D channels;
@@ -348,7 +348,7 @@
}
=
pa_log_info("connecting %s to %s", jack_port_name(u->port[i]),=
*p);
- =
+
if (jack_connect(u->client, *p, jack_port_name(u->port[i]))) {
pa_log("failed to connect %s to %s, leaving unconnected.",=
jack_port_name(u->port[i]), *p);
break;
@@ -358,10 +358,10 @@
}
=
u->io_event =3D c->mainloop->io_new(c->mainloop, u->pipe_fds[0], PA_IO=
_EVENT_INPUT, io_event_cb, u);
- =
+
free(ports);
pa_modargs_free(ma);
- =
+
return 0;
=
fail:
@@ -369,7 +369,7 @@
pa_modargs_free(ma);
=
free(ports);
- =
+
pa__done(c, m);
=
return -1;
Modified: trunk/src/modules/module-lirc.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-lirc.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-lirc.c (original)
+++ trunk/src/modules/module-lirc.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -73,20 +73,20 @@
pa_log("lost connection to LIRC daemon.");
goto fail;
}
- =
+
if (events & PA_IO_EVENT_INPUT) {
char *c;
- =
+
if (lirc_nextcode(&code) !=3D 0 || !code) {
pa_log("lirc_nextcode() failed.");
goto fail;
}
- =
+
c =3D pa_xstrdup(code);
c[strcspn(c, "\n\r")] =3D 0;
pa_log_debug("raw IR code '%s'", c);
pa_xfree(c);
- =
+
while (lirc_code2char(u->config, code, &name) =3D=3D 0 && name) {
enum {
INVALID,
@@ -96,9 +96,9 @@
RESET,
MUTE_TOGGLE
} volchange =3D INVALID;
- =
+
pa_log_info("translated IR code '%s'", name);
- =
+
if (strcasecmp(name, "volume-up") =3D=3D 0)
volchange =3D UP;
else if (strcasecmp(name, "volume-down") =3D=3D 0)
@@ -109,12 +109,12 @@
volchange =3D MUTE_TOGGLE;
else if (strcasecmp(name, "reset") =3D=3D 0)
volchange =3D RESET;
- =
+
if (volchange =3D=3D INVALID)
pa_log_warn("recieved unknown IR code '%s'", name);
else {
pa_sink *s;
- =
+
if (!(s =3D pa_namereg_get(u->module->core, u->sink_name, =
PA_NAMEREG_SINK, 1)))
pa_log("failed to get sink '%s'", u->sink_name);
else {
@@ -134,7 +134,7 @@
=
pa_sink_set_volume(s, PA_MIXER_HARDWARE, &cv);
break;
- =
+
case DOWN:
for (i =3D 0; i < cv.channels; i++) {
if (cv.values[i] >=3D DELTA)
@@ -142,18 +142,18 @@
else
cv.values[i] =3D PA_VOLUME_MUTED;
}
- =
+
pa_sink_set_volume(s, PA_MIXER_HARDWARE, &cv);
break;
- =
+
case MUTE:
pa_sink_set_mute(s, PA_MIXER_HARDWARE, 0);
break;
- =
+
case RESET:
pa_sink_set_mute(s, PA_MIXER_HARDWARE, 1);
break;
- =
+
case MUTE_TOGGLE:
=
pa_sink_set_mute(s, PA_MIXER_HARDWARE, !pa_sin=
k_get_mute(s, PA_MIXER_HARDWARE));
@@ -170,7 +170,7 @@
pa_xfree(code);
=
return;
- =
+
fail:
u->module->core->mainloop->io_free(u->io);
u->io =3D NULL;
@@ -179,7 +179,7 @@
=
free(code);
}
- =
+
int pa__init(pa_core *c, pa_module*m) {
pa_modargs *ma =3D NULL;
struct userdata *u;
@@ -189,7 +189,7 @@
pa_log("module-lirc may no be loaded twice.");
return -1;
}
- =
+
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
pa_log("Failed to parse module arguments");
goto fail;
@@ -212,13 +212,13 @@
pa_log("lirc_readconfig() failed.");
goto fail;
}
- =
+
u->io =3D c->mainloop->io_new(c->mainloop, u->lirc_fd, PA_IO_EVENT_INP=
UT|PA_IO_EVENT_HANGUP, io_callback, u);
=
lirc_in_use =3D 1;
=
pa_modargs_free(ma);
- =
+
return 0;
=
fail:
Modified: trunk/src/modules/module-match.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-match.=
c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-match.c (original)
+++ trunk/src/modules/module-match.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -88,7 +88,7 @@
}
=
pa_lock_fd(fileno(f), 1);
- =
+
while (!feof(f)) {
char *d, *v;
pa_volume_t volume;
@@ -96,12 +96,12 @@
regex_t regex;
char ln[256];
struct rule *rule;
- =
+
if (!fgets(ln, sizeof(ln), f))
break;
=
n++;
- =
+
pa_strip_nl(ln);
=
if (ln[0] =3D=3D '#' || !*ln )
@@ -110,7 +110,7 @@
d =3D ln+strcspn(ln, WHITESPACE);
v =3D d+strspn(d, WHITESPACE);
=
- =
+
if (!*v) {
pa_log(__FILE__ ": [%s:%u] failed to parse line - too few word=
s", filename, n);
goto finish;
@@ -124,7 +124,7 @@
=
volume =3D (pa_volume_t) k;
=
- =
+
if (regcomp(®ex, ln, REG_EXTENDED|REG_NOSUB) !=3D 0) {
pa_log("[%s:%u] invalid regular expression", filename, n);
goto finish;
@@ -140,12 +140,12 @@
else
u->rules =3D rule;
end =3D rule;
- =
+
*d =3D 0;
}
=
ret =3D 0;
- =
+
finish:
if (f) {
pa_lock_fd(fileno(f), 0);
@@ -172,7 +172,7 @@
=
if (!si->name)
return;
- =
+
for (r =3D u->rules; r; r =3D r->next) {
if (!regexec(&r->regex, si->name, 0, NULL, 0)) {
pa_cvolume cv;
@@ -197,7 +197,7 @@
u->rules =3D NULL;
u->subscription =3D NULL;
m->userdata =3D u;
- =
+
if (load_rules(u, pa_modargs_get_value(ma, "table", NULL)) < 0)
goto fail;
=
@@ -224,7 +224,7 @@
=
if (u->subscription)
pa_subscription_free(u->subscription);
- =
+
for (r =3D u->rules; r; r =3D n) {
n =3D r->next;
=
Modified: trunk/src/modules/module-mmkbd-evdev.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-mmkbd-=
evdev.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-mmkbd-evdev.c (original)
+++ trunk/src/modules/module-mmkbd-evdev.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -85,7 +85,7 @@
pa_log("lost connection to evdev device.");
goto fail;
}
- =
+
if (events & PA_IO_EVENT_INPUT) {
struct input_event ev;
=
@@ -107,15 +107,15 @@
=
if (volchange !=3D INVALID) {
pa_sink *s;
- =
+
if (!(s =3D pa_namereg_get(u->module->core, u->sink_name, =
PA_NAMEREG_SINK, 1)))
pa_log("failed to get sink '%s'", u->sink_name);
else {
int i;
pa_cvolume cv =3D *pa_sink_get_volume(s, PA_MIXER_HARD=
WARE);
- =
+
#define DELTA (PA_VOLUME_NORM/20)
- =
+
switch (volchange) {
case UP:
for (i =3D 0; i < cv.channels; i++) {
@@ -127,7 +127,7 @@
=
pa_sink_set_volume(s, PA_MIXER_HARDWARE, &cv);
break;
- =
+
case DOWN:
for (i =3D 0; i < cv.channels; i++) {
if (cv.values[i] >=3D DELTA)
@@ -135,10 +135,10 @@
else
cv.values[i] =3D PA_VOLUME_MUTED;
}
- =
+
pa_sink_set_volume(s, PA_MIXER_HARDWARE, &cv);
break;
- =
+
case MUTE_TOGGLE:
=
pa_sink_set_mute(s, PA_MIXER_HARDWARE, !pa_sin=
k_get_mute(s, PA_MIXER_HARDWARE));
@@ -153,7 +153,7 @@
}
=
return;
- =
+
fail:
u->module->core->mainloop->io_free(u->io);
u->io =3D NULL;
@@ -162,7 +162,7 @@
}
=
#define test_bit(bit, array) (array[bit/8] & (1<<(bit%8)))
- =
+
int pa__init(pa_core *c, pa_module*m) {
pa_modargs *ma =3D NULL;
struct userdata *u;
@@ -226,7 +226,7 @@
u->io =3D c->mainloop->io_new(c->mainloop, u->fd, PA_IO_EVENT_INPUT|PA=
_IO_EVENT_HANGUP, io_callback, u);
=
pa_modargs_free(ma);
- =
+
return 0;
=
fail:
Modified: trunk/src/modules/module-native-protocol-fd.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-native=
-protocol-fd.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-native-protocol-fd.c (original)
+++ trunk/src/modules/module-native-protocol-fd.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -61,7 +61,7 @@
pa_log("invalid file descriptor.");
goto finish;
}
- =
+
io =3D pa_iochannel_new(c->mainloop, fd, fd);
=
if (!(m->userdata =3D pa_protocol_native_new_iochannel(c, io, m, ma)))=
{
@@ -74,7 +74,7 @@
finish:
if (ma)
pa_modargs_free(ma);
- =
+
return r;
}
=
Modified: trunk/src/modules/module-null-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-null-s=
ink.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-null-sink.c (original)
+++ trunk/src/modules/module-null-sink.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -115,10 +115,10 @@
pa_sample_spec ss;
pa_channel_map map;
pa_modargs *ma =3D NULL;
- =
+
assert(c);
assert(m);
- =
+
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
pa_log("failed to parse module arguments.");
goto fail;
@@ -129,12 +129,12 @@
pa_log("invalid sample format specification or channel map.");
goto fail;
}
- =
+
u =3D pa_xnew0(struct userdata, 1);
u->core =3D c;
u->module =3D m;
m->userdata =3D u;
- =
+
if (!(u->sink =3D pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "s=
ink_name", DEFAULT_SINK_NAME), 0, &ss, &map))) {
pa_log("failed to create sink.");
goto fail;
@@ -147,19 +147,19 @@
=
u->n_bytes =3D 0;
pa_gettimeofday(&u->start_time);
- =
+
u->time_event =3D c->mainloop->time_new(c->mainloop, &u->start_time, t=
ime_callback, u);
=
u->block_size =3D pa_bytes_per_second(&ss) / 10;
- =
+
pa_modargs_free(ma);
- =
+
return 0;
=
fail:
if (ma)
pa_modargs_free(ma);
- =
+
pa__done(c, m);
=
return -1;
@@ -171,7 +171,7 @@
=
if (!(u =3D m->userdata))
return;
- =
+
pa_sink_disconnect(u->sink);
pa_sink_unref(u->sink);
=
Modified: trunk/src/modules/module-oss-mmap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss-mm=
ap.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-oss-mmap.c (original)
+++ trunk/src/modules/module-oss-mmap.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -113,7 +113,7 @@
#define DEFAULT_FRAGSIZE 1024
=
static void update_usage(struct userdata *u) {
- pa_module_set_used(u->module, =
+ pa_module_set_used(u->module,
(u->sink ? pa_sink_used_by(u->sink) : 0) +
(u->source ? pa_source_used_by(u->source) : 0));
}
@@ -126,7 +126,7 @@
pa_sink_unref(u->sink);
u->sink =3D NULL;
}
- =
+
if (u->source) {
pa_source_disconnect(u->source);
pa_source_unref(u->source);
@@ -137,12 +137,12 @@
munmap(u->in_mmap, u->in_mmap_length);
u->in_mmap =3D NULL;
}
- =
+
if (u->out_mmap && u->out_mmap !=3D MAP_FAILED) {
munmap(u->out_mmap, u->out_mmap_length);
u->out_mmap =3D NULL;
}
- =
+
if (u->io_event) {
u->core->mainloop->io_free(u->io_event);
u->io_event =3D NULL;
@@ -156,13 +156,13 @@
=
static void out_fill_memblocks(struct userdata *u, unsigned n) {
assert(u && u->out_memblocks);
- =
+
while (n > 0) {
pa_memchunk chunk;
- =
+
if (u->out_memblocks[u->out_current])
pa_memblock_unref_fixed(u->out_memblocks[u->out_current]);
- =
+
chunk.memblock =3D u->out_memblocks[u->out_current] =3D
pa_memblock_new_fixed(
u->core->mempool,
@@ -172,13 +172,13 @@
assert(chunk.memblock);
chunk.length =3D chunk.memblock->length;
chunk.index =3D 0;
- =
+
pa_sink_render_into_full(u->sink, &chunk);
- =
+
u->out_current++;
while (u->out_current >=3D u->out_fragments)
u->out_current -=3D u->out_fragments;
- =
+
n--;
}
}
@@ -188,7 +188,7 @@
assert(u && u->sink);
=
update_usage(u);
- =
+
if (ioctl(u->fd, SNDCTL_DSP_GETOPTR, &info) < 0) {
pa_log("SNDCTL_DSP_GETOPTR: %s", pa_cstrerror(errno));
=
@@ -199,31 +199,31 @@
=
info.blocks +=3D u->out_blocks_saved;
u->out_blocks_saved =3D 0;
- =
+
if (!info.blocks)
return;
- =
+
out_fill_memblocks(u, info.blocks);
}
=
static void in_post_memblocks(struct userdata *u, unsigned n) {
assert(u && u->in_memblocks);
- =
+
while (n > 0) {
pa_memchunk chunk;
- =
+
if (!u->in_memblocks[u->in_current]) {
chunk.memblock =3D u->in_memblocks[u->in_current] =3D pa_membl=
ock_new_fixed(u->core->mempool, (uint8_t*) u->in_mmap+u->in_fragment_size*u=
->in_current, u->in_fragment_size, 1);
chunk.length =3D chunk.memblock->length;
chunk.index =3D 0;
- =
+
pa_source_post(u->source, &chunk);
}
=
u->in_current++;
while (u->in_current >=3D u->in_fragments)
u->in_current -=3D u->in_fragments;
- =
+
n--;
}
}
@@ -234,7 +234,7 @@
=
if (n > u->in_fragments)
n =3D u->in_fragments;
- =
+
while (n > 0) {
if (u->in_memblocks[i]) {
pa_memblock_unref_fixed(u->in_memblocks[i]);
@@ -254,7 +254,7 @@
assert(u && u->source);
=
update_usage(u);
- =
+
if (ioctl(u->fd, SNDCTL_DSP_GETIPTR, &info) < 0) {
pa_log("SNDCTL_DSP_GETIPTR: %s", pa_cstrerror(errno));
=
@@ -265,10 +265,10 @@
=
info.blocks +=3D u->in_blocks_saved;
u->in_blocks_saved =3D 0;
- =
+
if (!info.blocks)
return;
- =
+
in_post_memblocks(u, info.blocks);
in_clear_memblocks(u, u->in_fragments/2);
}
@@ -311,7 +311,7 @@
n =3D bpos - info.ptr;
=
/* pa_log("n =3D %u, bpos =3D %u, ptr =3D %u, total=3D%u, fragsize =3D=
%u, n_frags =3D %u\n", n, bpos, (unsigned) info.ptr, total, u->out_fragmen=
t_size, u->out_fragments); */
- =
+
return pa_bytes_to_usec(n, &s->sample_spec);
}
=
@@ -337,7 +337,7 @@
n =3D (u->in_fragments * u->in_fragment_size) - bpos + info.ptr;
=
/* pa_log("n =3D %u, bpos =3D %u, ptr =3D %u, total=3D%u, fragsize =3D=
%u, n_frags =3D %u\n", n, bpos, (unsigned) info.ptr, total, u->in_fragment=
_size, u->in_fragments); */
- =
+
return pa_bytes_to_usec(n, &s->sample_spec);
}
=
@@ -416,7 +416,7 @@
pa_log("failed to parse module arguments.");
goto fail;
}
- =
+
if (pa_modargs_get_value_boolean(ma, "record", &record) < 0 || pa_moda=
rgs_get_value_boolean(ma, "playback", &playback) < 0) {
pa_log("record=3D and playback=3D expect numeric arguments.");
goto fail;
@@ -460,7 +460,7 @@
if (nfrags >=3D 2 && frag_size >=3D 1)
if (pa_oss_set_fragments(u->fd, nfrags, frag_size) < 0)
goto fail;
- =
+
if (pa_oss_auto_format(u->fd, &u->sample_spec) < 0)
goto fail;
=
@@ -491,7 +491,7 @@
=
if (!(u->source =3D pa_source_new(c, __FILE__, name, namereg_f=
ail, &u->sample_spec, &map)))
goto fail;
- =
+
u->source->userdata =3D u;
u->source->get_latency =3D source_get_latency_cb;
u->source->get_hw_volume =3D source_get_hw_volume;
@@ -504,22 +504,22 @@
hwd=
esc[0] ? ")" : ""));
pa_xfree(t);
u->source->is_hardware =3D 1;
- =
+
u->in_memblocks =3D pa_xnew0(pa_memblock*, u->in_fragments);
- =
+
enable_bits |=3D PCM_ENABLE_INPUT;
}
}
=
pa_xfree(name_buf);
name_buf =3D NULL;
- =
+
if (mode !=3D O_RDONLY) {
if (ioctl(u->fd, SNDCTL_DSP_GETOSPACE, &info) < 0) {
pa_log("SNDCTL_DSP_GETOSPACE: %s", pa_cstrerror(errno));
goto fail;
}
- =
+
pa_log_info("output -- %u fragments of size %u.", info.fragstotal,=
info.fragsize);
u->out_mmap_length =3D (u->out_fragment_size =3D info.fragsize) * =
(u->out_fragments =3D info.fragstotal);
=
@@ -540,7 +540,7 @@
name =3D name_buf =3D pa_sprintf_malloc("oss_output.%s", p=
a_path_get_filename(p));
namereg_fail =3D 0;
}
- =
+
if (!(u->sink =3D pa_sink_new(c, __FILE__, name, namereg_fail,=
&u->sample_spec, &map)))
goto fail;
=
@@ -555,28 +555,28 @@
hwdesc[=
0] ? hwdesc : "",
hwdesc[=
0] ? ")" : ""));
pa_xfree(t);
- =
+
u->sink->is_hardware =3D 1;
u->out_memblocks =3D pa_xmalloc0(sizeof(struct memblock *)*u->=
out_fragments);
- =
+
enable_bits |=3D PCM_ENABLE_OUTPUT;
}
}
=
pa_xfree(name_buf);
name_buf =3D NULL;
- =
+
zero =3D 0;
if (ioctl(u->fd, SNDCTL_DSP_SETTRIGGER, &zero) < 0) {
pa_log("SNDCTL_DSP_SETTRIGGER: %s", pa_cstrerror(errno));
goto fail;
}
- =
+
if (ioctl(u->fd, SNDCTL_DSP_SETTRIGGER, &enable_bits) < 0) {
pa_log("SNDCTL_DSP_SETTRIGGER: %s", pa_cstrerror(errno));
goto fail;
}
- =
+
assert(u->source || u->sink);
=
u->io_event =3D c->mainloop->io_new(c->mainloop, u->fd, (u->source ? P=
A_IO_EVENT_INPUT : 0) | (u->sink ? PA_IO_EVENT_OUTPUT : 0), io_callback, u);
@@ -589,7 +589,7 @@
source_get_hw_volume(u->source);
if (u->sink)
sink_get_hw_volume(u->sink);
- =
+
return 0;
=
fail:
@@ -599,13 +599,13 @@
pa_modargs_free(ma);
=
pa_xfree(name_buf);
- =
+
return -1;
}
=
void pa__done(pa_core *c, pa_module*m) {
struct userdata *u;
- =
+
assert(c);
assert(m);
=
@@ -629,6 +629,6 @@
pa_memblock_unref_fixed(u->in_memblocks[i]);
pa_xfree(u->in_memblocks);
}
- =
+
pa_xfree(u);
}
Modified: trunk/src/modules/module-oss.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-oss.c (original)
+++ trunk/src/modules/module-oss.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -100,20 +100,20 @@
#define DEFAULT_DEVICE "/dev/dsp"
=
static void update_usage(struct userdata *u) {
- pa_module_set_used(u->module, =
+ pa_module_set_used(u->module,
(u->sink ? pa_sink_used_by(u->sink) : 0) +
(u->source ? pa_source_used_by(u->source) : 0));
}
=
static void clear_up(struct userdata *u) {
assert(u);
- =
+
if (u->sink) {
pa_sink_disconnect(u->sink);
pa_sink_unref(u->sink);
u->sink =3D NULL;
}
- =
+
if (u->source) {
pa_source_disconnect(u->source);
pa_source_unref(u->source);
@@ -131,7 +131,7 @@
ssize_t r;
size_t l;
int loop =3D 0;
- =
+
assert(u);
=
if (!u->sink || !pa_iochannel_is_writable(u->io))
@@ -140,10 +140,10 @@
update_usage(u);
=
l =3D u->out_fragment_size;
- =
+
if (u->use_getospace) {
audio_buf_info info;
- =
+
if (ioctl(u->fd, SNDCTL_DSP_GETOSPACE, &info) < 0)
u->use_getospace =3D 0;
else {
@@ -156,15 +156,15 @@
=
do {
memchunk =3D &u->memchunk;
- =
+
if (!memchunk->length)
if (pa_sink_render(u->sink, l, memchunk) < 0)
memchunk =3D &u->silence;
- =
+
assert(memchunk->memblock);
assert(memchunk->memblock->data);
assert(memchunk->length);
- =
+
if ((r =3D pa_iochannel_write(u->io, (uint8_t*) memchunk->memblock=
->data + memchunk->index, memchunk->length)) < 0) {
pa_log("write() failed: %s", pa_cstrerror(errno));
=
@@ -172,13 +172,13 @@
pa_module_unload_request(u->module);
break;
}
- =
+
if (memchunk =3D=3D &u->silence)
assert(r % u->sample_size =3D=3D 0);
else {
u->memchunk.index +=3D r;
u->memchunk.length -=3D r;
- =
+
if (u->memchunk.length <=3D 0) {
pa_memblock_unref(u->memchunk.memblock);
u->memchunk.memblock =3D NULL;
@@ -195,7 +195,7 @@
size_t l;
int loop =3D 0;
assert(u);
- =
+
if (!u->source || !pa_iochannel_is_readable(u->io) || !pa_idxset_size(=
u->source->outputs))
return;
=
@@ -205,7 +205,7 @@
=
if (u->use_getispace) {
audio_buf_info info;
- =
+
if (ioctl(u->fd, SNDCTL_DSP_GETISPACE, &info) < 0)
u->use_getispace =3D 0;
else {
@@ -215,7 +215,7 @@
}
}
}
- =
+
do {
memchunk.memblock =3D pa_memblock_new(u->core->mempool, l);
assert(memchunk.memblock);
@@ -228,11 +228,11 @@
}
break;
}
- =
+
assert(r <=3D (ssize_t) memchunk.memblock->length);
memchunk.length =3D memchunk.memblock->length =3D r;
memchunk.index =3D 0;
- =
+
pa_source_post(u->source, &memchunk);
pa_memblock_unref(memchunk.memblock);
=
@@ -280,12 +280,12 @@
=
if (!u->use_getispace)
return 0;
- =
+
if (ioctl(u->fd, SNDCTL_DSP_GETISPACE, &info) < 0) {
u->use_getispace =3D 0;
return 0;
}
- =
+
if (info.bytes <=3D 0)
return 0;
=
@@ -355,7 +355,7 @@
const char *name;
char *name_buf =3D NULL;
int namereg_fail;
- =
+
assert(c);
assert(m);
=
@@ -363,7 +363,7 @@
pa_log("failed to parse module arguments.");
goto fail;
}
- =
+
if (pa_modargs_get_value_boolean(ma, "record", &record) < 0 || pa_moda=
rgs_get_value_boolean(ma, "playback", &playback) < 0) {
pa_log("record=3D and playback=3D expect numeric argument.");
goto fail;
@@ -381,11 +381,11 @@
pa_log("failed to parse sample specification or channel map");
goto fail;
}
- =
+
/* Fix latency to 100ms */
nfrags =3D 12;
frag_size =3D pa_bytes_per_second(&ss)/128;
- =
+
if (pa_modargs_get_value_s32(ma, "fragments", &nfrags) < 0 || pa_modar=
gs_get_value_s32(ma, "fragment_size", &frag_size) < 0) {
pa_log("failed to parse fragments arguments");
goto fail;
@@ -398,12 +398,12 @@
pa_log_info("hardware name is '%s'.", hwdesc);
else
hwdesc[0] =3D 0;
- =
+
pa_log_info("device opened in %s mode.", mode =3D=3D O_WRONLY ? "O_WRO=
NLY" : (mode =3D=3D O_RDONLY ? "O_RDONLY" : "O_RDWR"));
=
if (nfrags >=3D 2 && frag_size >=3D 1)
- if (pa_oss_set_fragments(fd, nfrags, frag_size) < 0) =
- goto fail; =
+ if (pa_oss_set_fragments(fd, nfrags, frag_size) < 0)
+ goto fail;
=
if (pa_oss_auto_format(fd, &ss) < 0)
goto fail;
@@ -418,7 +418,7 @@
u =3D pa_xmalloc(sizeof(struct userdata));
u->core =3D c;
u->use_getospace =3D u->use_getispace =3D 0;
- =
+
if (ioctl(fd, SNDCTL_DSP_GETISPACE, &info) >=3D 0) {
pa_log_info("input -- %u fragments of size %u.", info.fragstotal, =
info.fragsize);
in_frag_size =3D info.fragsize;
@@ -438,7 +438,7 @@
name =3D name_buf =3D pa_sprintf_malloc("oss_input.%s", pa_pat=
h_get_filename(p));
namereg_fail =3D 0;
}
- =
+
if (!(u->source =3D pa_source_new(c, __FILE__, name, namereg_fail,=
&ss, &map)))
goto fail;
=
@@ -468,7 +468,7 @@
name =3D name_buf =3D pa_sprintf_malloc("oss_output.%s", pa_pa=
th_get_filename(p));
namereg_fail =3D 0;
}
- =
+
if (!(u->sink =3D pa_sink_new(c, __FILE__, name, namereg_fail, &ss=
, &map)))
goto fail;
=
@@ -489,7 +489,7 @@
=
pa_xfree(name_buf);
name_buf =3D NULL;
- =
+
assert(u->source || u->sink);
=
u->io =3D pa_iochannel_new(c->mainloop, u->source ? fd : -1, u->sink ?=
fd : -1);
@@ -539,13 +539,13 @@
pa_modargs_free(ma);
=
pa_xfree(name_buf);
- =
+
return -1;
}
=
void pa__done(pa_core *c, pa_module*m) {
struct userdata *u;
- =
+
assert(c);
assert(m);
=
@@ -553,7 +553,7 @@
return;
=
clear_up(u);
- =
+
if (u->memchunk.memblock)
pa_memblock_unref(u->memchunk.memblock);
if (u->silence.memblock)
Modified: trunk/src/modules/module-pipe-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-pipe-s=
ink.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-pipe-sink.c (original)
+++ trunk/src/modules/module-pipe-sink.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -63,7 +63,7 @@
pa_core *core;
=
char *filename;
- =
+
pa_sink *sink;
pa_iochannel *io;
pa_defer_event *defer_event;
@@ -87,18 +87,18 @@
assert(u);
=
u->core->mainloop->defer_enable(u->defer_event, 0);
- =
+
if (!pa_iochannel_is_writable(u->io))
return;
=
pa_module_set_used(u->module, pa_sink_used_by(u->sink));
- =
+
if (!u->memchunk.length)
if (pa_sink_render(u->sink, PIPE_BUF, &u->memchunk) < 0)
return;
=
assert(u->memchunk.memblock && u->memchunk.length);
- =
+
if ((r =3D pa_iochannel_write(u->io, (uint8_t*) u->memchunk.memblock->=
data + u->memchunk.index, u->memchunk.length)) < 0) {
pa_log("write(): %s", pa_cstrerror(errno));
return;
@@ -106,7 +106,7 @@
=
u->memchunk.index +=3D r;
u->memchunk.length -=3D r;
- =
+
if (u->memchunk.length <=3D 0) {
pa_memblock_unref(u->memchunk.memblock);
u->memchunk.memblock =3D NULL;
@@ -149,9 +149,9 @@
pa_channel_map map;
pa_modargs *ma =3D NULL;
char *t;
- =
+
assert(c && m);
- =
+
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
pa_log("failed to parse module arguments");
goto fail;
@@ -162,7 +162,7 @@
pa_log("invalid sample format specification");
goto fail;
}
- =
+
mkfifo(p =3D pa_modargs_get_value(ma, "file", DEFAULT_FIFO_NAME), 0777=
);
=
if ((fd =3D open(p, O_RDWR)) < 0) {
@@ -171,7 +171,7 @@
}
=
pa_fd_set_cloexec(fd, 1);
- =
+
if (fstat(fd, &st) < 0) {
pa_log("fstat('%s'): %s", p, pa_cstrerror(errno));
goto fail;
@@ -187,7 +187,7 @@
u->core =3D c;
u->module =3D m;
m->userdata =3D u;
- =
+
if (!(u->sink =3D pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "s=
ink_name", DEFAULT_SINK_NAME), 0, &ss, &map))) {
pa_log("failed to create sink.");
goto fail;
@@ -211,13 +211,13 @@
c->mainloop->defer_enable(u->defer_event, 0);
=
pa_modargs_free(ma);
- =
+
return 0;
=
fail:
if (ma)
pa_modargs_free(ma);
- =
+
if (fd >=3D 0)
close(fd);
=
@@ -232,10 +232,10 @@
=
if (!(u =3D m->userdata))
return;
- =
+
if (u->memchunk.memblock)
pa_memblock_unref(u->memchunk.memblock);
- =
+
pa_sink_disconnect(u->sink);
pa_sink_unref(u->sink);
pa_iochannel_free(u->io);
@@ -244,6 +244,6 @@
assert(u->filename);
unlink(u->filename);
pa_xfree(u->filename);
- =
+
pa_xfree(u);
}
Modified: trunk/src/modules/module-pipe-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-pipe-s=
ource.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-pipe-source.c (original)
+++ trunk/src/modules/module-pipe-source.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -63,7 +63,7 @@
pa_core *core;
=
char *filename;
- =
+
pa_source *source;
pa_iochannel *io;
pa_module *module;
@@ -127,9 +127,9 @@
pa_channel_map map;
pa_modargs *ma =3D NULL;
char *t;
- =
+
assert(c && m);
- =
+
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
pa_log("failed to parse module arguments");
goto fail;
@@ -140,7 +140,7 @@
pa_log("invalid sample format specification or channel map");
goto fail;
}
- =
+
mkfifo(p =3D pa_modargs_get_value(ma, "file", DEFAULT_FIFO_NAME), 0777=
);
=
if ((fd =3D open(p, O_RDWR)) < 0) {
@@ -149,7 +149,7 @@
}
=
pa_fd_set_cloexec(fd, 1);
- =
+
if (fstat(fd, &st) < 0) {
pa_log("fstat('%s'): %s", p, pa_cstrerror(errno));
goto fail;
@@ -164,7 +164,7 @@
=
u->filename =3D pa_xstrdup(p);
u->core =3D c;
- =
+
if (!(u->source =3D pa_source_new(c, __FILE__, pa_modargs_get_value(ma=
, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, &map))) {
pa_log("failed to create source.");
goto fail;
@@ -180,18 +180,18 @@
=
u->chunk.memblock =3D NULL;
u->chunk.index =3D u->chunk.length =3D 0;
- =
+
u->module =3D m;
m->userdata =3D u;
=
pa_modargs_free(ma);
- =
+
return 0;
=
fail:
if (ma)
pa_modargs_free(ma);
- =
+
if (fd >=3D 0)
close(fd);
=
@@ -206,10 +206,10 @@
=
if (!(u =3D m->userdata))
return;
- =
+
if (u->chunk.memblock)
pa_memblock_unref(u->chunk.memblock);
- =
+
pa_source_disconnect(u->source);
pa_source_unref(u->source);
pa_iochannel_free(u->io);
@@ -217,6 +217,6 @@
assert(u->filename);
unlink(u->filename);
pa_xfree(u->filename);
- =
+
pa_xfree(u);
}
Modified: trunk/src/modules/module-protocol-stub.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-protoc=
ol-stub.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-protocol-stub.c (original)
+++ trunk/src/modules/module-protocol-stub.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -85,13 +85,13 @@
"record=3D<enable record?> "
SOCKET_USAGE)
#elif defined(USE_PROTOCOL_CLI)
- #include <pulsecore/protocol-cli.h> =
+ #include <pulsecore/protocol-cli.h>
#define protocol_new pa_protocol_cli_new
#define protocol_free pa_protocol_cli_free
#define TCPWRAP_SERVICE "pulseaudio-cli"
#define IPV4_PORT 4712
#define UNIX_SOCKET "cli"
- #define MODULE_ARGUMENTS =
+ #define MODULE_ARGUMENTS
#ifdef USE_TCP_SOCKETS
#include "module-cli-protocol-tcp-symdef.h"
#else
@@ -106,7 +106,7 @@
#define TCPWRAP_SERVICE "pulseaudio-http"
#define IPV4_PORT 4714
#define UNIX_SOCKET "http"
- #define MODULE_ARGUMENTS =
+ #define MODULE_ARGUMENTS
#ifdef USE_TCP_SOCKETS
#include "module-http-protocol-tcp-symdef.h"
#else
@@ -129,16 +129,16 @@
#endif
=
#if defined(HAVE_CREDS) && !defined(USE_TCP_SOCKETS)
- #define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-group", "auth-g=
roup-enable", =
+ #define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-group", "auth-g=
roup-enable",
#define AUTH_USAGE "auth-group=3D<system group to allow access> auth-g=
roup-enable=3D<enable auth by UNIX group?> "
#elif defined(USE_TCP_SOCKETS)
- #define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-ip-acl", =
+ #define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-ip-acl",
#define AUTH_USAGE "auth-ip-acl=3D<IP address ACL to allow access> "
#else
#define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON
#define AUTH_USAGE
#endif
- =
+
PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION)
PA_MODULE_USAGE("auth-anonymous=3D<don't check for cookies?> "
"cookie=3D<path to cookie file> "
@@ -160,7 +160,7 @@
#endif
=
#if defined(USE_TCP_SOCKETS)
- #define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-ip-acl", =
+ #define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-ip-acl",
#define AUTH_USAGE "auth-ip-acl=3D<IP address ACL to allow access> "
#else
#define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON
@@ -175,7 +175,7 @@
AUTH_USAGE
SOCKET_USAGE)
#else
- #error "Broken build system" =
+ #error "Broken build system"
#endif
=
PA_MODULE_AUTHOR("Lennart Poettering")
@@ -266,21 +266,21 @@
=
/* This socket doesn't reside in our own runtime dir but in
* /tmp/.esd/, hence we have to create the dir first */
- =
+
if (pa_make_secure_parent_dir(u->socket_path, c->is_system_instance ? =
0755 : 0700, (uid_t)-1, (gid_t)-1) < 0) {
pa_log("Failed to create socket directory: %s\n", pa_cstrerror(err=
no));
goto fail;
}
#endif
- =
+
if ((r =3D pa_unix_socket_remove_stale(tmp)) < 0) {
pa_log("Failed to remove stale UNIX socket '%s': %s", tmp, pa_cstr=
error(errno));
goto fail;
}
- =
+
if (r)
pa_log("Removed stale UNIX socket '%s'.", tmp);
- =
+
if (!(s =3D pa_socket_server_new_unix(c->mainloop, tmp)))
goto fail;
=
@@ -332,7 +332,7 @@
=
void pa__done(pa_core *c, pa_module*m) {
struct userdata *u;
- =
+
assert(c);
assert(m);
=
@@ -354,8 +354,8 @@
pa_xfree(p);
}
#endif
- =
- =
+
+
pa_xfree(u->socket_path);
#endif
=
Modified: trunk/src/modules/module-rescue-streams.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-rescue=
-streams.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-rescue-streams.c (original)
+++ trunk/src/modules/module-rescue-streams.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -49,7 +49,7 @@
static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void=
* userdata) {
pa_sink_input *i;
pa_sink *target;
- =
+
assert(c);
assert(sink);
=
@@ -57,7 +57,7 @@
pa_log_debug("No sink inputs to move away.");
return PA_HOOK_OK;
}
- =
+
if (!(target =3D pa_namereg_get(c, NULL, PA_NAMEREG_SINK, 0))) {
pa_log_info("No evacuation sink found.");
return PA_HOOK_OK;
@@ -74,14 +74,14 @@
pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->in=
dex, i->name, target->name);
}
=
- =
+
return PA_HOOK_OK;
}
=
static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source=
, void* userdata) {
pa_source_output *o;
pa_source *target;
- =
+
assert(c);
assert(source);
=
@@ -89,7 +89,7 @@
pa_log_debug("No source outputs to move away.");
return PA_HOOK_OK;
}
- =
+
if (!(target =3D pa_namereg_get(c, NULL, PA_NAMEREG_SOURCE, 0))) {
pa_log_info("No evacuation source found.");
return PA_HOOK_OK;
@@ -106,14 +106,14 @@
pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o-=
>index, o->name, target->name);
}
=
- =
+
return PA_HOOK_OK;
}
=
int pa__init(pa_core *c, pa_module*m) {
pa_modargs *ma =3D NULL;
struct userdata *u;
- =
+
assert(c);
assert(m);
=
@@ -132,7 +132,7 @@
=
void pa__done(pa_core *c, pa_module*m) {
struct userdata *u;
- =
+
assert(c);
assert(m);
=
Modified: trunk/src/modules/module-sine.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-sine.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-sine.c (original)
+++ trunk/src/modules/module-sine.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -96,7 +96,7 @@
size_t i;
=
l /=3D sizeof(float);
- =
+
for (i =3D 0; i < l; i++)
f[i] =3D (float) sin((double) i/l*M_PI*2*freq)/2;
}
@@ -115,7 +115,7 @@
pa_log("Failed to parse module arguments");
goto fail;
}
- =
+
m->userdata =3D u =3D pa_xmalloc(sizeof(struct userdata));
u->core =3D c;
u->module =3D m;
@@ -138,7 +138,7 @@
pa_log("Invalid frequency specification");
goto fail;
}
- =
+
u->memblock =3D pa_memblock_new(c->mempool, pa_bytes_per_second(&ss));
calc_sine(u->memblock->data, u->memblock->length, frequency);
=
@@ -160,10 +160,10 @@
u->sink_input->userdata =3D u;
=
u->peek_index =3D 0;
- =
+
pa_modargs_free(ma);
return 0;
- =
+
fail:
if (ma)
pa_modargs_free(ma);
@@ -183,7 +183,7 @@
pa_sink_input_disconnect(u->sink_input);
pa_sink_input_unref(u->sink_input);
}
- =
+
if (u->memblock)
pa_memblock_unref(u->memblock);
pa_xfree(u);
Modified: trunk/src/modules/module-solaris.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-solari=
s.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-solaris.c (original)
+++ trunk/src/modules/module-solaris.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -124,7 +124,7 @@
int err;
size_t len;
ssize_t r;
- =
+
assert(u);
=
/* We cannot check pa_iochannel_is_writable() because of our buffer ha=
ck */
@@ -163,7 +163,7 @@
}
=
u->sink_underflow =3D 0;
- =
+
assert(u->memchunk.memblock);
assert(u->memchunk.memblock->data);
assert(u->memchunk.length);
@@ -181,10 +181,10 @@
}
=
assert(r % u->frame_size =3D=3D 0);
- =
+
u->memchunk.index +=3D r;
u->memchunk.length -=3D r;
- =
+
if (u->memchunk.length <=3D 0) {
pa_memblock_unref(u->memchunk.memblock);
u->memchunk.memblock =3D NULL;
@@ -199,7 +199,7 @@
size_t l;
ssize_t r;
assert(u);
- =
+
if (!u->source || !pa_iochannel_is_readable(u->io))
return;
=
@@ -221,11 +221,11 @@
pa_log("read() failed: %s", pa_cstrerror(errno));
return;
}
- =
+
assert(r <=3D (ssize_t) memchunk.memblock->length);
memchunk.length =3D memchunk.memblock->length =3D r;
memchunk.index =3D 0;
- =
+
pa_source_post(u->source, &memchunk);
pa_memblock_unref(memchunk.memblock);
=
@@ -256,7 +256,7 @@
static void sig_callback(pa_mainloop_api *api, pa_signal_event*e, int sig,=
void *userdata) {
struct userdata *u =3D userdata;
pa_cvolume old_vol;
- =
+
assert(u);
=
if (u->sink) {
@@ -518,7 +518,7 @@
pa_log("failed to parse module arguments.");
goto fail;
}
- =
+
if (pa_modargs_get_value_boolean(ma, "record", &record) < 0 || pa_moda=
rgs_get_value_boolean(ma, "playback", &playback) < 0) {
pa_log("record=3D and playback=3D expect numeric argument.");
goto fail;
@@ -531,7 +531,7 @@
=
mode =3D (playback&&record) ? O_RDWR : (playback ? O_WRONLY : (record =
? O_RDONLY : 0));
=
- buffer_size =3D 16384; =
+ buffer_size =3D 16384;
if (pa_modargs_get_value_s32(ma, "buffer_size", &buffer_size) < 0) {
pa_log("failed to parse buffer size argument");
goto fail;
@@ -542,7 +542,7 @@
pa_log("failed to parse sample specification");
goto fail;
}
- =
+
if ((fd =3D open(p =3D pa_modargs_get_value(ma, "device", DEFAULT_DEVI=
CE), mode | O_NONBLOCK)) < 0)
goto fail;
=
@@ -642,7 +642,7 @@
=
if (ma)
pa_modargs_free(ma);
- =
+
return -1;
}
=
@@ -657,7 +657,7 @@
c->mainloop->time_free(u->timer);
ioctl(u->fd, I_SETSIG, 0);
pa_signal_free(u->sig);
- =
+
if (u->memchunk.memblock)
pa_memblock_unref(u->memchunk.memblock);
=
@@ -665,12 +665,12 @@
pa_sink_disconnect(u->sink);
pa_sink_unref(u->sink);
}
- =
+
if (u->source) {
pa_source_disconnect(u->source);
pa_source_unref(u->source);
}
- =
+
pa_iochannel_free(u->io);
pa_xfree(u);
}
Modified: trunk/src/modules/module-tunnel.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-tunnel=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-tunnel.c (original)
+++ trunk/src/modules/module-tunnel.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -116,10 +116,10 @@
static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] =3D {
#ifdef TUNNEL_SINK
[PA_COMMAND_REQUEST] =3D command_request,
-#endif =
+#endif
[PA_COMMAND_PLAYBACK_STREAM_KILLED] =3D command_stream_killed,
[PA_COMMAND_RECORD_STREAM_KILLED] =3D command_stream_killed,
- [PA_COMMAND_SUBSCRIBE_EVENT] =3D command_subscribe_event, =
+ [PA_COMMAND_SUBSCRIBE_EVENT] =3D command_subscribe_event,
};
=
struct userdata {
@@ -136,7 +136,7 @@
char *source_name;
pa_source *source;
#endif
- =
+
pa_module *module;
pa_core *core;
=
@@ -146,7 +146,7 @@
uint32_t ctag;
uint32_t device_index;
uint32_t channel;
- =
+
pa_usec_t host_latency;
=
pa_time_event *time_event;
@@ -156,7 +156,7 @@
=
static void close_stuff(struct userdata *u) {
assert(u);
- =
+
if (u->pstream) {
pa_pstream_close(u->pstream);
pa_pstream_unref(u->pstream);
@@ -256,10 +256,10 @@
while (u->requested_bytes > 0) {
pa_memchunk chunk;
if (pa_sink_render(u->sink, u->requested_bytes, &chunk) < 0) {
- =
- if (u->requested_bytes >=3D DEFAULT_TLENGTH-DEFAULT_PREBUF) =
+
+ if (u->requested_bytes >=3D DEFAULT_TLENGTH-DEFAULT_PREBUF)
send_prebuf_request(u);
- =
+
return;
}
=
@@ -293,7 +293,7 @@
die(u);
return;
}
- =
+
u->requested_bytes +=3D bytes;
send_bytes(u);
}
@@ -316,7 +316,7 @@
die(u);
return;
}
- =
+
if (pa_tagstruct_get_usec(t, &sink_usec) < 0 ||
pa_tagstruct_get_usec(t, &source_usec) < 0 ||
pa_tagstruct_get_boolean(t, &playing) < 0 ||
@@ -333,14 +333,14 @@
pa_gettimeofday(&now);
=
/* FIXME! This could use some serious love. */
- =
+
if (pa_timeval_cmp(&local, &remote) < 0 && pa_timeval_cmp(&remote, &no=
w)) {
/* local and remote seem to have synchronized clocks */
#ifdef TUNNEL_SINK
transport_usec =3D pa_timeval_diff(&remote, &local);
#else
transport_usec =3D pa_timeval_diff(&now, &remote);
-#endif =
+#endif
} else
transport_usec =3D pa_timeval_diff(&now, &local)/2;
=
@@ -364,7 +364,7 @@
assert(u);
=
t =3D pa_tagstruct_new(NULL, 0);
-#ifdef TUNNEL_SINK =
+#ifdef TUNNEL_SINK
pa_tagstruct_putu32(t, PA_COMMAND_GET_PLAYBACK_LATENCY);
#else
pa_tagstruct_putu32(t, PA_COMMAND_GET_RECORD_LATENCY);
@@ -374,7 +374,7 @@
=
pa_gettimeofday(&now);
pa_tagstruct_put_timeval(t, &now);
- =
+
pa_pstream_send_tagstruct(u->pstream, t);
pa_pdispatch_register_reply(u->pdispatch, tag, DEFAULT_TIMEOUT, stream=
_get_latency_callback, u, NULL);
}
@@ -496,7 +496,7 @@
assert(m && e && u);
=
request_latency(u);
- =
+
pa_gettimeofday(&ntv);
ntv.tv_sec +=3D LATENCY_INTERVAL;
m->time_restart(e, &ntv);
@@ -518,16 +518,16 @@
=
if (pa_tagstruct_getu32(t, &u->channel) < 0 ||
pa_tagstruct_getu32(t, &u->device_index) < 0
-#ifdef TUNNEL_SINK =
+#ifdef TUNNEL_SINK
|| pa_tagstruct_getu32(t, &u->requested_bytes) < 0
-#endif =
+#endif
)
goto parse_error;
=
if (u->version >=3D 9) {
#ifdef TUNNEL_SINK
uint32_t maxlength, tlength, prebuf, minreq;
- =
+
if (pa_tagstruct_getu32(t, &maxlength) < 0 ||
pa_tagstruct_getu32(t, &tlength) < 0 ||
pa_tagstruct_getu32(t, &prebuf) < 0 ||
@@ -535,13 +535,13 @@
goto parse_error;
#else
uint32_t maxlength, fragsize;
- =
+
if (pa_tagstruct_getu32(t, &maxlength) < 0 ||
- pa_tagstruct_getu32(t, &fragsize) < 0) =
+ pa_tagstruct_getu32(t, &fragsize) < 0)
goto parse_error;
#endif
}
- =
+
if (!pa_tagstruct_eof(t))
goto parse_error;
=
@@ -559,7 +559,7 @@
#endif
=
return;
- =
+
parse_error:
pa_log("invalid reply. (create stream)");
die(u);
@@ -603,7 +603,7 @@
pa_get_user_name(un, sizeof(un)),
u->source->name);
#endif
- =
+
reply =3D pa_tagstruct_new(NULL, 0);
pa_tagstruct_putu32(reply, PA_COMMAND_SET_CLIENT_NAME);
pa_tagstruct_putu32(reply, tag =3D u->ctag++);
@@ -612,7 +612,7 @@
/* We ignore the server's reply here */
=
reply =3D pa_tagstruct_new(NULL, 0);
-#ifdef TUNNEL_SINK =
+#ifdef TUNNEL_SINK
pa_tagstruct_putu32(reply, PA_COMMAND_CREATE_PLAYBACK_STREAM);
pa_tagstruct_putu32(reply, tag =3D u->ctag++);
pa_tagstruct_puts(reply, name);
@@ -640,7 +640,7 @@
pa_tagstruct_put_boolean(reply, 0);
pa_tagstruct_putu32(reply, DEFAULT_FRAGSIZE);
#endif
- =
+
pa_pstream_send_tagstruct(u->pstream, reply);
pa_pdispatch_register_reply(u->pdispatch, tag, DEFAULT_TIMEOUT, create=
_stream_callback, u, NULL);
}
@@ -673,7 +673,7 @@
die(u);
return;
}
- =
+
pa_source_post(u->source, chunk);
}
#endif
@@ -686,7 +686,7 @@
=
pa_socket_client_unref(u->client);
u->client =3D NULL;
- =
+
if (!io) {
pa_log("connection failed.");
pa_module_unload_request(u->module);
@@ -701,7 +701,7 @@
#ifndef TUNNEL_SINK
pa_pstream_set_recieve_memblock_callback(u->pstream, pstream_memblock_=
callback, u);
#endif
- =
+
t =3D pa_tagstruct_new(NULL, 0);
pa_tagstruct_putu32(t, PA_COMMAND_AUTH);
pa_tagstruct_putu32(t, tag =3D u->ctag++);
@@ -709,7 +709,7 @@
pa_tagstruct_put_arbitrary(t, u->auth_cookie, sizeof(u->auth_cookie));
pa_pstream_send_tagstruct(u->pstream, t);
pa_pdispatch_register_reply(u->pdispatch, tag, DEFAULT_TIMEOUT, setup_=
complete_callback, u, NULL);
- =
+
}
=
#ifdef TUNNEL_SINK
@@ -862,14 +862,14 @@
assert(u);
=
u->auth_cookie_in_property =3D 0;
- =
+
if (!fn && pa_authkey_prop_get(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME=
, u->auth_cookie, sizeof(u->auth_cookie)) >=3D 0) {
pa_log_debug("using already loaded auth cookie.");
pa_authkey_prop_ref(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME);
u->auth_cookie_in_property =3D 1;
return 0;
}
- =
+
if (!fn)
fn =3D PA_NATIVE_COOKIE_FILE;
=
@@ -877,7 +877,7 @@
return -1;
=
pa_log_debug("loading cookie from disk.");
- =
+
if (pa_authkey_prop_put(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->au=
th_cookie, sizeof(u->auth_cookie)) >=3D 0)
u->auth_cookie_in_property =3D 1;
=
@@ -890,7 +890,7 @@
pa_sample_spec ss;
pa_channel_map map;
char *t, *dn =3D NULL;
- =
+
assert(c && m);
=
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
@@ -919,10 +919,10 @@
u->host_latency =3D 0;
u->auth_cookie_in_property =3D 0;
u->time_event =3D NULL;
- =
+
if (load_key(u, pa_modargs_get_value(ma, "cookie", NULL)) < 0)
goto fail;
- =
+
if (!(u->server_name =3D pa_xstrdup(pa_modargs_get_value(ma, "server",=
NULL)))) {
pa_log("no server specified.");
goto fail;
@@ -938,7 +938,7 @@
pa_log("failed to connect to server '%s'", u->server_name);
goto fail;
}
- =
+
if (!u->client)
goto fail;
=
@@ -987,7 +987,7 @@
=
pa_source_set_owner(u->source, m);
#endif
- =
+
pa_xfree(dn);
=
u->time_event =3D NULL;
@@ -995,7 +995,7 @@
pa_modargs_free(ma);
=
return 0;
- =
+
fail:
pa__done(c, m);
=
@@ -1003,7 +1003,7 @@
pa_modargs_free(ma);
=
pa_xfree(dn);
- =
+
return -1;
}
=
@@ -1018,7 +1018,7 @@
=
if (u->auth_cookie_in_property)
pa_authkey_prop_unref(c, PA_NATIVE_COOKIE_PROPERTY_NAME);
- =
+
#ifdef TUNNEL_SINK
pa_xfree(u->sink_name);
#else
Modified: trunk/src/modules/module-volume-restore.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-volume=
-restore.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-volume-restore.c (original)
+++ trunk/src/modules/module-volume-restore.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -82,7 +82,7 @@
char *p;
long k;
unsigned i;
- =
+
assert(s);
assert(v);
=
@@ -92,7 +92,7 @@
k =3D strtol(s, &p, 0);
if (k <=3D 0 || k > PA_CHANNELS_MAX)
return NULL;
- =
+
v->channels =3D (unsigned) k;
=
for (i =3D 0; i < v->channels; i++) {
@@ -105,7 +105,7 @@
=
if (k < PA_VOLUME_MUTED)
return NULL;
- =
+
v->values[i] =3D (pa_volume_t) k;
}
=
@@ -132,22 +132,22 @@
ret =3D 0;
} else
pa_log("failed to open file '%s': %s", u->table_file, pa_cstre=
rror(errno));
- =
+
goto finish;
}
=
pa_lock_fd(fileno(f), 1);
- =
+
while (!feof(f)) {
struct rule *rule;
pa_cvolume v;
int v_is_set;
- =
+
if (!fgets(ln, sizeof(buf_name), f))
break;
=
n++;
- =
+
pa_strip_nl(ln);
=
if (ln[0] =3D=3D '#')
@@ -181,12 +181,12 @@
v_is_set =3D 0;
=
ln =3D buf_name;
- =
+
if (pa_hashmap_get(u->hashmap, buf_name)) {
pa_log("double entry in %s:%u, ignoring", u->table_file, n);
continue;
}
- =
+
rule =3D pa_xnew(struct rule, 1);
rule->name =3D pa_xstrdup(buf_name);
if ((rule->volume_is_set =3D v_is_set))
@@ -203,7 +203,7 @@
}
=
ret =3D 0;
- =
+
finish:
if (f) {
pa_lock_fd(fileno(f), 0);
@@ -218,7 +218,7 @@
int ret =3D -1;
void *state =3D NULL;
struct rule *rule;
- =
+
f =3D u->table_file ?
fopen(u->table_file, "w") :
pa_open_config_file(NULL, DEFAULT_VOLUME_TABLE_FILE, NULL, &u->tab=
le_file, "w");
@@ -232,7 +232,7 @@
=
while ((rule =3D pa_hashmap_iterate(u->hashmap, &state, NULL))) {
unsigned i;
- =
+
fprintf(f, "%s\n", rule->name);
=
if (rule->volume_is_set) {
@@ -241,14 +241,14 @@
for (i =3D 0; i < rule->volume.channels; i++)
fprintf(f, " %u", rule->volume.values[i]);
}
- =
+
fprintf(f, "\n%s\n%s\n",
rule->sink ? rule->sink : "",
rule->source ? rule->source : "");
}
- =
+
ret =3D 0;
- =
+
finish:
if (f) {
pa_lock_fd(fileno(f), 0);
@@ -260,7 +260,7 @@
=
static char* client_name(pa_client *c) {
char *t, *e;
- =
+
if (!c->name || !c->driver)
return NULL;
=
@@ -280,11 +280,11 @@
* sessions of the same application, which is something we
* explicitly don't want. Besides other stuff this makes xmms
* with esound work properly for us. */
- =
+
if (*k =3D=3D ')' && *(k+1) =3D=3D 0)
*e =3D 0;
}
- =
+
return t;
}
=
@@ -294,7 +294,7 @@
pa_source_output *so =3D NULL;
struct rule *r;
char *name;
- =
+
assert(c);
assert(u);
=
@@ -307,7 +307,7 @@
if ((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) =3D=3D PA_SUBSCRIPTION_E=
VENT_SINK_INPUT) {
if (!(si =3D pa_idxset_get_by_index(c->sink_inputs, idx)))
return;
- =
+
if (!si->client || !(name =3D client_name(si->client)))
return;
} else {
@@ -315,7 +315,7 @@
=
if (!(so =3D pa_idxset_get_by_index(c->source_outputs, idx)))
return;
- =
+
if (!so->client || !(name =3D client_name(so->client)))
return;
}
@@ -348,7 +348,7 @@
u->modified =3D 1;
}
}
- =
+
} else {
pa_log_info("Creating new entry for <%s>", name);
=
@@ -366,7 +366,7 @@
r->sink =3D NULL;
r->source =3D pa_xstrdup(so->source->name);
}
- =
+
pa_hashmap_put(u->hashmap, r->name, r);
u->modified =3D 1;
}
@@ -419,7 +419,7 @@
int pa__init(pa_core *c, pa_module*m) {
pa_modargs *ma =3D NULL;
struct userdata *u;
- =
+
assert(c);
assert(m);
=
@@ -433,9 +433,9 @@
u->subscription =3D NULL;
u->table_file =3D pa_xstrdup(pa_modargs_get_value(ma, "table", NULL));
u->modified =3D 0;
- =
+
m->userdata =3D u;
- =
+
if (load_rules(u) < 0)
goto fail;
=
@@ -451,7 +451,7 @@
=
if (ma)
pa_modargs_free(ma);
- =
+
return -1;
}
=
@@ -467,7 +467,7 @@
=
void pa__done(pa_core *c, pa_module*m) {
struct userdata* u;
- =
+
assert(c);
assert(m);
=
@@ -486,7 +486,7 @@
=
if (u->modified)
save_rules(u);
- =
+
pa_hashmap_free(u->hashmap, free_func, NULL);
}
=
Modified: trunk/src/modules/module-waveout.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-waveou=
t.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-waveout.c (original)
+++ trunk/src/modules/module-waveout.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -172,7 +172,7 @@
pa_log_error(__FILE__ ": ERROR: Unable to write waveOut block:=
%d",
res);
}
- =
+
u->written_bytes +=3D hdr->dwBufferLength;
=
EnterCriticalSection(&u->crit);
@@ -233,7 +233,7 @@
pa_log_error(__FILE__ ": ERROR: Unable to add waveIn block: %d=
",
res);
}
- =
+
free_frags--;
u->cur_ihdr++;
u->cur_ihdr %=3D u->fragments;
@@ -561,7 +561,7 @@
u->ohdrs[i].lpData =3D pa_xmalloc(u->fragment_size);
assert(u->ohdrs);
}
- =
+
u->module =3D m;
m->userdata =3D u;
=
@@ -585,7 +585,7 @@
=
if (ma)
pa_modargs_free(ma);
- =
+
return -1;
}
=
@@ -597,7 +597,7 @@
=
if (!(u =3D m->userdata))
return;
- =
+
if (u->event)
c->mainloop->time_free(u->event);
=
@@ -608,12 +608,12 @@
pa_sink_disconnect(u->sink);
pa_sink_unref(u->sink);
}
- =
+
if (u->source) {
pa_source_disconnect(u->source);
pa_source_unref(u->source);
}
- =
+
if (u->hwi !=3D INVALID_HANDLE_VALUE) {
waveInReset(u->hwi);
waveInClose(u->hwi);
@@ -633,6 +633,6 @@
pa_xfree(u->ohdrs);
=
DeleteCriticalSection(&u->crit);
- =
+
pa_xfree(u);
}
Modified: trunk/src/modules/module-x11-bell.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-x11-be=
ll.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-x11-bell.c (original)
+++ trunk/src/modules/module-x11-bell.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -107,19 +107,19 @@
pa_log("failed to parse module arguments");
goto fail;
}
- =
+
m->userdata =3D u =3D pa_xmalloc(sizeof(struct userdata));
u->core =3D c;
u->scache_item =3D pa_xstrdup(pa_modargs_get_value(ma, "sample", "x11-=
bell"));
u->sink_name =3D pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL));
u->x11_client =3D NULL;
=
- if (!(u->x11_wrapper =3D pa_x11_wrapper_get(c, pa_modargs_get_value(ma=
, "display", NULL)))) =
+ if (!(u->x11_wrapper =3D pa_x11_wrapper_get(c, pa_modargs_get_value(ma=
, "display", NULL))))
goto fail;
=
major =3D XkbMajorVersion;
minor =3D XkbMinorVersion;
- =
+
if (!XkbLibraryVersion(&major, &minor)) {
pa_log("XkbLibraryVersion() failed");
goto fail;
@@ -140,11 +140,11 @@
XkbChangeEnabledControls(pa_x11_wrapper_get_display(u->x11_wrapper), X=
kbUseCoreKbd, XkbAudibleBellMask, 0);
=
u->x11_client =3D pa_x11_client_new(u->x11_wrapper, x11_event_callback=
, u);
- =
+
pa_modargs_free(ma);
- =
+
return 0;
- =
+
fail:
if (ma)
pa_modargs_free(ma);
Modified: trunk/src/modules/module-x11-publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-x11-pu=
blish.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-x11-publish.c (original)
+++ trunk/src/modules/module-x11-publish.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -77,14 +77,14 @@
assert(u);
=
u->auth_cookie_in_property =3D 0;
- =
+
if (!fn && pa_authkey_prop_get(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME=
, u->auth_cookie, sizeof(u->auth_cookie)) >=3D 0) {
pa_log_debug("using already loaded auth cookie.");
pa_authkey_prop_ref(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME);
u->auth_cookie_in_property =3D 1;
return 0;
}
- =
+
if (!fn)
fn =3D PA_NATIVE_COOKIE_FILE;
=
@@ -92,7 +92,7 @@
return -1;
=
pa_log_debug("loading cookie from disk.");
- =
+
if (pa_authkey_prop_put(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->au=
th_cookie, sizeof(u->auth_cookie)) >=3D 0)
u->auth_cookie_in_property =3D 1;
=
@@ -121,7 +121,7 @@
if (load_key(u, pa_modargs_get_value(ma, "cookie", NULL)) < 0)
goto fail;
=
- if (!(u->x11_wrapper =3D pa_x11_wrapper_get(c, pa_modargs_get_value(ma=
, "display", NULL)))) =
+ if (!(u->x11_wrapper =3D pa_x11_wrapper_get(c, pa_modargs_get_value(ma=
, "display", NULL))))
goto fail;
=
if (!(l =3D pa_property_get(c, PA_NATIVE_SERVER_PROPERTY_NAME)))
@@ -130,10 +130,10 @@
s =3D pa_strlist_tostring(l);
pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SER=
VER", s);
pa_xfree(s);
- =
+
if (!pa_get_fqdn(hn, sizeof(hn)) || !pa_get_user_name(un, sizeof(un)))
goto fail;
- =
+
u->id =3D pa_sprintf_malloc("%s@%s/%u", un, hn, (unsigned) getpid());
pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_ID"=
, u->id);
=
@@ -144,10 +144,10 @@
pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE=
_SINK", t);
=
pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_COO=
KIE", pa_hexstr(u->auth_cookie, sizeof(u->auth_cookie), hx, sizeof(hx)));
- =
+
pa_modargs_free(ma);
return 0;
- =
+
fail:
if (ma)
pa_modargs_free(ma);
@@ -162,7 +162,7 @@
=
if (!(u =3D m->userdata))
return;
- =
+
if (u->x11_wrapper) {
char t[256];
=
@@ -178,7 +178,7 @@
XSync(pa_x11_wrapper_get_display(u->x11_wrapper), False);
}
}
- =
+
if (u->x11_wrapper)
pa_x11_wrapper_unref(u->x11_wrapper);
=
Modified: trunk/src/modules/module-zeroconf-publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-zeroco=
nf-publish.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-zeroconf-publish.c (original)
+++ trunk/src/modules/module-zeroconf-publish.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -153,7 +153,7 @@
=
if (!u->client || avahi_client_get_state(u->client) !=3D AVAHI_CLIENT_=
S_RUNNING)
return 0;
- =
+
if ((s->published =3D=3D PUBLISHED_REAL && s->loaded.valid) ||
(s->published =3D=3D PUBLISHED_AUTOLOAD && s->autoload.valid && !s=
->loaded.valid))
return 0;
@@ -161,8 +161,8 @@
if (s->published !=3D UNPUBLISHED) {
avahi_entry_group_reset(s->entry_group);
s->published =3D UNPUBLISHED;
- } =
- =
+ }
+
if (s->loaded.valid || s->autoload.valid) {
pa_namereg_type_t type;
=
@@ -172,26 +172,26 @@
goto finish;
}
}
- =
+
txt =3D avahi_string_list_add_pair(txt, "device", s->name);
txt =3D txt_record_server_data(u->core, txt);
- =
+
if (s->loaded.valid) {
char *description;
pa_sample_spec ss;
- =
+
get_service_data(u, s, &ss, &description);
- =
+
txt =3D avahi_string_list_add_printf(txt, "rate=3D%u", ss.rate=
);
txt =3D avahi_string_list_add_printf(txt, "channels=3D%u", ss.=
channels);
txt =3D avahi_string_list_add_pair(txt, "format", pa_sample_fo=
rmat_to_string(ss.format));
if (description)
txt =3D avahi_string_list_add_pair(txt, "description", des=
cription);
- =
+
type =3D s->loaded.type;
} else if (s->autoload.valid)
type =3D s->autoload.type;
- =
+
if (avahi_entry_group_add_service_strlst(
s->entry_group,
AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
@@ -202,24 +202,24 @@
NULL,
u->port,
txt) < 0) {
- =
+
pa_log("avahi_entry_group_add_service_strlst(): %s", avahi_str=
error(avahi_client_errno(u->client)));
goto finish;
}
- =
+
if (avahi_entry_group_commit(s->entry_group) < 0) {
pa_log("avahi_entry_group_commit(): %s", avahi_strerror(avahi_=
client_errno(u->client)));
goto finish;
}
- =
+
if (s->loaded.valid)
s->published =3D PUBLISHED_REAL;
else if (s->autoload.valid)
s->published =3D PUBLISHED_AUTOLOAD;
}
- =
+
r =3D 0;
- =
+
finish:
=
if (s->published =3D=3D UNPUBLISHED) {
@@ -227,7 +227,7 @@
=
if (s->entry_group)
avahi_entry_group_free(s->entry_group);
- =
+
pa_hashmap_remove(u->services, s->name);
pa_xfree(s->name);
pa_xfree(s->service_name);
@@ -236,17 +236,17 @@
=
if (txt)
avahi_string_list_free(txt);
- =
+
return r;
}
=
static struct service *get_service(struct userdata *u, const char *name, c=
onst char *description) {
struct service *s;
char hn[64];
- =
+
if ((s =3D pa_hashmap_get(u->services, name)))
return s;
- =
+
s =3D pa_xnew(struct service, 1);
s->userdata =3D u;
s->entry_group =3D NULL;
@@ -283,7 +283,7 @@
static int publish_source(struct userdata *u, pa_source *s) {
struct service *svc;
int ret;
- =
+
assert(u && s);
=
svc =3D get_service(u, s->name, s->description);
@@ -295,7 +295,7 @@
svc->loaded.index =3D s->index;
=
pa_dynarray_put(u->source_dynarray, s->index, svc);
- =
+
if ((ret =3D publish_service(u, svc)) < 0)
return ret;
=
@@ -306,7 +306,7 @@
static int publish_autoload(struct userdata *u, pa_autoload_entry *s) {
struct service *svc;
int ret;
- =
+
assert(u && s);
=
svc =3D get_service(u, s->name, NULL);
@@ -319,7 +319,7 @@
=
if ((ret =3D publish_service(u, svc)) < 0)
return ret;
- =
+
pa_dynarray_put(u->autoload_dynarray, s->index, svc);
return ret;
}
@@ -336,14 +336,14 @@
=
svc->loaded.valid =3D 0;
pa_dynarray_put(u->sink_dynarray, idx, NULL);
- =
+
return publish_service(u, svc);
}
=
static int remove_source(struct userdata *u, uint32_t idx) {
struct service *svc;
assert(u && idx !=3D PA_INVALID_INDEX);
- =
+
if (!(svc =3D pa_dynarray_get(u->source_dynarray, idx)))
return 0;
=
@@ -359,7 +359,7 @@
static int remove_autoload(struct userdata *u, uint32_t idx) {
struct service *svc;
assert(u && idx !=3D PA_INVALID_INDEX);
- =
+
if (!(svc =3D pa_dynarray_get(u->autoload_dynarray, idx)))
return 0;
=
@@ -389,14 +389,14 @@
if (remove_sink(u, idx) < 0)
goto fail;
}
- =
+
break;
=
case PA_SUBSCRIPTION_EVENT_SOURCE:
=
if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) =3D=3D PA_SUBSCRIPTI=
ON_EVENT_NEW) {
pa_source *source;
- =
+
if ((source =3D pa_idxset_get_by_index(c->sources, idx))) {
if (publish_source(u, source) < 0)
goto fail;
@@ -405,13 +405,13 @@
if (remove_source(u, idx) < 0)
goto fail;
}
- =
+
break;
=
case PA_SUBSCRIPTION_EVENT_AUTOLOAD:
if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) =3D=3D PA_SUBSCRIPTI=
ON_EVENT_NEW) {
pa_autoload_entry *autoload;
- =
+
if ((autoload =3D pa_idxset_get_by_index(c->autoload_idxse=
t, idx))) {
if (publish_autoload(u, autoload) < 0)
goto fail;
@@ -420,7 +420,7 @@
if (remove_autoload(u, idx) < 0)
goto fail;
}
- =
+
break;
}
=
@@ -453,7 +453,7 @@
static int publish_main_service(struct userdata *u) {
AvahiStringList *txt =3D NULL;
int r =3D -1;
- =
+
if (!u->main_entry_group) {
if (!(u->main_entry_group =3D avahi_entry_group_new(u->client, mai=
n_entry_group_callback, u))) {
pa_log("avahi_entry_group_new() failed: %s", avahi_strerror(av=
ahi_client_errno(u->client)));
@@ -461,7 +461,7 @@
}
} else
avahi_entry_group_reset(u->main_entry_group);
- =
+
txt =3D txt_record_server_data(u->core, NULL);
=
if (avahi_entry_group_add_service_strlst(
@@ -474,18 +474,18 @@
NULL,
u->port,
txt) < 0) {
- =
+
pa_log("avahi_entry_group_add_service_strlst() failed: %s", avahi_=
strerror(avahi_client_errno(u->client)));
goto fail;
}
- =
+
if (avahi_entry_group_commit(u->main_entry_group) < 0) {
pa_log("avahi_entry_group_commit() failed: %s", avahi_strerror(ava=
hi_client_errno(u->client)));
goto fail;
}
=
r =3D 0;
- =
+
fail:
avahi_string_list_free(txt);
=
@@ -498,7 +498,7 @@
pa_autoload_entry *autoload;
int r =3D -1;
uint32_t idx;
- =
+
assert(u);
=
pa_log_debug("Publishing services in Zeroconf");
@@ -518,9 +518,9 @@
=
if (publish_main_service(u) < 0)
goto fail;
- =
+
r =3D 0;
- =
+
fail:
return r;
}
@@ -528,7 +528,7 @@
static void unpublish_all_services(struct userdata *u, int rem) {
void *state =3D NULL;
struct service *s;
- =
+
assert(u);
=
pa_log_debug("Unpublishing services in Zeroconf");
@@ -538,7 +538,7 @@
if (rem) {
avahi_entry_group_free(s->entry_group);
s->entry_group =3D NULL;
- } else =
+ } else
avahi_entry_group_reset(s->entry_group);
}
=
@@ -559,12 +559,12 @@
assert(c);
=
u->client =3D c;
- =
+
switch (state) {
case AVAHI_CLIENT_S_RUNNING:
publish_all_services(u);
break;
- =
+
case AVAHI_CLIENT_S_COLLISION:
unpublish_all_services(u, 0);
break;
@@ -578,7 +578,7 @@
if (!(u->client =3D avahi_client_new(u->avahi_poll, AVAHI_=
CLIENT_NO_FAIL, client_callback, u, &error)))
pa_log("pa_avahi_client_new() failed: %s", avahi_strer=
ror(error));
}
- =
+
break;
=
default: ;
@@ -607,7 +607,7 @@
u->port =3D (uint16_t) port;
=
u->avahi_poll =3D pa_avahi_poll_new(c->mainloop);
- =
+
u->services =3D pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_s=
tring_compare_func);
u->sink_dynarray =3D pa_dynarray_new();
u->source_dynarray =3D pa_dynarray_new();
@@ -628,15 +628,15 @@
}
=
pa_modargs_free(ma);
- =
+
return 0;
- =
+
fail:
pa__done(c, m);
=
if (ma)
pa_modargs_free(ma);
- =
+
return -1;
}
=
@@ -649,7 +649,7 @@
=
if (s->entry_group)
avahi_entry_group_free(s->entry_group);
- =
+
pa_xfree(s->service_name);
pa_xfree(s->name);
pa_xfree(s);
@@ -674,14 +674,14 @@
pa_dynarray_free(u->source_dynarray, NULL, NULL);
if (u->autoload_dynarray)
pa_dynarray_free(u->autoload_dynarray, NULL, NULL);
- =
+
=
if (u->main_entry_group)
avahi_entry_group_free(u->main_entry_group);
- =
+
if (u->client)
avahi_client_free(u->client);
- =
+
if (u->avahi_poll)
pa_avahi_poll_free(u->avahi_poll);
=
Modified: trunk/src/modules/oss-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/oss-util.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/oss-util.c (original)
+++ trunk/src/modules/oss-util.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -48,14 +48,14 @@
=
if(!pcaps)
pcaps =3D ∩︀
- =
+
if (*mode =3D=3D O_RDWR) {
if ((fd =3D open(device, O_RDWR|O_NDELAY)) >=3D 0) {
int dcaps, *tcaps;
ioctl(fd, SNDCTL_DSP_SETDUPLEX, 0);
=
tcaps =3D pcaps ? pcaps : &dcaps;
- =
+
if (ioctl(fd, SNDCTL_DSP_GETCAPS, tcaps) < 0) {
pa_log("SNDCTL_DSP_GETCAPS: %s", pa_cstrerror(errno));
goto fail;
@@ -68,7 +68,7 @@
=
close(fd);
}
- =
+
if ((fd =3D open(device, (*mode =3D O_WRONLY)|O_NDELAY)) < 0) {
if ((fd =3D open(device, (*mode =3D O_RDONLY)|O_NDELAY)) < 0) {
pa_log("open('%s'): %s", device, pa_cstrerror(errno));
@@ -80,17 +80,17 @@
pa_log("open('%s'): %s", device, pa_cstrerror(errno));
goto fail;
}
- } =
+ }
=
success:
=
*pcaps =3D 0;
- =
+
if (ioctl(fd, SNDCTL_DSP_GETCAPS, pcaps) < 0) {
pa_log("SNDCTL_DSP_GETCAPS: %s", pa_cstrerror(errno));
goto fail;
}
- =
+
pa_log_debug("capabilities:%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
*pcaps & DSP_CAP_BATCH ? " BATCH" : "",
#ifdef DSP_CAP_BIND
@@ -100,7 +100,7 @@
#endif
*pcaps & DSP_CAP_COPROC ? " COPROC" : "",
*pcaps & DSP_CAP_DUPLEX ? " DUPLEX" : "",
-#ifdef DSP_CAP_FREERATE =
+#ifdef DSP_CAP_FREERATE
*pcaps & DSP_CAP_FREERATE ? " FREERATE" : "",
#else
"",
@@ -140,7 +140,7 @@
*pcaps & DSP_CAP_TRIGGER ? " TRIGGER" : "");
=
pa_fd_set_cloexec(fd, 1);
- =
+
return fd;
=
fail:
@@ -152,7 +152,7 @@
int pa_oss_auto_format(int fd, pa_sample_spec *ss) {
int format, channels, speed, reqformat;
pa_sample_format_t orig_format;
- =
+
static const int format_trans[PA_SAMPLE_MAX] =3D {
[PA_SAMPLE_U8] =3D AFMT_U8,
[PA_SAMPLE_ALAW] =3D AFMT_A_LAW,
@@ -166,7 +166,7 @@
assert(fd >=3D 0 && ss);
=
orig_format =3D ss->format;
- =
+
reqformat =3D format =3D format_trans[ss->format];
if (reqformat =3D=3D AFMT_QUERY || ioctl(fd, SNDCTL_DSP_SETFMT, &forma=
t) < 0 || format !=3D reqformat) {
format =3D AFMT_S16_NE;
@@ -190,7 +190,7 @@
pa_log_warn("device doesn't support sample format %s, changed to %=
s.",
pa_sample_format_to_string(orig_format),
pa_sample_format_to_string(ss->format));
- =
+
channels =3D ss->channels;
if (ioctl(fd, SNDCTL_DSP_CHANNELS, &channels) < 0) {
pa_log("SNDCTL_DSP_CHANNELS: %s", pa_cstrerror(errno));
@@ -229,14 +229,14 @@
if (!v) break;
k++;
}
- =
+
return k;
}
=
int pa_oss_set_fragments(int fd, int nfrags, int frag_size) {
int arg;
arg =3D ((int) nfrags << 16) | simple_log2(frag_size);
- =
+
if (ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &arg) < 0) {
pa_log("SNDCTL_DSP_SETFRAGMENT: %s", pa_cstrerror(errno));
return -1;
@@ -252,7 +252,7 @@
assert(fd >=3D 0);
assert(ss);
assert(volume);
- =
+
if (ioctl(fd, mixer, &vol) < 0)
return -1;
=
@@ -278,7 +278,7 @@
r =3D volume->values[1] > PA_VOLUME_NORM ? PA_VOLUME_NORM : volume=
->values[1];
vol |=3D ((r*100)/PA_VOLUME_NORM) << 8;
}
- =
+
if (ioctl(fd, mixer, &vol) < 0)
return -1;
=
@@ -321,7 +321,7 @@
n =3D *e - '0';
else
return -1;
- =
+
if (!(f =3D fopen("/dev/sndstat", "r")) &&
!(f =3D fopen("/proc/sndstat", "r")) &&
!(f =3D fopen("/proc/asound/oss/sndstat", "r"))) {
@@ -335,7 +335,7 @@
while (!feof(f)) {
char line[64];
int device;
- =
+
if (!fgets(line, sizeof(line), f))
break;
=
@@ -348,7 +348,7 @@
=
if (line[0] =3D=3D 0)
break;
- =
+
if (sscanf(line, "%i: ", &device) !=3D 1)
continue;
=
@@ -360,7 +360,7 @@
=
if (pa_endswith(k, " (DUPLEX)"))
k[strlen(k)-9] =3D 0;
- =
+
pa_strlcpy(name, k, l);
r =3D 0;
break;
Modified: trunk/src/modules/oss-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/oss-util.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/oss-util.h (original)
+++ trunk/src/modules/oss-util.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/browser.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/browser.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/browser.c (original)
+++ trunk/src/pulse/browser.c Thu Jan 4 14:43:45 2007
@@ -2,26 +2,26 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
***/
=
-#ifdef HAVE_CONFIG_H =
-#include "config.h" =
-#endif =
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
=
#include <assert.h>
#include <string.h>
@@ -53,10 +53,10 @@
=
pa_browser_error_cb_t error_callback;
void *error_userdata;
- =
+
AvahiClient *client;
AvahiServiceBrowser *server_browser, *sink_browser, *source_browser;
- =
+
};
=
static int map_to_opcode(const char *type, int new) {
@@ -84,7 +84,7 @@
AvahiStringList *txt,
AvahiLookupResultFlags flags,
void *userdata) {
- =
+
pa_browser *b =3D userdata;
pa_browse_info i;
char ip[256], a[256];
@@ -94,7 +94,7 @@
pa_sample_spec ss;
int ss_valid =3D 0;
char *key =3D NULL, *value =3D NULL;
- =
+
assert(b);
=
memset(&i, 0, sizeof(i));
@@ -102,7 +102,7 @@
=
if (event !=3D AVAHI_RESOLVER_FOUND)
goto fail;
- =
+
if (!b->callback)
goto fail;
=
@@ -119,10 +119,10 @@
=
=
while (txt) {
- =
+
if (avahi_string_list_get_pair(txt, &key, &value, NULL) < 0)
break;
- =
+
if (!strcmp(key, "device")) {
device_found =3D 1;
pa_xfree((char*) i.device);
@@ -138,11 +138,11 @@
value =3D NULL;
} else if (!strcmp(key, "fqdn")) {
size_t l;
- =
+
pa_xfree((char*) i.fqdn);
i.fqdn =3D value;
value =3D NULL;
- =
+
l =3D strlen(a);
assert(l+1 <=3D sizeof(a));
strncat(a, " ", sizeof(a)-l-1);
@@ -151,7 +151,7 @@
=
if (pa_atou(value, &cookie) < 0)
goto fail;
- =
+
i.cookie =3D &cookie;
} else if (!strcmp(key, "description")) {
pa_xfree((char*) i.description);
@@ -159,13 +159,13 @@
value =3D NULL;
} else if (!strcmp(key, "channels")) {
uint32_t ch;
- =
+
if (pa_atou(value, &ch) < 0 || ch <=3D 0 || ch > 255)
goto fail;
- =
+
ss.channels =3D (uint8_t) ch;
ss_valid |=3D 1;
- =
+
} else if (!strcmp(key, "rate")) {
if (pa_atou(value, &ss.rate) < 0)
goto fail;
@@ -174,7 +174,7 @@
=
if ((ss.format =3D pa_parse_sample_format(value)) =3D=3D PA_SA=
MPLE_INVALID)
goto fail;
- =
+
ss_valid |=3D 4;
}
=
@@ -186,7 +186,7 @@
}
=
/* No device txt record was sent for a sink or source service */
- if (opcode !=3D PA_BROWSE_NEW_SERVER && !device_found) =
+ if (opcode !=3D PA_BROWSE_NEW_SERVER && !device_found)
goto fail;
=
if (ss_valid =3D=3D 7)
@@ -203,7 +203,7 @@
=
pa_xfree(key);
pa_xfree(value);
- =
+
avahi_service_resolver_free(r);
}
=
@@ -263,19 +263,19 @@
=
break;
}
- =
+
case AVAHI_BROWSER_REMOVE: {
=
if (b->callback) {
pa_browse_info i;
int opcode;
- =
+
memset(&i, 0, sizeof(i));
i.name =3D name;
=
opcode =3D map_to_opcode(type, 0);
assert(opcode >=3D 0);
- =
+
b->callback(b, opcode, &i, b->userdata);
}
break;
@@ -285,7 +285,7 @@
handle_failure(b);
break;
}
- =
+
default:
;
}
@@ -313,7 +313,7 @@
=
if (flags & ~(PA_BROWSE_FOR_SERVERS|PA_BROWSE_FOR_SINKS|PA_BROWSE_FOR_=
SOURCES) || flags =3D=3D 0)
return NULL;
- =
+
b =3D pa_xnew(pa_browser, 1);
b->mainloop =3D mainloop;
b->ref =3D 1;
@@ -346,7 +346,7 @@
*error_string =3D avahi_strerror(avahi_client_errno(b->client)=
);
goto fail;
}
- =
+
if ((flags & PA_BROWSE_FOR_SINKS) &&
!(b->sink_browser =3D avahi_service_browser_new(
b->client,
@@ -378,13 +378,13 @@
*error_string =3D avahi_strerror(avahi_client_errno(b->client)=
);
goto fail;
}
- =
+
return b;
=
fail:
if (b)
browser_free(b);
- =
+
return NULL;
}
=
@@ -403,7 +403,7 @@
=
if (b->avahi_poll)
pa_avahi_poll_free(b->avahi_poll);
- =
+
pa_xfree(b);
}
=
Modified: trunk/src/pulse/browser.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/browser.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/browser.h (original)
+++ trunk/src/pulse/browser.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -41,7 +41,7 @@
PA_BROWSE_NEW_SINK, /**< New sink found */
PA_BROWSE_NEW_SOURCE, /**< New source found */
PA_BROWSE_REMOVE_SERVER, /**< Server disappeared */
- PA_BROWSE_REMOVE_SINK, /**< Sink disappeared */ =
+ PA_BROWSE_REMOVE_SINK, /**< Sink disappeared */
PA_BROWSE_REMOVE_SOURCE /**< Source disappeared */
} pa_browse_opcode_t;
=
Modified: trunk/src/pulse/cdecl.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/cdecl.h?rev=3D1=
418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/cdecl.h (original)
+++ trunk/src/pulse/cdecl.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/channelmap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/channelmap.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/channelmap.c (original)
+++ trunk/src/pulse/channelmap.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -35,23 +35,23 @@
=
const char *const table[] =3D {
[PA_CHANNEL_POSITION_MONO] =3D "mono",
- =
+
[PA_CHANNEL_POSITION_FRONT_CENTER] =3D "front-center",
[PA_CHANNEL_POSITION_FRONT_LEFT] =3D "front-left",
[PA_CHANNEL_POSITION_FRONT_RIGHT] =3D "front-right",
- =
+
[PA_CHANNEL_POSITION_REAR_CENTER] =3D "rear-center",
[PA_CHANNEL_POSITION_REAR_LEFT] =3D "rear-left",
[PA_CHANNEL_POSITION_REAR_RIGHT] =3D "rear-right",
- =
+
[PA_CHANNEL_POSITION_LFE] =3D "lfe",
- =
+
[PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER] =3D "front-left-of-center",
[PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER] =3D "front-right-of-center=
",
- =
+
[PA_CHANNEL_POSITION_SIDE_LEFT] =3D "side-left",
[PA_CHANNEL_POSITION_SIDE_RIGHT] =3D "side-right",
- =
+
[PA_CHANNEL_POSITION_AUX0] =3D "aux0",
[PA_CHANNEL_POSITION_AUX1] =3D "aux1",
[PA_CHANNEL_POSITION_AUX2] =3D "aux2",
@@ -86,7 +86,7 @@
[PA_CHANNEL_POSITION_AUX31] =3D "aux31",
=
[PA_CHANNEL_POSITION_TOP_CENTER] =3D "top-center",
- =
+
[PA_CHANNEL_POSITION_TOP_FRONT_LEFT] =3D "top-front-left",
[PA_CHANNEL_POSITION_TOP_FRONT_RIGHT] =3D "top-front-right",
[PA_CHANNEL_POSITION_TOP_FRONT_CENTER] =3D "top-front-center",
@@ -140,14 +140,14 @@
=
switch (def) {
case PA_CHANNEL_MAP_AIFF:
- =
+
/* This is somewhat compatible with RFC3551 */
- =
+
switch (channels) {
case 1:
m->map[0] =3D PA_CHANNEL_POSITION_MONO;
return m;
- =
+
case 6:
m->map[0] =3D PA_CHANNEL_POSITION_FRONT_LEFT;
m->map[1] =3D PA_CHANNEL_POSITION_SIDE_LEFT;
@@ -156,31 +156,31 @@
m->map[4] =3D PA_CHANNEL_POSITION_SIDE_RIGHT;
m->map[5] =3D PA_CHANNEL_POSITION_LFE;
return m;
- =
+
case 5:
m->map[2] =3D PA_CHANNEL_POSITION_FRONT_CENTER;
m->map[3] =3D PA_CHANNEL_POSITION_REAR_LEFT;
m->map[4] =3D PA_CHANNEL_POSITION_REAR_RIGHT;
/* Fall through */
- =
+
case 2:
m->map[0] =3D PA_CHANNEL_POSITION_FRONT_LEFT;
m->map[1] =3D PA_CHANNEL_POSITION_FRONT_RIGHT;
return m;
- =
+
case 3:
m->map[0] =3D PA_CHANNEL_POSITION_LEFT;
m->map[1] =3D PA_CHANNEL_POSITION_RIGHT;
m->map[2] =3D PA_CHANNEL_POSITION_CENTER;
return m;
- =
+
case 4:
m->map[0] =3D PA_CHANNEL_POSITION_LEFT;
m->map[1] =3D PA_CHANNEL_POSITION_CENTER;
m->map[2] =3D PA_CHANNEL_POSITION_RIGHT;
m->map[3] =3D PA_CHANNEL_POSITION_LFE;
return m;
- =
+
default:
return NULL;
}
@@ -191,43 +191,43 @@
case 1:
m->map[0] =3D PA_CHANNEL_POSITION_MONO;
return m;
- =
+
case 8:
m->map[6] =3D PA_CHANNEL_POSITION_SIDE_LEFT;
m->map[7] =3D PA_CHANNEL_POSITION_SIDE_RIGHT;
/* Fall through */
- =
+
case 6:
m->map[5] =3D PA_CHANNEL_POSITION_LFE;
/* Fall through */
- =
+
case 5:
m->map[4] =3D PA_CHANNEL_POSITION_FRONT_CENTER;
/* Fall through */
- =
+
case 4:
m->map[2] =3D PA_CHANNEL_POSITION_REAR_LEFT;
m->map[3] =3D PA_CHANNEL_POSITION_REAR_RIGHT;
/* Fall through */
- =
+
case 2:
m->map[0] =3D PA_CHANNEL_POSITION_FRONT_LEFT;
m->map[1] =3D PA_CHANNEL_POSITION_FRONT_RIGHT;
return m;
- =
+
default:
return NULL;
}
=
case PA_CHANNEL_MAP_AUX: {
unsigned i;
- =
+
if (channels >=3D PA_CHANNELS_MAX)
return NULL;
=
for (i =3D 0; i < channels; i++)
m->map[i] =3D PA_CHANNEL_POSITION_AUX0 + i;
- =
+
return m;
}
=
@@ -237,55 +237,55 @@
case 1:
m->map[0] =3D PA_CHANNEL_POSITION_MONO;
return m;
- =
+
case 18:
m->map[15] =3D PA_CHANNEL_POSITION_TOP_REAR_LEFT;
m->map[16] =3D PA_CHANNEL_POSITION_TOP_REAR_CENTER;
m->map[17] =3D PA_CHANNEL_POSITION_TOP_REAR_RIGHT;
/* Fall through */
- =
+
case 15:
m->map[12] =3D PA_CHANNEL_POSITION_TOP_FRONT_LEFT;
m->map[13] =3D PA_CHANNEL_POSITION_TOP_FRONT_CENTER;
m->map[14] =3D PA_CHANNEL_POSITION_TOP_FRONT_RIGHT;
/* Fall through */
- =
+
case 12:
m->map[11] =3D PA_CHANNEL_POSITION_TOP_CENTER;
/* Fall through */
- =
+
case 11:
m->map[9] =3D PA_CHANNEL_POSITION_SIDE_LEFT;
m->map[10] =3D PA_CHANNEL_POSITION_SIDE_RIGHT;
/* Fall through */
- =
+
case 9:
m->map[8] =3D PA_CHANNEL_POSITION_REAR_CENTER;
/* Fall through */
- =
+
case 8:
m->map[6] =3D PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER;
m->map[7] =3D PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTE=
R;
/* Fall through */
- =
+
case 6:
m->map[4] =3D PA_CHANNEL_POSITION_REAR_LEFT;
m->map[5] =3D PA_CHANNEL_POSITION_REAR_RIGHT;
/* Fall through */
- =
+
case 4:
m->map[3] =3D PA_CHANNEL_POSITION_LFE;
/* Fall through */
- =
+
case 3:
m->map[2] =3D PA_CHANNEL_POSITION_FRONT_CENTER;
/* Fall through */
- =
+
case 2:
m->map[0] =3D PA_CHANNEL_POSITION_FRONT_LEFT;
m->map[1] =3D PA_CHANNEL_POSITION_FRONT_RIGHT;
return m;
- =
+
default:
return NULL;
}
@@ -296,12 +296,12 @@
case 1:
m->map[0] =3D PA_CHANNEL_POSITION_MONO;
return m;
- =
+
case 8:
m->map[6] =3D PA_CHANNEL_POSITION_REAR_LEFT;
m->map[7] =3D PA_CHANNEL_POSITION_REAR_RIGHT;
/* Fall through */
- =
+
case 6:
m->map[4] =3D PA_CHANNEL_POSITION_SIDE_LEFT;
m->map[5] =3D PA_CHANNEL_POSITION_SIDE_RIGHT;
@@ -310,20 +310,20 @@
case 4:
m->map[3] =3D PA_CHANNEL_POSITION_LFE;
/* Fall through */
- =
+
case 3:
m->map[2] =3D PA_CHANNEL_POSITION_FRONT_CENTER;
/* Fall through */
- =
+
case 2:
m->map[0] =3D PA_CHANNEL_POSITION_FRONT_LEFT;
m->map[1] =3D PA_CHANNEL_POSITION_FRONT_RIGHT;
return m;
- =
+
default:
return NULL;
}
- =
+
=
default:
return NULL;
@@ -341,13 +341,13 @@
=
int pa_channel_map_equal(const pa_channel_map *a, const pa_channel_map *b)=
{
unsigned c;
- =
+
assert(a);
assert(b);
=
if (a->channels !=3D b->channels)
return 0;
- =
+
for (c =3D 0; c < a->channels; c++)
if (a->map[c] !=3D b->map[c])
return 0;
@@ -359,7 +359,7 @@
unsigned channel;
int first =3D 1;
char *e;
- =
+
assert(s);
assert(l > 0);
assert(map);
@@ -382,7 +382,7 @@
const char *state;
pa_channel_map map;
char *p;
- =
+
assert(rmap);
assert(s);
=
@@ -397,14 +397,14 @@
=
state =3D NULL;
map.channels =3D 0;
- =
+
while ((p =3D pa_split(s, ",", &state))) {
=
if (map.channels >=3D PA_CHANNELS_MAX) {
pa_xfree(p);
return NULL;
}
- =
+
/* Some special aliases */
if (strcmp(p, "left") =3D=3D 0)
map.map[map.channels++] =3D PA_CHANNEL_POSITION_LEFT;
@@ -416,13 +416,13 @@
map.map[map.channels++] =3D PA_CHANNEL_POSITION_SUBWOOFER;
else {
pa_channel_position_t i;
- =
+
for (i =3D 0; i < PA_CHANNEL_POSITION_MAX; i++)
if (strcmp(p, table[i]) =3D=3D 0) {
map.map[map.channels++] =3D i;
break;
}
- =
+
if (i >=3D PA_CHANNEL_POSITION_MAX) {
pa_xfree(p);
return NULL;
@@ -433,24 +433,24 @@
}
=
finish:
- =
+
if (!pa_channel_map_valid(&map))
return NULL;
- =
+
*rmap =3D map;
return rmap;
}
=
int pa_channel_map_valid(const pa_channel_map *map) {
unsigned c;
- =
+
assert(map);
=
if (map->channels <=3D 0 || map->channels > PA_CHANNELS_MAX)
return 0;
=
for (c =3D 0; c < map->channels; c++) {
- =
+
if (map->map[c] < 0 ||map->map[c] >=3D PA_CHANNEL_POSITION_MAX)
return 0;
=
Modified: trunk/src/pulse/channelmap.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/channelmap.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/channelmap.h (original)
+++ trunk/src/pulse/channelmap.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -72,7 +72,7 @@
PA_CHANNEL_POSITION_LEFT,
PA_CHANNEL_POSITION_RIGHT,
PA_CHANNEL_POSITION_CENTER,
- =
+
PA_CHANNEL_POSITION_FRONT_LEFT =3D PA_CHANNEL_POSITION_LEFT,
PA_CHANNEL_POSITION_FRONT_RIGHT =3D PA_CHANNEL_POSITION_RIGHT,
PA_CHANNEL_POSITION_FRONT_CENTER =3D PA_CHANNEL_POSITION_CENTER,
@@ -80,13 +80,13 @@
PA_CHANNEL_POSITION_REAR_CENTER,
PA_CHANNEL_POSITION_REAR_LEFT,
PA_CHANNEL_POSITION_REAR_RIGHT,
- =
+
PA_CHANNEL_POSITION_LFE,
PA_CHANNEL_POSITION_SUBWOOFER =3D PA_CHANNEL_POSITION_LFE,
- =
+
PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,
PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
- =
+
PA_CHANNEL_POSITION_SIDE_LEFT,
PA_CHANNEL_POSITION_SIDE_RIGHT,
=
@@ -124,7 +124,7 @@
PA_CHANNEL_POSITION_AUX31,
=
PA_CHANNEL_POSITION_TOP_CENTER,
- =
+
PA_CHANNEL_POSITION_TOP_FRONT_LEFT,
PA_CHANNEL_POSITION_TOP_FRONT_RIGHT,
PA_CHANNEL_POSITION_TOP_FRONT_CENTER,
@@ -132,7 +132,7 @@
PA_CHANNEL_POSITION_TOP_REAR_LEFT,
PA_CHANNEL_POSITION_TOP_REAR_RIGHT,
PA_CHANNEL_POSITION_TOP_REAR_CENTER,
- =
+
PA_CHANNEL_POSITION_MAX
} pa_channel_position_t;
=
@@ -143,7 +143,7 @@
PA_CHANNEL_MAP_AUX, /**< Only aux channels */
PA_CHANNEL_MAP_WAVEEX, /**< Microsoft's WAVEFORMATEXTENSIBLE mapping */
PA_CHANNEL_MAP_OSS, /**< The default channel mapping used by OSS as=
defined in the OSS 4.0 API specs */
- =
+
PA_CHANNEL_MAP_DEFAULT =3D PA_CHANNEL_MAP_AIFF /**< The default channe=
l map */
} pa_channel_map_def_t;
=
Modified: trunk/src/pulse/client-conf-x11.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf-x11=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/client-conf-x11.c (original)
+++ trunk/src/pulse/client-conf-x11.c Thu Jan 4 14:43:45 2007
@@ -44,7 +44,7 @@
=
if (!dname && !getenv("DISPLAY"))
goto finish;
- =
+
if (!(d =3D XOpenDisplay(dname))) {
pa_log("XOpenDisplay() failed");
goto finish;
@@ -89,5 +89,5 @@
XCloseDisplay(d);
=
return ret;
- =
+
}
Modified: trunk/src/pulse/client-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/client-conf.c (original)
+++ trunk/src/pulse/client-conf.c Thu Jan 4 14:43:45 2007
@@ -69,11 +69,11 @@
=
pa_client_conf *pa_client_conf_new(void) {
pa_client_conf *c =3D pa_xmemdup(&default_conf, sizeof(default_conf));
- =
+
c->daemon_binary =3D pa_xstrdup(PA_BINARY);
c->extra_arguments =3D pa_xstrdup("--log-target=3Dsyslog --exit-idle-t=
ime=3D5");
c->cookie_file =3D pa_xstrdup(PA_NATIVE_COOKIE_FILE);
- =
+
return c;
}
=
@@ -122,25 +122,25 @@
pa_log("WARNING: failed to open configuration file '%s': %s", fn, =
pa_cstrerror(errno));
goto finish;
}
- =
+
r =3D f ? pa_config_parse(fn, f, table, NULL) : 0;
=
if (!r)
r =3D pa_client_conf_load_cookie(c);
- =
+
=
finish:
pa_xfree(fn);
=
if (f)
fclose(f);
- =
+
return r;
}
=
int pa_client_conf_env(pa_client_conf *c) {
char *e;
- =
+
if ((e =3D getenv(ENV_DEFAULT_SINK))) {
pa_xfree(c->default_sink);
c->default_sink =3D pa_xstrdup(e);
@@ -155,7 +155,7 @@
pa_xfree(c->default_server);
c->default_server =3D pa_xstrdup(e);
}
- =
+
if ((e =3D getenv(ENV_DAEMON_BINARY))) {
pa_xfree(c->daemon_binary);
c->daemon_binary =3D pa_xstrdup(e);
@@ -167,7 +167,7 @@
=
return pa_client_conf_load_cookie(c);
}
- =
+
return 0;
}
=
Modified: trunk/src/pulse/context.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/context.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/context.c (original)
+++ trunk/src/pulse/context.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -88,11 +88,11 @@
=
static void unlock_autospawn_lock_file(pa_context *c) {
assert(c);
- =
+
if (c->autospawn_lock_fd >=3D 0) {
char lf[PATH_MAX];
pa_runtime_path(AUTOSPAWN_LOCK, lf, sizeof(lf));
- =
+
pa_unlock_lockfile(lf, c->autospawn_lock_fd);
c->autospawn_lock_fd =3D -1;
}
@@ -102,10 +102,10 @@
=
pa_context *pa_context_new(pa_mainloop_api *mainloop, const char *name) {
pa_context *c;
- =
+
assert(mainloop);
assert(name);
- =
+
c =3D pa_xnew(pa_context, 1);
c->ref =3D 1;
c->name =3D pa_xstrdup(name);
@@ -118,7 +118,7 @@
=
PA_LLIST_HEAD_INIT(pa_stream, c->streams);
PA_LLIST_HEAD_INIT(pa_operation, c->operations);
- =
+
c->error =3D PA_OK;
c->state =3D PA_CONTEXT_UNCONNECTED;
c->ctag =3D 0;
@@ -138,7 +138,7 @@
c->do_autospawn =3D 0;
=
#ifndef MSG_NOSIGNAL
-#ifdef SIGPIPE =
+#ifdef SIGPIPE
pa_check_signal_is_blocked(SIGPIPE);
#endif
#endif
@@ -183,7 +183,7 @@
pa_pstream_close(c->pstream);
pa_pstream_unref(c->pstream);
}
- =
+
if (c->record_streams)
pa_dynarray_free(c->record_streams, NULL, NULL);
if (c->playback_streams)
@@ -196,7 +196,7 @@
pa_client_conf_free(c->conf);
=
pa_strlist_free(c->server_list);
- =
+
pa_xfree(c->name);
pa_xfree(c->server);
pa_xfree(c);
@@ -205,7 +205,7 @@
pa_context* pa_context_ref(pa_context *c) {
assert(c);
assert(c->ref >=3D 1);
- =
+
c->ref++;
return c;
}
@@ -221,7 +221,7 @@
void pa_context_set_state(pa_context *c, pa_context_state_t st) {
assert(c);
assert(c->ref >=3D 1);
- =
+
if (c->state =3D=3D st)
return;
=
@@ -233,7 +233,7 @@
=
if (st =3D=3D PA_CONTEXT_FAILED || st =3D=3D PA_CONTEXT_TERMINATED) {
pa_stream *s;
- =
+
s =3D c->streams ? pa_stream_ref(c->streams) : NULL;
while (s) {
pa_stream *n =3D s->next ? pa_stream_ref(s->next) : NULL;
@@ -245,13 +245,13 @@
if (c->pdispatch)
pa_pdispatch_unref(c->pdispatch);
c->pdispatch =3D NULL;
- =
+
if (c->pstream) {
pa_pstream_close(c->pstream);
pa_pstream_unref(c->pstream);
}
c->pstream =3D NULL;
- =
+
if (c->client)
pa_socket_client_unref(c->client);
c->client =3D NULL;
@@ -263,7 +263,7 @@
void pa_context_fail(pa_context *c, int error) {
assert(c);
assert(c->ref >=3D 1);
- =
+
pa_context_set_error(c, error);
pa_context_set_state(c, PA_CONTEXT_FAILED);
}
@@ -283,19 +283,19 @@
=
assert(p);
assert(c);
- =
+
pa_context_fail(c, PA_ERR_CONNECTIONTERMINATED);
}
=
static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, cons=
t pa_creds *creds, void *userdata) {
pa_context *c =3D userdata;
- =
+
assert(p);
assert(packet);
assert(c);
=
pa_context_ref(c);
- =
+
if (pa_pdispatch_run(c->pdispatch, packet, creds, c) < 0)
pa_context_fail(c, PA_ERR_PROTOCOL);
=
@@ -305,7 +305,7 @@
static void pstream_memblock_callback(pa_pstream *p, uint32_t channel, int=
64_t offset, pa_seek_mode_t seek, const pa_memchunk *chunk, void *userdata)=
{
pa_context *c =3D userdata;
pa_stream *s;
- =
+
assert(p);
assert(chunk);
assert(chunk->memblock);
@@ -321,7 +321,7 @@
=
pa_memblockq_seek(s->record_memblockq, offset, seek);
pa_memblockq_push_align(s->record_memblockq, chunk);
- =
+
if (s->read_callback) {
size_t l;
=
@@ -339,11 +339,11 @@
=
if (command =3D=3D PA_COMMAND_ERROR) {
assert(t);
- =
+
if (pa_tagstruct_getu32(t, &c->error) < 0) {
pa_context_fail(c, PA_ERR_PROTOCOL);
return -1;
- =
+
}
} else if (command =3D=3D PA_COMMAND_TIMEOUT)
c->error =3D PA_ERR_TIMEOUT;
@@ -357,15 +357,15 @@
=
static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, ui=
nt32_t tag, pa_tagstruct *t, void *userdata) {
pa_context *c =3D userdata;
- =
+
assert(pd);
assert(c);
assert(c->state =3D=3D PA_CONTEXT_AUTHORIZING || c->state =3D=3D PA_CO=
NTEXT_SETTING_NAME);
=
pa_context_ref(c);
- =
+
if (command !=3D PA_COMMAND_REPLY) {
- =
+
if (pa_context_handle_error(c, command, t) < 0)
pa_context_fail(c, PA_ERR_PROTOCOL);
=
@@ -398,7 +398,7 @@
* user. This is a security measure because otherwise
* data private to the user might leak. */
=
-#ifdef HAVE_CREDS =
+#ifdef HAVE_CREDS
const pa_creds *creds;
if ((creds =3D pa_pdispatch_creds(pd)))
if (getuid() =3D=3D creds->uid)
@@ -418,7 +418,7 @@
case PA_CONTEXT_SETTING_NAME :
pa_context_set_state(c, PA_CONTEXT_READY);
break;
- =
+
default:
assert(0);
}
@@ -430,12 +430,12 @@
static void setup_context(pa_context *c, pa_iochannel *io) {
pa_tagstruct *t;
uint32_t tag;
- =
+
assert(c);
assert(io);
=
pa_context_ref(c);
- =
+
assert(!c->pstream);
c->pstream =3D pa_pstream_new(c->mainloop, io, c->mempool);
=
@@ -462,13 +462,13 @@
=
ucred.uid =3D getuid();
ucred.gid =3D getgid();
- =
+
pa_pstream_send_tagstruct_with_creds(c->pstream, t, &ucred);
}
#else
pa_pstream_send_tagstruct(c->pstream, t);
#endif
- =
+
pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, setup_=
complete_callback, c, NULL);
=
pa_context_set_state(c, PA_CONTEXT_AUTHORIZING);
@@ -487,7 +487,7 @@
pa_iochannel *io;
=
pa_context_ref(c);
- =
+
if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) {
pa_log("socketpair(): %s", pa_cstrerror(errno));
pa_context_fail(c, PA_ERR_INTERNAL);
@@ -495,7 +495,7 @@
}
=
pa_fd_set_cloexec(fds[0], 1);
- =
+
pa_socket_low_delay(fds[0]);
pa_socket_low_delay(fds[1]);
=
@@ -508,7 +508,7 @@
=
if (c->spawn_api.postfork)
c->spawn_api.postfork();
- =
+
goto fail;
} else if (!pid) {
/* Child */
@@ -521,17 +521,17 @@
=
/* Not required, since fds[0] has CLOEXEC enabled anyway */
close(fds[0]);
- =
+
if (c->spawn_api.atfork)
c->spawn_api.atfork();
=
/* Setup argv */
=
n =3D 0;
- =
+
argv[n++] =3D c->conf->daemon_binary;
argv[n++] =3D "--daemonize=3Dyes";
- =
+
snprintf(t, sizeof(t), "-Lmodule-native-protocol-fd fd=3D%i", fds[=
1]);
argv[n++] =3D strdup(t);
=
@@ -540,7 +540,7 @@
=
if (!(a =3D pa_split_spaces(c->conf->extra_arguments, &state)))
break;
- =
+
argv[n++] =3D a;
}
=
@@ -549,7 +549,7 @@
execv(argv[0], (char * const *) argv);
_exit(1);
#undef MAX_ARGS
- } =
+ }
=
/* Parent */
=
@@ -557,7 +557,7 @@
=
if (c->spawn_api.postfork)
c->spawn_api.postfork();
- =
+
if (r < 0) {
pa_log("waitpid(): %s", pa_cstrerror(errno));
pa_context_fail(c, PA_ERR_INTERNAL);
@@ -570,7 +570,7 @@
close(fds[1]);
=
c->is_local =3D 1;
- =
+
io =3D pa_iochannel_new(c->mainloop, fds[0], fds[0]);
=
setup_context(c, io);
@@ -598,16 +598,16 @@
static int try_next_connection(pa_context *c) {
char *u =3D NULL;
int r =3D -1;
- =
+
assert(c);
assert(!c->client);
=
for (;;) {
pa_xfree(u);
u =3D NULL;
- =
+
c->server_list =3D pa_strlist_pop(c->server_list, &u);
- =
+
if (!u) {
=
#ifndef OS_IS_WIN32
@@ -616,19 +616,19 @@
goto finish;
}
#endif
- =
+
pa_context_fail(c, PA_ERR_CONNECTIONREFUSED);
goto finish;
}
- =
- pa_log_debug("Trying to connect to %s...", u); =
+
+ pa_log_debug("Trying to connect to %s...", u);
=
pa_xfree(c->server);
c->server =3D pa_xstrdup(u);
=
if (!(c->client =3D pa_socket_client_new_string(c->mainloop, u, PA=
_NATIVE_DEFAULT_PORT)))
continue;
- =
+
c->is_local =3D pa_socket_client_is_local(c->client);
pa_socket_client_set_callback(c->client, on_connection, c);
break;
@@ -638,13 +638,13 @@
=
finish:
pa_xfree(u);
- =
+
return r;
}
=
static void on_connection(pa_socket_client *client, pa_iochannel*io, void =
*userdata) {
pa_context *c =3D userdata;
- =
+
assert(client);
assert(c);
assert(c->state =3D=3D PA_CONTEXT_CONNECTING);
@@ -677,9 +677,9 @@
const char *server,
pa_context_flags_t flags,
const pa_spawn_api *api) {
- =
+
int r =3D -1;
- =
+
assert(c);
assert(c->ref >=3D 1);
=
@@ -693,7 +693,7 @@
pa_context_ref(c);
=
assert(!c->server_list);
- =
+
if (server) {
if (!(c->server_list =3D pa_strlist_parse(server))) {
pa_context_fail(c, PA_ERR_INVALIDSERVER);
@@ -704,7 +704,7 @@
char ufn[PATH_MAX];
=
/* Prepend in reverse order */
- =
+
if ((d =3D getenv("DISPLAY"))) {
char *e;
d =3D pa_xstrdup(d);
@@ -716,7 +716,7 @@
=
pa_xfree(d);
}
- =
+
c->server_list =3D pa_strlist_prepend(c->server_list, "tcp6:localh=
ost");
c->server_list =3D pa_strlist_prepend(c->server_list, "tcp4:localh=
ost");
=
@@ -744,38 +744,38 @@
=
pa_context_set_state(c, PA_CONTEXT_CONNECTING);
r =3D try_next_connection(c);
- =
+
finish:
pa_context_unref(c);
- =
+
return r;
}
=
void pa_context_disconnect(pa_context *c) {
assert(c);
assert(c->ref >=3D 1);
- =
+
pa_context_set_state(c, PA_CONTEXT_TERMINATED);
}
=
pa_context_state_t pa_context_get_state(pa_context *c) {
assert(c);
assert(c->ref >=3D 1);
- =
+
return c->state;
}
=
int pa_context_errno(pa_context *c) {
assert(c);
assert(c->ref >=3D 1);
- =
+
return c->error;
}
=
void pa_context_set_state_callback(pa_context *c, pa_context_notify_cb_t c=
b, void *userdata) {
assert(c);
assert(c->ref >=3D 1);
- =
+
c->state_callback =3D cb;
c->state_userdata =3D userdata;
}
@@ -807,7 +807,7 @@
=
static void set_dispatch_callbacks(pa_operation *o) {
int done =3D 1;
- =
+
assert(o);
assert(o->ref >=3D 1);
assert(o->context);
@@ -816,7 +816,7 @@
=
pa_pstream_set_drain_callback(o->context->pstream, NULL, NULL);
pa_pdispatch_set_drain_callback(o->context->pdispatch, NULL, NULL);
- =
+
if (pa_pdispatch_is_pending(o->context->pdispatch)) {
pa_pdispatch_set_drain_callback(o->context->pdispatch, pdispatch_d=
rain_callback, o);
done =3D 0;
@@ -832,7 +832,7 @@
pa_context_notify_cb_t cb =3D (pa_context_notify_cb_t) o->call=
back;
cb(o->context, o->userdata);
}
- =
+
pa_operation_done(o);
pa_operation_unref(o);
}
@@ -840,13 +840,13 @@
=
pa_operation* pa_context_drain(pa_context *c, pa_context_notify_cb_t cb, v=
oid *userdata) {
pa_operation *o;
- =
+
assert(c);
assert(c->ref >=3D 1);
=
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, pa_context_is_pending(c), PA_ERR_BADS=
TATE);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
set_dispatch_callbacks(pa_operation_ref(o));
=
@@ -856,7 +856,7 @@
void pa_context_simple_ack_callback(pa_pdispatch *pd, uint32_t command, PA=
_GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
pa_operation *o =3D userdata;
int success =3D 1;
- =
+
assert(pd);
assert(o);
assert(o->ref >=3D 1);
@@ -907,12 +907,12 @@
pa_tagstruct *t;
pa_operation *o;
uint32_t tag;
- =
+
assert(c);
assert(c->ref >=3D 1);
=
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
- =
+
o =3D pa_operation_new(c, NULL, cb, userdata);
=
t =3D pa_tagstruct_command(c, command, &tag);
@@ -926,7 +926,7 @@
pa_tagstruct *t;
pa_operation *o;
uint32_t tag;
- =
+
assert(c);
assert(c->ref >=3D 1);
=
@@ -951,7 +951,7 @@
assert(c->ref >=3D 1);
=
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
t =3D pa_tagstruct_command(c, PA_COMMAND_SET_DEFAULT_SOURCE, &tag);
@@ -964,7 +964,7 @@
=
int pa_context_is_local(pa_context *c) {
assert(c);
- =
+
return c->is_local;
}
=
@@ -978,7 +978,7 @@
assert(name);
=
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
t =3D pa_tagstruct_command(c, PA_COMMAND_SET_CLIENT_NAME, &tag);
@@ -999,12 +999,12 @@
=
if (!c->server)
return NULL;
- =
+
if (*c->server =3D=3D '{') {
char *e =3D strchr(c->server+1, '}');
return e ? e+1 : c->server;
}
- =
+
return c->server;
}
=
@@ -1024,7 +1024,7 @@
=
assert(c);
assert(tag);
- =
+
t =3D pa_tagstruct_new(NULL, 0);
pa_tagstruct_putu32(t, command);
pa_tagstruct_putu32(t, *tag =3D c->ctag++);
Modified: trunk/src/pulse/context.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/context.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/context.h (original)
+++ trunk/src/pulse/context.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -50,7 +50,7 @@
* The abstraction is represented as a number of function pointers in the
* pa_mainloop_api structure.
*
- * To actually be able to use these functions, an implementation needs to =
+ * To actually be able to use these functions, an implementation needs to
* be coupled to the abstraction. There are three of these shipped with
* PulseAudio, but any other can be used with a minimal ammount of work,
* provided it supports the three basic events listed above.
@@ -76,7 +76,7 @@
* and decrease their reference counts. Whenever an object's reference
* count reaches zero, that object gets destroy and any resources it uses
* get freed.
- * =
+ *
* The benefit of this design is that an application need not worry about
* whether or not it needs to keep an object around in case the library is
* using it internally. If it is, then it has made sure it has its own
Modified: trunk/src/pulse/def.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/def.h?rev=3D141=
8&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/def.h (original)
+++ trunk/src/pulse/def.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -69,7 +69,7 @@
PA_CONTEXT_NOAUTOSPAWN =3D 1 /**< Disabled autospawning of the PulseAu=
dio daemon if required */
} pa_context_flags_t;
=
-/** The direction of a pa_stream object */ =
+/** The direction of a pa_stream object */
typedef enum pa_stream_direction {
PA_STREAM_NODIRECTION, /**< Invalid direction */
PA_STREAM_PLAYBACK, /**< Playback stream */
@@ -149,7 +149,7 @@
PA_ERR_EXIST, /**< Entity exists */
PA_ERR_NOENTITY, /**< No such entity */
PA_ERR_CONNECTIONREFUSED, /**< Connection refused */
- PA_ERR_PROTOCOL, /**< Protocol error */ =
+ PA_ERR_PROTOCOL, /**< Protocol error */
PA_ERR_TIMEOUT, /**< Timeout */
PA_ERR_AUTHKEY, /**< No authorization key */
PA_ERR_INTERNAL, /**< Internal error */
@@ -207,7 +207,7 @@
* total output latency a sample that is written with
* pa_stream_write() takes to be played may be estimated by
* sink_usec+buffer_usec+transport_usec. (where buffer_usec is defined
- * as pa_bytes_to_usec(write_index-read_index)) The output buffer =
+ * as pa_bytes_to_usec(write_index-read_index)) The output buffer
* which buffer_usec relates to may be manipulated freely (with
* pa_stream_write()'s seek argument, pa_stream_flush() and friends),
* the buffers sink_usec and source_usec relate to are first-in
@@ -256,7 +256,7 @@
* flush request that corrupted it has
* been issued in the time since this
* latency info was current. \since 0.8 */
- =
+
int64_t read_index; /**< Current read index into the
* playback buffer in bytes. Think twice bef=
ore
* using this for seeking purposes: it
@@ -288,7 +288,7 @@
/** Seek type for pa_stream_write(). \since 0.8*/
typedef enum pa_seek_mode {
PA_SEEK_RELATIVE =3D 0, /**< Seek relatively to the write in=
dex */
- PA_SEEK_ABSOLUTE =3D 1, /**< Seek relatively to the start of=
the buffer queue */ =
+ PA_SEEK_ABSOLUTE =3D 1, /**< Seek relatively to the start of=
the buffer queue */
PA_SEEK_RELATIVE_ON_READ =3D 2, /**< Seek relatively to the read ind=
ex. */
PA_SEEK_RELATIVE_END =3D 3 /**< Seek relatively to the current =
end of the buffer queue. */
} pa_seek_mode_t;
Modified: trunk/src/pulse/error.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/error.c?rev=3D1=
418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/error.c (original)
+++ trunk/src/pulse/error.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/error.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/error.h?rev=3D1=
418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/error.h (original)
+++ trunk/src/pulse/error.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/glib-mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/glib-mainloop.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/glib-mainloop.c (original)
+++ trunk/src/pulse/glib-mainloop.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -69,7 +69,7 @@
int dead;
=
int enabled;
- =
+
pa_defer_event_cb_t callback;
void *userdata;
pa_defer_event_destroy_cb_t destroy_callback;
@@ -79,7 +79,7 @@
=
struct pa_glib_mainloop {
GSource source;
- =
+
pa_mainloop_api api;
GMainContext *context;
=
@@ -102,7 +102,7 @@
=
if (!force && g->io_events_please_scan <=3D 0)
break;
- =
+
if (force || e->dead) {
PA_LLIST_REMOVE(pa_io_event, g->io_events, e);
=
@@ -110,13 +110,13 @@
g_assert(g->io_events_please_scan > 0);
g->io_events_please_scan--;
}
- =
+
if (e->poll_fd_added)
g_source_remove_poll(&g->source, &e->poll_fd);
- =
+
if (e->destroy_callback)
e->destroy_callback(&g->api, e, e->userdata);
- =
+
pa_xfree(e);
}
=
@@ -135,7 +135,7 @@
=
if (!force && g->time_events_please_scan <=3D 0)
break;
- =
+
if (force || e->dead) {
PA_LLIST_REMOVE(pa_time_event, g->time_events, e);
=
@@ -148,10 +148,10 @@
g_assert(g->n_enabled_time_events > 0);
g->n_enabled_time_events--;
}
- =
+
if (e->destroy_callback)
e->destroy_callback(&g->api, e, e->userdata);
- =
+
pa_xfree(e);
}
=
@@ -170,7 +170,7 @@
=
if (!force && g->defer_events_please_scan <=3D 0)
break;
- =
+
if (force || e->dead) {
PA_LLIST_REMOVE(pa_defer_event, g->defer_events, e);
=
@@ -183,10 +183,10 @@
g_assert(g->n_enabled_defer_events > 0);
g->n_enabled_defer_events--;
}
- =
+
if (e->destroy_callback)
e->destroy_callback(&g->api, e, e->userdata);
- =
+
pa_xfree(e);
}
=
@@ -218,7 +218,7 @@
pa_io_event_flags_t f,
pa_io_event_cb_t cb,
void *userdata) {
- =
+
pa_io_event *e;
pa_glib_mainloop *g;
=
@@ -226,7 +226,7 @@
g_assert(m->userdata);
g_assert(fd >=3D 0);
g_assert(cb);
- =
+
g =3D m->userdata;
=
e =3D pa_xnew(pa_io_event, 1);
@@ -236,7 +236,7 @@
e->poll_fd.fd =3D fd;
e->poll_fd.events =3D map_flags_to_glib(f);
e->poll_fd.revents =3D 0;
- =
+
e->callback =3D cb;
e->userdata =3D userdata;
e->destroy_callback =3D NULL;
@@ -245,7 +245,7 @@
=
g_source_add_poll(&g->source, &e->poll_fd);
e->poll_fd_added =3D 1;
- =
+
return e;
}
=
@@ -272,7 +272,7 @@
static void glib_io_set_destroy(pa_io_event*e, pa_io_event_destroy_cb_t cb=
) {
g_assert(e);
g_assert(!e->dead);
- =
+
e->destroy_callback =3D cb;
}
=
@@ -283,14 +283,14 @@
const struct timeval *tv,
pa_time_event_cb_t cb,
void *userdata) {
- =
+
pa_glib_mainloop *g;
pa_time_event *e;
- =
+
g_assert(m);
g_assert(m->userdata);
g_assert(cb);
- =
+
g =3D m->userdata;
=
e =3D pa_xnew(pa_time_event, 1);
@@ -308,13 +308,13 @@
g->cached_next_time_event =3D e;
}
}
- =
+
e->callback =3D cb;
e->userdata =3D userdata;
e->destroy_callback =3D NULL;
=
PA_LLIST_PREPEND(pa_time_event, g->time_events, e);
- =
+
return e;
}
=
@@ -328,12 +328,12 @@
} else if (!e->enabled && tv)
e->mainloop->n_enabled_time_events++;
=
- if ((e->enabled =3D !!tv)) =
+ if ((e->enabled =3D !!tv))
e->timeval =3D *tv;
=
if (e->mainloop->cached_next_time_event && e->enabled) {
g_assert(e->mainloop->cached_next_time_event->enabled);
- =
+
if (pa_timeval_cmp(tv, &e->mainloop->cached_next_time_event->timev=
al) < 0)
e->mainloop->cached_next_time_event =3D e;
} else if (e->mainloop->cached_next_time_event =3D=3D e)
@@ -357,7 +357,7 @@
static void glib_time_set_destroy(pa_time_event *e, pa_time_event_destroy_=
cb_t cb) {
g_assert(e);
g_assert(!e->dead);
- =
+
e->destroy_callback =3D cb;
}
=
@@ -367,27 +367,27 @@
pa_mainloop_api*m,
pa_defer_event_cb_t cb,
void *userdata) {
- =
+
pa_defer_event *e;
pa_glib_mainloop *g;
=
g_assert(m);
g_assert(m->userdata);
g_assert(cb);
- =
+
g =3D m->userdata;
- =
+
e =3D pa_xnew(pa_defer_event, 1);
e->mainloop =3D g;
e->dead =3D 0;
=
e->enabled =3D 1;
g->n_enabled_defer_events++;
- =
+
e->callback =3D cb;
e->userdata =3D userdata;
e->destroy_callback =3D NULL;
- =
+
PA_LLIST_PREPEND(pa_defer_event, g->defer_events, e);
return e;
}
@@ -430,7 +430,7 @@
static void glib_quit(pa_mainloop_api*a, PA_GCC_UNUSED int retval) {
=
g_warning("quit() ignored");
- =
+
/* NOOP */
}
=
@@ -440,7 +440,7 @@
=
if (g->cached_next_time_event)
return g->cached_next_time_event;
- =
+
for (t =3D g->time_events; t; t =3D t->next) {
=
if (t->dead || !t->enabled)
@@ -461,7 +461,7 @@
=
static void scan_dead(pa_glib_mainloop *g) {
g_assert(g);
- =
+
if (g->io_events_please_scan)
cleanup_io_events(g, 0);
=
@@ -499,7 +499,7 @@
if (pa_timeval_cmp(&t->timeval, &tvnow) <=3D 0) {
*timeout =3D 0;
return TRUE;
- } =
+ }
usec =3D pa_timeval_diff(&t->timeval, &tvnow);
*timeout =3D (gint) (usec / 1000);
} else
@@ -519,10 +519,10 @@
pa_time_event *t;
GTimeVal now;
struct timeval tvnow;
- =
+
t =3D find_next_time_event(g);
g_assert(t);
- =
+
g_source_get_current_time(source, &now);
tvnow.tv_sec =3D now.tv_sec;
tvnow.tv_usec =3D now.tv_usec;
@@ -555,7 +555,7 @@
}
=
g_assert(d);
- =
+
d->callback(&g->api, d, d->userdata);
return TRUE;
}
@@ -567,7 +567,7 @@
=
t =3D find_next_time_event(g);
g_assert(t);
- =
+
g_source_get_current_time(source, &now);
tvnow.tv_sec =3D now.tv_sec;
tvnow.tv_usec =3D now.tv_usec;
@@ -576,7 +576,7 @@
=
/* Disable time event */
glib_time_restart(t, NULL);
- =
+
t->callback(&g->api, t, &t->timeval, t->userdata);
return TRUE;
}
@@ -604,12 +604,12 @@
.time_restart =3D glib_time_restart,
.time_free =3D glib_time_free,
.time_set_destroy =3D glib_time_set_destroy,
- =
+
.defer_new =3D glib_defer_new,
.defer_enable =3D glib_defer_enable,
.defer_free =3D glib_defer_free,
.defer_set_destroy =3D glib_defer_set_destroy,
- =
+
.quit =3D glib_quit,
};
=
@@ -624,10 +624,10 @@
NULL,
NULL
};
- =
+
g =3D (pa_glib_mainloop*) g_source_new(&source_funcs, sizeof(pa_glib_m=
ainloop));
g_main_context_ref(g->context =3D c ? c : g_main_context_default());
- =
+
g->api =3D vtable;
g->api.userdata =3D g;
=
@@ -639,10 +639,10 @@
g->io_events_please_scan =3D g->time_events_please_scan =3D g->defer_e=
vents_please_scan =3D 0;
=
g->cached_next_time_event =3D NULL;
- =
+
g_source_attach(&g->source, g->context);
g_source_set_can_recurse(&g->source, FALSE);
- =
+
return g;
}
=
@@ -660,6 +660,6 @@
=
pa_mainloop_api* pa_glib_mainloop_get_api(pa_glib_mainloop *g) {
g_assert(g);
- =
+
return &g->api;
}
Modified: trunk/src/pulse/glib-mainloop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/glib-mainloop.h=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/glib-mainloop.h (original)
+++ trunk/src/pulse/glib-mainloop.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/internal.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/internal.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/internal.h (original)
+++ trunk/src/pulse/internal.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -45,7 +45,7 @@
=
struct pa_context {
int ref;
- =
+
char *name;
pa_mainloop_api* mainloop;
=
@@ -75,7 +75,7 @@
int do_autospawn;
int autospawn_lock_fd;
pa_spawn_api spawn_api;
- =
+
pa_strlist *server_list;
=
char *server;
@@ -109,7 +109,7 @@
uint32_t device_index;
pa_stream_direction_t direction;
pa_stream_state_t state;
- =
+
uint32_t requested_bytes;
=
pa_memchunk peek_memchunk;
@@ -120,10 +120,10 @@
/* Store latest latency info */
pa_timing_info timing_info;
int timing_info_valid;
- =
+
/* Use to make sure that time advances monotonically */
pa_usec_t previous_time;
- =
+
/* time updates with tags older than these are invalid */
uint32_t write_index_not_before;
uint32_t read_index_not_before;
@@ -135,7 +135,7 @@
/* Latency interpolation stuff */
pa_time_event *auto_timing_update_event;
int auto_timing_update_requested;
- =
+
pa_usec_t cached_time;
int cached_time_valid;
=
@@ -160,7 +160,7 @@
int ref;
pa_context *context;
pa_stream *stream;
- =
+
PA_LLIST_FIELDS(pa_operation);
=
pa_operation_state_t state;
Modified: trunk/src/pulse/introspect.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/introspect.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/introspect.c (original)
+++ trunk/src/pulse/introspect.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -39,7 +39,7 @@
static void context_stat_callback(pa_pdispatch *pd, uint32_t command, PA_G=
CC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
pa_operation *o =3D userdata;
pa_stat_info i, *p =3D &i;
- =
+
assert(pd);
assert(o);
assert(o->ref >=3D 1);
@@ -81,11 +81,11 @@
static void context_get_server_info_callback(pa_pdispatch *pd, uint32_t co=
mmand, PA_GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
pa_operation *o =3D userdata;
pa_server_info i, *p =3D &i;
- =
+
assert(pd);
assert(o);
assert(o->ref >=3D 1);
- =
+
if (!o->context)
goto finish;
=
@@ -107,7 +107,7 @@
pa_context_fail(o->context, PA_ERR_PROTOCOL);
goto finish;
}
- =
+
if (o->callback) {
pa_server_info_cb_t cb =3D (pa_server_info_cb_t) o->callback;
cb(o->context, p, o->userdata);
@@ -127,14 +127,14 @@
static void context_get_sink_info_callback(pa_pdispatch *pd, uint32_t comm=
and, PA_GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
pa_operation *o =3D userdata;
int eol =3D 1;
- =
+
assert(pd);
assert(o);
assert(o->ref >=3D 1);
=
if (!o->context)
goto finish;
- =
+
if (command !=3D PA_COMMAND_REPLY) {
if (pa_context_handle_error(o->context, command, t) < 0)
goto finish;
@@ -142,10 +142,10 @@
eol =3D -1;
} else {
uint32_t flags;
- =
+
while (!pa_tagstruct_eof(t)) {
pa_sink_info i;
- =
+
if (pa_tagstruct_getu32(t, &i.index) < 0 ||
pa_tagstruct_gets(t, &i.name) < 0 ||
pa_tagstruct_gets(t, &i.description) < 0 ||
@@ -159,7 +159,7 @@
pa_tagstruct_get_usec(t, &i.latency) < 0 ||
pa_tagstruct_gets(t, &i.driver) < 0 ||
pa_tagstruct_getu32(t, &flags) < 0) {
- =
+
pa_context_fail(o->context, PA_ERR_PROTOCOL);
goto finish;
}
@@ -172,7 +172,7 @@
}
}
}
- =
+
if (o->callback) {
pa_sink_info_cb_t cb =3D (pa_sink_info_cb_t) o->callback;
cb(o->context, NULL, eol, o->userdata);
@@ -191,7 +191,7 @@
pa_tagstruct *t;
pa_operation *o;
uint32_t tag;
- =
+
assert(c);
assert(c->ref >=3D 1);
assert(cb);
@@ -213,7 +213,7 @@
pa_tagstruct *t;
pa_operation *o;
uint32_t tag;
- =
+
assert(c);
assert(c->ref >=3D 1);
assert(cb);
@@ -251,11 +251,11 @@
=
eol =3D -1;
} else {
- =
+
while (!pa_tagstruct_eof(t)) {
pa_source_info i;
uint32_t flags;
- =
+
if (pa_tagstruct_getu32(t, &i.index) < 0 ||
pa_tagstruct_gets(t, &i.name) < 0 ||
pa_tagstruct_gets(t, &i.description) < 0 ||
@@ -269,7 +269,7 @@
pa_tagstruct_get_usec(t, &i.latency) < 0 ||
pa_tagstruct_gets(t, &i.driver) < 0 ||
pa_tagstruct_getu32(t, &flags) < 0) {
- =
+
pa_context_fail(o->context, PA_ERR_PROTOCOL);
goto finish;
}
@@ -282,7 +282,7 @@
}
}
}
- =
+
if (o->callback) {
pa_source_info_cb_t cb =3D (pa_source_info_cb_t) o->callback;
cb(o->context, NULL, eol, o->userdata);
@@ -309,7 +309,7 @@
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
=
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
- =
+
t =3D pa_tagstruct_command(c, PA_COMMAND_GET_SOURCE_INFO, &tag);
pa_tagstruct_putu32(t, idx);
pa_tagstruct_puts(t, NULL);
@@ -361,10 +361,10 @@
=
eol =3D -1;
} else {
- =
+
while (!pa_tagstruct_eof(t)) {
pa_client_info i;
- =
+
if (pa_tagstruct_getu32(t, &i.index) < 0 ||
pa_tagstruct_gets(t, &i.name) < 0 ||
pa_tagstruct_getu32(t, &i.owner_module) < 0 ||
@@ -379,7 +379,7 @@
}
}
}
- =
+
if (o->callback) {
pa_client_info_cb_t cb =3D (pa_client_info_cb_t) o->callback;
cb(o->context, NULL, eol, o->userdata);
@@ -428,17 +428,17 @@
=
if (!o->context)
goto finish;
- =
+
if (command !=3D PA_COMMAND_REPLY) {
if (pa_context_handle_error(o->context, command, t) < 0)
goto finish;
=
eol =3D -1;
} else {
- =
+
while (!pa_tagstruct_eof(t)) {
pa_module_info i;
- =
+
if (pa_tagstruct_getu32(t, &i.index) < 0 ||
pa_tagstruct_gets(t, &i.name) < 0 ||
pa_tagstruct_gets(t, &i.argument) < 0 ||
@@ -454,7 +454,7 @@
}
}
}
- =
+
if (o->callback) {
pa_module_info_cb_t cb =3D (pa_module_info_cb_t) o->callback;
cb(o->context, NULL, eol, o->userdata);
@@ -476,7 +476,7 @@
=
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, idx !=3D PA_INVALID_INDEX, PA_ERR_INV=
ALID);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
t =3D pa_tagstruct_command(c, PA_COMMAND_GET_MODULE_INFO, &tag);
@@ -503,17 +503,17 @@
=
if (!o->context)
goto finish;
- =
+
if (command !=3D PA_COMMAND_REPLY) {
if (pa_context_handle_error(o->context, command, t) < 0)
goto finish;
=
eol =3D -1;
} else {
- =
+
while (!pa_tagstruct_eof(t)) {
pa_sink_input_info i;
- =
+
if (pa_tagstruct_getu32(t, &i.index) < 0 ||
pa_tagstruct_gets(t, &i.name) < 0 ||
pa_tagstruct_getu32(t, &i.owner_module) < 0 ||
@@ -526,7 +526,7 @@
pa_tagstruct_get_usec(t, &i.sink_usec) < 0 ||
pa_tagstruct_gets(t, &i.resample_method) < 0 ||
pa_tagstruct_gets(t, &i.driver) < 0) {
- =
+
pa_context_fail(o->context, PA_ERR_PROTOCOL);
goto finish;
}
@@ -537,7 +537,7 @@
}
}
}
- =
+
if (o->callback) {
pa_sink_input_info_cb_t cb =3D (pa_sink_input_info_cb_t) o->callba=
ck;
cb(o->context, NULL, eol, o->userdata);
@@ -559,7 +559,7 @@
=
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, idx !=3D PA_INVALID_INDEX, PA_ERR_INV=
ALID);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
t =3D pa_tagstruct_command(c, PA_COMMAND_GET_SINK_INPUT_INFO, &tag);
@@ -593,10 +593,10 @@
=
eol =3D -1;
} else {
- =
+
while (!pa_tagstruct_eof(t)) {
pa_source_output_info i;
- =
+
if (pa_tagstruct_getu32(t, &i.index) < 0 ||
pa_tagstruct_gets(t, &i.name) < 0 ||
pa_tagstruct_getu32(t, &i.owner_module) < 0 ||
@@ -608,7 +608,7 @@
pa_tagstruct_get_usec(t, &i.source_usec) < 0 ||
pa_tagstruct_gets(t, &i.resample_method) < 0 ||
pa_tagstruct_gets(t, &i.driver) < 0) {
- =
+
pa_context_fail(o->context, PA_ERR_PROTOCOL);
goto finish;
}
@@ -619,7 +619,7 @@
}
}
}
- =
+
if (o->callback) {
pa_source_output_info_cb_t cb =3D (pa_source_output_info_cb_t) o->=
callback;
cb(o->context, NULL, eol, o->userdata);
@@ -641,7 +641,7 @@
=
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, idx !=3D PA_INVALID_INDEX, PA_ERR_INV=
ALID);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
t =3D pa_tagstruct_command(c, PA_COMMAND_GET_SOURCE_OUTPUT_INFO, &tag);
@@ -695,7 +695,7 @@
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, pa_cvolume_valid(volume), PA_ERR_INVA=
LID);
PA_CHECK_VALIDITY_RETURN_NULL(c, !name || *name, PA_ERR_INVALID);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
t =3D pa_tagstruct_command(c, PA_COMMAND_SET_SINK_VOLUME, &tag);
@@ -741,7 +741,7 @@
=
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, !name || *name, PA_ERR_INVALID);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
t =3D pa_tagstruct_command(c, PA_COMMAND_SET_SINK_MUTE, &tag);
@@ -766,7 +766,7 @@
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, idx !=3D PA_INVALID_INDEX, PA_ERR_INV=
ALID);
PA_CHECK_VALIDITY_RETURN_NULL(c, pa_cvolume_valid(volume), PA_ERR_INVA=
LID);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
t =3D pa_tagstruct_command(c, PA_COMMAND_SET_SINK_INPUT_VOLUME, &tag);
@@ -815,7 +815,7 @@
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, pa_cvolume_valid(volume), PA_ERR_INVA=
LID);
PA_CHECK_VALIDITY_RETURN_NULL(c, !name || *name, PA_ERR_INVALID);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
t =3D pa_tagstruct_command(c, PA_COMMAND_SET_SOURCE_VOLUME, &tag);
@@ -861,7 +861,7 @@
=
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, !name || *name, PA_ERR_INVALID);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
t =3D pa_tagstruct_command(c, PA_COMMAND_SET_SOURCE_MUTE, &tag);
@@ -886,17 +886,17 @@
=
if (!o->context)
goto finish;
- =
+
if (command !=3D PA_COMMAND_REPLY) {
if (pa_context_handle_error(o->context, command, t) < 0)
goto finish;
=
eol =3D -1;
} else {
- =
+
while (!pa_tagstruct_eof(t)) {
pa_sample_info i;
- =
+
if (pa_tagstruct_getu32(t, &i.index) < 0 ||
pa_tagstruct_gets(t, &i.name) < 0 ||
pa_tagstruct_get_cvolume(t, &i.volume) < 0 ||
@@ -906,7 +906,7 @@
pa_tagstruct_getu32(t, &i.bytes) < 0 ||
pa_tagstruct_get_boolean(t, &i.lazy) < 0 ||
pa_tagstruct_gets(t, &i.filename) < 0) {
- =
+
pa_context_fail(o->context, PA_ERR_PROTOCOL);
goto finish;
}
@@ -917,7 +917,7 @@
}
}
}
- =
+
if (o->callback) {
pa_sample_info_cb_t cb =3D (pa_sample_info_cb_t) o->callback;
cb(o->context, NULL, eol, o->userdata);
@@ -932,7 +932,7 @@
pa_tagstruct *t;
pa_operation *o;
uint32_t tag;
- =
+
assert(c);
assert(c->ref >=3D 1);
assert(cb);
@@ -1002,7 +1002,7 @@
pa_operation* pa_context_kill_client(pa_context *c, uint32_t idx, pa_conte=
xt_success_cb_t cb, void *userdata) {
return command_kill(c, PA_COMMAND_KILL_CLIENT, idx, cb, userdata);
}
- =
+
pa_operation* pa_context_kill_sink_input(pa_context *c, uint32_t idx, pa_c=
ontext_success_cb_t cb, void *userdata) {
return command_kill(c, PA_COMMAND_KILL_SINK_INPUT, idx, cb, userdata);
}
@@ -1021,7 +1021,7 @@
=
if (!o->context)
goto finish;
- =
+
if (command !=3D PA_COMMAND_REPLY) {
if (pa_context_handle_error(o->context, command, t) < 0)
goto finish;
@@ -1048,7 +1048,7 @@
pa_operation *o;
pa_tagstruct *t;
uint32_t tag;
- =
+
assert(c);
assert(c->ref >=3D 1);
=
@@ -1089,10 +1089,10 @@
=
eol =3D -1;
} else {
- =
+
while (!pa_tagstruct_eof(t)) {
pa_autoload_info i;
- =
+
if (pa_tagstruct_getu32(t, &i.index) < 0 ||
pa_tagstruct_gets(t, &i.name) < 0 ||
pa_tagstruct_getu32(t, &i.type) < 0 ||
@@ -1108,7 +1108,7 @@
}
}
}
- =
+
if (o->callback) {
pa_autoload_info_cb_t cb =3D (pa_autoload_info_cb_t) o->callback;
cb(o->context, NULL, eol, o->userdata);
@@ -1147,7 +1147,7 @@
pa_tagstruct *t;
pa_operation *o;
uint32_t tag;
- =
+
assert(c);
assert(c->ref >=3D 1);
assert(cb);
@@ -1176,7 +1176,7 @@
=
assert(c);
assert(c->ref >=3D 1);
- =
+
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, name && *name, PA_ERR_INVALID);
PA_CHECK_VALIDITY_RETURN_NULL(c, type =3D=3D PA_AUTOLOAD_SINK || type =
=3D=3D PA_AUTOLOAD_SOURCE, PA_ERR_INVALID);
@@ -1202,7 +1202,7 @@
=
assert(c);
assert(c->ref >=3D 1);
- =
+
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, name && *name, PA_ERR_INVALID);
PA_CHECK_VALIDITY_RETURN_NULL(c, type =3D=3D PA_AUTOLOAD_SINK || type =
=3D=3D PA_AUTOLOAD_SOURCE, PA_ERR_INVALID);
Modified: trunk/src/pulse/introspect.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/introspect.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/introspect.h (original)
+++ trunk/src/pulse/introspect.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -206,7 +206,7 @@
/** Stores information about sinks */
typedef struct pa_sink_info {
const char *name; /**< Name of the sink */
- uint32_t index; /**< Index of the sink */ =
+ uint32_t index; /**< Index of the sink */
const char *description; /**< Description of this sink */
pa_sample_spec sample_spec; /**< Sample spec of this sink */
pa_channel_map channel_map; /**< Channel map \since 0.8 */
@@ -233,7 +233,7 @@
pa_operation* pa_context_get_sink_info_list(pa_context *c, pa_sink_info_cb=
_t cb, void *userdata);
=
/** Stores information about sources */
-typedef struct pa_source_info { =
+typedef struct pa_source_info {
const char *name ; /**< Name of the source */
uint32_t index; /**< Index of the source */
const char *description; /**< Description of this source */
@@ -316,7 +316,7 @@
=
/** Stores information about sink inputs */
typedef struct pa_sink_input_info {
- uint32_t index; /**< Index of the sink input */ =
+ uint32_t index; /**< Index of the sink input */
const char *name; /**< Name of the sink input */
uint32_t owner_module; /**< Index of the module this sin=
k input belongs to, or PA_INVALID_INDEX when it does not belong to any modu=
le */
uint32_t client; /**< Index of the client this sin=
k input belongs to, or PA_INVALID_INDEX when it does not belong to any clie=
nt */
@@ -341,11 +341,11 @@
=
/** Stores information about source outputs */
typedef struct pa_source_output_info {
- uint32_t index; /**< Index of the sink input */ =
+ uint32_t index; /**< Index of the sink input */
const char *name; /**< Name of the sink input */
- uint32_t owner_module; /**< Index of the module this sin=
k input belongs to, or PA_INVALID_INDEX when it does not belong to any modu=
le */ =
- uint32_t client; /**< Index of the client this sin=
k input belongs to, or PA_INVALID_INDEX when it does not belong to any clie=
nt */ =
- uint32_t source; /**< Index of the connected sourc=
e */ =
+ uint32_t owner_module; /**< Index of the module this sin=
k input belongs to, or PA_INVALID_INDEX when it does not belong to any modu=
le */
+ uint32_t client; /**< Index of the client this sin=
k input belongs to, or PA_INVALID_INDEX when it does not belong to any clie=
nt */
+ uint32_t source; /**< Index of the connected sourc=
e */
pa_sample_spec sample_spec; /**< The sample specification of =
the source output */
pa_channel_map channel_map; /**< Channel map */
pa_usec_t buffer_usec; /**< Latency due to buffering in =
the source output, see pa_latency_info for details. \since 0.5 */
@@ -396,7 +396,7 @@
uint32_t memblock_total_size; /**< Currentl total size of allocat=
ed memory blocks */
uint32_t memblock_allocated; /**< Allocated memory blocks during=
the whole lifetime of the daemon */
uint32_t memblock_allocated_size; /**< Total size of all memory block=
s allocated during the whole lifetime of the daemon */
- uint32_t scache_size; /**< Total size of all sample cache=
entries. \since 0.4 */ =
+ uint32_t scache_size; /**< Total size of all sample cache=
entries. \since 0.4 */
} pa_stat_info;
=
/** Callback prototype for pa_context_stat() */
@@ -432,7 +432,7 @@
=
/** Kill a client. \since 0.5 */
pa_operation* pa_context_kill_client(pa_context *c, uint32_t idx, pa_conte=
xt_success_cb_t cb, void *userdata);
- =
+
/** Kill a sink input. \since 0.5 */
pa_operation* pa_context_kill_sink_input(pa_context *c, uint32_t idx, pa_c=
ontext_success_cb_t cb, void *userdata);
=
Modified: trunk/src/pulse/mainloop-api.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop-api.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/mainloop-api.c (original)
+++ trunk/src/pulse/mainloop-api.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/mainloop-api.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop-api.h?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/mainloop-api.h (original)
+++ trunk/src/pulse/mainloop-api.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -28,7 +28,7 @@
#include <pulse/cdecl.h>
=
/** \file
- * =
+ *
* Main loop abstraction layer. Both the PulseAudio core and the
* PulseAudio client library use a main loop abstraction layer. Due to
* this it is possible to embed PulseAudio into other
Modified: trunk/src/pulse/mainloop-signal.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop-signal=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/mainloop-signal.c (original)
+++ trunk/src/pulse/mainloop-signal.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -73,7 +73,7 @@
static void dispatch(pa_mainloop_api*a, int sig) {
pa_signal_event*s;
=
- for (s =3D signals; s; s =3D s->next) =
+ for (s =3D signals; s; s =3D s->next)
if (s->sig =3D=3D sig) {
assert(s->callback);
s->callback(a, s, sig, s->userdata);
@@ -93,7 +93,7 @@
pa_log("read(): %s", pa_cstrerror(errno));
return;
}
- =
+
if (r !=3D sizeof(sig)) {
pa_log("short read()");
return;
@@ -129,7 +129,7 @@
=
while (signals)
pa_signal_free(signals);
- =
+
api->io_free(io_event);
io_event =3D NULL;
=
@@ -148,11 +148,11 @@
#endif
=
assert(sig > 0 && _callback);
- =
+
for (e =3D signals; e; e =3D e->next)
if (e->sig =3D=3D sig)
goto fail;
- =
+
e =3D pa_xmalloc(sizeof(pa_signal_event));
e->sig =3D sig;
e->callback =3D _callback;
@@ -164,7 +164,7 @@
sa.sa_handler =3D signal_handler;
sigemptyset(&sa.sa_mask);
sa.sa_flags =3D SA_RESTART;
- =
+
if (sigaction(sig, &sa, &e->saved_sigaction) < 0)
#else
if ((e->saved_handler =3D signal(sig, signal_handler)) =3D=3D SIG_ERR)
@@ -200,7 +200,7 @@
=
if (e->destroy_callback)
e->destroy_callback(api, e, e->userdata);
- =
+
pa_xfree(e);
}
=
Modified: trunk/src/pulse/mainloop-signal.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop-signal=
.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/mainloop-signal.h (original)
+++ trunk/src/pulse/mainloop-signal.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/mainloop.c (original)
+++ trunk/src/pulse/mainloop.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -57,11 +57,11 @@
struct pa_io_event {
pa_mainloop *mainloop;
int dead;
- =
+
int fd;
pa_io_event_flags_t events;
struct pollfd *pollfd;
- =
+
pa_io_event_cb_t callback;
void *userdata;
pa_io_event_destroy_cb_t destroy_callback;
@@ -154,7 +154,7 @@
pa_io_event_flags_t events,
pa_io_event_cb_t callback,
void *userdata) {
- =
+
pa_mainloop *m;
pa_io_event *e;
=
@@ -162,7 +162,7 @@
assert(a->userdata);
assert(fd >=3D 0);
assert(callback);
- =
+
m =3D a->userdata;
assert(a =3D=3D &m->api);
=
@@ -173,7 +173,7 @@
e->fd =3D fd;
e->events =3D events;
e->pollfd =3D NULL;
- =
+
e->callback =3D callback;
e->userdata =3D userdata;
e->destroy_callback =3D NULL;
@@ -213,7 +213,7 @@
=
if (e->events =3D=3D events)
return;
- =
+
e->events =3D events;
=
if (e->pollfd)
@@ -239,7 +239,7 @@
=
static void mainloop_io_set_destroy(pa_io_event *e, pa_io_event_destroy_cb=
_t callback) {
assert(e);
- =
+
e->destroy_callback =3D callback;
}
=
@@ -255,7 +255,7 @@
assert(a);
assert(a->userdata);
assert(callback);
- =
+
m =3D a->userdata;
assert(a =3D=3D &m->api);
=
@@ -265,7 +265,7 @@
=
e->enabled =3D 1;
m->n_enabled_defer_events++;
- =
+
e->callback =3D callback;
e->userdata =3D userdata;
e->destroy_callback =3D NULL;
@@ -288,7 +288,7 @@
e->mainloop->n_enabled_defer_events++;
pa_mainloop_wakeup(e->mainloop);
}
- =
+
e->enabled =3D b;
}
=
@@ -318,14 +318,14 @@
const struct timeval *tv,
pa_time_event_cb_t callback,
void *userdata) {
- =
+
pa_mainloop *m;
pa_time_event *e;
=
assert(a);
assert(a->userdata);
assert(callback);
- =
+
m =3D a->userdata;
assert(a =3D=3D &m->api);
=
@@ -354,7 +354,7 @@
=
if (e->enabled)
pa_mainloop_wakeup(m);
- =
+
return e;
}
=
@@ -375,7 +375,7 @@
=
if (e->mainloop->cached_next_time_event && e->enabled) {
assert(e->mainloop->cached_next_time_event->enabled);
- =
+
if (pa_timeval_cmp(tv, &e->mainloop->cached_next_time_event->timev=
al) < 0)
e->mainloop->cached_next_time_event =3D e;
} else if (e->mainloop->cached_next_time_event =3D=3D e)
@@ -396,7 +396,7 @@
=
if (e->mainloop->cached_next_time_event =3D=3D e)
e->mainloop->cached_next_time_event =3D NULL;
- =
+
/* no wakeup needed here. Think about it! */
}
=
@@ -411,7 +411,7 @@
=
static void mainloop_quit(pa_mainloop_api*a, int retval) {
pa_mainloop *m;
- =
+
assert(a);
assert(a->userdata);
m =3D a->userdata;
@@ -419,7 +419,7 @@
=
pa_mainloop_quit(m, retval);
}
- =
+
static const pa_mainloop_api vtable =3D {
.userdata =3D NULL,
=
@@ -432,12 +432,12 @@
.time_restart =3D mainloop_time_restart,
.time_free =3D mainloop_time_free,
.time_set_destroy =3D mainloop_time_set_destroy,
- =
+
.defer_new =3D mainloop_defer_new,
.defer_enable =3D mainloop_defer_enable,
.defer_free =3D mainloop_defer_free,
.defer_set_destroy =3D mainloop_defer_set_destroy,
- =
+
.quit =3D mainloop_quit,
};
=
@@ -466,7 +466,7 @@
=
m->cached_next_time_event =3D NULL;
m->prepared_timeout =3D 0;
- =
+
m->pollfds =3D NULL;
m->max_pollfds =3D m->n_pollfds =3D 0;
m->rebuild_pollfds =3D 1;
@@ -481,7 +481,7 @@
m->poll_func =3D NULL;
m->poll_func_userdata =3D NULL;
m->poll_func_ret =3D -1;
- =
+
return m;
}
=
@@ -494,7 +494,7 @@
=
if (!force && m->io_events_please_scan <=3D 0)
break;
- =
+
if (force || e->dead) {
PA_LLIST_REMOVE(pa_io_event, m->io_events, e);
=
@@ -502,10 +502,10 @@
assert(m->io_events_please_scan > 0);
m->io_events_please_scan--;
}
- =
+
if (e->destroy_callback)
e->destroy_callback(&m->api, e, e->userdata);
- =
+
pa_xfree(e);
=
m->rebuild_pollfds =3D 1;
@@ -526,7 +526,7 @@
=
if (!force && m->time_events_please_scan <=3D 0)
break;
- =
+
if (force || e->dead) {
PA_LLIST_REMOVE(pa_time_event, m->time_events, e);
=
@@ -539,10 +539,10 @@
assert(m->n_enabled_time_events > 0);
m->n_enabled_time_events--;
}
- =
+
if (e->destroy_callback)
e->destroy_callback(&m->api, e, e->userdata);
- =
+
pa_xfree(e);
}
=
@@ -561,7 +561,7 @@
=
if (!force && m->defer_events_please_scan <=3D 0)
break;
- =
+
if (force || e->dead) {
PA_LLIST_REMOVE(pa_defer_event, m->defer_events, e);
=
@@ -574,10 +574,10 @@
assert(m->n_enabled_defer_events > 0);
m->n_enabled_defer_events--;
}
- =
+
if (e->destroy_callback)
e->destroy_callback(&m->api, e, e->userdata);
- =
+
pa_xfree(e);
}
=
@@ -664,11 +664,11 @@
int r =3D 0, k;
=
assert(m->poll_func_ret > 0);
- =
+
for (e =3D m->io_events, k =3D m->poll_func_ret; e && !m->quit && k > =
0; e =3D e->next) {
if (e->dead || !e->pollfd || !e->pollfd->revents)
continue;
- =
+
assert(e->pollfd->fd =3D=3D e->fd && e->callback);
e->callback(&m->api, e, e->fd, map_flags_from_libc(e->pollfd->reve=
nts), e->userdata);
e->pollfd->revents =3D 0;
@@ -690,7 +690,7 @@
for (e =3D m->defer_events; e && !m->quit; e =3D e->next) {
if (e->dead || !e->enabled)
continue;
- =
+
assert(e->callback);
e->callback(&m->api, e, e->userdata);
r++;
@@ -705,7 +705,7 @@
=
if (m->cached_next_time_event)
return m->cached_next_time_event;
- =
+
for (t =3D m->time_events; t; t =3D t->next) {
=
if (t->dead || !t->enabled)
@@ -737,7 +737,7 @@
=
if (t->timeval.tv_sec <=3D 0)
return 0;
- =
+
pa_gettimeofday(&now);
=
if (pa_timeval_cmp(&t->timeval, &now) <=3D 0)
@@ -759,7 +759,7 @@
pa_gettimeofday(&now);
=
for (e =3D m->time_events; e && !m->quit; e =3D e->next) {
- =
+
if (e->dead || !e->enabled)
continue;
=
@@ -815,7 +815,7 @@
if (m->n_enabled_defer_events <=3D 0) {
if (m->rebuild_pollfds)
rebuild_pollfds(m);
- =
+
m->prepared_timeout =3D calc_next_timeout(m);
if (timeout >=3D 0 && (timeout < m->prepared_timeout || m->prepare=
d_timeout < 0))
m->prepared_timeout =3D timeout;
@@ -842,7 +842,7 @@
m->poll_func_ret =3D 0;
else {
assert(!m->rebuild_pollfds);
- =
+
if (m->poll_func)
m->poll_func_ret =3D m->poll_func(m->pollfds, m->n_pollfds, m-=
>prepared_timeout, m->poll_func_userdata);
else
@@ -872,23 +872,23 @@
=
if (m->quit)
goto quit;
- =
+
if (m->n_enabled_defer_events)
dispatched +=3D dispatch_defer(m);
else {
- if (m->n_enabled_time_events) =
+ if (m->n_enabled_time_events)
dispatched +=3D dispatch_timeout(m);
- =
+
if (m->quit)
goto quit;
=
if (m->poll_func_ret > 0)
dispatched +=3D dispatch_pollfds(m);
}
- =
+
if (m->quit)
goto quit;
- =
+
m->state =3D STATE_PASSIVE;
=
return dispatched;
@@ -919,7 +919,7 @@
return r;
=
quit:
- =
+
if ((r =3D=3D -2) && retval)
*retval =3D pa_mainloop_get_retval(m);
return r;
@@ -927,7 +927,7 @@
=
int pa_mainloop_run(pa_mainloop *m, int *retval) {
int r;
- =
+
while ((r =3D pa_mainloop_iterate(m, 1, retval)) >=3D 0);
=
if (r =3D=3D -2)
Modified: trunk/src/pulse/mainloop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/mainloop.h (original)
+++ trunk/src/pulse/mainloop.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -65,7 +65,7 @@
*/
=
/** \file
- * =
+ *
* A minimal main loop implementation based on the C library's poll()
* function. Using the routines defined herein you may create a simple
* main loop supporting the generic main loop abstraction layer as
Modified: trunk/src/pulse/operation.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/operation.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/operation.c (original)
+++ trunk/src/pulse/operation.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -46,14 +46,14 @@
/* Refcounting is strictly one-way: from the "bigger" to the "smaller"=
object. */
PA_LLIST_PREPEND(pa_operation, c->operations, o);
pa_operation_ref(o);
- =
+
return o;
}
=
pa_operation *pa_operation_ref(pa_operation *o) {
assert(o);
assert(o->ref >=3D 1);
- =
+
o->ref++;
return o;
}
@@ -81,14 +81,14 @@
o->state =3D st;
=
if ((o->state =3D=3D PA_OPERATION_DONE) || (o->state =3D=3D PA_OPERATI=
ON_CANCELED)) {
- =
+
if (o->context) {
assert(o->ref >=3D 2);
- =
+
PA_LLIST_REMOVE(pa_operation, o->context->operations, o);
pa_operation_unref(o);
}
- =
+
o->context =3D NULL;
o->stream =3D NULL;
o->callback =3D NULL;
@@ -101,14 +101,14 @@
void pa_operation_cancel(pa_operation *o) {
assert(o);
assert(o->ref >=3D 1);
- =
+
operation_set_state(o, PA_OPERATION_CANCELED);
}
=
void pa_operation_done(pa_operation *o) {
assert(o);
assert(o->ref >=3D 1);
- =
+
operation_set_state(o, PA_OPERATION_DONE);
}
=
Modified: trunk/src/pulse/operation.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/operation.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/operation.h (original)
+++ trunk/src/pulse/operation.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/pulseaudio.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/pulseaudio.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/pulseaudio.h (original)
+++ trunk/src/pulse/pulseaudio.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -55,11 +55,11 @@
/** \mainpage
*
* \section intro_sec Introduction
- * =
+ *
* This document describes the client API for the PulseAudio sound
* server. The API comes in two flavours to accomodate different styles
* of applications and different needs in complexity:
- * =
+ *
* \li The complete but somewhat complicated to use asynchronous API
* \li The simplified, easy to use, but limited synchronous API
*
@@ -67,7 +67,7 @@
* locale. Some functions will filter invalid sequences from the string, s=
ome
* will simply fail. To ensure reliable behaviour, make sure everything you
* pass to the API is already in UTF-8.
- =
+
* \section simple_sec Simple API
*
* Use this if you develop your program in synchronous style and just
Modified: trunk/src/pulse/sample.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/sample.c?rev=3D=
1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/sample.c (original)
+++ trunk/src/pulse/sample.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -70,7 +70,7 @@
size_t pa_usec_to_bytes(pa_usec_t t, const pa_sample_spec *spec) {
assert(spec);
=
- return (size_t) (((double) t * spec->rate / 1000000))*pa_frame_size(sp=
ec); =
+ return (size_t) (((double) t * spec->rate / 1000000))*pa_frame_size(sp=
ec);
}
=
int pa_sample_spec_valid(const pa_sample_spec *spec) {
@@ -111,7 +111,7 @@
=
char *pa_sample_spec_snprint(char *s, size_t l, const pa_sample_spec *spec=
) {
assert(s && l && spec);
- =
+
if (!pa_sample_spec_valid(spec))
snprintf(s, l, "Invalid");
else
@@ -134,7 +134,7 @@
}
=
pa_sample_format_t pa_parse_sample_format(const char *format) {
- =
+
if (strcasecmp(format, "s16le") =3D=3D 0)
return PA_SAMPLE_S16LE;
else if (strcasecmp(format, "s16be") =3D=3D 0)
Modified: trunk/src/pulse/sample.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/sample.h?rev=3D=
1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/sample.h (original)
+++ trunk/src/pulse/sample.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/scache.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/scache.c?rev=3D=
1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/scache.c (original)
+++ trunk/src/pulse/scache.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -37,14 +37,14 @@
int pa_stream_connect_upload(pa_stream *s, size_t length) {
pa_tagstruct *t;
uint32_t tag;
- =
+
assert(s);
=
PA_CHECK_VALIDITY(s->context, s->state =3D=3D PA_STREAM_UNCONNECTED, P=
A_ERR_BADSTATE);
PA_CHECK_VALIDITY(s->context, length > 0, PA_ERR_INVALID);
- =
+
pa_stream_ref(s);
- =
+
s->direction =3D PA_STREAM_UPLOAD;
=
t =3D pa_tagstruct_command(s->context, PA_COMMAND_CREATE_UPLOAD_STREAM=
, &tag);
@@ -56,7 +56,7 @@
pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOU=
T, pa_create_stream_callback, s, NULL);
=
pa_stream_set_state(s, PA_STREAM_CREATING);
- =
+
pa_stream_unref(s);
return 0;
}
@@ -87,16 +87,16 @@
=
assert(c);
assert(c->ref >=3D 1);
- =
+
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, name && *name, PA_ERR_INVALID);
PA_CHECK_VALIDITY_RETURN_NULL(c, !dev || *dev, PA_ERR_INVALID);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
if (!dev)
dev =3D c->conf->default_sink;
- =
+
t =3D pa_tagstruct_command(c, PA_COMMAND_PLAY_SAMPLE, &tag);
pa_tagstruct_putu32(t, PA_INVALID_INDEX);
pa_tagstruct_puts(t, dev);
@@ -118,9 +118,9 @@
=
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(c, name && *name, PA_ERR_INVALID);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
- =
+
t =3D pa_tagstruct_command(c, PA_COMMAND_REMOVE_SAMPLE, &tag);
pa_tagstruct_puts(t, name);
pa_pstream_send_tagstruct(c->pstream, t);
Modified: trunk/src/pulse/scache.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/scache.h?rev=3D=
1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/scache.h (original)
+++ trunk/src/pulse/scache.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/simple.c?rev=3D=
1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/simple.c (original)
+++ trunk/src/pulse/simple.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -64,7 +64,7 @@
goto label; \
} \
} while(0);
- =
+
#define CHECK_DEAD_GOTO(p, rerror, label) do { \
if (!(p)->context || pa_context_get_state((p)->context) !=3D PA_CONTEXT_RE=
ADY || \
!(p)->stream || pa_stream_get_state((p)->stream) !=3D PA_STREAM_READY)=
{ \
@@ -143,7 +143,7 @@
const pa_channel_map *map,
const pa_buffer_attr *attr,
int *rerror) {
- =
+
pa_simple *p;
int error =3D PA_ERR_INTERNAL, r;
=
@@ -162,12 +162,12 @@
=
if (!(p->mainloop =3D pa_threaded_mainloop_new()))
goto fail;
- =
+
if (!(p->context =3D pa_context_new(pa_threaded_mainloop_get_api(p->ma=
inloop), name)))
goto fail;
=
pa_context_set_state_callback(p->context, context_state_cb, p);
- =
+
if (pa_context_connect(p->context, server, 0, NULL) < 0) {
error =3D pa_context_errno(p->context);
goto fail;
@@ -180,7 +180,7 @@
=
/* Wait until the context is ready */
pa_threaded_mainloop_wait(p->mainloop);
- =
+
if (pa_context_get_state(p->context) !=3D PA_CONTEXT_READY) {
error =3D pa_context_errno(p->context);
goto unlock_and_fail;
@@ -216,12 +216,12 @@
}
=
pa_threaded_mainloop_unlock(p->mainloop);
- =
+
return p;
=
unlock_and_fail:
pa_threaded_mainloop_unlock(p->mainloop);
- =
+
fail:
if (rerror)
*rerror =3D error;
@@ -234,10 +234,10 @@
=
if (s->mainloop)
pa_threaded_mainloop_stop(s->mainloop);
- =
+
if (s->stream)
pa_stream_unref(s->stream);
- =
+
if (s->context)
pa_context_unref(s->context);
=
@@ -249,38 +249,38 @@
=
int pa_simple_write(pa_simple *p, const void*data, size_t length, int *rer=
ror) {
assert(p);
- =
+
CHECK_VALIDITY_RETURN_ANY(rerror, p->direction =3D=3D PA_STREAM_PLAYBA=
CK, PA_ERR_BADSTATE, -1);
CHECK_VALIDITY_RETURN_ANY(rerror, data && length, PA_ERR_INVALID, -1);
=
pa_threaded_mainloop_lock(p->mainloop);
- =
+
CHECK_DEAD_GOTO(p, rerror, unlock_and_fail);
=
while (length > 0) {
size_t l;
int r;
- =
+
while (!(l =3D pa_stream_writable_size(p->stream))) {
pa_threaded_mainloop_wait(p->mainloop);
CHECK_DEAD_GOTO(p, rerror, unlock_and_fail);
}
=
CHECK_SUCCESS_GOTO(p, rerror, l !=3D (size_t) -1, unlock_and_fail);
- =
+
if (l > length)
l =3D length;
=
r =3D pa_stream_write(p->stream, data, l, NULL, 0, PA_SEEK_RELATIV=
E);
CHECK_SUCCESS_GOTO(p, rerror, r >=3D 0, unlock_and_fail);
- =
+
data =3D (const uint8_t*) data + l;
length -=3D l;
}
=
pa_threaded_mainloop_unlock(p->mainloop);
return 0;
- =
+
unlock_and_fail:
pa_threaded_mainloop_unlock(p->mainloop);
return -1;
@@ -293,15 +293,15 @@
CHECK_VALIDITY_RETURN_ANY(rerror, data && length, PA_ERR_INVALID, -1);
=
pa_threaded_mainloop_lock(p->mainloop);
- =
+
CHECK_DEAD_GOTO(p, rerror, unlock_and_fail);
=
while (length > 0) {
size_t l;
- =
+
while (!p->read_data) {
int r;
- =
+
r =3D pa_stream_peek(p->stream, &p->read_data, &p->read_length=
);
CHECK_SUCCESS_GOTO(p, rerror, r =3D=3D 0, unlock_and_fail);
=
@@ -311,31 +311,31 @@
} else
p->read_index =3D 0;
}
- =
+
l =3D p->read_length < length ? p->read_length : length;
memcpy(data, (const uint8_t*) p->read_data+p->read_index, l);
=
data =3D (uint8_t*) data + l;
length -=3D l;
- =
+
p->read_index +=3D l;
p->read_length -=3D l;
=
if (!p->read_length) {
int r;
- =
+
r =3D pa_stream_drop(p->stream);
p->read_data =3D NULL;
p->read_length =3D 0;
p->read_index =3D 0;
- =
+
CHECK_SUCCESS_GOTO(p, rerror, r =3D=3D 0, unlock_and_fail);
}
}
=
pa_threaded_mainloop_unlock(p->mainloop);
return 0;
- =
+
unlock_and_fail:
pa_threaded_mainloop_unlock(p->mainloop);
return -1;
@@ -353,7 +353,7 @@
=
int pa_simple_drain(pa_simple *p, int *rerror) {
pa_operation *o =3D NULL;
- =
+
assert(p);
=
CHECK_VALIDITY_RETURN_ANY(rerror, p->direction =3D=3D PA_STREAM_PLAYBA=
CK, PA_ERR_BADSTATE, -1);
@@ -370,7 +370,7 @@
CHECK_DEAD_GOTO(p, rerror, unlock_and_fail);
}
CHECK_SUCCESS_GOTO(p, rerror, p->operation_success, unlock_and_fail);
- =
+
pa_operation_unref(o);
pa_threaded_mainloop_unlock(p->mainloop);
=
@@ -389,7 +389,7 @@
=
int pa_simple_flush(pa_simple *p, int *rerror) {
pa_operation *o =3D NULL;
- =
+
assert(p);
=
CHECK_VALIDITY_RETURN_ANY(rerror, p->direction =3D=3D PA_STREAM_PLAYBA=
CK, PA_ERR_BADSTATE, -1);
@@ -399,7 +399,7 @@
=
o =3D pa_stream_flush(p->stream, success_cb, p);
CHECK_SUCCESS_GOTO(p, rerror, o, unlock_and_fail);
- =
+
p->operation_success =3D 0;
while (pa_operation_get_state(o) !=3D PA_OPERATION_DONE) {
pa_threaded_mainloop_wait(p->mainloop);
@@ -426,14 +426,14 @@
pa_usec_t pa_simple_get_latency(pa_simple *p, int *rerror) {
pa_usec_t t;
int negative;
- =
- assert(p);
- =
+
+ assert(p);
+
pa_threaded_mainloop_lock(p->mainloop);
=
for (;;) {
CHECK_DEAD_GOTO(p, rerror, unlock_and_fail);
- =
+
if (pa_stream_get_latency(p->stream, &t, &negative) >=3D 0)
break;
=
@@ -442,7 +442,7 @@
/* Wait until latency data is available again */
pa_threaded_mainloop_wait(p->mainloop);
}
- =
+
pa_threaded_mainloop_unlock(p->mainloop);
=
return negative ? 0 : t;
Modified: trunk/src/pulse/simple.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/simple.h?rev=3D=
1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/simple.h (original)
+++ trunk/src/pulse/simple.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/stream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/stream.c?rev=3D=
1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/stream.c (original)
+++ trunk/src/pulse/stream.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -43,7 +43,7 @@
pa_stream *pa_stream_new(pa_context *c, const char *name, const pa_sample_=
spec *ss, const pa_channel_map *map) {
pa_stream *s;
int i;
- =
+
assert(c);
=
PA_CHECK_VALIDITY_RETURN_NULL(c, ss && pa_sample_spec_valid(ss), PA_ER=
R_INVALID);
@@ -76,7 +76,7 @@
s->channel_map =3D *map;
else
pa_channel_map_init_auto(&s->channel_map, ss->channels, PA_CHANNEL=
_MAP_DEFAULT);
- =
+
s->channel =3D 0;
s->channel_valid =3D 0;
s->syncid =3D c->csyncid++;
@@ -99,11 +99,11 @@
for (i =3D 0; i < PA_MAX_WRITE_INDEX_CORRECTIONS; i++)
s->write_index_corrections[i].valid =3D 0;
s->current_write_index_correction =3D 0;
- =
+
s->corked =3D 0;
=
s->cached_time_valid =3D 0;
- =
+
s->auto_timing_update_event =3D NULL;
s->auto_timing_update_requested =3D 0;
=
@@ -143,7 +143,7 @@
pa_stream* pa_stream_ref(pa_stream *s) {
assert(s);
assert(s->ref >=3D 1);
- =
+
s->ref++;
return s;
}
@@ -151,14 +151,14 @@
pa_stream_state_t pa_stream_get_state(pa_stream *s) {
assert(s);
assert(s->ref >=3D 1);
- =
+
return s->state;
}
=
pa_context* pa_stream_get_context(pa_stream *s) {
assert(s);
assert(s->ref >=3D 1);
- =
+
return s->context;
}
=
@@ -167,17 +167,17 @@
assert(s->ref >=3D 1);
=
PA_CHECK_VALIDITY_RETURN_ANY(s->context, s->state =3D=3D PA_STREAM_REA=
DY, PA_ERR_BADSTATE, PA_INVALID_INDEX);
- =
+
return s->device_index;
}
- =
+
void pa_stream_set_state(pa_stream *s, pa_stream_state_t st) {
assert(s);
assert(s->ref >=3D 1);
=
if (s->state =3D=3D st)
return;
- =
+
pa_stream_ref(s);
=
s->state =3D st;
@@ -192,24 +192,24 @@
/* Unref all operatio object that point to us */
for (o =3D s->context->operations; o; o =3D n) {
n =3D o->next;
- =
+
if (o->stream =3D=3D s)
pa_operation_cancel(o);
}
- =
+
/* Drop all outstanding replies for this stream */
if (s->context->pdispatch)
pa_pdispatch_unregister_reply(s->context->pdispatch, s);
=
if (s->channel_valid)
pa_dynarray_put((s->direction =3D=3D PA_STREAM_PLAYBACK) ? s->=
context->playback_streams : s->context->record_streams, s->channel, NULL);
- =
+
PA_LLIST_REMOVE(pa_stream, s->context->streams, s);
pa_stream_unref(s);
=
s->channel =3D 0;
s->channel_valid =3D 0;
- =
+
s->context =3D NULL;
}
=
@@ -220,20 +220,20 @@
pa_context *c =3D userdata;
pa_stream *s;
uint32_t channel;
- =
+
assert(pd);
assert(command =3D=3D PA_COMMAND_PLAYBACK_STREAM_KILLED || command =3D=
=3D PA_COMMAND_RECORD_STREAM_KILLED);
assert(t);
assert(c);
=
pa_context_ref(c);
- =
+
if (pa_tagstruct_getu32(t, &channel) < 0 ||
!pa_tagstruct_eof(t)) {
pa_context_fail(c, PA_ERR_PROTOCOL);
goto finish;
}
- =
+
if (!(s =3D pa_dynarray_get(command =3D=3D PA_COMMAND_PLAYBACK_STREAM_=
KILLED ? c->playback_streams : c->record_streams, channel)))
goto finish;
=
@@ -248,27 +248,27 @@
pa_stream *s;
pa_context *c =3D userdata;
uint32_t bytes, channel;
- =
+
assert(pd);
assert(command =3D=3D PA_COMMAND_REQUEST);
assert(t);
assert(c);
=
pa_context_ref(c);
- =
+
if (pa_tagstruct_getu32(t, &channel) < 0 ||
pa_tagstruct_getu32(t, &bytes) < 0 ||
!pa_tagstruct_eof(t)) {
pa_context_fail(c, PA_ERR_PROTOCOL);
goto finish;
}
- =
+
if (!(s =3D pa_dynarray_get(c->playback_streams, channel)))
goto finish;
=
if (s->state =3D=3D PA_STREAM_READY) {
s->requested_bytes +=3D bytes;
- =
+
if (s->requested_bytes > 0 && s->write_callback)
s->write_callback(s, s->requested_bytes, s->write_userdata);
}
@@ -288,13 +288,13 @@
assert(c);
=
pa_context_ref(c);
- =
+
if (pa_tagstruct_getu32(t, &channel) < 0 ||
!pa_tagstruct_eof(t)) {
pa_context_fail(c, PA_ERR_PROTOCOL);
goto finish;
}
- =
+
if (!(s =3D pa_dynarray_get(c->playback_streams, channel)))
goto finish;
=
@@ -319,11 +319,11 @@
=
if (!(s->flags & PA_STREAM_AUTO_TIMING_UPDATE))
return;
- =
+
if (s->state =3D=3D PA_STREAM_READY &&
(force || !s->auto_timing_update_requested)) {
pa_operation *o;
- =
+
/* pa_log("automatically requesting new timing data"); */
=
if ((o =3D pa_stream_update_timing_info(s, NULL, NULL))) {
@@ -341,32 +341,32 @@
assert(s);
=
/* pa_log("invalidate r:%u w:%u tag:%u", r, w, s->context->ctag); */
- =
+
if (s->state !=3D PA_STREAM_READY)
return;
=
if (w) {
s->write_index_not_before =3D s->context->ctag;
- =
+
if (s->timing_info_valid)
s->timing_info.write_index_corrupt =3D 1;
- =
+
/* pa_log("write_index invalidated"); */
}
- =
+
if (r) {
s->read_index_not_before =3D s->context->ctag;
- =
+
if (s->timing_info_valid)
s->timing_info.read_index_corrupt =3D 1;
- =
+
/* pa_log("read_index invalidated"); */
}
- =
+
if ((s->direction =3D=3D PA_STREAM_PLAYBACK && r) ||
(s->direction =3D=3D PA_STREAM_RECORD && w))
s->cached_time_valid =3D 0;
- =
+
request_auto_timing_update(s, 1);
}
=
@@ -382,17 +382,17 @@
=
void pa_create_stream_callback(pa_pdispatch *pd, uint32_t command, PA_GCC_=
UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
pa_stream *s =3D userdata;
- =
+
assert(pd);
assert(s);
assert(s->state =3D=3D PA_STREAM_CREATING);
- =
+
pa_stream_ref(s);
- =
+
if (command !=3D PA_COMMAND_REPLY) {
if (pa_context_handle_error(s->context, command, t) < 0)
goto finish;
- =
+
pa_stream_set_state(s, PA_STREAM_FAILED);
goto finish;
}
@@ -429,9 +429,9 @@
=
if (s->direction =3D=3D PA_STREAM_RECORD) {
assert(!s->record_memblockq);
- =
+
s->record_memblockq =3D pa_memblockq_new(
- 0, =
+ 0,
s->buffer_attr.maxlength,
0,
pa_frame_size(&s->sample_spec),
@@ -444,7 +444,7 @@
pa_dynarray_put((s->direction =3D=3D PA_STREAM_RECORD) ? s->context->r=
ecord_streams : s->context->playback_streams, s->channel, s);
=
pa_stream_set_state(s, PA_STREAM_READY);
- =
+
if (s->direction !=3D PA_STREAM_UPLOAD &&
s->flags & PA_STREAM_AUTO_TIMING_UPDATE) {
struct timeval tv;
@@ -473,13 +473,13 @@
pa_stream_flags_t flags,
const pa_cvolume *volume,
pa_stream *sync_stream) {
- =
+
pa_tagstruct *t;
uint32_t tag;
- =
- assert(s);
- assert(s->ref >=3D 1);
- =
+
+ assert(s);
+ assert(s->ref >=3D 1);
+
PA_CHECK_VALIDITY(s->context, s->state =3D=3D PA_STREAM_UNCONNECTED, P=
A_ERR_BADSTATE);
PA_CHECK_VALIDITY(s->context, !(flags & ~((direction !=3D PA_STREAM_UP=
LOAD ?
PA_STREAM_START_CORKED|
@@ -493,10 +493,10 @@
=
s->direction =3D direction;
s->flags =3D flags;
- =
+
if (sync_stream)
s->syncid =3D sync_stream->syncid;
- =
+
if (attr)
s->buffer_attr =3D *attr;
else {
@@ -515,7 +515,7 @@
s->context,
s->direction =3D=3D PA_STREAM_PLAYBACK ? PA_COMMAND_CREATE_PLA=
YBACK_STREAM : PA_COMMAND_CREATE_RECORD_STREAM,
&tag);
- =
+
pa_tagstruct_put(
t,
PA_TAG_STRING, s->name,
@@ -526,7 +526,7 @@
PA_TAG_U32, s->buffer_attr.maxlength,
PA_TAG_BOOLEAN, !!(flags & PA_STREAM_START_CORKED),
PA_TAG_INVALID);
- =
+
if (s->direction =3D=3D PA_STREAM_PLAYBACK) {
pa_cvolume cv;
=
@@ -540,7 +540,7 @@
=
if (!volume)
volume =3D pa_cvolume_reset(&cv, s->sample_spec.channels);
- =
+
pa_tagstruct_put_cvolume(t, volume);
} else
pa_tagstruct_putu32(t, s->buffer_attr.fragsize);
@@ -549,7 +549,7 @@
pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOU=
T, pa_create_stream_callback, s, NULL);
=
pa_stream_set_state(s, PA_STREAM_CREATING);
- =
+
pa_stream_unref(s);
return 0;
}
@@ -561,10 +561,10 @@
pa_stream_flags_t flags,
pa_cvolume *volume,
pa_stream *sync_stream) {
- =
- assert(s);
- assert(s->ref >=3D 1);
- =
+
+ assert(s);
+ assert(s->ref >=3D 1);
+
return create_stream(PA_STREAM_PLAYBACK, s, dev, attr, flags, volume, =
sync_stream);
}
=
@@ -573,7 +573,7 @@
const char *dev,
const pa_buffer_attr *attr,
pa_stream_flags_t flags) {
- =
+
assert(s);
assert(s->ref >=3D 1);
=
@@ -587,9 +587,9 @@
void (*free_cb)(void *p),
int64_t offset,
pa_seek_mode_t seek) {
- =
+
pa_memchunk chunk;
- =
+
assert(s);
assert(s->ref >=3D 1);
assert(data);
@@ -602,29 +602,29 @@
if (length <=3D 0)
return 0;
=
- if (free_cb) =
+ if (free_cb)
chunk.memblock =3D pa_memblock_new_user(s->context->mempool, (void=
*) data, length, free_cb, 1);
else {
chunk.memblock =3D pa_memblock_new(s->context->mempool, length);
memcpy(chunk.memblock->data, data, length);
}
- =
+
chunk.index =3D 0;
chunk.length =3D length;
=
pa_pstream_send_memblock(s->context->pstream, s->channel, offset, seek=
, &chunk);
pa_memblock_unref(chunk.memblock);
- =
+
if (length < s->requested_bytes)
s->requested_bytes -=3D length;
else
s->requested_bytes =3D 0;
=
if (s->direction =3D=3D PA_STREAM_PLAYBACK) {
- =
+
/* Update latency request correction */
if (s->write_index_corrections[s->current_write_index_correction].=
valid) {
- =
+
if (seek =3D=3D PA_SEEK_ABSOLUTE) {
s->write_index_corrections[s->current_write_index_correcti=
on].corrupt =3D 0;
s->write_index_corrections[s->current_write_index_correcti=
on].absolute =3D 1;
@@ -635,10 +635,10 @@
} else
s->write_index_corrections[s->current_write_index_correcti=
on].corrupt =3D 1;
}
- =
+
/* Update the write index in the already available latency data */
if (s->timing_info_valid) {
- =
+
if (seek =3D=3D PA_SEEK_ABSOLUTE) {
s->timing_info.write_index_corrupt =3D 0;
s->timing_info.write_index =3D offset + length;
@@ -652,7 +652,7 @@
if (!s->timing_info_valid || s->timing_info.write_index_corrupt)
request_auto_timing_update(s, 1);
}
- =
+
return 0;
}
=
@@ -664,7 +664,7 @@
=
PA_CHECK_VALIDITY(s->context, s->state =3D=3D PA_STREAM_READY, PA_ERR_=
BADSTATE);
PA_CHECK_VALIDITY(s->context, s->direction =3D=3D PA_STREAM_RECORD, PA=
_ERR_BADSTATE);
- =
+
if (!s->peek_memchunk.memblock) {
=
if (pa_memblockq_peek(s->record_memblockq, &s->peek_memchunk) < 0)=
{
@@ -686,13 +686,13 @@
PA_CHECK_VALIDITY(s->context, s->state =3D=3D PA_STREAM_READY, PA_ERR_=
BADSTATE);
PA_CHECK_VALIDITY(s->context, s->direction =3D=3D PA_STREAM_RECORD, PA=
_ERR_BADSTATE);
PA_CHECK_VALIDITY(s->context, s->peek_memchunk.memblock, PA_ERR_BADSTA=
TE);
- =
+
pa_memblockq_drop(s->record_memblockq, &s->peek_memchunk, s->peek_memc=
hunk.length);
=
/* Fix the simulated local read index */
if (s->timing_info_valid && !s->timing_info.read_index_corrupt)
s->timing_info.read_index +=3D s->peek_memchunk.length;
- =
+
pa_memblock_unref(s->peek_memchunk.memblock);
s->peek_memchunk.length =3D 0;
s->peek_memchunk.index =3D 0;
@@ -707,7 +707,7 @@
=
PA_CHECK_VALIDITY_RETURN_ANY(s->context, s->state =3D=3D PA_STREAM_REA=
DY, PA_ERR_BADSTATE, (size_t) -1);
PA_CHECK_VALIDITY_RETURN_ANY(s->context, s->direction !=3D PA_STREAM_R=
ECORD, PA_ERR_BADSTATE, (size_t) -1);
- =
+
return s->requested_bytes;
}
=
@@ -725,7 +725,7 @@
pa_operation *o;
pa_tagstruct *t;
uint32_t tag;
- =
+
assert(s);
assert(s->ref >=3D 1);
=
@@ -746,7 +746,7 @@
pa_operation *o =3D userdata;
struct timeval local, remote, now;
pa_timing_info *i;
- =
+
assert(pd);
assert(o);
=
@@ -756,7 +756,7 @@
i =3D &o->stream->timing_info;
=
/* pa_log("pre corrupt w:%u r:%u\n", !o->stream->timing_info_valid || =
i->write_index_corrupt,!o->stream->timing_info_valid || i->read_index_corru=
pt); */
- =
+
o->stream->timing_info_valid =3D 0;
i->write_index_corrupt =3D 0;
i->read_index_corrupt =3D 0;
@@ -777,21 +777,21 @@
!pa_tagstruct_eof(t)) {
pa_context_fail(o->context, PA_ERR_PROTOCOL);
goto finish;
- =
+
} else {
o->stream->timing_info_valid =3D 1;
=
pa_gettimeofday(&now);
- =
+
/* Calculcate timestamps */
if (pa_timeval_cmp(&local, &remote) <=3D 0 && pa_timeval_cmp(&remo=
te, &now) <=3D 0) {
/* local and remote seem to have synchronized clocks */
- =
+
if (o->stream->direction =3D=3D PA_STREAM_PLAYBACK)
i->transport_usec =3D pa_timeval_diff(&remote, &local);
else
i->transport_usec =3D pa_timeval_diff(&now, &remote);
- =
+
i->synchronized_clocks =3D 1;
i->timestamp =3D remote;
} else {
@@ -816,7 +816,7 @@
uint32_t ctag =3D tag;
=
/* Go through the saved correction values and add up the total=
correction.*/
- =
+
for (n =3D 0, j =3D o->stream->current_write_index_correction+=
1;
n < PA_MAX_WRITE_INDEX_CORRECTIONS;
n++, j =3D (j + 1) % PA_MAX_WRITE_INDEX_CORRECTIONS) {
@@ -851,21 +851,21 @@
if (!i->read_index_corrupt)
i->read_index -=3D pa_memblockq_get_length(o->stream->reco=
rd_memblockq);
}
- =
+
o->stream->cached_time_valid =3D 0;
}
=
o->stream->auto_timing_update_requested =3D 0;
/* pa_log("post corrupt w:%u r:%u\n", i->write_index_corrupt || !o->st=
ream->timing_info_valid, i->read_index_corrupt || !o->stream->timing_info_v=
alid); */
- =
+
/* Clear old correction entries */
if (o->stream->direction =3D=3D PA_STREAM_PLAYBACK) {
int n;
- =
+
for (n =3D 0; n < PA_MAX_WRITE_INDEX_CORRECTIONS; n++) {
if (!o->stream->write_index_corrections[n].valid)
continue;
- =
+
if (o->stream->write_index_corrections[n].tag <=3D tag)
o->stream->write_index_corrections[n].valid =3D 0;
}
@@ -873,12 +873,12 @@
=
if (o->stream->latency_update_callback)
o->stream->latency_update_callback(o->stream, o->stream->latency_u=
pdate_userdata);
- =
+
if (o->callback && o->stream && o->stream->state =3D=3D PA_STREAM_READ=
Y) {
pa_stream_success_cb_t cb =3D (pa_stream_success_cb_t) o->callback;
cb(o->stream, o->stream->timing_info_valid, o->userdata);
}
- =
+
finish:
=
pa_operation_done(o);
@@ -891,29 +891,29 @@
pa_tagstruct *t;
struct timeval now;
int cidx =3D 0;
- =
+
assert(s);
assert(s->ref >=3D 1);
=
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->state =3D=3D PA_STREAM_RE=
ADY, PA_ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction !=3D PA_STREAM_=
UPLOAD, PA_ERR_BADSTATE);
- =
+
if (s->direction =3D=3D PA_STREAM_PLAYBACK) {
/* Find a place to store the write_index correction data for this =
entry */
cidx =3D (s->current_write_index_correction + 1) % PA_MAX_WRITE_IN=
DEX_CORRECTIONS;
- =
+
/* Check if we could allocate a correction slot. If not, there are=
too many outstanding queries */
PA_CHECK_VALIDITY_RETURN_NULL(s->context, !s->write_index_correcti=
ons[cidx].valid, PA_ERR_INTERNAL);
}
o =3D pa_operation_new(s->context, s, (pa_operation_cb_t) cb, userdata=
);
- =
+
t =3D pa_tagstruct_command(
s->context,
s->direction =3D=3D PA_STREAM_PLAYBACK ? PA_COMMAND_GET_PLAYBA=
CK_LATENCY : PA_COMMAND_GET_RECORD_LATENCY,
&tag);
pa_tagstruct_putu32(t, s->channel);
pa_tagstruct_put_timeval(t, pa_gettimeofday(&now));
- =
+
pa_pstream_send_tagstruct(s->context->pstream, t);
pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOU=
T, stream_get_timing_info_callback, pa_operation_ref(o), (pa_free_cb_t) pa_=
operation_unref);
=
@@ -926,15 +926,15 @@
o->stream->write_index_corrections[cidx].value =3D 0;
o->stream->write_index_corrections[cidx].corrupt =3D 0;
}
- =
+
/* pa_log("requesting update %u\n", tag); */
- =
+
return o;
}
=
void pa_stream_disconnect_callback(pa_pdispatch *pd, uint32_t command, PA_=
GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
pa_stream *s =3D userdata;
- =
+
assert(pd);
assert(s);
assert(s->ref >=3D 1);
@@ -961,7 +961,7 @@
int pa_stream_disconnect(pa_stream *s) {
pa_tagstruct *t;
uint32_t tag;
- =
+
assert(s);
assert(s->ref >=3D 1);
=
@@ -1010,7 +1010,7 @@
void pa_stream_set_overflow_callback(pa_stream *s, pa_stream_notify_cb_t c=
b, void *userdata) {
assert(s);
assert(s->ref >=3D 1);
- =
+
s->overflow_callback =3D cb;
s->overflow_userdata =3D userdata;
}
@@ -1018,7 +1018,7 @@
void pa_stream_set_underflow_callback(pa_stream *s, pa_stream_notify_cb_t =
cb, void *userdata) {
assert(s);
assert(s->ref >=3D 1);
- =
+
s->underflow_callback =3D cb;
s->underflow_userdata =3D userdata;
}
@@ -1026,7 +1026,7 @@
void pa_stream_set_latency_update_callback(pa_stream *s, pa_stream_notify_=
cb_t cb, void *userdata) {
assert(s);
assert(s->ref >=3D 1);
- =
+
s->latency_update_callback =3D cb;
s->latency_update_userdata =3D userdata;
}
@@ -1034,14 +1034,14 @@
void pa_stream_simple_ack_callback(pa_pdispatch *pd, uint32_t command, PA_=
GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
pa_operation *o =3D userdata;
int success =3D 1;
- =
+
assert(pd);
assert(o);
assert(o->ref >=3D 1);
=
if (!o->context)
goto finish;
- =
+
if (command !=3D PA_COMMAND_REPLY) {
if (pa_context_handle_error(o->context, command, t) < 0)
goto finish;
@@ -1066,15 +1066,15 @@
pa_operation *o;
pa_tagstruct *t;
uint32_t tag;
- =
- assert(s);
- assert(s->ref >=3D 1);
- =
+
+ assert(s);
+ assert(s->ref >=3D 1);
+
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->state =3D=3D PA_STREAM_RE=
ADY, PA_ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction !=3D PA_STREAM_=
UPLOAD, PA_ERR_BADSTATE);
=
s->corked =3D b;
- =
+
o =3D pa_operation_new(s->context, s, (pa_operation_cb_t) cb, userdata=
);
=
t =3D pa_tagstruct_command(
@@ -1096,12 +1096,12 @@
pa_tagstruct *t;
pa_operation *o;
uint32_t tag;
- =
+
assert(s);
assert(s->ref >=3D 1);
=
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->state =3D=3D PA_STREAM_RE=
ADY, PA_ERR_BADSTATE);
- =
+
o =3D pa_operation_new(s->context, s, (pa_operation_cb_t) cb, userdata=
);
=
t =3D pa_tagstruct_command(s->context, command, &tag);
@@ -1114,26 +1114,26 @@
=
pa_operation* pa_stream_flush(pa_stream *s, pa_stream_success_cb_t cb, voi=
d *userdata) {
pa_operation *o;
- =
+
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction !=3D PA_STREAM_=
UPLOAD, PA_ERR_BADSTATE);
- =
+
if ((o =3D stream_send_simple_command(s, s->direction =3D=3D PA_STREAM=
_PLAYBACK ? PA_COMMAND_FLUSH_PLAYBACK_STREAM : PA_COMMAND_FLUSH_RECORD_STRE=
AM, cb, userdata))) {
=
if (s->direction =3D=3D PA_STREAM_PLAYBACK) {
if (s->write_index_corrections[s->current_write_index_correcti=
on].valid)
s->write_index_corrections[s->current_write_index_correcti=
on].corrupt =3D 1;
- =
+
if (s->timing_info_valid)
s->timing_info.write_index_corrupt =3D 1;
=
- if (s->buffer_attr.prebuf > 0) =
+ if (s->buffer_attr.prebuf > 0)
invalidate_indexes(s, 1, 0);
else
request_auto_timing_update(s, 1);
} else
invalidate_indexes(s, 0, 1);
}
- =
+
return o;
}
=
@@ -1151,13 +1151,13 @@
=
pa_operation* pa_stream_trigger(pa_stream *s, pa_stream_success_cb_t cb, v=
oid *userdata) {
pa_operation *o;
- =
+
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction =3D=3D PA_STREA=
M_PLAYBACK, PA_ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->buffer_attr.prebuf > 0, P=
A_ERR_BADSTATE);
=
if ((o =3D stream_send_simple_command(s, PA_COMMAND_TRIGGER_PLAYBACK_S=
TREAM, cb, userdata)))
invalidate_indexes(s, 1, 0);
- =
+
return o;
}
=
@@ -1165,7 +1165,7 @@
pa_operation *o;
pa_tagstruct *t;
uint32_t tag;
- =
+
assert(s);
assert(s->ref >=3D 1);
assert(name);
@@ -1213,7 +1213,7 @@
* to us, we assume that the real output time is actually
* a little ahead */
usec +=3D s->timing_info.transport_usec;
- =
+
/* However, the output device usually maintains a buffer
too, hence the real sample currently played is a little
back */
@@ -1222,7 +1222,7 @@
else
usec -=3D s->timing_info.sink_usec;
}
- =
+
} else if (s->direction =3D=3D PA_STREAM_RECORD) {
/* The last byte written into the server side queue had
* this time value associated */
@@ -1231,10 +1231,10 @@
if (!s->corked) {
/* Add transport latency */
usec +=3D s->timing_info.transport_usec;
- =
+
/* Add latency of data in device buffer */
usec +=3D s->timing_info.source_usec;
- =
+
/* If this is a monitor source, we need to correct the
* time by the playback device buffer */
if (s->timing_info.sink_usec >=3D usec)
@@ -1269,18 +1269,18 @@
=
if (r_usec)
*r_usec =3D usec;
- =
+
return 0;
}
=
static pa_usec_t time_counter_diff(pa_stream *s, pa_usec_t a, pa_usec_t b,=
int *negative) {
assert(s);
assert(s->ref >=3D 1);
- =
+
if (negative)
*negative =3D 0;
=
- if (a >=3D b) =
+ if (a >=3D b)
return a-b;
else {
if (negative && s->direction =3D=3D PA_STREAM_RECORD) {
@@ -1305,7 +1305,7 @@
PA_CHECK_VALIDITY(s->context, s->timing_info_valid, PA_ERR_NODATA);
PA_CHECK_VALIDITY(s->context, s->direction !=3D PA_STREAM_PLAYBACK || =
!s->timing_info.write_index_corrupt, PA_ERR_NODATA);
PA_CHECK_VALIDITY(s->context, s->direction !=3D PA_STREAM_RECORD || !s=
->timing_info.read_index_corrupt, PA_ERR_NODATA);
- =
+
if ((r =3D pa_stream_get_time(s, &t)) < 0)
return r;
=
@@ -1316,7 +1316,7 @@
=
if (cindex < 0)
cindex =3D 0;
- =
+
c =3D pa_bytes_to_usec(cindex, &s->sample_spec);
=
if (s->direction =3D=3D PA_STREAM_PLAYBACK)
Modified: trunk/src/pulse/stream.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/stream.h?rev=3D=
1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/stream.h (original)
+++ trunk/src/pulse/stream.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -113,7 +113,7 @@
* read index may be larger than the write index, in which case
* silence is played. If the application writes data to indexes lower
* than the read index, the data is immediately lost.
- * =
+ *
* \section transfer_sec Transferring Data
*
* Once the stream is up, data can start flowing between the client and the
@@ -159,13 +159,13 @@
* \li PA_SEEK_ABSOLUTE - seek relative to the beginning of the playback b=
uffer, (i.e. the first that was ever played in the stream)
* \li PA_SEEK_RELATIVE_ON_READ - seek relative to the current read index.=
Use this to write data to the output buffer that should be played as soon =
as possible
* \li PA_SEEK_RELATIVE_END - seek relative to the last byte ever written.
- * =
+ *
* If an application just wants to append some data to the output
* buffer, PA_SEEK_RELATIVE and an offset of 0 should be used.
*
* After a call to pa_stream_write() the write index will be left at
* the position right after the last byte of the written data.
- * =
+ *
* \section latency_sec Latency
*
* A major problem with networked audio is the increased latency caused by
@@ -217,7 +217,7 @@
* this option with PA_STREAM_AUTO_TIMING_UPDATE, which will enable
* you to monitor the current playback time/latency very precisely and
* very frequently without requiring a network round trip every time.
- * =
+ *
* \section flow_sec Overflow and underflow
*
* Even with the best precautions, buffers will sometime over - or
@@ -275,7 +275,7 @@
=
/** Create a new, unconnected stream with the specified name and sample ty=
pe */
pa_stream* pa_stream_new(
- pa_context *c /**< The context to create this =
stream in */, =
+ pa_context *c /**< The context to create this =
stream in */,
const char *name /**< A name for this stream */,
const pa_sample_spec *ss /**< The desired sample format *=
/,
const pa_channel_map *map /**< The desired channel map, or=
NULL for default */);
@@ -320,7 +320,7 @@
* is not copied. If NULL, the data is copied into an internal
* buffer. The client my freely seek around in the output buffer. For
* most applications passing 0 and PA_SEEK_RELATIVE as arguments for
- * offset and seek should be useful.*/ =
+ * offset and seek should be useful.*/
int pa_stream_write(
pa_stream *p /**< The stream to use */,
const void *data /**< The data to write */,
@@ -333,7 +333,7 @@
* data will point to the actual data and length will contain the size
* of the data in bytes (which can be less than a complete framgnet).
* Use pa_stream_drop() to actually remove the data from the
- * buffer. If no data is available will return a NULL pointer \since 0.8 =
*/ =
+ * buffer. If no data is available will return a NULL pointer \since 0.8 =
*/
int pa_stream_peek(
pa_stream *p /**< The stream to use */,
const void **data /**< Pointer to pointer that will poi=
nt to data */,
Modified: trunk/src/pulse/subscribe.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/subscribe.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/subscribe.c (original)
+++ trunk/src/pulse/subscribe.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -69,7 +69,7 @@
assert(c->ref >=3D 1);
=
PA_CHECK_VALIDITY_RETURN_NULL(c, c->state =3D=3D PA_CONTEXT_READY, PA_=
ERR_BADSTATE);
- =
+
o =3D pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
=
t =3D pa_tagstruct_command(c, PA_COMMAND_SUBSCRIBE, &tag);
@@ -83,7 +83,7 @@
void pa_context_set_subscribe_callback(pa_context *c, pa_context_subscribe=
_cb_t cb, void *userdata) {
assert(c);
assert(c->ref >=3D 1);
- =
+
c->subscribe_callback =3D cb;
c->subscribe_userdata =3D userdata;
}
Modified: trunk/src/pulse/subscribe.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/subscribe.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/subscribe.h (original)
+++ trunk/src/pulse/subscribe.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/thread-mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/thread-mainloop=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/thread-mainloop.c (original)
+++ trunk/src/pulse/thread-mainloop.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -128,7 +128,7 @@
pa_mutex_free(m->mutex);
pa_cond_free(m->cond);
pa_cond_free(m->accept_cond);
- =
+
pa_xfree(m);
}
=
@@ -161,7 +161,7 @@
=
void pa_threaded_mainloop_lock(pa_threaded_mainloop *m) {
assert(m);
- =
+
/* Make sure that this function is not called from the helper thread */
assert(!m->thread || !pa_thread_is_running(m->thread) || !in_worker(m)=
);
=
@@ -170,7 +170,7 @@
=
void pa_threaded_mainloop_unlock(pa_threaded_mainloop *m) {
assert(m);
- =
+
/* Make sure that this function is not called from the helper thread */
assert(!m->thread || !pa_thread_is_running(m->thread) || !in_worker(m)=
);
=
@@ -188,7 +188,7 @@
=
void pa_threaded_mainloop_wait(pa_threaded_mainloop *m) {
assert(m);
- =
+
/* Make sure that this function is not called from the helper thread */
assert(!m->thread || !pa_thread_is_running(m->thread) || !in_worker(m)=
);
=
@@ -202,7 +202,7 @@
=
void pa_threaded_mainloop_accept(pa_threaded_mainloop *m) {
assert(m);
- =
+
/* Make sure that this function is not called from the helper thread */
assert(!m->thread || !pa_thread_is_running(m->thread) || !in_worker(m)=
);
=
Modified: trunk/src/pulse/thread-mainloop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/thread-mainloop=
.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/thread-mainloop.h (original)
+++ trunk/src/pulse/thread-mainloop.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -149,7 +149,7 @@
* deal with that.
*
* The functions will not dead lock because the wait function will release
- * the lock before waiting and then regrab it once it has been signaled. =
+ * the lock before waiting and then regrab it once it has been signaled.
* For those of you familiar with threads, the behaviour is that of a
* condition variable.
*
@@ -229,7 +229,7 @@
*/
=
/** \file
- * =
+ *
* A thread based event loop implementation based on pa_mainloop. The
* event loop is run in a helper thread in the background. A few
* synchronization primitives are available to access the objects
Modified: trunk/src/pulse/timeval.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/timeval.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/timeval.c (original)
+++ trunk/src/pulse/timeval.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -38,7 +38,7 @@
struct timeval *pa_gettimeofday(struct timeval *tv) {
#ifdef HAVE_GETTIMEOFDAY
assert(tv);
- =
+
return gettimeofday(tv, NULL) < 0 ? NULL : tv;
#elif defined(OS_IS_WIN32)
/*
@@ -118,14 +118,14 @@
pa_usec_t pa_timeval_age(const struct timeval *tv) {
struct timeval now;
assert(tv);
- =
+
return pa_timeval_diff(pa_gettimeofday(&now), tv);
}
=
struct timeval* pa_timeval_add(struct timeval *tv, pa_usec_t v) {
unsigned long secs;
assert(tv);
- =
+
secs =3D (v/1000000);
tv->tv_sec +=3D (unsigned long) secs;
v -=3D secs*1000000;
Modified: trunk/src/pulse/timeval.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/timeval.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/timeval.h (original)
+++ trunk/src/pulse/timeval.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/utf8.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/utf8.c?rev=3D14=
18&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/utf8.c (original)
+++ trunk/src/pulse/utf8.c Thu Jan 4 14:43:45 2007
@@ -130,7 +130,7 @@
=
if (o)
o++;
- =
+
continue;
=
error:
Modified: trunk/src/pulse/utf8.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/utf8.h?rev=3D14=
18&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/utf8.h (original)
+++ trunk/src/pulse/utf8.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/util.c?rev=3D14=
18&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/util.c (original)
+++ trunk/src/pulse/util.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -79,7 +79,7 @@
=
if (!(p =3D getenv("USER")) && !(p =3D getenv("LOGNAME")) && !(p =3D g=
etenv("USERNAME"))) {
#ifdef HAVE_PWD_H
- =
+
#ifdef HAVE_GETPWUID_R
if (getpwuid_r(getuid(), &pw, buf, sizeof(buf), &r) !=3D 0 || !r) {
#else
@@ -90,7 +90,7 @@
snprintf(s, l, "%lu", (unsigned long) getuid());
return s;
}
- =
+
p =3D r->pw_name;
=
#elif defined(OS_IS_WIN32) /* HAVE_PWD_H */
@@ -162,26 +162,26 @@
#if defined(OS_IS_WIN32)
{
char path[PATH_MAX];
- =
+
if (GetModuleFileName(NULL, path, PATH_MAX))
return pa_strlcpy(s, pa_path_get_filename(path), l);
}
#endif
- =
+
#ifdef HAVE_READLINK
{
int i;
char path[PATH_MAX];
/* This works on Linux only */
- =
+
if ((i =3D readlink("/proc/self/exe", path, sizeof(path)-1)) >=3D =
0) {
path[i] =3D 0;
return pa_strlcpy(s, pa_path_get_filename(path), l);
}
}
- =
-#endif
- =
+
+#endif
+
#if defined(HAVE_SYS_PRCTL_H) && defined(PR_GET_NAME)
{
=
@@ -192,14 +192,14 @@
=
char tcomm[TASK_COMM_LEN+1];
memset(tcomm, 0, sizeof(tcomm));
- =
+
/* This works on Linux only */
if (prctl(PR_GET_NAME, (unsigned long) tcomm, 0, 0, 0) =3D=3D 0)
return pa_strlcpy(s, tcomm, l);
- =
- }
-#endif
- =
+
+ }
+#endif
+
return NULL;
}
=
@@ -214,7 +214,7 @@
=
char *pa_get_fqdn(char *s, size_t l) {
char hn[256];
-#ifdef HAVE_GETADDRINFO =
+#ifdef HAVE_GETADDRINFO
struct addrinfo *a, hints;
#endif
=
@@ -225,7 +225,7 @@
memset(&hints, 0, sizeof(hints));
hints.ai_family =3D AF_UNSPEC;
hints.ai_flags =3D AI_CANONNAME;
- =
+
if (getaddrinfo(hn, NULL, &hints, &a) < 0 || !a || !a->ai_canonname ||=
!*a->ai_canonname)
return pa_strlcpy(s, hn, l);
=
Modified: trunk/src/pulse/util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/util.h?rev=3D14=
18&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/util.h (original)
+++ trunk/src/pulse/util.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/volume.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/volume.c?rev=3D=
1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/volume.c (original)
+++ trunk/src/pulse/volume.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -36,7 +36,7 @@
=
if (a->channels !=3D b->channels)
return 0;
- =
+
for (i =3D 0; i < a->channels; i++)
if (a->values[i] !=3D b->values[i])
return 0;
@@ -46,7 +46,7 @@
=
pa_cvolume* pa_cvolume_set(pa_cvolume *a, unsigned channels, pa_volume_t v=
) {
int i;
- =
+
assert(a);
assert(channels > 0);
assert(channels <=3D PA_CHANNELS_MAX);
@@ -115,7 +115,7 @@
unsigned channel;
int first =3D 1;
char *e;
- =
+
assert(s);
assert(l > 0);
assert(c);
@@ -149,7 +149,7 @@
=
pa_cvolume *pa_sw_cvolume_multiply(pa_cvolume *dest, const pa_cvolume *a, =
const pa_cvolume *b) {
unsigned i;
- =
+
assert(dest);
assert(a);
assert(b);
Modified: trunk/src/pulse/volume.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/volume.h?rev=3D=
1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/volume.h (original)
+++ trunk/src/pulse/volume.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulse/xmalloc.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/xmalloc.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/xmalloc.c (original)
+++ trunk/src/pulse/xmalloc.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -60,10 +60,10 @@
void *p;
assert(size > 0);
assert(size < MAX_ALLOC_SIZE);
- =
+
if (!(p =3D malloc(size)))
oom();
- =
+
return p;
}
=
@@ -71,18 +71,18 @@
void *p;
assert(size > 0);
assert(size < MAX_ALLOC_SIZE);
- =
+
if (!(p =3D calloc(1, size)))
oom();
- =
+
return p;
}
- =
+
void *pa_xrealloc(void *ptr, size_t size) {
void *p;
assert(size > 0);
assert(size < MAX_ALLOC_SIZE);
- =
+
if (!(p =3D realloc(ptr, size)))
oom();
return p;
@@ -107,7 +107,7 @@
=
char *pa_xstrndup(const char *s, size_t l) {
char *e, *r;
- =
+
if (!s)
return NULL;
=
Modified: trunk/src/pulse/xmalloc.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/xmalloc.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulse/xmalloc.h (original)
+++ trunk/src/pulse/xmalloc.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/anotify.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/anotify.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/anotify.c (original)
+++ trunk/src/pulsecore/anotify.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -48,7 +48,7 @@
static void dispatch_event(pa_anotify *a) {
assert(a);
assert(a->queue_index < a->n_queued_events);
- =
+
a->callback(a->queued_events[a->queue_index++], a->userdata);
=
if (a->queue_index >=3D a->n_queued_events) {
@@ -69,14 +69,14 @@
int fd,
pa_io_event_flags_t events,
void *userdata) {
- =
+
pa_anotify *a =3D userdata;
ssize_t r;
=
assert(a);
assert(events =3D=3D PA_IO_EVENT_INPUT);
assert(a->n_queued_events =3D=3D 0);
- =
+
r =3D read(fd, a->queued_events, sizeof(a->queued_events));
assert(r > 0);
=
@@ -96,7 +96,7 @@
=
pa_anotify *pa_anotify_new(pa_mainloop_api*api, pa_anotify_cb_t cb, void *=
userdata) {
pa_anotify *a;
- =
+
assert(api);
assert(cb);
=
@@ -106,7 +106,7 @@
pa_xfree(a);
return NULL;
}
- =
+
a->api =3D api;
a->callback =3D cb;
a->userdata =3D userdata;
@@ -130,7 +130,7 @@
close(a->fds[0]);
if (a->fds[1] >=3D 0)
close(a->fds[1]);
- =
+
pa_xfree(a);
}
=
Modified: trunk/src/pulsecore/anotify.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/anotify.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/anotify.h (original)
+++ trunk/src/pulsecore/anotify.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/atomic.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/atomic.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/atomic.h (original)
+++ trunk/src/pulsecore/atomic.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/authkey-prop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/authkey-pro=
p.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/authkey-prop.c (original)
+++ trunk/src/pulsecore/authkey-prop.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -37,7 +37,7 @@
int pa_authkey_prop_get(pa_core *c, const char *name, void *data, size_t l=
en) {
struct authkey_data *a;
assert(c && name && data && len > 0);
- =
+
if (!(a =3D pa_property_get(c, name)))
return -1;
=
@@ -59,7 +59,7 @@
memcpy(a+1, data, len);
=
pa_property_set(c, name, a);
- =
+
return 0;
}
=
Modified: trunk/src/pulsecore/authkey-prop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/authkey-pro=
p.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/authkey-prop.h (original)
+++ trunk/src/pulsecore/authkey-prop.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/authkey.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/authkey.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/authkey.c (original)
+++ trunk/src/pulsecore/authkey.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -91,25 +91,25 @@
=
if ((size_t) r !=3D length) {
pa_log_debug("got %d bytes from cookie file '%s', expected %d", (i=
nt)r, fn, (int)length);
- =
+
if (!writable) {
pa_log("unable to write cookie to read only file");
goto finish;
}
- =
+
if (generate(fd, data, length) < 0)
goto finish;
}
=
ret =3D 0;
- =
+
finish:
=
if (fd >=3D 0) {
- =
+
if (unlock)
pa_lock_fd(fd, 0);
- =
+
close(fd);
}
=
@@ -144,7 +144,7 @@
char homedir[PATH_MAX];
if (!pa_get_home_dir(homedir, sizeof(homedir)))
return NULL;
- =
+
#ifndef OS_IS_WIN32
snprintf(s, l, "%s/%s", homedir, fn);
#else
@@ -165,7 +165,7 @@
=
if (!(p =3D normalize_path(fn, path, sizeof(path))))
return -2;
- =
+
return pa_authkey_load(p, data, length);
}
=
@@ -194,14 +194,14 @@
}
=
ret =3D 0;
- =
+
finish:
=
if (fd >=3D 0) {
- =
+
if (unlock)
pa_lock_fd(fd, 0);
- =
+
close(fd);
}
=
Modified: trunk/src/pulsecore/authkey.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/authkey.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/authkey.h (original)
+++ trunk/src/pulsecore/authkey.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/autoload.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/autoload.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/autoload.c (original)
+++ trunk/src/pulsecore/autoload.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -58,20 +58,20 @@
static pa_autoload_entry* entry_new(pa_core *c, const char *name) {
pa_autoload_entry *e =3D NULL;
assert(c && name);
- =
+
if (c->autoload_hashmap && (e =3D pa_hashmap_get(c->autoload_hashmap, =
name)))
return NULL;
- =
+
e =3D pa_xmalloc(sizeof(pa_autoload_entry));
e->core =3D c;
e->name =3D pa_xstrdup(name);
e->module =3D e->argument =3D NULL;
e->in_action =3D 0;
- =
+
if (!c->autoload_hashmap)
c->autoload_hashmap =3D pa_hashmap_new(pa_idxset_string_hash_func,=
pa_idxset_string_compare_func);
assert(c->autoload_hashmap);
- =
+
pa_hashmap_put(c->autoload_hashmap, e->name, e);
=
if (!c->autoload_idxset)
@@ -79,24 +79,24 @@
pa_idxset_put(c->autoload_idxset, e, &e->index);
=
pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_AUTOLOAD|PA_SUBSCRIPTION=
_EVENT_NEW, e->index);
- =
+
return e;
}
=
int pa_autoload_add(pa_core *c, const char*name, pa_namereg_type_t type, c=
onst char*module, const char *argument, uint32_t *idx) {
pa_autoload_entry *e =3D NULL;
assert(c && name && module && (type =3D=3D PA_NAMEREG_SINK || type =3D=
=3D PA_NAMEREG_SOURCE));
- =
+
if (!(e =3D entry_new(c, name)))
return -1;
- =
+
e->module =3D pa_xstrdup(module);
e->argument =3D pa_xstrdup(argument);
e->type =3D type;
=
if (idx)
*idx =3D e->index;
- =
+
return 0;
}
=
@@ -139,7 +139,7 @@
if ((m =3D pa_module_load(c, e->module, e->argument)))
m->auto_unload =3D 1;
}
- =
+
e->in_action =3D 0;
}
=
@@ -154,7 +154,7 @@
pa_hashmap_free(c->autoload_hashmap, free_func, NULL);
c->autoload_hashmap =3D NULL;
}
- =
+
if (c->autoload_idxset) {
pa_idxset_free(c->autoload_idxset, NULL, NULL);
c->autoload_idxset =3D NULL;
@@ -164,7 +164,7 @@
const pa_autoload_entry* pa_autoload_get_by_name(pa_core *c, const char*na=
me, pa_namereg_type_t type) {
pa_autoload_entry *e;
assert(c && name);
- =
+
if (!c->autoload_hashmap || !(e =3D pa_hashmap_get(c->autoload_hashmap=
, name)) || e->type !=3D type)
return NULL;
=
@@ -174,7 +174,7 @@
const pa_autoload_entry* pa_autoload_get_by_index(pa_core *c, uint32_t idx=
) {
pa_autoload_entry *e;
assert(c && idx !=3D PA_IDXSET_INVALID);
- =
+
if (!c->autoload_idxset || !(e =3D pa_idxset_get_by_index(c->autoload_=
idxset, idx)))
return NULL;
=
Modified: trunk/src/pulsecore/autoload.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/autoload.h?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/autoload.h (original)
+++ trunk/src/pulsecore/autoload.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -36,7 +36,7 @@
char *name;
pa_namereg_type_t type; /* Type of the autoload entry */
int in_action; /* Currently loaded */
- char *module, *argument; =
+ char *module, *argument;
} pa_autoload_entry;
=
/* Add a new autoload entry of the given time, with the speicified
Modified: trunk/src/pulsecore/avahi-wrap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/avahi-wrap.=
c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/avahi-wrap.c (original)
+++ trunk/src/pulsecore/avahi-wrap.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -58,7 +58,7 @@
=
static void watch_callback(pa_mainloop_api*a, pa_io_event* e, int fd, pa_i=
o_event_flags_t events, void *userdata) {
AvahiWatch *w =3D userdata;
- =
+
assert(a);
assert(e);
assert(w);
@@ -75,7 +75,7 @@
assert(api);
assert(fd >=3D 0);
assert(callback);
- =
+
p =3D api->userdata;
assert(p);
=
@@ -88,19 +88,19 @@
=
return w;
}
- =
+
static void watch_update(AvahiWatch *w, AvahiWatchEvent event) {
assert(w);
=
w->avahi_poll->mainloop->io_enable(w->io_event, translate_io_flags(eve=
nt));
}
- =
+
static AvahiWatchEvent watch_get_events(AvahiWatch *w) {
assert(w);
=
return w->current_event;
}
- =
+
static void watch_free(AvahiWatch *w) {
assert(w);
=
@@ -117,7 +117,7 @@
=
static void timeout_callback(pa_mainloop_api*a, pa_time_event* e, const st=
ruct timeval *tv, void *userdata) {
AvahiTimeout *t =3D userdata;
- =
+
assert(a);
assert(e);
assert(t);
@@ -131,7 +131,7 @@
=
assert(api);
assert(callback);
- =
+
p =3D api->userdata;
assert(p);
=
@@ -139,12 +139,12 @@
t->avahi_poll =3D p;
t->callback =3D callback;
t->userdata =3D userdata;
- =
+
t->time_event =3D tv ? p->mainloop->time_new(p->mainloop, tv, timeout_=
callback, t) : NULL;
=
return t;
}
- =
+
static void timeout_update(AvahiTimeout *t, const struct timeval *tv) {
assert(t);
=
@@ -157,7 +157,7 @@
t->time_event =3D NULL;
}
}
- =
+
static void timeout_free(AvahiTimeout *t) {
assert(t);
=
@@ -170,9 +170,9 @@
pa_avahi_poll *p;
=
assert(m);
- =
+
p =3D pa_xnew(pa_avahi_poll, 1);
- =
+
p->api.userdata =3D p;
p->api.watch_new =3D watch_new;
p->api.watch_update =3D watch_update;
@@ -182,7 +182,7 @@
p->api.timeout_update =3D timeout_update;
p->api.timeout_free =3D timeout_free;
p->mainloop =3D m;
- =
+
return &p->api;
}
=
@@ -191,7 +191,7 @@
assert(api);
p =3D api->userdata;
assert(p);
- =
+
pa_xfree(p);
}
=
Modified: trunk/src/pulsecore/avahi-wrap.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/avahi-wrap.=
h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/avahi-wrap.h (original)
+++ trunk/src/pulsecore/avahi-wrap.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/cli-command.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli-command=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/cli-command.c (original)
+++ trunk/src/pulsecore/cli-command.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -172,7 +172,7 @@
assert(c && t && buf);
=
pa_strbuf_puts(buf, "Available commands:\n");
- =
+
for (command =3D commands; command->name; command++)
if (command->help)
pa_strbuf_printf(buf, " %-25s %s\n", command->name, command=
->help);
@@ -252,12 +252,12 @@
[PA_MEMBLOCK_FIXED] =3D "FIXED",
[PA_MEMBLOCK_IMPORTED] =3D "IMPORTED",
};
- =
+
assert(c);
assert(t);
=
stat =3D pa_mempool_get_stat(c->mempool);
- =
+
pa_strbuf_printf(buf, "Memory blocks currently allocated: %u, size: %s=
.\n",
(unsigned) AO_load_acquire_read((AO_t*) &stat->n_allo=
cated),
pa_bytes_snprint(s, sizeof(s), (size_t) AO_load_acqui=
re_read((AO_t*) &stat->allocated_size)));
@@ -291,7 +291,7 @@
type_table[k],
(unsigned) AO_load_acquire_read(&stat->n_allocate=
d_by_type[k]),
(unsigned) AO_load_acquire_read(&stat->n_accumula=
ted_by_type[k]));
- =
+
return 0;
}
=
@@ -318,7 +318,7 @@
pa_strbuf_puts(buf, "You need to specify the module name and optio=
nally arguments.\n");
return -1;
}
- =
+
if (!(m =3D pa_module_load(c, name, pa_tokenizer_get(t, 2)))) {
pa_strbuf_puts(buf, "Module load failed.\n");
return -1;
@@ -724,14 +724,14 @@
}
=
pa_autoload_add(c, a, strstr(pa_tokenizer_get(t, 0), "sink") ? PA_NAME=
REG_SINK : PA_NAMEREG_SOURCE, b, pa_tokenizer_get(t, 3), NULL);
- =
+
return 0;
}
=
static int pa_cli_command_autoload_remove(pa_core *c, pa_tokenizer *t, pa_=
strbuf *buf, int *fail) {
const char *name;
assert(c && t && buf && fail);
- =
+
if (!(name =3D pa_tokenizer_get(t, 1))) {
pa_strbuf_puts(buf, "You need to specify a device name\n");
return -1;
@@ -742,7 +742,7 @@
return -1;
}
=
- return 0; =
+ return 0;
}
=
static int pa_cli_command_autoload_list(pa_core *c, pa_tokenizer *t, pa_st=
rbuf *buf, PA_GCC_UNUSED int *fail) {
@@ -766,7 +766,7 @@
assert(t);
=
pa_mempool_vacuum(c->mempool);
- =
+
return 0;
}
=
@@ -857,7 +857,7 @@
time_t now;
void *i;
pa_autoload_entry *a;
- =
+
assert(c && t);
=
time(&now);
@@ -868,7 +868,7 @@
pa_strbuf_printf(buf, "### Configuration dump generated at %s\n", ctim=
e(&now));
#endif
=
- =
+
for (m =3D pa_idxset_first(c->modules, &idx); m; m =3D pa_idxset_next(=
c->modules, &idx)) {
if (m->auto_unload)
continue;
@@ -912,7 +912,7 @@
=
if (c->autoload_hashmap) {
nl =3D 0;
- =
+
i =3D NULL;
while ((a =3D pa_hashmap_iterate(c->autoload_hashmap, &i, NULL))) {
=
@@ -920,18 +920,18 @@
pa_strbuf_puts(buf, "\n");
nl =3D 1;
}
- =
+
pa_strbuf_printf(buf, "add-autoload-%s %s %s", a->type =3D=3D =
PA_NAMEREG_SINK ? "sink" : "source", a->name, a->module);
- =
+
if (a->argument)
pa_strbuf_printf(buf, " %s", a->argument);
- =
+
pa_strbuf_puts(buf, "\n");
}
}
=
nl =3D 0;
- =
+
if ((p =3D pa_namereg_get_default_sink_name(c))) {
if (!nl) {
pa_strbuf_puts(buf, "\n");
@@ -955,7 +955,7 @@
=
int pa_cli_command_execute_line(pa_core *c, const char *s, pa_strbuf *buf,=
int *fail) {
const char *cs;
- =
+
cs =3D s+strspn(s, whitespace);
=
if (*cs =3D=3D '#' || !*cs)
@@ -983,10 +983,10 @@
const struct command*command;
int unknown =3D 1;
size_t l;
- =
+
l =3D strcspn(cs, whitespace);
=
- for (command =3D commands; command->name; command++) =
+ for (command =3D commands; command->name; command++)
if (strlen(command->name) =3D=3D l && !strncmp(cs, command->na=
me, l)) {
int ret;
pa_tokenizer *t =3D pa_tokenizer_new(cs, command->args);
@@ -997,7 +997,7 @@
=
if (ret < 0 && *fail)
return -1;
- =
+
break;
}
=
@@ -1049,7 +1049,7 @@
while (*p) {
size_t l =3D strcspn(p, linebreak);
char *line =3D pa_xstrndup(p, l);
- =
+
if (pa_cli_command_execute_line(c, line, buf, fail) < 0&& *fail) {
pa_xfree(line);
return -1;
Modified: trunk/src/pulsecore/cli-command.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli-command=
.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/cli-command.h (original)
+++ trunk/src/pulsecore/cli-command.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/cli-text.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli-text.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/cli-text.c (original)
+++ trunk/src/pulsecore/cli-text.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -52,10 +52,10 @@
assert(s);
=
pa_strbuf_printf(s, "%u module(s) loaded.\n", pa_idxset_size(c->module=
s));
- =
+
for (m =3D pa_idxset_first(c->modules, &idx); m; m =3D pa_idxset_next(=
c->modules, &idx))
pa_strbuf_printf(s, " index: %u\n\tname: <%s>\n\targument: <%s>=
\n\tused: %i\n\tauto unload: %s\n", m->index, m->name, m->argument, m->n_us=
ed, m->auto_unload ? "yes" : "no");
- =
+
return pa_strbuf_tostring_free(s);
}
=
@@ -69,14 +69,14 @@
assert(s);
=
pa_strbuf_printf(s, "%u client(s) logged in.\n", pa_idxset_size(c->cli=
ents));
- =
+
for (client =3D pa_idxset_first(c->clients, &idx); client; client =3D =
pa_idxset_next(c->clients, &idx)) {
pa_strbuf_printf(s, " index: %u\n\tname: <%s>\n\tdriver: <%s>\n=
", client->index, client->name, client->driver);
=
if (client->owner)
pa_strbuf_printf(s, "\towner module: <%u>\n", client->owner->i=
ndex);
}
- =
+
return pa_strbuf_tostring_free(s);
}
=
@@ -93,7 +93,7 @@
=
for (sink =3D pa_idxset_first(c->sinks, &idx); sink; sink =3D pa_idxse=
t_next(c->sinks, &idx)) {
char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], c=
m[PA_CHANNEL_MAP_SNPRINT_MAX];
- =
+
pa_strbuf_printf(
s,
" %c index: %u\n"
@@ -118,7 +118,7 @@
if (sink->description)
pa_strbuf_printf(s, "\tdescription: <%s>\n", sink->description=
);
}
- =
+
return pa_strbuf_tostring_free(s);
}
=
@@ -135,8 +135,8 @@
=
for (source =3D pa_idxset_first(c->sources, &idx); source; source =3D =
pa_idxset_next(c->sources, &idx)) {
char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX=
];
- =
- =
+
+
pa_strbuf_printf(
s,
" %c index: %u\n"
@@ -153,14 +153,14 @@
pa_sample_spec_snprint(ss, sizeof(ss), &source->sample_spec),
pa_channel_map_snprint(cm, sizeof(cm), &source->channel_map));
=
- if (source->monitor_of) =
+ if (source->monitor_of)
pa_strbuf_printf(s, "\tmonitor_of: <%u>\n", source->monitor_of=
->index);
if (source->owner)
pa_strbuf_printf(s, "\towner module: <%u>\n", source->owner->i=
ndex);
if (source->description)
pa_strbuf_printf(s, "\tdescription: <%s>\n", source->descripti=
on);
}
- =
+
return pa_strbuf_tostring_free(s);
}
=
@@ -183,9 +183,9 @@
=
for (o =3D pa_idxset_first(c->source_outputs, &idx); o; o =3D pa_idxse=
t_next(c->source_outputs, &idx)) {
char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX=
];
- =
+
assert(o->source);
- =
+
pa_strbuf_printf(
s,
" index: %u\n"
@@ -209,7 +209,7 @@
if (o->client)
pa_strbuf_printf(s, "\tclient: <%u> '%s'\n", o->client->index,=
o->client->name);
}
- =
+
return pa_strbuf_tostring_free(s);
}
=
@@ -233,7 +233,7 @@
char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], c=
m[PA_CHANNEL_MAP_SNPRINT_MAX];
=
assert(i->sink);
- =
+
pa_strbuf_printf(
s,
" index: %u\n"
@@ -262,7 +262,7 @@
if (i->client)
pa_strbuf_printf(s, "\tclient: <%u> '%s'\n", i->client->index,=
i->client->name);
}
- =
+
return pa_strbuf_tostring_free(s);
}
=
@@ -282,13 +282,13 @@
for (e =3D pa_idxset_first(c->scache, &idx); e; e =3D pa_idxset_ne=
xt(c->scache, &idx)) {
double l =3D 0;
char ss[PA_SAMPLE_SPEC_SNPRINT_MAX] =3D "n/a", cv[PA_CVOLUME_S=
NPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX] =3D "n/a";
- =
+
if (e->memchunk.memblock) {
pa_sample_spec_snprint(ss, sizeof(ss), &e->sample_spec);
pa_channel_map_snprint(cm, sizeof(cm), &e->channel_map);
l =3D (double) e->memchunk.length / pa_bytes_per_second(&e=
->sample_spec);
}
- =
+
pa_strbuf_printf(
s,
" name: <%s>\n"
@@ -351,9 +351,9 @@
=
for (i =3D 0; i < 8; i++) {
char *t =3D NULL;
- =
+
switch (i) {
- case 0: =
+ case 0:
t =3D pa_sink_list_to_string(c);
break;
case 1:
@@ -365,7 +365,7 @@
case 3:
t =3D pa_source_output_list_to_string(c);
break;
- case 4: =
+ case 4:
t =3D pa_client_list_to_string(c);
break;
case 5:
Modified: trunk/src/pulsecore/cli-text.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli-text.h?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/cli-text.h (original)
+++ trunk/src/pulsecore/cli-text.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/cli.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/cli.c (original)
+++ trunk/src/pulsecore/cli.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -82,12 +82,12 @@
c->client->kill =3D client_kill;
c->client->userdata =3D c;
c->client->owner =3D m;
- =
+
pa_ioline_set_callback(c->line, line_callback, c);
pa_ioline_puts(c->line, "Welcome to PulseAudio! Use \"help\" for usage=
information.\n"PROMPT);
=
c->fail =3D c->kill_requested =3D c->defer_kill =3D 0;
- =
+
return c;
}
=
@@ -103,7 +103,7 @@
pa_cli *c;
assert(client && client->userdata);
c =3D client->userdata;
- =
+
pa_log_debug("CLI client killed.");
if (c->defer_kill)
c->kill_requested =3D 1;
@@ -138,7 +138,7 @@
if (c->kill_requested) {
if (c->eof_callback)
c->eof_callback(c, c->userdata);
- } else =
+ } else
pa_ioline_puts(line, PROMPT);
}
=
Modified: trunk/src/pulsecore/cli.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/cli.h (original)
+++ trunk/src/pulsecore/cli.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/client.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/client.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/client.c (original)
+++ trunk/src/pulsecore/client.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -56,7 +56,7 @@
pa_subscription_post(core, PA_SUBSCRIPTION_EVENT_CLIENT|PA_SUBSCRIPTIO=
N_EVENT_NEW, c->index);
=
pa_core_check_quit(core);
- =
+
return c;
}
=
Modified: trunk/src/pulsecore/client.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/client.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/client.h (original)
+++ trunk/src/pulsecore/client.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/conf-parser.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/conf-parser=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/conf-parser.c (original)
+++ trunk/src/pulsecore/conf-parser.c Thu Jan 4 14:43:45 2007
@@ -42,24 +42,24 @@
/* Run the user supplied parser for an assignment */
static int next_assignment(const char *filename, unsigned line, const pa_c=
onfig_item *t, const char *lvalue, const char *rvalue, void *userdata) {
assert(filename && t && lvalue && rvalue);
- =
+
for (; t->parse; t++)
if (!strcmp(lvalue, t->lvalue))
return t->parse(filename, line, lvalue, rvalue, t->data, userd=
ata);
=
pa_log("[%s:%u] Unknown lvalue '%s'.", filename, line, lvalue);
- =
+
return -1;
}
=
/* Returns non-zero when c is contained in s */
static int in_string(char c, const char *s) {
assert(s);
- =
+
for (; *s; s++)
if (*s =3D=3D c)
return 1;
- =
+
return 0;
}
=
@@ -85,7 +85,7 @@
=
if ((c =3D strpbrk(b, COMMENTS)))
*c =3D 0;
- =
+
if (!*b)
return 0;
=
@@ -106,13 +106,13 @@
unsigned line =3D 0;
int do_close =3D !f;
assert(filename && t);
- =
+
if (!f && !(f =3D fopen(filename, "r"))) {
if (errno =3D=3D ENOENT) {
r =3D 0;
goto finish;
}
- =
+
pa_log_warn("WARNING: failed to open configuration file '%s': %s",
filename, pa_cstrerror(errno));
goto finish;
@@ -123,23 +123,23 @@
if (!fgets(l, sizeof(l), f)) {
if (feof(f))
break;
- =
+
pa_log_warn("WARNING: failed to read configuration file '%s': =
%s",
filename, pa_cstrerror(errno));
goto finish;
}
- =
+
if (parse_line(filename, ++line, t, l, userdata) < 0)
goto finish;
}
- =
+
r =3D 0;
- =
+
finish:
=
if (do_close && f)
fclose(f);
- =
+
return r;
}
=
@@ -152,22 +152,22 @@
pa_log("[%s:%u] Failed to parse numeric value: %s", filename, line=
, rvalue);
return -1;
}
- =
+
*i =3D (int) k;
- return 0; =
+ return 0;
}
=
int pa_config_parse_bool(const char *filename, unsigned line, const char *=
lvalue, const char *rvalue, void *data, PA_GCC_UNUSED void *userdata) {
int *b =3D data, k;
assert(filename && lvalue && rvalue && data);
- =
+
if ((k =3D pa_parse_boolean(rvalue)) < 0) {
pa_log("[%s:%u] Failed to parse boolean value: %s", filename, line=
, rvalue);
return -1;
}
- =
+
*b =3D k;
- =
+
return 0;
}
=
Modified: trunk/src/pulsecore/core-def.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-def.h?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core-def.h (original)
+++ trunk/src/pulsecore/core-def.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/core-error.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-error.=
c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core-error.c (original)
+++ trunk/src/pulsecore/core-error.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/core-error.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-error.=
h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core-error.h (original)
+++ trunk/src/pulsecore/core-error.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/core-scache.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-scache=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core-scache.c (original)
+++ trunk/src/pulsecore/core-scache.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -94,7 +94,7 @@
pa_memblock_unref(e->memchunk.memblock);
=
pa_xfree(e->filename);
- =
+
assert(e->core =3D=3D c);
=
pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE|PA_SUBS=
CRIPTION_EVENT_CHANGE, e->index);
@@ -178,7 +178,7 @@
=
if (pa_sound_file_load(c->mempool, filename, &ss, &map, &chunk) < 0)
return -1;
- =
+
r =3D pa_scache_add_item(c, name, &ss, &map, &chunk, idx);
pa_memblock_unref(chunk.memblock);
=
@@ -202,7 +202,7 @@
=
e->lazy =3D 1;
e->filename =3D pa_xstrdup(filename);
- =
+
if (!c->scache_auto_unload_event) {
struct timeval ntv;
pa_gettimeofday(&ntv);
@@ -252,7 +252,7 @@
pa_scache_entry *e;
char *t;
pa_cvolume r;
- =
+
assert(c);
assert(name);
assert(sink);
@@ -269,7 +269,7 @@
if (e->volume.channels > e->sample_spec.channels)
e->volume.channels =3D e->sample_spec.channels;
}
- =
+
if (!e->memchunk.memblock)
return -1;
=
@@ -287,7 +287,7 @@
=
if (e->lazy)
time(&e->last_used_time);
- =
+
return 0;
}
=
@@ -318,7 +318,7 @@
=
if (!c->scache || !pa_idxset_size(c->scache))
return 0;
- =
+
for (e =3D pa_idxset_first(c->scache, &idx); e; e =3D pa_idxset_next(c=
->scache, &idx))
if (e->memchunk.memblock)
sum +=3D e->memchunk.length;
@@ -334,7 +334,7 @@
=
if (!c->scache || !pa_idxset_size(c->scache))
return;
- =
+
time(&now);
=
for (e =3D pa_idxset_first(c->scache, &idx); e; e =3D pa_idxset_next(c=
->scache, &idx)) {
@@ -344,7 +344,7 @@
=
if (e->last_used_time + c->scache_idle_time > now)
continue;
- =
+
pa_memblock_unref(e->memchunk.memblock);
e->memchunk.memblock =3D NULL;
e->memchunk.index =3D e->memchunk.length =3D 0;
@@ -358,7 +358,7 @@
const char *e;
=
e =3D pa_path_get_filename(pathname);
- =
+
if (stat(pathname, &st) < 0) {
pa_log("stat('%s'): %s", pathname, pa_cstrerror(errno));
return;
@@ -388,7 +388,7 @@
=
for (i =3D 0; i < p.gl_pathc; i++)
add_file(c, p.gl_pathv[i]);
- =
+
globfree(&p);
#else
return -1;
Modified: trunk/src/pulsecore/core-scache.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-scache=
.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core-scache.h (original)
+++ trunk/src/pulsecore/core-scache.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -32,14 +32,14 @@
pa_core *core;
uint32_t index;
char *name;
- =
+
pa_cvolume volume;
pa_sample_spec sample_spec;
pa_channel_map channel_map;
pa_memchunk memchunk;
=
char *filename;
- =
+
int lazy;
time_t last_used_time;
} pa_scache_entry;
Modified: trunk/src/pulsecore/core-subscribe.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-subscr=
ibe.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core-subscribe.c (original)
+++ trunk/src/pulsecore/core-subscribe.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -65,7 +65,7 @@
/* Allocate a new subscription object for the given subscription mask. Use=
the specified callback function and user data */
pa_subscription* pa_subscription_new(pa_core *c, pa_subscription_mask_t m,=
pa_subscription_cb_t callback, void *userdata) {
pa_subscription *s;
- =
+
assert(c);
assert(m);
assert(callback);
@@ -85,7 +85,7 @@
void pa_subscription_free(pa_subscription*s) {
assert(s);
assert(!s->dead);
- =
+
s->dead =3D 1;
sched_event(s->core);
}
@@ -104,7 +104,7 @@
=
if (!s->next)
s->core->subscription_event_last =3D s->prev;
- =
+
PA_LLIST_REMOVE(pa_subscription_event, s->core->subscription_event_que=
ue, s);
pa_xfree(s);
}
@@ -112,7 +112,7 @@
/* Free all subscription objects */
void pa_subscription_free_all(pa_core *c) {
assert(c);
- =
+
while (c->subscriptions)
free_subscription(c->subscriptions);
=
@@ -157,7 +157,7 @@
static void defer_cb(pa_mainloop_api *m, pa_defer_event *de, void *userdat=
a) {
pa_core *c =3D userdata;
pa_subscription *s;
- =
+
assert(c->mainloop =3D=3D m);
assert(c);
assert(c->subscription_defer_event =3D=3D de);
@@ -170,7 +170,7 @@
pa_subscription_event *e =3D c->subscription_event_queue;
=
for (s =3D c->subscriptions; s; s =3D s->next) {
- =
+
if (!s->dead && pa_subscription_match_flags(s->mask, e->type))
s->callback(c, e->type, e->index, s->userdata);
}
@@ -182,7 +182,7 @@
}
=
/* Remove dead subscriptions */
- =
+
s =3D c->subscriptions;
while (s) {
pa_subscription *n =3D s->next;
@@ -200,7 +200,7 @@
c->subscription_defer_event =3D c->mainloop->defer_new(c->mainloop=
, defer_cb, c);
assert(c->subscription_defer_event);
}
- =
+
c->mainloop->defer_enable(c->subscription_defer_event, 1);
}
=
@@ -212,18 +212,18 @@
/* No need for queuing subscriptions of noone is listening */
if (!c->subscriptions)
return;
- =
+
if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) !=3D PA_SUBSCRIPTION_EVENT_N=
EW) {
pa_subscription_event *i, *n;
- =
+
/* Check for duplicates */
for (i =3D c->subscription_event_last; i; i =3D n) {
n =3D i->prev;
- =
+
/* not the same object type */
if (((t ^ i->type) & PA_SUBSCRIPTION_EVENT_FACILITY_MASK))
continue;
- =
+
/* not the same object */
if (i->index !=3D index)
continue;
@@ -253,7 +253,7 @@
e->type =3D t;
e->index =3D index;
=
- PA_LLIST_INSERT_AFTER(pa_subscription_event, c->subscription_event_que=
ue, c->subscription_event_last, e); =
+ PA_LLIST_INSERT_AFTER(pa_subscription_event, c->subscription_event_que=
ue, c->subscription_event_last, e);
c->subscription_event_last =3D e;
=
#ifdef DEBUG
Modified: trunk/src/pulsecore/core-subscribe.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-subscr=
ibe.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core-subscribe.h (original)
+++ trunk/src/pulsecore/core-subscribe.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/core-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-util.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core-util.c (original)
+++ trunk/src/pulsecore/core-util.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -139,7 +139,7 @@
int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) {
struct stat st;
int r;
- =
+
assert(dir);
=
#ifdef OS_IS_WIN32
@@ -152,7 +152,7 @@
umask(u);
}
#endif
- =
+
if (r < 0 && errno !=3D EEXIST)
return -1;
=
@@ -163,18 +163,18 @@
gid =3D getgid();
chown(dir, uid, gid);
#endif
- =
+
#ifdef HAVE_CHMOD
chmod(dir, m);
#endif
- =
+
#ifdef HAVE_LSTAT
if (lstat(dir, &st) < 0)
#else
if (stat(dir, &st) < 0)
#endif
goto fail;
- =
+
#ifndef OS_IS_WIN32
if (!S_ISDIR(st.st_mode) ||
(st.st_uid !=3D uid) ||
@@ -186,9 +186,9 @@
#else
pa_log_warn("secure directory creation not supported on Win32.");
#endif
- =
+
return 0;
- =
+
fail:
rmdir(dir);
return -1;
@@ -214,12 +214,12 @@
=
if (!(dir =3D pa_parent_dir(fn)))
goto finish;
- =
+
if (pa_make_secure_dir(dir, m, uid, gid) < 0)
goto finish;
=
ret =3D 0;
- =
+
finish:
pa_xfree(dir);
return ret;
@@ -237,7 +237,7 @@
=
if (!type || *type =3D=3D 0) {
ssize_t r;
- =
+
if ((r =3D recv(fd, buf, count, 0)) >=3D 0)
return r;
=
@@ -251,7 +251,7 @@
}
=
#endif
- =
+
return read(fd, buf, count);
}
=
@@ -263,7 +263,7 @@
=
if ((r =3D send(fd, buf, count, MSG_NOSIGNAL)) >=3D 0)
return r;
- =
+
#ifdef OS_IS_WIN32
if (WSAGetLastError() !=3D WSAENOTSOCK) {
errno =3D WSAGetLastError();
@@ -286,7 +286,7 @@
ssize_t pa_loop_read(int fd, void*data, size_t size, int *type) {
ssize_t ret =3D 0;
int _type;
- =
+
assert(fd >=3D 0);
assert(data);
assert(size);
@@ -304,7 +304,7 @@
=
if (r =3D=3D 0)
break;
- =
+
ret +=3D r;
data =3D (uint8_t*) data + r;
size -=3D r;
@@ -335,7 +335,7 @@
=
if (r =3D=3D 0)
break;
- =
+
ret +=3D r;
data =3D (const uint8_t*) data + r;
size -=3D r;
@@ -354,8 +354,8 @@
/* If POSIX threads are supported use thread-aware
* pthread_sigmask() function, to check if the signal is
* blocked. Otherwise fall back to sigprocmask() */
- =
-#ifdef HAVE_PTHREAD =
+
+#ifdef HAVE_PTHREAD
if (pthread_sigmask(SIG_SETMASK, NULL, &set) < 0) {
#endif
if (sigprocmask(SIG_SETMASK, NULL, &set) < 0) {
@@ -370,15 +370,15 @@
return;
=
/* Check whether the signal is trapped */
- =
+
if (sigaction(sig, NULL, &sa) < 0) {
pa_log("sigaction(): %s", pa_cstrerror(errno));
return;
}
- =
+
if (sa.sa_handler !=3D SIG_DFL)
return;
- =
+
pa_log("WARNING: %s is not trapped. This might cause malfunction!", pa=
_strsignal(sig));
#else /* HAVE_SIGACTION */
pa_log("WARNING: %s might not be trapped. This might cause malfunction=
!", pa_strsignal(sig));
@@ -390,9 +390,9 @@
char *pa_sprintf_malloc(const char *format, ...) {
int size =3D 100;
char *c =3D NULL;
- =
+
assert(format);
- =
+
for(;;) {
int r;
va_list ap;
@@ -402,12 +402,12 @@
va_start(ap, format);
r =3D vsnprintf(c, size, format, ap);
va_end(ap);
- =
+
if (r > -1 && r < size)
return c;
=
if (r > -1) /* glibc 2.1 */
- size =3D r+1; =
+ size =3D r+1;
else /* glibc 2.0 */
size *=3D 2;
}
@@ -418,9 +418,9 @@
char *pa_vsprintf_malloc(const char *format, va_list ap) {
int size =3D 100;
char *c =3D NULL;
- =
+
assert(format);
- =
+
for(;;) {
int r;
va_list aq;
@@ -431,12 +431,12 @@
r =3D vsnprintf(c, size, format, aq);
=
va_end(aq);
- =
+
if (r > -1 && r < size)
return c;
=
if (r > -1) /* glibc 2.1 */
- size =3D r+1; =
+ size =3D r+1;
else /* glibc 2.0 */
size *=3D 2;
}
@@ -461,10 +461,10 @@
#ifdef HAVE_SYS_RESOURCE_H
if (setpriority(PRIO_PROCESS, 0, NICE_LEVEL) < 0)
pa_log_warn("setpriority(): %s", pa_cstrerror(errno));
- else =
- pa_log_info("Successfully gained nice level %i.", NICE_LEVEL); =
-#endif
- =
+ else
+ pa_log_info("Successfully gained nice level %i.", NICE_LEVEL);
+#endif
+
#ifdef _POSIX_PRIORITY_SCHEDULING
{
struct sched_param sp;
@@ -473,14 +473,14 @@
pa_log("sched_getparam(): %s", pa_cstrerror(errno));
return;
}
- =
+
sp.sched_priority =3D 1;
if (sched_setscheduler(0, SCHED_FIFO, &sp) < 0) {
pa_log_warn("sched_setscheduler(): %s", pa_cstrerror(errno));
return;
}
=
- pa_log_info("Successfully enabled SCHED_FIFO scheduling."); =
+ pa_log_info("Successfully enabled SCHED_FIFO scheduling.");
}
#endif
=
@@ -488,7 +488,7 @@
if (!SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS))
pa_log_warn("SetPriorityClass() failed: 0x%08X", GetLastError());
else
- pa_log_info("Successfully gained high priority class."); =
+ pa_log_info("Successfully gained high priority class.");
#endif
}
=
@@ -521,19 +521,19 @@
=
if ((v =3D fcntl(fd, F_GETFD, 0)) < 0)
return -1;
- =
+
v =3D (v & ~FD_CLOEXEC) | (b ? FD_CLOEXEC : 0);
- =
+
if (fcntl(fd, F_SETFD, v) < 0)
return -1;
-#endif =
+#endif
=
return 0;
}
=
/* Try to parse a boolean string value.*/
int pa_parse_boolean(const char *v) {
- =
+
if (!strcmp(v, "1") || v[0] =3D=3D 'y' || v[0] =3D=3D 'Y' || v[0] =3D=
=3D 't' || v[0] =3D=3D 'T' || !strcasecmp(v, "on"))
return 1;
else if (!strcmp(v, "0") || v[0] =3D=3D 'n' || v[0] =3D=3D 'N' || v[0]=
=3D=3D 'f' || v[0] =3D=3D 'F' || !strcasecmp(v, "off"))
@@ -552,7 +552,7 @@
=
if (!*current)
return NULL;
- =
+
l =3D strcspn(current, delimiter);
*state =3D current+l;
=
@@ -632,7 +632,7 @@
}
=
r =3D strcmp(name, result->gr_name) =3D=3D 0;
- =
+
finish:
pa_xfree(data);
#else
@@ -647,7 +647,7 @@
=
finish:
#endif
- =
+
return r;
}
=
@@ -658,9 +658,9 @@
int r =3D -1, i;
=
assert(n > 0);
- =
+
gids =3D pa_xmalloc(sizeof(GETGROUPS_T)*n);
- =
+
if ((n =3D getgroups(n, gids)) < 0) {
pa_log("getgroups(): %s", pa_cstrerror(errno));
goto finish;
@@ -681,7 +681,7 @@
}
=
r =3D 0;
- =
+
finish:
=
pa_xfree(gids);
@@ -695,20 +695,20 @@
struct group grbuf, *gr;
char **i;
int r =3D -1;
- =
+
g_n =3D sysconf(_SC_GETGR_R_SIZE_MAX);
g_buf =3D pa_xmalloc(g_n);
=
p_n =3D sysconf(_SC_GETPW_R_SIZE_MAX);
p_buf =3D pa_xmalloc(p_n);
- =
+
if (getgrnam_r(name, &grbuf, g_buf, (size_t) g_n, &gr) !=3D 0 || !gr)
goto finish;
=
r =3D 0;
for (i =3D gr->gr_mem; *i; i++) {
struct passwd pwbuf, *pw;
- =
+
if (getpwnam_r(*i, &pwbuf, p_buf, (size_t) p_n, &pw) !=3D 0 || !pw)
continue;
=
@@ -763,7 +763,7 @@
=
int pa_own_uid_in_group(const char *name, gid_t *gid) {
return -1;
- =
+
}
=
int pa_uid_in_group(uid_t uid, const char *name) {
@@ -787,7 +787,7 @@
struct flock flock;
=
/* Try a R/W lock first */
- =
+
flock.l_type =3D b ? F_WRLCK : F_UNLCK;
flock.l_whence =3D SEEK_SET;
flock.l_start =3D 0;
@@ -802,7 +802,7 @@
if (fcntl(fd, F_SETLKW, &flock) >=3D 0)
return 0;
}
- =
+
pa_log("%slock: %s", !b? "un" : "",
pa_cstrerror(errno));
#endif
@@ -836,18 +836,18 @@
=
for (;;) {
struct stat st;
- =
+
if ((fd =3D open(fn, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0) {
pa_log("failed to create lock file '%s': %s", fn,
pa_cstrerror(errno));
goto fail;
}
- =
+
if (pa_lock_fd(fd, 1) < 0) {
pa_log("failed to lock file '%s'.", fn);
goto fail;
}
- =
+
if (fstat(fd, &st) < 0) {
pa_log("failed to fstat() file '%s'.", fn);
goto fail;
@@ -856,12 +856,12 @@
/* Check wheter the file has been removed meanwhile. When yes, res=
tart this loop, otherwise, we're done */
if (st.st_nlink >=3D 1)
break;
- =
+
if (pa_lock_fd(fd, 0) < 0) {
pa_log("failed to unlock file '%s'.", fn);
goto fail;
}
- =
+
if (close(fd) < 0) {
pa_log("failed to close file '%s'.", fn);
goto fail;
@@ -869,7 +869,7 @@
=
fd =3D -1;
}
- =
+
return fd;
=
fail:
@@ -890,7 +890,7 @@
fn, pa_cstrerror(errno));
r =3D -1;
}
- =
+
if (pa_lock_fd(fd, 0) < 0) {
pa_log_warn("WARNING: failed to unlock file '%s'.", fn);
r =3D -1;
@@ -946,20 +946,20 @@
=
if (lfn) {
FILE *f;
- =
+
#ifdef OS_IS_WIN32
if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX))
return NULL;
fn =3D buf;
#endif
- =
+
if ((f =3D fopen(fn, mode)) || errno !=3D ENOENT) {
if (result)
*result =3D pa_xstrdup(fn);
pa_xfree(lfn);
return f;
}
- =
+
pa_xfree(lfn);
}
}
@@ -979,10 +979,10 @@
=
if (result)
*result =3D pa_xstrdup(global);
- =
+
return fopen(global, mode);
}
- =
+
/* Format the specified data as a hexademical string */
char *pa_hexstr(const uint8_t* d, size_t dlength, char *s, size_t slength)=
{
size_t i =3D 0, j =3D 0;
@@ -1025,7 +1025,7 @@
=
if ((b =3D hexc(*(p++))) < 0)
return (size_t) -1;
- =
+
d[j] =3D (uint8_t) (b << 4);
=
if (!*p)
@@ -1044,10 +1044,10 @@
/* Returns nonzero when *s starts with *pfx */
int pa_startswith(const char *s, const char *pfx) {
size_t l;
- =
+
assert(s);
assert(pfx);
- =
+
l =3D strlen(pfx);
=
return strlen(s) >=3D l && strncmp(s, pfx, l) =3D=3D 0;
@@ -1056,10 +1056,10 @@
/* Returns nonzero when *s ends with *sfx */
int pa_endswith(const char *s, const char *sfx) {
size_t l1, l2;
- =
+
assert(s);
assert(sfx);
- =
+
l1 =3D strlen(s);
l2 =3D strlen(sfx);
=
@@ -1081,20 +1081,20 @@
=
if ((e =3D getenv("PULSE_RUNTIME_PATH"))) {
=
- if (fn) =
+ if (fn)
snprintf(s, l, "%s%c%s", e, PATH_SEP, fn);
else
snprintf(s, l, "%s", e);
- =
+
} else {
char u[256];
- =
- if (fn) =
+
+ if (fn)
snprintf(s, l, "%s%s%c%s", PA_USER_RUNTIME_PATH_PREFIX, pa_get=
_user_name(u, sizeof(u)), PATH_SEP, fn);
else
snprintf(s, l, "%s%s", PA_USER_RUNTIME_PATH_PREFIX, pa_get_use=
r_name(u, sizeof(u)));
}
- =
+
=
#ifdef OS_IS_WIN32
{
@@ -1119,7 +1119,7 @@
return -1;
=
*ret_i =3D (int32_t) l;
- =
+
return 0;
}
=
@@ -1135,6 +1135,6 @@
return -1;
=
*ret_u =3D (uint32_t) l;
- =
+
return 0;
}
Modified: trunk/src/pulsecore/core-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-util.h=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core-util.h (original)
+++ trunk/src/pulsecore/core-util.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/core.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core.c (original)
+++ trunk/src/pulsecore/core.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -116,7 +116,7 @@
pa_property_init(c);
=
pa_random(&c->cookie, sizeof(c->cookie));
- =
+
#ifdef SIGPIPE
pa_check_signal_is_blocked(SIGPIPE);
#endif
@@ -131,16 +131,16 @@
=
assert(pa_idxset_isempty(c->clients));
pa_idxset_free(c->clients, NULL, NULL);
- =
+
assert(pa_idxset_isempty(c->sinks));
pa_idxset_free(c->sinks, NULL, NULL);
=
assert(pa_idxset_isempty(c->sources));
pa_idxset_free(c->sources, NULL, NULL);
- =
+
assert(pa_idxset_isempty(c->source_outputs));
pa_idxset_free(c->source_outputs, NULL, NULL);
- =
+
assert(pa_idxset_isempty(c->sink_inputs));
pa_idxset_free(c->sink_inputs, NULL, NULL);
=
@@ -163,8 +163,8 @@
pa_hook_free(&c->hook_sink_disconnect);
pa_hook_free(&c->hook_source_output_new);
pa_hook_free(&c->hook_source_disconnect);
- =
- pa_xfree(c); =
+
+ pa_xfree(c);
}
=
static void quit_callback(pa_mainloop_api*m, pa_time_event *e, PA_GCC_UNUS=
ED const struct timeval *tv, void *userdata) {
Modified: trunk/src/pulsecore/core.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core.h (original)
+++ trunk/src/pulsecore/core.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -46,7 +46,7 @@
/* A random value which may be used to identify this instance of
* PulseAudio. Not cryptographically secure in any way. */
uint32_t cookie;
- =
+
pa_mainloop_api *mainloop;
=
/* idxset of all kinds of entities */
Modified: trunk/src/pulsecore/creds.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/creds.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/creds.h (original)
+++ trunk/src/pulsecore/creds.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/dynarray.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/dynarray.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/dynarray.c (original)
+++ trunk/src/pulsecore/dynarray.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/dynarray.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/dynarray.h?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/dynarray.h (original)
+++ trunk/src/pulsecore/dynarray.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/endianmacros.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/endianmacro=
s.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/endianmacros.h (original)
+++ trunk/src/pulsecore/endianmacros.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/esound.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/esound.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/esound.h (original)
+++ trunk/src/pulsecore/esound.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/flist.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/flist.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/flist.c (original)
+++ trunk/src/pulsecore/flist.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -111,12 +111,12 @@
size =3D FLIST_SIZE;
=
assert(is_power_of_two(size));
- =
+
l =3D pa_xnew(pa_flist, 1);
=
l->size =3D size;
l->cells =3D pa_xnew0(struct cell, size);
- =
+
pa_atomic_store(&l->read_idx, 0);
pa_atomic_store(&l->write_idx, 0);
pa_atomic_store(&l->length, 0);
@@ -133,10 +133,10 @@
=
if (free_cb) {
int len, idx;
- =
+
idx =3D reduce(l, pa_atomic_load(&l->read_idx));
len =3D pa_atomic_load(&l->length);
- =
+
for (; len > 0; len--) {
=
if (pa_atomic_load(&l->cells[idx].state) =3D=3D STATE_USED)
@@ -152,7 +152,7 @@
=
int pa_flist_push(pa_flist*l, void *p) {
int idx, len, n;
- =
+
assert(l);
assert(p);
=
@@ -183,13 +183,13 @@
if (len > N_EXTRA_SCAN)
pa_log("WARNING: Didn't find free cell after %u iterations.", len=
);
#endif
- =
+
return -1;
}
=
void* pa_flist_pop(pa_flist*l) {
int idx, len, n;
- =
+
assert(l);
=
n =3D len =3D pa_atomic_load(&l->length) + N_EXTRA_SCAN;
@@ -221,6 +221,6 @@
if (len > N_EXTRA_SCAN)
pa_log("WARNING: Didn't find used cell after %u iterations.", len);
#endif
- =
+
return NULL;
}
Modified: trunk/src/pulsecore/flist.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/flist.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/flist.h (original)
+++ trunk/src/pulsecore/flist.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/g711.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/g711.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/g711.h (original)
+++ trunk/src/pulsecore/g711.h Thu Jan 4 14:43:45 2007
@@ -33,7 +33,7 @@
#define st_14linear2ulaw(sw) (_st_14linear2ulaw[(sw + 0x2000)])
#define st_ulaw2linear16(uc) (_st_ulaw2linear16[uc])
#else
-unsigned char st_14linear2ulaw(int16_t pcm_val); =
+unsigned char st_14linear2ulaw(int16_t pcm_val);
int16_t st_ulaw2linear16(unsigned char);
#endif
=
Modified: trunk/src/pulsecore/gccmacro.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/gccmacro.h?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/gccmacro.h (original)
+++ trunk/src/pulsecore/gccmacro.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/hashmap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/hashmap.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/hashmap.c (original)
+++ trunk/src/pulsecore/hashmap.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -47,7 +47,7 @@
unsigned size;
struct hashmap_entry **data;
struct hashmap_entry *first_entry;
- =
+
unsigned n_entries;
pa_hash_func_t hash_func;
pa_compare_func_t compare_func;
@@ -55,14 +55,14 @@
=
pa_hashmap *pa_hashmap_new(pa_hash_func_t hash_func, pa_compare_func_t com=
pare_func) {
pa_hashmap *h;
- =
+
h =3D pa_xnew(pa_hashmap, 1);
h->data =3D pa_xnew0(struct hashmap_entry*, h->size =3D BUCKETS);
h->first_entry =3D NULL;
h->n_entries =3D 0;
h->hash_func =3D hash_func ? hash_func : pa_idxset_trivial_hash_func;
h->compare_func =3D compare_func ? compare_func : pa_idxset_trivial_co=
mpare_func;
- =
+
return h;
}
=
@@ -98,7 +98,7 @@
free_func(h->first_entry->value, userdata);
remove(h, h->first_entry);
}
- =
+
pa_xfree(h->data);
pa_xfree(h);
}
@@ -124,24 +124,24 @@
=
if ((e =3D get(h, hash, key)))
return -1;
- =
+
e =3D pa_xnew(struct hashmap_entry, 1);
e->hash =3D hash;
e->key =3D key;
e->value =3D value;
- =
+
e->previous =3D NULL;
e->next =3D h->first_entry;
if (h->first_entry)
h->first_entry->previous =3D e;
h->first_entry =3D e;
- =
+
e->bucket_previous =3D NULL;
e->bucket_next =3D h->data[hash];
if (h->data[hash])
h->data[hash]->bucket_previous =3D e;
h->data[hash] =3D e;
- =
+
h->n_entries ++;
return 0;
}
@@ -164,7 +164,7 @@
struct hashmap_entry *e;
unsigned hash;
void *data;
- =
+
assert(h);
=
hash =3D h->hash_func(key) % h->size;
@@ -185,7 +185,7 @@
assert(h);
assert(state);
=
- if (!*state) =
+ if (!*state)
*state =3D h->first_entry;
else
*state =3D ((struct hashmap_entry*) *state)->next;
@@ -198,13 +198,13 @@
=
if (key)
*key =3D ((struct hashmap_entry*) *state)->key;
- =
+
return ((struct hashmap_entry*) *state)->value;
}
=
void* pa_hashmap_steal_first(pa_hashmap *h) {
void *data;
- =
+
assert(h);
=
if (!h->first_entry)
Modified: trunk/src/pulsecore/hashmap.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/hashmap.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/hashmap.h (original)
+++ trunk/src/pulsecore/hashmap.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/hook-list.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/hook-list.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/hook-list.c (original)
+++ trunk/src/pulsecore/hook-list.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -36,9 +36,9 @@
=
if (hook->last =3D=3D slot)
hook->last =3D slot->prev;
- =
+
PA_LLIST_REMOVE(pa_hook_slot, hook->slots, slot);
- =
+
pa_xfree(slot);
}
=
@@ -48,13 +48,13 @@
=
while (hook->slots)
slot_free(hook, hook->slots);
- =
+
pa_hook_init(hook, NULL);
}
=
pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_cb_t cb, void *data) {
pa_hook_slot *slot;
- =
+
assert(cb);
=
slot =3D pa_xnew(pa_hook_slot, 1);
@@ -62,17 +62,17 @@
slot->dead =3D 0;
slot->callback =3D cb;
slot->data =3D data;
- =
+
PA_LLIST_INSERT_AFTER(pa_hook_slot, hook->slots, hook->last, slot);
hook->last =3D slot;
- =
+
return slot;
}
=
void pa_hook_slot_free(pa_hook_slot *slot) {
assert(slot);
assert(!slot->dead);
- =
+
if (slot->hook->firing > 0) {
slot->dead =3D 1;
slot->hook->n_dead++;
@@ -83,7 +83,7 @@
pa_hook_result_t pa_hook_fire(pa_hook *hook, void *data) {
pa_hook_slot *slot, *next;
pa_hook_result_t result =3D PA_HOOK_OK;
- =
+
assert(hook);
=
hook->firing ++;
@@ -91,16 +91,16 @@
for (slot =3D hook->slots; slot; slot =3D slot->next) {
if (slot->dead)
continue;
- =
+
if ((result =3D slot->callback(hook->data, data, slot->data)) !=3D=
PA_HOOK_OK)
break;
}
- =
+
hook->firing --;
- =
+
for (slot =3D hook->slots; hook->n_dead > 0 && slot; slot =3D next) {
next =3D slot->next;
- =
+
if (slot->dead) {
slot_free(hook, slot);
hook->n_dead--;
Modified: trunk/src/pulsecore/hook-list.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/hook-list.h=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/hook-list.h (original)
+++ trunk/src/pulsecore/hook-list.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/idxset.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/idxset.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/idxset.c (original)
+++ trunk/src/pulsecore/idxset.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -44,7 +44,7 @@
struct pa_idxset {
pa_hash_func_t hash_func;
pa_compare_func_t compare_func;
- =
+
unsigned hash_table_size, n_entries;
idxset_entry **hash_table, **array, *iterate_list_head, *iterate_list_=
tail;
uint32_t index, start_index, array_size;
@@ -53,7 +53,7 @@
unsigned pa_idxset_string_hash_func(const void *p) {
unsigned hash =3D 0;
const char *c;
- =
+
for (c =3D p; *c; c++)
hash =3D 31 * hash + *c;
=
@@ -97,7 +97,7 @@
while (s->iterate_list_head) {
idxset_entry *e =3D s->iterate_list_head;
s->iterate_list_head =3D s->iterate_list_head->iterate_next;
- =
+
if (free_func)
free_func(e->data, userdata);
pa_xfree(e);
@@ -133,12 +133,12 @@
=
l =3D idx - s->start_index - i + 100;
n =3D pa_xnew0(idxset_entry*, l);
- =
+
for (j =3D 0; j < s->array_size-i; j++)
n[j] =3D s->array[i+j];
=
pa_xfree(s->array);
- =
+
s->array =3D n;
s->array_size =3D l;
s->start_index +=3D i;
@@ -147,17 +147,17 @@
static idxset_entry** array_index(pa_idxset*s, uint32_t idx) {
if (idx >=3D s->start_index + s->array_size)
return NULL;
- =
+
if (idx < s->start_index)
return NULL;
- =
+
return s->array + idx - s->start_index;
}
=
int pa_idxset_put(pa_idxset*s, void *p, uint32_t *idx) {
unsigned h;
idxset_entry *e, **a;
- =
+
assert(s);
assert(p);
=
@@ -168,7 +168,7 @@
if ((e =3D hash_scan(s, s->hash_table[h], p))) {
if (idx)
*idx =3D e->index;
- =
+
return -1;
}
=
@@ -201,10 +201,10 @@
s->iterate_list_head =3D e;
}
s->iterate_list_tail =3D e;
- =
+
s->n_entries++;
assert(s->n_entries >=3D 1);
- =
+
if (idx)
*idx =3D e->index;
=
@@ -214,7 +214,7 @@
void* pa_idxset_get_by_index(pa_idxset*s, uint32_t idx) {
idxset_entry **a;
assert(s);
- =
+
if (!(a =3D array_index(s, idx)))
return NULL;
=
@@ -228,7 +228,7 @@
unsigned h;
idxset_entry *e;
assert(s && p);
- =
+
assert(s->hash_func);
h =3D s->hash_func(p) % s->hash_table_size;
=
@@ -250,13 +250,13 @@
a =3D array_index(s, e->index);
assert(a && *a && *a =3D=3D e);
*a =3D NULL;
- =
+
/* Remove from linked list */
if (e->iterate_next)
e->iterate_next->iterate_prev =3D e->iterate_prev;
else
s->iterate_list_tail =3D e->iterate_prev;
- =
+
if (e->iterate_prev)
e->iterate_prev->iterate_next =3D e->iterate_next;
else
@@ -280,7 +280,7 @@
void* pa_idxset_remove_by_index(pa_idxset*s, uint32_t idx) {
idxset_entry **a;
void *data;
- =
+
assert(s);
=
if (!(a =3D array_index(s, idx)))
@@ -291,15 +291,15 @@
=
data =3D (*a)->data;
remove_entry(s, *a);
- =
- return data; =
+
+ return data;
}
=
void* pa_idxset_remove_by_data(pa_idxset*s, const void *data, uint32_t *id=
x) {
idxset_entry *e;
unsigned h;
void *r;
- =
+
assert(s->hash_func);
h =3D s->hash_func(data) % s->hash_table_size;
=
@@ -328,7 +328,7 @@
=
if (!e)
return NULL;
- =
+
*idx =3D e->index;
return e->data;
}
@@ -351,7 +351,7 @@
=
if ((a =3D array_index(s, *idx)) && *a)
e =3D (*a)->iterate_next;
- =
+
if (e) {
*idx =3D e->index;
return e->data;
@@ -380,7 +380,7 @@
=
e =3D n;
}
- =
+
return 0;
}
=
Modified: trunk/src/pulsecore/idxset.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/idxset.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/idxset.h (original)
+++ trunk/src/pulsecore/idxset.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/inet_ntop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/inet_ntop.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/inet_ntop.c (original)
+++ trunk/src/pulsecore/inet_ntop.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/inet_pton.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/inet_pton.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/inet_pton.c (original)
+++ trunk/src/pulsecore/inet_pton.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/iochannel.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/iochannel.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/iochannel.c (original)
+++ trunk/src/pulsecore/iochannel.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -54,11 +54,11 @@
=
pa_iochannel_cb_t callback;
void*userdata;
- =
+
int readable;
int writable;
int hungup;
- =
+
int no_close;
=
pa_io_event* input_event, *output_event;
@@ -70,7 +70,7 @@
if (io->input_event =3D=3D io->output_event && io->input_event) {
pa_io_event_flags_t f =3D PA_IO_EVENT_NULL;
assert(io->input_event);
- =
+
if (!io->readable)
f |=3D PA_IO_EVENT_INPUT;
if (!io->writable)
@@ -88,7 +88,7 @@
static void callback(pa_mainloop_api* m, pa_io_event *e, int fd, pa_io_eve=
nt_flags_t f, void *userdata) {
pa_iochannel *io =3D userdata;
int changed =3D 0;
- =
+
assert(m);
assert(e);
assert(fd >=3D 0);
@@ -104,7 +104,7 @@
changed =3D 1;
assert(e =3D=3D io->input_event);
}
- =
+
if ((f & PA_IO_EVENT_OUTPUT) && !io->writable) {
io->writable =3D 1;
changed =3D 1;
@@ -113,7 +113,7 @@
=
if (changed) {
enable_mainloop_sources(io);
- =
+
if (io->callback)
io->callback(io, io->userdata);
}
@@ -121,7 +121,7 @@
=
pa_iochannel* pa_iochannel_new(pa_mainloop_api*m, int ifd, int ofd) {
pa_iochannel *io;
- =
+
assert(m);
assert(ifd >=3D 0 || ofd >=3D 0);
=
@@ -165,42 +165,42 @@
=
if (io->input_event)
io->mainloop->io_free(io->input_event);
- =
+
if (io->output_event && (io->output_event !=3D io->input_event))
io->mainloop->io_free(io->output_event);
=
if (!io->no_close) {
if (io->ifd >=3D 0)
- =
+
close(io->ifd);
if (io->ofd >=3D 0 && io->ofd !=3D io->ifd)
close(io->ofd);
}
- =
+
pa_xfree(io);
}
=
int pa_iochannel_is_readable(pa_iochannel*io) {
assert(io);
- =
+
return io->readable || io->hungup;
}
=
int pa_iochannel_is_writable(pa_iochannel*io) {
assert(io);
- =
+
return io->writable && !io->hungup;
}
=
int pa_iochannel_is_hungup(pa_iochannel*io) {
assert(io);
- =
+
return io->hungup;
}
=
ssize_t pa_iochannel_write(pa_iochannel*io, const void*data, size_t l) {
ssize_t r;
- =
+
assert(io);
assert(data);
assert(l);
@@ -217,7 +217,7 @@
=
ssize_t pa_iochannel_read(pa_iochannel*io, void*data, size_t l) {
ssize_t r;
- =
+
assert(io);
assert(data);
assert(io->ifd >=3D 0);
@@ -236,13 +236,13 @@
int pa_iochannel_creds_supported(pa_iochannel *io) {
struct sockaddr_un sa;
socklen_t l;
- =
+
assert(io);
assert(io->ifd >=3D 0);
assert(io->ofd =3D=3D io->ifd);
=
l =3D sizeof(sa);
- =
+
if (getsockname(io->ifd, (struct sockaddr*) &sa, &l) < 0)
return 0;
=
@@ -254,7 +254,7 @@
=
assert(io);
assert(io->ifd >=3D 0);
- =
+
if (setsockopt(io->ifd, SOL_SOCKET, SO_PASSCRED, &t, sizeof(t)) < 0) {
pa_log_error("setsockopt(SOL_SOCKET, SO_PASSCRED): %s", pa_cstrerr=
or(errno));
return -1;
@@ -270,7 +270,7 @@
uint8_t cmsg_data[CMSG_SPACE(sizeof(struct ucred))];
struct ucred *u;
struct cmsghdr *cmsg;
- =
+
assert(io);
assert(data);
assert(l);
@@ -296,7 +296,7 @@
u->uid =3D getuid();
u->gid =3D getgid();
}
- =
+
memset(&mh, 0, sizeof(mh));
mh.msg_name =3D NULL;
mh.msg_namelen =3D 0;
@@ -319,7 +319,7 @@
struct msghdr mh;
struct iovec iov;
uint8_t cmsg_data[CMSG_SPACE(sizeof(struct ucred))];
- =
+
assert(io);
assert(data);
assert(l);
@@ -346,9 +346,9 @@
struct cmsghdr *cmsg;
=
*creds_valid =3D 0;
- =
+
for (cmsg =3D CMSG_FIRSTHDR(&mh); cmsg; cmsg =3D CMSG_NXTHDR(&mh, =
cmsg)) {
- =
+
if (cmsg->cmsg_level =3D=3D SOL_SOCKET && cmsg->cmsg_type =3D=
=3D SCM_CREDENTIALS) {
struct ucred u;
assert(cmsg->cmsg_len =3D=3D CMSG_LEN(sizeof(struct ucred)=
));
@@ -364,7 +364,7 @@
io->readable =3D 0;
enable_mainloop_sources(io);
}
- =
+
return r;
}
=
@@ -372,14 +372,14 @@
=
void pa_iochannel_set_callback(pa_iochannel*io, pa_iochannel_cb_t _callbac=
k, void *userdata) {
assert(io);
- =
+
io->callback =3D _callback;
io->userdata =3D userdata;
}
=
void pa_iochannel_set_noclose(pa_iochannel*io, int b) {
assert(io);
- =
+
io->no_close =3D b;
}
=
@@ -387,25 +387,25 @@
assert(io);
assert(s);
assert(l);
- =
+
pa_socket_peer_to_string(io->ifd, s, l);
}
=
int pa_iochannel_socket_set_rcvbuf(pa_iochannel *io, size_t l) {
assert(io);
- =
+
return pa_socket_set_rcvbuf(io->ifd, l);
}
=
int pa_iochannel_socket_set_sndbuf(pa_iochannel *io, size_t l) {
assert(io);
- =
+
return pa_socket_set_sndbuf(io->ofd, l);
}
=
pa_mainloop_api* pa_iochannel_get_mainloop_api(pa_iochannel *io) {
assert(io);
- =
+
return io->mainloop;
}
=
Modified: trunk/src/pulsecore/iochannel.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/iochannel.h=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/iochannel.h (original)
+++ trunk/src/pulsecore/iochannel.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/ioline.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/ioline.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/ioline.c (original)
+++ trunk/src/pulsecore/ioline.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -64,7 +64,7 @@
pa_ioline* pa_ioline_new(pa_iochannel *io) {
pa_ioline *l;
assert(io);
- =
+
l =3D pa_xnew(pa_ioline, 1);
l->io =3D io;
l->dead =3D 0;
@@ -85,9 +85,9 @@
l->mainloop->defer_enable(l->defer_event, 0);
=
l->defer_close =3D 0;
- =
+
pa_iochannel_set_callback(io, io_callback, l);
- =
+
return l;
}
=
@@ -126,7 +126,7 @@
assert(l->ref >=3D 1);
=
l->dead =3D 1;
- =
+
if (l->io) {
pa_iochannel_free(l->io);
l->io =3D NULL;
@@ -143,21 +143,21 @@
=
void pa_ioline_puts(pa_ioline *l, const char *c) {
size_t len;
- =
+
assert(l);
assert(l->ref >=3D 1);
assert(c);
=
if (l->dead)
return;
- =
+
len =3D strlen(c);
if (len > BUFFER_LIMIT - l->wbuf_valid_length)
len =3D BUFFER_LIMIT - l->wbuf_valid_length;
=
if (len) {
assert(l->wbuf_length >=3D l->wbuf_valid_length);
- =
+
/* In case the allocated buffer is too small, enlarge it. */
if (l->wbuf_valid_length + len > l->wbuf_length) {
size_t n =3D l->wbuf_valid_length+len;
@@ -170,14 +170,14 @@
l->wbuf_length =3D n;
l->wbuf_index =3D 0;
} else if (l->wbuf_index + l->wbuf_valid_length + len > l->wbuf_le=
ngth) {
- =
+
/* In case the allocated buffer fits, but the current index is=
too far from the start, move it to the front. */
memmove(l->wbuf, l->wbuf+l->wbuf_index, l->wbuf_valid_length);
l->wbuf_index =3D 0;
}
- =
+
assert(l->wbuf_index + l->wbuf_valid_length + len <=3D l->wbuf_len=
gth);
- =
+
/* Append the new string */
memcpy(l->wbuf + l->wbuf_index + l->wbuf_valid_length, c, len);
l->wbuf_valid_length +=3D len;
@@ -189,7 +189,7 @@
void pa_ioline_set_callback(pa_ioline*l, void (*callback)(pa_ioline*io, co=
nst char *s, void *userdata), void *userdata) {
assert(l);
assert(l->ref >=3D 1);
- =
+
l->callback =3D callback;
l->userdata =3D userdata;
}
@@ -213,7 +213,7 @@
l->callback(l, NULL, l->userdata);
l->callback =3D NULL;
}
- =
+
pa_ioline_close(l);
}
=
@@ -223,12 +223,12 @@
while (!l->dead && l->rbuf_valid_length > skip) {
char *e, *p;
size_t m;
- =
+
if (!(e =3D memchr(l->rbuf + l->rbuf_index + skip, '\n', l->rbuf_v=
alid_length - skip)))
break;
=
*e =3D 0;
- =
+
p =3D l->rbuf + l->rbuf_index;
m =3D strlen(p);
=
@@ -260,14 +260,14 @@
size_t len;
=
len =3D l->rbuf_length - l->rbuf_index - l->rbuf_valid_length;
- =
+
/* Check if we have to enlarge the read buffer */
if (len < READ_SIZE) {
size_t n =3D l->rbuf_valid_length+READ_SIZE;
- =
+
if (n >=3D BUFFER_LIMIT)
n =3D BUFFER_LIMIT;
- =
+
if (l->rbuf_length >=3D n) {
/* The current buffer is large enough, let's just move the=
data to the front */
if (l->rbuf_valid_length)
@@ -281,14 +281,14 @@
l->rbuf =3D new;
l->rbuf_length =3D n;
}
- =
+
l->rbuf_index =3D 0;
}
- =
+
len =3D l->rbuf_length - l->rbuf_index - l->rbuf_valid_length;
- =
+
assert(len >=3D READ_SIZE);
- =
+
/* Read some data */
if ((r =3D pa_iochannel_read(l->io, l->rbuf+l->rbuf_index+l->rbuf_=
valid_length, len)) <=3D 0) {
if (r < 0) {
@@ -296,16 +296,16 @@
failure(l, 0);
} else
failure(l, 1);
- =
+
return -1;
}
- =
+
l->rbuf_valid_length +=3D r;
- =
+
/* Look if a line has been terminated in the newly read data */
scan_for_lines(l, l->rbuf_valid_length - r);
}
- =
+
return 0;
}
=
@@ -315,21 +315,21 @@
assert(l && l->ref >=3D 1);
=
while (!l->dead && pa_iochannel_is_writable(l->io) && l->wbuf_valid_le=
ngth) {
- =
+
if ((r =3D pa_iochannel_write(l->io, l->wbuf+l->wbuf_index, l->wbu=
f_valid_length)) < 0) {
pa_log("write(): %s", r < 0 ? pa_cstrerror(errno) : "EOF");
failure(l, 0);
return -1;
}
- =
+
l->wbuf_index +=3D r;
l->wbuf_valid_length -=3D r;
- =
+
/* A shortcut for the next time */
if (l->wbuf_valid_length =3D=3D 0)
l->wbuf_index =3D 0;
}
- =
+
return 0;
}
=
@@ -341,7 +341,7 @@
pa_ioline_ref(l);
=
l->mainloop->defer_enable(l->defer_event, 0);
- =
+
if (!l->dead)
do_read(l);
=
@@ -371,7 +371,7 @@
void pa_ioline_defer_close(pa_ioline *l) {
assert(l);
assert(l->ref >=3D 1);
- =
+
l->defer_close =3D 1;
=
if (!l->wbuf_valid_length)
@@ -381,7 +381,7 @@
void pa_ioline_printf(pa_ioline *l, const char *format, ...) {
char *t;
va_list ap;
- =
+
assert(l);
assert(l->ref >=3D 1);
=
Modified: trunk/src/pulsecore/ioline.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/ioline.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/ioline.h (original)
+++ trunk/src/pulsecore/ioline.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/ipacl.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/ipacl.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/ipacl.c (original)
+++ trunk/src/pulsecore/ipacl.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -59,7 +59,7 @@
=
struct acl_entry {
PA_LLIST_FIELDS(struct acl_entry);
- int family; =
+ int family;
struct in_addr address_ipv4;
struct in6_addr address_ipv6;
int bits;
@@ -75,10 +75,10 @@
pa_ip_acl *acl;
=
assert(s);
- =
+
acl =3D pa_xnew(pa_ip_acl, 1);
PA_LLIST_HEAD_INIT(struct acl_entry, acl->entries);
- =
+
while ((a =3D pa_split(s, ";", &state))) {
char *slash;
struct acl_entry e, *n;
@@ -97,7 +97,7 @@
if (inet_pton(AF_INET, a, &e.address_ipv4) > 0) {
=
e.bits =3D bits =3D=3D (uint32_t) -1 ? 32 : (int) bits;
- =
+
if (e.bits > 32) {
pa_log("number of bits out of range: %i", e.bits);
goto fail;
@@ -107,7 +107,7 @@
=
if (e.bits < 32 && (uint32_t) (ntohl(e.address_ipv4.s_addr) <<=
e.bits) !=3D 0)
pa_log_warn("WARNING: Host part of ACL entry '%s/%u' is no=
t zero!", a, e.bits);
- =
+
} else if (inet_pton(AF_INET6, a, &e.address_ipv6) > 0) {
=
e.bits =3D bits =3D=3D (uint32_t) -1 ? 128 : (int) bits;
@@ -123,7 +123,7 @@
=
for (i =3D 0, bits =3D e.bits; i < 16; i++) {
=
- if (bits >=3D 8) =
+ if (bits >=3D 8)
bits -=3D 8;
else {
if ((uint8_t) ((e.address_ipv6.s6_addr[i]) << bits=
) !=3D 0) {
@@ -137,7 +137,7 @@
if (t)
pa_log_warn("WARNING: Host part of ACL entry '%s/%u' i=
s not zero!", a, e.bits);
}
- =
+
} else {
pa_log("failed to parse address: %s", a);
goto fail;
@@ -145,16 +145,16 @@
=
n =3D pa_xmemdup(&e, sizeof(struct acl_entry));
PA_LLIST_PREPEND(struct acl_entry, acl->entries, n);
- =
+
pa_xfree(a);
}
=
return acl;
- =
+
fail:
pa_xfree(a);
pa_ip_acl_free(acl);
- =
+
return NULL;
}
=
@@ -166,7 +166,7 @@
PA_LLIST_REMOVE(struct acl_entry, acl->entries, e);
pa_xfree(e);
}
- =
+
pa_xfree(acl);
}
=
@@ -174,7 +174,7 @@
struct sockaddr_storage sa;
struct acl_entry *e;
socklen_t salen;
- =
+
assert(acl);
assert(fd >=3D 0);
=
@@ -190,7 +190,7 @@
=
if (sa.ss_family =3D=3D AF_INET6 && salen !=3D sizeof(struct sockaddr_=
in6))
return -1;
- =
+
for (e =3D acl->entries; e; e =3D e->next) {
=
if (e->family !=3D sa.ss_family)
@@ -198,7 +198,7 @@
=
if (e->family =3D=3D AF_INET) {
struct sockaddr_in *sai =3D (struct sockaddr_in*) &sa;
- =
+
if (e->bits =3D=3D 0 || /* this needs special handling because=
>> takes the right-hand side modulo 32 */
(ntohl(sai->sin_addr.s_addr ^ e->address_ipv4.s_addr) >> (=
32 - e->bits)) =3D=3D 0)
return 1;
@@ -211,7 +211,7 @@
=
if (e->bits =3D=3D 0)
return 1;
- =
+
for (i =3D 0, bits =3D e->bits; i < 16; i++) {
=
if (bits >=3D 8) {
Modified: trunk/src/pulsecore/ipacl.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/ipacl.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/ipacl.h (original)
+++ trunk/src/pulsecore/ipacl.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/llist.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/llist.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/llist.h (original)
+++ trunk/src/pulsecore/llist.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -75,7 +75,7 @@
assert(_head); \
while ((*_head)->prev) \
*_head =3D (*_head)->prev; \
-} while (0) =
+} while (0)
=
#define PA_LLIST_INSERT_AFTER(t,head,a,b) \
do { \
@@ -92,7 +92,7 @@
_b->prev =3D _a; \
_a->next =3D _b; \
} \
-} while (0) =
- =
+} while (0)
+
=
#endif
Modified: trunk/src/pulsecore/log.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/log.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/log.c (original)
+++ trunk/src/pulsecore/log.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -89,16 +89,16 @@
const char *func,
const char *format,
va_list ap) {
- =
+
const char *e;
char *text, *t, *n, *location;
- =
+
assert(level < PA_LOG_LEVEL_MAX);
assert(format);
=
if ((e =3D getenv(ENV_LOGLEVEL)))
maximal_level =3D atoi(e);
- =
+
if (level > maximal_level)
return;
=
@@ -122,13 +122,13 @@
=
if (!*t)
continue;
- =
+
switch (log_target) {
case PA_LOG_STDERR: {
const char *prefix =3D "", *suffix =3D "";
char *local_t;
=
-#ifndef OS_IS_WIN32 =
+#ifndef OS_IS_WIN32
/* Yes indeed. Useless, but fun! */
if (isatty(STDERR_FILENO)) {
if (level <=3D PA_LOG_ERROR) {
@@ -151,8 +151,8 @@
=
break;
}
- =
-#ifdef HAVE_SYSLOG_H =
+
+#ifdef HAVE_SYSLOG_H
case PA_LOG_SYSLOG: {
char *local_t;
=
@@ -167,20 +167,20 @@
}
=
closelog();
- break; =
+ break;
}
#endif
- =
+
case PA_LOG_USER: {
char *x;
=
x =3D pa_sprintf_malloc("%s%s", location, t);
user_log_func(level, x);
pa_xfree(x);
- =
+
break;
}
- =
+
case PA_LOG_NULL:
default:
break;
@@ -197,7 +197,7 @@
int line,
const char *func,
const char *format, ...) {
- =
+
va_list ap;
va_start(ap, format);
pa_log_levelv_meta(level, file, line, func, format, ap);
Modified: trunk/src/pulsecore/log.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/log.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/log.h (original)
+++ trunk/src/pulsecore/log.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/mcalign.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/mcalign.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/mcalign.c (original)
+++ trunk/src/pulsecore/mcalign.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -42,11 +42,11 @@
assert(base);
=
m =3D pa_xnew(pa_mcalign, 1);
- =
+
m->base =3D base;
pa_memchunk_reset(&m->leftover);
pa_memchunk_reset(&m->current);
- =
+
return m;
}
=
@@ -58,22 +58,22 @@
=
if (m->current.memblock)
pa_memblock_unref(m->current.memblock);
- =
+
pa_xfree(m);
}
=
void pa_mcalign_push(pa_mcalign *m, const pa_memchunk *c) {
assert(m);
assert(c);
- =
+
assert(c->memblock);
assert(c->length > 0);
=
assert(!m->current.memblock);
- =
+
/* Append to the leftover memory block */
if (m->leftover.memblock) {
- =
+
/* Try to merge */
if (m->leftover.memblock =3D=3D c->memblock &&
m->leftover.index + m->leftover.length =3D=3D c->index) {
@@ -85,7 +85,7 @@
if (m->leftover.length >=3D m->base) {
m->current =3D m->leftover;
pa_memchunk_reset(&m->leftover);
- } =
+ }
=
} else {
size_t l;
@@ -93,7 +93,7 @@
/* We have to copy */
assert(m->leftover.length < m->base);
l =3D m->base - m->leftover.length;
- =
+
if (l > c->length)
l =3D c->length;
=
@@ -115,7 +115,7 @@
}
} else {
/* Nothing to merge or copy, just store it */
- =
+
if (c->length >=3D m->base)
m->current =3D *c;
else
@@ -146,7 +146,7 @@
m->leftover =3D m->current;
pa_memchunk_reset(&m->current);
}
- =
+
return 0;
}
=
@@ -182,13 +182,13 @@
}
=
pa_memchunk_reset(&m->current);
- =
+
return 0;
}
=
/* There's simply nothing */
return -1;
- =
+
}
=
size_t pa_mcalign_csize(pa_mcalign *m, size_t l) {
@@ -196,9 +196,9 @@
assert(l > 0);
=
assert(!m->current.memblock);
- =
+
if (m->leftover.memblock)
l +=3D m->leftover.length;
- =
+
return (l/m->base)*m->base;
}
Modified: trunk/src/pulsecore/mcalign.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/mcalign.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/mcalign.h (original)
+++ trunk/src/pulsecore/mcalign.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -41,11 +41,11 @@
* for (;;) {
* pa_memchunk input;
*
- * ... fill input ... =
+ * ... fill input ...
*
* pa_mcalign_push(m, &input);
* pa_memblock_unref(input.memblock);
- * =
+ *
* for (;;) {
* pa_memchunk output;
*
Modified: trunk/src/pulsecore/memblock.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memblock.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/memblock.c (original)
+++ trunk/src/pulsecore/memblock.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -71,7 +71,7 @@
=
struct pa_memexport {
pa_mempool *pool;
- =
+
struct memexport_slot slots[PA_MEMEXPORT_SLOTS_MAX];
PA_LLIST_HEAD(struct memexport_slot, free_slots);
PA_LLIST_HEAD(struct memexport_slot, used_slots);
@@ -101,7 +101,7 @@
=
/* A list of free slots that may be reused */
PA_LLIST_HEAD(struct mempool_slot, free_slots);
- =
+
pa_mempool_stat stat;
};
=
@@ -132,14 +132,14 @@
=
assert(AO_load_acquire_read(&b->pool->stat.n_allocated) > 0);
assert(AO_load_acquire_read(&b->pool->stat.allocated_size) >=3D (AO_t)=
b->length);
- =
+
AO_fetch_and_sub1_release_write(&b->pool->stat.n_allocated);
AO_fetch_and_add_release_write(&b->pool->stat.allocated_size, (AO_t) =
(-b->length));
=
if (b->type =3D=3D PA_MEMBLOCK_IMPORTED) {
assert(AO_load_acquire_read(&b->pool->stat.n_imported) > 0);
assert(AO_load_acquire_read(&b->pool->stat.imported_size) >=3D (AO=
_t) b->length);
- =
+
AO_fetch_and_sub1_release_write(&b->pool->stat.n_imported);
AO_fetch_and_add_release_write(&b->pool->stat.imported_size, (AO_t=
) (-b->length));
}
@@ -151,10 +151,10 @@
=
pa_memblock *pa_memblock_new(pa_mempool *p, size_t length) {
pa_memblock *b;
- =
+
assert(p);
assert(length > 0);
- =
+
if (!(b =3D pa_memblock_new_pool(p, length)))
b =3D memblock_new_appended(p, length);
=
@@ -231,16 +231,16 @@
=
if (!(slot =3D mempool_allocate_slot(p)))
return NULL;
- =
+
b =3D mempool_slot_data(slot);
b->type =3D PA_MEMBLOCK_POOL;
b->data =3D (uint8_t*) b + sizeof(pa_memblock);
- =
+
} else if (p->block_size - sizeof(struct mempool_slot) >=3D length) {
=
if (!(slot =3D mempool_allocate_slot(p)))
return NULL;
- =
+
b =3D pa_xnew(pa_memblock, 1);
b->type =3D PA_MEMBLOCK_POOL_EXTERNAL;
b->data =3D mempool_slot_data(slot);
@@ -285,7 +285,7 @@
assert(d);
assert(length > 0);
assert(free_cb);
- =
+
b =3D pa_xnew(pa_memblock, 1);
b->type =3D PA_MEMBLOCK_USER;
b->read_only =3D read_only;
@@ -313,7 +313,7 @@
=
if (PA_REFCNT_DEC(b) > 0)
return;
- =
+
stat_remove(b);
=
switch (b->type) {
@@ -334,13 +334,13 @@
segment =3D b->per_type.imported.segment;
assert(segment);
assert(segment->import);
- =
+
pa_hashmap_remove(segment->import->blocks, PA_UINT32_TO_PTR(b-=
>per_type.imported.id));
segment->import->release_cb(segment->import, b->per_type.impor=
ted.id, segment->import->userdata);
=
if (-- segment->n_blocks <=3D 0)
segment_detach(segment);
- =
+
pa_xfree(b);
break;
}
@@ -351,9 +351,9 @@
=
slot =3D mempool_slot_by_ptr(b->pool, b->data);
assert(slot);
- =
+
PA_LLIST_PREPEND(struct mempool_slot, b->pool->free_slots, slo=
t);
- =
+
if (b->type =3D=3D PA_MEMBLOCK_POOL_EXTERNAL)
pa_xfree(b);
=
@@ -377,7 +377,7 @@
if ((slot =3D mempool_allocate_slot(b->pool))) {
void *new_data;
/* We can move it into a local pool, perfect! */
- =
+
b->type =3D PA_MEMBLOCK_POOL_EXTERNAL;
b->read_only =3D 0;
=
@@ -412,7 +412,7 @@
=
static void memblock_replace_import(pa_memblock *b) {
pa_memimport_segment *seg;
- =
+
assert(b);
assert(b->type =3D=3D PA_MEMBLOCK_IMPORTED);
=
@@ -453,7 +453,7 @@
=
if (p->block_size < ps)
p->block_size =3D ps;
- =
+
p->n_blocks =3D PA_MEMPOOL_SLOTS_MAX;
=
assert(p->block_size > sizeof(struct mempool_slot));
@@ -464,7 +464,7 @@
}
=
p->n_init =3D 0;
- =
+
PA_LLIST_HEAD_INIT(pa_memimport, p->imports);
PA_LLIST_HEAD_INIT(pa_memexport, p->exports);
PA_LLIST_HEAD_INIT(struct mempool_slot, p->free_slots);
@@ -485,7 +485,7 @@
=
if (AO_load_acquire_read(&p->stat.n_allocated) > 0)
pa_log_warn("WARNING! Memory pool destroyed but not all memory blo=
cks freed!");
- =
+
pa_shm_free(&p->memory);
pa_xfree(p);
}
@@ -498,7 +498,7 @@
=
void pa_mempool_vacuum(pa_mempool *p) {
struct mempool_slot *slot;
- =
+
assert(p);
=
for (slot =3D p->free_slots; slot; slot =3D slot->next)
@@ -512,7 +512,7 @@
return -1;
=
*id =3D p->memory.id;
- =
+
return 0;
}
=
@@ -528,14 +528,14 @@
=
assert(p);
assert(cb);
- =
+
i =3D pa_xnew(pa_memimport, 1);
i->pool =3D p;
i->segments =3D pa_hashmap_new(NULL, NULL);
i->blocks =3D pa_hashmap_new(NULL, NULL);
i->release_cb =3D cb;
i->userdata =3D userdata;
- =
+
PA_LLIST_PREPEND(pa_memimport, p->imports, i);
return i;
}
@@ -549,7 +549,7 @@
return NULL;
=
seg =3D pa_xnew(pa_memimport_segment, 1);
- =
+
if (pa_shm_attach_ro(&seg->memory, shm_id) < 0) {
pa_xfree(seg);
return NULL;
@@ -557,7 +557,7 @@
=
seg->import =3D i;
seg->n_blocks =3D 0;
- =
+
pa_hashmap_put(i->segments, PA_UINT32_TO_PTR(shm_id), seg);
return seg;
}
@@ -573,7 +573,7 @@
void pa_memimport_free(pa_memimport *i) {
pa_memexport *e;
pa_memblock *b;
- =
+
assert(i);
=
/* If we've exported this block further we need to revoke that export =
*/
@@ -587,7 +587,7 @@
=
pa_hashmap_free(i->blocks, NULL, NULL);
pa_hashmap_free(i->segments, NULL, NULL);
- =
+
PA_LLIST_REMOVE(pa_memimport, i->pool->imports, i);
pa_xfree(i);
}
@@ -595,19 +595,19 @@
pa_memblock* pa_memimport_get(pa_memimport *i, uint32_t block_id, uint32_t=
shm_id, size_t offset, size_t size) {
pa_memblock *b;
pa_memimport_segment *seg;
- =
+
assert(i);
=
if (pa_hashmap_size(i->blocks) >=3D PA_MEMIMPORT_SLOTS_MAX)
return NULL;
=
- if (!(seg =3D pa_hashmap_get(i->segments, PA_UINT32_TO_PTR(shm_id)))) =
+ if (!(seg =3D pa_hashmap_get(i->segments, PA_UINT32_TO_PTR(shm_id))))
if (!(seg =3D segment_attach(i, shm_id)))
return NULL;
=
if (offset+size > seg->memory.size)
return NULL;
- =
+
b =3D pa_xnew(pa_memblock, 1);
b->type =3D PA_MEMBLOCK_IMPORTED;
b->read_only =3D 1;
@@ -621,9 +621,9 @@
pa_hashmap_put(i->blocks, PA_UINT32_TO_PTR(block_id), b);
=
seg->n_blocks++;
- =
+
stat_add(b);
- =
+
return b;
}
=
@@ -633,7 +633,7 @@
=
if (!(b =3D pa_hashmap_get(i->blocks, PA_UINT32_TO_PTR(id))))
return -1;
- =
+
memblock_replace_import(b);
return 0;
}
@@ -641,13 +641,13 @@
/* For sending blocks to other nodes */
pa_memexport* pa_memexport_new(pa_mempool *p, pa_memexport_revoke_cb_t cb,=
void *userdata) {
pa_memexport *e;
- =
+
assert(p);
assert(cb);
=
if (!p->memory.shared)
return NULL;
- =
+
e =3D pa_xnew(pa_memexport, 1);
e->pool =3D p;
PA_LLIST_HEAD_INIT(struct memexport_slot, e->free_slots);
@@ -655,7 +655,7 @@
e->n_init =3D 0;
e->revoke_cb =3D cb;
e->userdata =3D userdata;
- =
+
PA_LLIST_PREPEND(pa_memexport, p->exports, e);
return e;
}
@@ -683,10 +683,10 @@
=
assert(AO_load_acquire_read(&e->pool->stat.n_exported) > 0);
assert(AO_load_acquire_read(&e->pool->stat.exported_size) >=3D (AO_t) =
e->slots[id].block->length);
- =
+
AO_fetch_and_sub1_release_write(&e->pool->stat.n_exported);
AO_fetch_and_add_release_write(&e->pool->stat.exported_size, (AO_t) -e=
->slots[id].block->length);
- =
+
pa_memblock_unref(e->slots[id].block);
e->slots[id].block =3D NULL;
=
@@ -704,7 +704,7 @@
for (slot =3D e->used_slots; slot; slot =3D next) {
uint32_t idx;
next =3D slot->next;
- =
+
if (slot->block->type !=3D PA_MEMBLOCK_IMPORTED ||
slot->block->per_type.imported.segment->import !=3D i)
continue;
@@ -720,7 +720,7 @@
=
assert(p);
assert(b);
- =
+
if (b->type =3D=3D PA_MEMBLOCK_IMPORTED ||
b->type =3D=3D PA_MEMBLOCK_POOL ||
b->type =3D=3D PA_MEMBLOCK_POOL_EXTERNAL) {
@@ -738,7 +738,7 @@
int pa_memexport_put(pa_memexport *e, pa_memblock *b, uint32_t *block_id, =
uint32_t *shm_id, size_t *offset, size_t * size) {
pa_shm *memory;
struct memexport_slot *slot;
- =
+
assert(e);
assert(b);
assert(block_id);
@@ -774,10 +774,10 @@
assert(b->pool);
memory =3D &b->pool->memory;
}
- =
+
assert(b->data >=3D memory->ptr);
assert((uint8_t*) b->data + b->length <=3D (uint8_t*) memory->ptr + me=
mory->size);
- =
+
*shm_id =3D memory->id;
*offset =3D (uint8_t*) b->data - (uint8_t*) memory->ptr;
*size =3D b->length;
Modified: trunk/src/pulsecore/memblock.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memblock.h?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/memblock.h (original)
+++ trunk/src/pulsecore/memblock.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -37,7 +37,7 @@
typedef enum pa_memblock_type {
PA_MEMBLOCK_POOL, /* Memory is part of the memory pool */
PA_MEMBLOCK_POOL_EXTERNAL, /* Data memory is part of the memory poo=
l but the pa_memblock structure itself not */
- PA_MEMBLOCK_APPENDED, /* the data is appended to the memory bl=
ock */ =
+ PA_MEMBLOCK_APPENDED, /* the data is appended to the memory bl=
ock */
PA_MEMBLOCK_USER, /* User supplied memory, to be freed wit=
h free_cb */
PA_MEMBLOCK_FIXED, /* data is a pointer to fixed memory tha=
t needs not to be freed */
PA_MEMBLOCK_IMPORTED, /* Memory is imported from another proce=
ss via shm */
@@ -66,7 +66,7 @@
struct {
void (*free_cb)(void *p); /* If type =3D=3D PA_MEMBLOCK_USER =
this points to a function for freeing this memory block */
} user;
- =
+
struct {
uint32_t id;
pa_memimport_segment *segment;
Modified: trunk/src/pulsecore/memblockq.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memblockq.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/memblockq.c (original)
+++ trunk/src/pulsecore/memblockq.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -61,12 +61,12 @@
size_t prebuf,
size_t minreq,
pa_memblock *silence) {
- =
+
pa_memblockq* bq;
- =
+
assert(base > 0);
assert(maxlength >=3D base);
- =
+
bq =3D pa_xnew(pa_memblockq, 1);
bq->blocks =3D bq->blocks_tail =3D NULL;
bq->n_blocks =3D 0;
@@ -90,20 +90,20 @@
bq->prebuf =3D bq->maxlength;
=
bq->minreq =3D (minreq/base)*base;
- =
+
if (bq->minreq > bq->tlength - bq->prebuf)
bq->minreq =3D bq->tlength - bq->prebuf;
=
if (!bq->minreq)
bq->minreq =3D 1;
- =
+
pa_log_debug("memblockq sanitized: maxlength=3D%lu, tlength=3D%lu, bas=
e=3D%lu, prebuf=3D%lu, minreq=3D%lu",
(unsigned long)bq->maxlength, (unsigned long)bq->tlength, (unsigne=
d long)bq->base, (unsigned long)bq->prebuf, (unsigned long)bq->minreq);
=
bq->state =3D bq->prebuf ? PREBUF : RUNNING;
bq->silence =3D silence ? pa_memblock_ref(silence) : NULL;
bq->mcalign =3D NULL;
- =
+
return bq;
}
=
@@ -117,7 +117,7 @@
=
if (bq->mcalign)
pa_mcalign_free(bq->mcalign);
- =
+
pa_xfree(bq);
}
=
@@ -126,12 +126,12 @@
assert(q);
=
assert(bq->n_blocks >=3D 1);
- =
+
if (q->prev)
q->prev->next =3D q->next;
else
bq->blocks =3D q->next;
- =
+
if (q->next)
q->next->prev =3D q->prev;
else
@@ -168,10 +168,10 @@
}
=
int pa_memblockq_push(pa_memblockq* bq, const pa_memchunk *uchunk) {
- =
+
struct memblock_list *q, *n;
pa_memchunk chunk;
- =
+
assert(bq);
assert(uchunk);
assert(uchunk->memblock);
@@ -185,7 +185,7 @@
return -1;
=
chunk =3D *uchunk;
- =
+
if (bq->read_index > bq->write_index) {
=
/* We currently have a buffer underflow, we need to drop some
@@ -203,7 +203,7 @@
return 0;
}
}
- =
+
/* We go from back to front to look for the right place to add
* this new entry. Drop data we will overwrite on the way */
=
@@ -275,29 +275,29 @@
assert(bq->write_index + (int64_t)chunk.length > q->index &&
bq->write_index + (int64_t)chunk.length < q->index + (i=
nt64_t)q->chunk.length &&
bq->write_index < q->index);
- =
+
/* The job overwrites the current entry at the end, so let's d=
rop the beginning of this entry */
=
d =3D bq->write_index + chunk.length - q->index;
q->index +=3D d;
q->chunk.index +=3D d;
q->chunk.length -=3D d;
- =
+
q =3D q->prev;
}
- =
+
}
=
if (q) {
assert(bq->write_index >=3D q->index + (int64_t)q->chunk.length);
assert(!q->next || (bq->write_index + (int64_t)chunk.length <=3D q=
->next->index));
- =
+
/* Try to merge memory blocks */
- =
+
if (q->chunk.memblock =3D=3D chunk.memblock &&
q->chunk.index + (int64_t)q->chunk.length =3D=3D chunk.index &&
bq->write_index =3D=3D q->index + (int64_t)q->chunk.length) {
- =
+
q->chunk.length +=3D chunk.length;
bq->write_index +=3D chunk.length;
return 0;
@@ -324,7 +324,7 @@
n->prev->next =3D n;
else
bq->blocks =3D n;
- =
+
bq->n_blocks++;
return 0;
}
@@ -347,7 +347,7 @@
bq->state =3D PREBUF;
return -1;
}
- =
+
/* Do we need to spit out silence? */
if (!bq->blocks || bq->blocks->index > bq->read_index) {
=
@@ -362,7 +362,7 @@
=
if (!length || length > chunk->memblock->length)
length =3D chunk->memblock->length;
- =
+
chunk->length =3D length;
} else {
=
@@ -370,7 +370,7 @@
* the time to sleep */
if (!bq->blocks)
return -1;
- =
+
chunk->memblock =3D NULL;
chunk->length =3D length;
}
@@ -381,7 +381,7 @@
=
/* Ok, let's pass real data to the caller */
assert(bq->blocks->index =3D=3D bq->read_index);
- =
+
*chunk =3D bq->blocks->chunk;
pa_memblock_ref(chunk->memblock);
=
@@ -432,14 +432,14 @@
assert(bq->blocks->index >=3D bq->read_index);
=
d =3D (size_t) (bq->blocks->index - bq->read_index);
- =
+
if (d >=3D length) {
/* The first block is too far in the future */
- =
+
bq->read_index +=3D length;
break;
} else {
- =
+
length -=3D d;
bq->read_index +=3D d;
}
@@ -462,7 +462,7 @@
bq->read_index +=3D length;
break;
}
- =
+
} else {
=
/* The list is empty, there's nothing we could drop */
@@ -477,7 +477,7 @@
=
if (bq->prebuf > 0) {
size_t l =3D pa_memblockq_get_length(bq);
- =
+
if (bq->state =3D=3D PREBUF && l < bq->prebuf)
return 0;
=
@@ -493,7 +493,7 @@
=
if (length % bq->base)
return 0;
- =
+
return pa_memblockq_get_length(bq) + length <=3D bq->tlength;
}
=
@@ -502,7 +502,7 @@
=
if (bq->write_index <=3D bq->read_index)
return 0;
- =
+
return (size_t) (bq->write_index - bq->read_index);
}
=
@@ -546,7 +546,7 @@
=
void pa_memblockq_flush(pa_memblockq *bq) {
assert(bq);
- =
+
while (bq->blocks)
drop_block(bq, bq->blocks);
=
@@ -559,7 +559,7 @@
=
size_t pa_memblockq_get_tlength(pa_memblockq *bq) {
assert(bq);
- =
+
return bq->tlength;
}
=
@@ -578,18 +578,18 @@
=
assert(bq);
assert(chunk && bq->base);
- =
+
if (bq->base =3D=3D 1)
return pa_memblockq_push(bq, chunk);
- =
+
if (!bq->mcalign)
bq->mcalign =3D pa_mcalign_new(bq->base);
=
if (!can_push(bq, pa_mcalign_csize(bq->mcalign, chunk->length)))
return -1;
- =
+
pa_mcalign_push(bq->mcalign, chunk);
- =
+
while (pa_mcalign_pop(bq->mcalign, &rchunk) >=3D 0) {
int r;
r =3D pa_memblockq_push(bq, &rchunk);
Modified: trunk/src/pulsecore/memblockq.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memblockq.h=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/memblockq.h (original)
+++ trunk/src/pulsecore/memblockq.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -39,27 +39,27 @@
=
=
/* Parameters:
- =
+
- idx: start value for both read and write index
=
- maxlength: maximum length of queue. If more data is pushed into
the queue, the operation will fail. Must not be 0.
- =
+
- tlength: the target length of the queue. Pass 0 for the default.
- =
+
- base: a base value for all metrics. Only multiples of this value
are popped from the queue or should be pushed into
it. Must not be 0.
- =
+
- prebuf: If the queue runs empty wait until this many bytes are in
queue again before passing the first byte out. If set
to 0 pa_memblockq_pop() will return a silence memblock
if no data is in the queue and will never fail. Pass
(size_t) -1 for the default.
- =
+
- minreq: pa_memblockq_missing() will only return values greater
than this value. Pass 0 for the default.
- =
+
- silence: return this memblock whzen reading unitialized data
*/
pa_memblockq* pa_memblockq_new(
@@ -67,7 +67,7 @@
size_t maxlength,
size_t tlength,
size_t base,
- size_t prebuf, =
+ size_t prebuf,
size_t minreq,
pa_memblock *silence);
=
Modified: trunk/src/pulsecore/memchunk.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memchunk.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/memchunk.c (original)
+++ trunk/src/pulsecore/memchunk.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -35,7 +35,7 @@
void pa_memchunk_make_writable(pa_memchunk *c, size_t min) {
pa_memblock *n;
size_t l;
- =
+
assert(c);
assert(c->memblock);
assert(PA_REFCNT_VALUE(c->memblock) > 0);
@@ -48,7 +48,7 @@
l =3D c->length;
if (l < min)
l =3D min;
- =
+
n =3D pa_memblock_new(c->memblock->pool, l);
memcpy(n->data, (uint8_t*) c->memblock->data + c->index, c->length);
pa_memblock_unref(c->memblock);
Modified: trunk/src/pulsecore/memchunk.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memchunk.h?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/memchunk.h (original)
+++ trunk/src/pulsecore/memchunk.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/modargs.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/modargs.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/modargs.c (original)
+++ trunk/src/pulsecore/modargs.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -60,7 +60,7 @@
return -1;
}
}
- =
+
e =3D pa_xmalloc(sizeof(struct entry));
e->key =3D key;
e->value =3D value;
@@ -78,7 +78,7 @@
enum { WHITESPACE, KEY, VALUE_START, VALUE_SIMPLE, VALUE_DOUBLE_QU=
OTES, VALUE_TICKS } state;
const char *p, *key, *value;
size_t key_len =3D 0, value_len =3D 0;
- =
+
key =3D value =3D NULL;
state =3D WHITESPACE;
for (p =3D args; *p; p++) {
@@ -160,7 +160,7 @@
=
if (map)
pa_modargs_free((pa_modargs*) map);
- =
+
return NULL;
}
=
@@ -210,7 +210,7 @@
=
if (pa_atoi(v, value) < 0)
return -1;
- =
+
return 0;
}
=
@@ -239,7 +239,7 @@
assert(ma && rss);
=
/* DEBUG_TRAP;*/
- =
+
ss =3D *rss;
if ((pa_modargs_get_value_u32(ma, "rate", &ss.rate)) < 0)
return -1;
@@ -257,14 +257,14 @@
return -1;
=
*rss =3D ss;
- =
+
return 0;
}
=
int pa_modargs_get_channel_map(pa_modargs *ma, pa_channel_map *rmap) {
pa_channel_map map;
const char *cm;
- =
+
assert(ma);
assert(rmap);
=
@@ -284,7 +284,7 @@
int pa_modargs_get_sample_spec_and_channel_map(pa_modargs *ma, pa_sample_s=
pec *rss, pa_channel_map *rmap, pa_channel_map_def_t def) {
pa_sample_spec ss;
pa_channel_map map;
- =
+
assert(ma);
assert(rss);
assert(rmap);
Modified: trunk/src/pulsecore/modargs.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/modargs.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/modargs.h (original)
+++ trunk/src/pulsecore/modargs.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/modinfo.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/modinfo.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/modinfo.c (original)
+++ trunk/src/pulsecore/modinfo.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/modinfo.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/modinfo.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/modinfo.h (original)
+++ trunk/src/pulsecore/modinfo.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/module.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/module.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/module.c (original)
+++ trunk/src/pulsecore/module.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -100,17 +100,17 @@
pa_module* pa_module_load(pa_core *c, const char *name, const char *argume=
nt) {
pa_module *m =3D NULL;
int r;
- =
+
assert(c && name);
=
if (c->disallow_module_loading)
goto fail;
- =
+
m =3D pa_xmalloc(sizeof(pa_module));
=
m->name =3D pa_xstrdup(name);
m->argument =3D pa_xstrdup(argument);
- =
+
if (!(m->dl =3D lt_dlopenext(name))) {
pa_log("Failed to open module \"%s\": %s", name, lt_dlerror());
goto fail;
@@ -125,7 +125,7 @@
pa_log("Failed to load module \"%s\": symbol \""PA_SYMBOL_DONE"\" =
not found.", name);
goto fail;
}
- =
+
m->userdata =3D NULL;
m->core =3D c;
m->n_used =3D -1;
@@ -148,23 +148,23 @@
c->module_auto_unload_event =3D c->mainloop->time_new(c->mainloop,=
&ntv, timeout_callback, c);
}
assert(c->module_auto_unload_event);
- =
+
assert(c->modules);
r =3D pa_idxset_put(c->modules, m, &m->index);
assert(r >=3D 0 && m->index !=3D PA_IDXSET_INVALID);
=
- pa_log_info("Loaded \"%s\" (index: #%u; argument: \"%s\").", m->name, =
m->index, m->argument ? m->argument : ""); =
+ pa_log_info("Loaded \"%s\" (index: #%u; argument: \"%s\").", m->name, =
m->index, m->argument ? m->argument : "");
=
pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_MODULE|PA_SUBSCRIPTION_E=
VENT_NEW, m->index);
- =
+
return m;
- =
+
fail:
=
if (m) {
pa_xfree(m->argument);
pa_xfree(m->name);
- =
+
if (m->dl)
lt_dlclose(m->dl);
=
@@ -180,16 +180,16 @@
if (m->core->disallow_module_loading)
return;
=
- pa_log_info("Unloading \"%s\" (index: #%u).", m->name, m->index); =
+ pa_log_info("Unloading \"%s\" (index: #%u).", m->name, m->index);
=
m->done(m->core, m);
=
lt_dlclose(m->dl);
- =
- pa_log_info("Unloaded \"%s\" (index: #%u).", m->name, m->index); =
+
+ pa_log_info("Unloaded \"%s\" (index: #%u).", m->name, m->index);
=
pa_subscription_post(m->core, PA_SUBSCRIPTION_EVENT_MODULE|PA_SUBSCRIP=
TION_EVENT_REMOVE, m->index);
- =
+
pa_xfree(m->name);
pa_xfree(m->argument);
pa_xfree(m);
@@ -250,7 +250,7 @@
pa_module *m =3D p;
time_t *now =3D userdata;
assert(p && del && now);
- =
+
if (m->n_used =3D=3D 0 && m->auto_unload && m->last_used_time+m->core-=
>module_idle_time <=3D *now) {
pa_module_free(m);
*del =3D 1;
@@ -265,7 +265,7 @@
=
if (!c->modules)
return;
- =
+
time(&now);
pa_idxset_foreach(c->modules, unused_callback, &now);
}
@@ -309,7 +309,7 @@
=
if (m->n_used !=3D used)
pa_subscription_post(m->core, PA_SUBSCRIPTION_EVENT_MODULE|PA_SUBS=
CRIPTION_EVENT_CHANGE, m->index);
- =
+
if (m->n_used !=3D used && used =3D=3D 0)
time(&m->last_used_time);
=
Modified: trunk/src/pulsecore/module.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/module.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/module.h (original)
+++ trunk/src/pulsecore/module.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -36,7 +36,7 @@
uint32_t index;
=
lt_dlhandle dl;
- =
+
int (*init)(pa_core *c, pa_module*m);
void (*done)(pa_core *c, pa_module*m);
=
Modified: trunk/src/pulsecore/mutex-posix.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/mutex-posix=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/mutex-posix.c (original)
+++ trunk/src/pulsecore/mutex-posix.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/mutex-win32.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/mutex-win32=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/mutex-win32.c (original)
+++ trunk/src/pulsecore/mutex-win32.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/mutex.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/mutex.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/mutex.h (original)
+++ trunk/src/pulsecore/mutex.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/namereg.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/namereg.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/namereg.c (original)
+++ trunk/src/pulsecore/namereg.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -59,14 +59,14 @@
=
if (*name =3D=3D 0)
return 0;
- =
+
for (c =3D name; *c && (c-name < PA_NAME_MAX); c++)
if (!is_valid_char(*c))
return 0;
=
if (*c)
return 0;
- =
+
return 1;
}
=
@@ -78,7 +78,7 @@
return NULL;
=
n =3D pa_xnew(char, strlen(name)+1);
- =
+
for (a =3D name, b =3D n; *a && (a-name < PA_NAME_MAX); a++, b++)
*b =3D is_valid_char(*a) ? *a : '_';
=
@@ -89,10 +89,10 @@
=
void pa_namereg_free(pa_core *c) {
assert(c);
- =
+
if (!c->namereg)
return;
- =
+
assert(pa_hashmap_size(c->namereg) =3D=3D 0);
pa_hashmap_free(c->namereg, NULL, NULL);
}
@@ -101,17 +101,17 @@
struct namereg_entry *e;
char *n =3D NULL;
int r;
- =
+
assert(c);
assert(name);
assert(data);
=
if (!*name)
return NULL;
- =
+
if ((type =3D=3D PA_NAMEREG_SINK || type =3D=3D PA_NAMEREG_SOURCE) &&
!is_valid_name(name) ) {
- =
+
if (fail)
return NULL;
=
@@ -136,9 +136,9 @@
pa_xfree(n);
return NULL;
}
- =
+
k =3D pa_xnew(char, l+4);
- =
+
for (i =3D 2; i <=3D 99; i++) {
snprintf(k, l+4, "%s.%u", name, i);
=
@@ -151,11 +151,11 @@
pa_xfree(k);
return NULL;
}
- =
+
pa_xfree(n);
n =3D k;
}
- =
+
e =3D pa_xnew(struct namereg_entry, 1);
e->type =3D type;
e->name =3D n ? n : pa_xstrdup(name);
@@ -169,7 +169,7 @@
=
void pa_namereg_unregister(pa_core *c, const char *name) {
struct namereg_entry *e;
- =
+
assert(c);
assert(name);
=
@@ -184,26 +184,26 @@
struct namereg_entry *e;
uint32_t idx;
assert(c);
- =
+
if (!name) {
- =
+
if (type =3D=3D PA_NAMEREG_SOURCE)
name =3D pa_namereg_get_default_source_name(c);
else if (type =3D=3D PA_NAMEREG_SINK)
name =3D pa_namereg_get_default_sink_name(c);
- =
+
} else if (strcmp(name, "@DEFAULT_SINK@") =3D=3D 0) {
if (type =3D=3D PA_NAMEREG_SINK)
name =3D pa_namereg_get_default_sink_name(c);
- =
+
} else if (strcmp(name, "@DEFAULT_SOURCE@") =3D=3D 0) {
if (type =3D=3D PA_NAMEREG_SOURCE)
name =3D pa_namereg_get_default_source_name(c);
- =
+
} else if (strcmp(name, "@DEFAULT_MONITOR@") =3D=3D 0) {
if (type =3D=3D PA_NAMEREG_SOURCE) {
pa_sink *k;
- =
+
if ((k =3D pa_namereg_get(c, NULL, PA_NAMEREG_SINK, autoload)))
return k->monitor_source;
}
@@ -212,7 +212,7 @@
=
if (!name)
return NULL;
- =
+
if (c->namereg && (e =3D pa_hashmap_get(c->namereg, name)))
if (e->type =3D=3D type)
return e->data;
@@ -221,12 +221,12 @@
=
if (autoload) {
pa_autoload_request(c, name, type);
- =
+
if (c->namereg && (e =3D pa_hashmap_get(c->namereg, name)))
if (e->type =3D=3D type)
return e->data;
}
- =
+
return NULL;
}
=
@@ -242,7 +242,7 @@
=
int pa_namereg_set_default(pa_core*c, const char *name, pa_namereg_type_t =
type) {
char **s;
- =
+
assert(c);
assert(type =3D=3D PA_NAMEREG_SINK || type =3D=3D PA_NAMEREG_SOURCE);
=
@@ -256,7 +256,7 @@
=
if (!is_valid_name(name))
return -1;
- =
+
pa_xfree(*s);
*s =3D pa_xstrdup(name);
pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_SERVER|PA_SUBSCRIPTION_E=
VENT_CHANGE, PA_INVALID_INDEX);
@@ -266,12 +266,12 @@
=
const char *pa_namereg_get_default_sink_name(pa_core *c) {
pa_sink *s;
- =
+
assert(c);
=
if (c->default_sink_name)
return c->default_sink_name;
- =
+
if ((s =3D pa_idxset_first(c->sinks, NULL)))
pa_namereg_set_default(c, s->name, PA_NAMEREG_SINK);
=
@@ -281,7 +281,7 @@
const char *pa_namereg_get_default_source_name(pa_core *c) {
pa_source *s;
uint32_t idx;
- =
+
assert(c);
=
if (c->default_source_name)
Modified: trunk/src/pulsecore/namereg.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/namereg.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/namereg.h (original)
+++ trunk/src/pulsecore/namereg.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/native-common.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/native-comm=
on.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/native-common.h (original)
+++ trunk/src/pulsecore/native-common.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -51,7 +51,7 @@
PA_COMMAND_FINISH_UPLOAD_STREAM,
PA_COMMAND_PLAY_SAMPLE,
PA_COMMAND_REMOVE_SAMPLE,
- =
+
PA_COMMAND_GET_SERVER_INFO,
PA_COMMAND_GET_SINK_INFO,
PA_COMMAND_GET_SINK_INFO_LIST,
@@ -68,24 +68,24 @@
PA_COMMAND_GET_SAMPLE_INFO,
PA_COMMAND_GET_SAMPLE_INFO_LIST,
PA_COMMAND_SUBSCRIBE,
- =
+
PA_COMMAND_SET_SINK_VOLUME,
PA_COMMAND_SET_SINK_INPUT_VOLUME,
PA_COMMAND_SET_SOURCE_VOLUME,
=
PA_COMMAND_SET_SINK_MUTE,
PA_COMMAND_SET_SOURCE_MUTE,
- =
+
PA_COMMAND_CORK_PLAYBACK_STREAM,
PA_COMMAND_FLUSH_PLAYBACK_STREAM,
PA_COMMAND_TRIGGER_PLAYBACK_STREAM,
- =
+
PA_COMMAND_SET_DEFAULT_SINK,
PA_COMMAND_SET_DEFAULT_SOURCE,
- =
+
PA_COMMAND_SET_PLAYBACK_STREAM_NAME,
PA_COMMAND_SET_RECORD_STREAM_NAME,
- =
+
PA_COMMAND_KILL_CLIENT,
PA_COMMAND_KILL_SINK_INPUT,
PA_COMMAND_KILL_SOURCE_OUTPUT,
Modified: trunk/src/pulsecore/once-posix.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/once-posix.=
c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/once-posix.c (original)
+++ trunk/src/pulsecore/once-posix.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -35,22 +35,22 @@
assert(_r =3D=3D 0); \
} while(0)
=
-static pa_mutex *global_mutex; =
+static pa_mutex *global_mutex;
static pthread_once_t global_mutex_once =3D PTHREAD_ONCE_INIT;
=
-static void global_mutex_once_func(void) { =
- global_mutex =3D pa_mutex_new(0); =
-} =
+static void global_mutex_once_func(void) {
+ global_mutex =3D pa_mutex_new(0);
+}
=
-void pa_once(pa_once_t *control, pa_once_func_t func) { =
- assert(control); =
- assert(func); =
- =
+void pa_once(pa_once_t *control, pa_once_func_t func) {
+ assert(control);
+ assert(func);
+
/* Create the global mutex */
- ASSERT_SUCCESS(pthread_once(&global_mutex_once, global_mutex_once_func=
)); =
+ ASSERT_SUCCESS(pthread_once(&global_mutex_once, global_mutex_once_func=
));
=
/* Create the local mutex */
- pa_mutex_lock(global_mutex); =
+ pa_mutex_lock(global_mutex);
if (!control->mutex)
control->mutex =3D pa_mutex_new(1);
pa_mutex_unlock(global_mutex);
@@ -61,9 +61,9 @@
control->once_value =3D 1;
func();
}
- pa_mutex_unlock(control->mutex); =
+ pa_mutex_unlock(control->mutex);
=
/* Caveat: We have to make sure that the once func has completed
* before returning, even if the once func is not actually
* executed by us. Hence the awkward locking. */
-} =
+}
Modified: trunk/src/pulsecore/once-win32.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/once-win32.=
c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/once-win32.c (original)
+++ trunk/src/pulsecore/once-win32.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -59,7 +59,7 @@
control->once_value =3D 1;
func();
}
- pa_mutex_unlock(control->mutex); =
+ pa_mutex_unlock(control->mutex);
=
/* Caveat: We have to make sure that the once func has completed
* before returning, even if the once func is not actually
Modified: trunk/src/pulsecore/once.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/once.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/once.h (original)
+++ trunk/src/pulsecore/once.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/packet.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/packet.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/packet.c (original)
+++ trunk/src/pulsecore/packet.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -40,7 +40,7 @@
p->length =3D length;
p->data =3D (uint8_t*) (p+1);
p->type =3D PA_PACKET_APPENDED;
- =
+
return p;
}
=
@@ -55,14 +55,14 @@
p->length =3D length;
p->data =3D data;
p->type =3D PA_PACKET_DYNAMIC;
- =
+
return p;
}
=
pa_packet* pa_packet_ref(pa_packet *p) {
assert(p);
assert(p->ref >=3D 1);
- =
+
p->ref++;
return p;
}
@@ -70,7 +70,7 @@
void pa_packet_unref(pa_packet *p) {
assert(p);
assert(p->ref >=3D 1);
- =
+
if (--p->ref =3D=3D 0) {
if (p->type =3D=3D PA_PACKET_DYNAMIC)
pa_xfree(p->data);
Modified: trunk/src/pulsecore/packet.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/packet.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/packet.h (original)
+++ trunk/src/pulsecore/packet.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/parseaddr.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/parseaddr.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/parseaddr.c (original)
+++ trunk/src/pulsecore/parseaddr.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -53,11 +53,11 @@
*ret_port =3D atoi(e+2);
else if (e[1] !=3D 0)
return NULL;
- =
+
return pa_xstrndup(s+1, e-s-1);
} else {
char *e;
- =
+
if (!(e =3D strrchr(s, ':')))
return pa_xstrdup(s);
=
@@ -75,22 +75,22 @@
if (*name =3D=3D '{') {
char hn[256], *pfx;
/* The URL starts with a host specification for detecting local co=
nnections */
- =
+
if (!pa_get_host_name(hn, sizeof(hn)))
return -1;
- =
+
pfx =3D pa_sprintf_malloc("{%s}", hn);
if (!pa_startswith(name, pfx)) {
pa_xfree(pfx);
/* Not local */
return -1;
}
- =
+
p =3D name + strlen(pfx);
pa_xfree(pfx);
} else
p =3D name;
- =
+
if (*p =3D=3D '/')
ret_p->type =3D PA_PARSED_ADDRESS_UNIX;
else if (pa_startswith(p, "unix:")) {
@@ -109,7 +109,7 @@
else
if (!(ret_p->path_or_host =3D parse_host(p, &ret_p->port)))
return -1;
- =
- =
+
+
return 0;
}
Modified: trunk/src/pulsecore/parseaddr.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/parseaddr.h=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/parseaddr.h (original)
+++ trunk/src/pulsecore/parseaddr.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/pdispatch.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pdispatch.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/pdispatch.c (original)
+++ trunk/src/pulsecore/pdispatch.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -120,9 +120,9 @@
=
if (r->time_event)
r->pdispatch->mainloop->time_free(r->time_event);
- =
+
PA_LLIST_REMOVE(struct reply_info, r->pdispatch->replies, r);
- =
+
pa_xfree(r);
}
=
@@ -131,7 +131,7 @@
assert(mainloop);
=
assert((entries && table) || (!entries && !table));
- =
+
pd =3D pa_xmalloc(sizeof(pa_pdispatch));
pd->ref =3D 1;
pd->mainloop =3D mainloop;
@@ -141,7 +141,7 @@
pd->drain_callback =3D NULL;
pd->drain_userdata =3D NULL;
pd->creds =3D NULL;
- =
+
return pd;
}
=
@@ -154,7 +154,7 @@
=
reply_info_free(pd->replies);
}
- =
+
pa_xfree(pd);
}
=
@@ -165,13 +165,13 @@
assert(r);
=
pa_pdispatch_ref(pd);
- =
+
callback =3D r->callback;
userdata =3D r->userdata;
tag =3D r->tag;
- =
+
reply_info_free(r);
- =
+
callback(pd, command, tag, ts, userdata);
=
if (pd->drain_callback && !pa_pdispatch_is_pending(pd))
@@ -187,24 +187,24 @@
assert(pd && packet && packet->data);
=
pa_pdispatch_ref(pd);
- =
+
if (packet->length <=3D 8)
goto finish;
=
ts =3D pa_tagstruct_new(packet->data, packet->length);
assert(ts);
- =
+
if (pa_tagstruct_getu32(ts, &command) < 0 ||
pa_tagstruct_getu32(ts, &tag) < 0)
goto finish;
- =
+
#ifdef DEBUG_OPCODES
{
char t[256];
char const *p;
if (!(p =3D command_names[command]))
snprintf((char*) (p =3D t), sizeof(t), "%u", command);
- =
+
pa_log("Recieved opcode <%s>", p);
}
#endif
@@ -231,10 +231,10 @@
}
=
ret =3D 0;
- =
+
finish:
pd->creds =3D NULL;
- =
+
if (ts)
pa_tagstruct_free(ts);
=
@@ -261,7 +261,7 @@
r->userdata =3D userdata;
r->free_cb =3D free_cb;
r->tag =3D tag;
- =
+
pa_gettimeofday(&tv);
tv.tv_sec +=3D timeout;
=
@@ -292,7 +292,7 @@
for (r =3D pd->replies; r; r =3D n) {
n =3D r->next;
=
- if (r->userdata =3D=3D userdata) =
+ if (r->userdata =3D=3D userdata)
reply_info_free(r);
}
}
@@ -313,6 +313,6 @@
const pa_creds * pa_pdispatch_creds(pa_pdispatch *pd) {
assert(pd);
assert(pd->ref >=3D 1);
- =
+
return pd->creds;
}
Modified: trunk/src/pulsecore/pdispatch.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pdispatch.h=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/pdispatch.h (original)
+++ trunk/src/pulsecore/pdispatch.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/pid.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pid.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/pid.c (original)
+++ trunk/src/pulsecore/pid.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -64,7 +64,7 @@
=
if (r =3D=3D 0)
return (pid_t) 0;
- =
+
t[r] =3D 0;
if ((e =3D strchr(t, '\n')))
*e =3D 0;
@@ -79,10 +79,10 @@
=
static int open_pid_file(const char *fn, int mode) {
int fd =3D -1;
- =
+
for (;;) {
struct stat st;
- =
+
if ((fd =3D open(fn, mode, S_IRUSR|S_IWUSR)) < 0) {
if (mode !=3D O_RDONLY || errno !=3D ENOENT)
pa_log_warn("WARNING: failed to open PID file '%s': %s",
@@ -93,7 +93,7 @@
/* Try to lock the file. If that fails, go without */
if (pa_lock_fd(fd, 1) < 0)
goto fail;
- =
+
if (fstat(fd, &st) < 0) {
pa_log_warn("WARNING: failed to fstat() PID file '%s': %s",
fn, pa_cstrerror(errno));
@@ -168,23 +168,23 @@
fn, pa_cstrerror(errno));
goto fail;
}
- =
+
snprintf(t, sizeof(t), "%lu\n", (unsigned long) getpid());
l =3D strlen(t);
- =
+
if (pa_loop_write(fd, t, l, NULL) !=3D (ssize_t) l) {
pa_log("failed to write PID file.");
goto fail;
}
=
ret =3D 0;
- =
-fail:
- if (fd >=3D 0) {
- pa_lock_fd(fd, 0);
- close(fd);
- }
- =
+
+fail:
+ if (fd >=3D 0) {
+ pa_lock_fd(fd, 0);
+ close(fd);
+ }
+
return ret;
}
=
@@ -230,7 +230,7 @@
}
=
ret =3D 0;
- =
+
fail:
=
if (fd >=3D 0) {
@@ -262,26 +262,26 @@
=
if (!pid)
pid =3D &_pid;
- =
+
pa_runtime_path("pid", fn, sizeof(fn));
- =
+
if ((fd =3D open_pid_file(fn, O_RDONLY)) < 0)
goto fail;
- =
+
if ((*pid =3D read_pid(fn, fd)) =3D=3D (pid_t) -1)
goto fail;
=
ret =3D kill(*pid, sig);
- =
-fail:
- =
+
+fail:
+
if (fd >=3D 0) {
pa_lock_fd(fd, 0);
close(fd);
}
=
return ret;
- =
+
}
=
#else /* OS_IS_WIN32 */
Modified: trunk/src/pulsecore/pid.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pid.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/pid.h (original)
+++ trunk/src/pulsecore/pid.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/pipe.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pipe.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/pipe.c (original)
+++ trunk/src/pulsecore/pipe.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/pipe.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pipe.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/pipe.h (original)
+++ trunk/src/pulsecore/pipe.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/play-memblockq.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/play-memblo=
ckq.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/play-memblockq.c (original)
+++ trunk/src/pulsecore/play-memblockq.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -65,11 +65,11 @@
=
static void sink_input_drop(pa_sink_input *i, const pa_memchunk*chunk, siz=
e_t length) {
pa_memblockq *q;
- =
+
assert(i);
assert(length > 0);
assert( i->userdata);
- =
+
q =3D i->userdata;
=
pa_memblockq_drop(q, chunk, length);
@@ -85,7 +85,7 @@
const pa_channel_map *map,
pa_memblockq *q,
pa_cvolume *volume) {
- =
+
pa_sink_input *si;
pa_sink_input_new_data data;
=
@@ -110,17 +110,17 @@
pa_sink_input_new_data_set_channel_map(&data, map);
pa_sink_input_new_data_set_sample_spec(&data, ss);
pa_sink_input_new_data_set_volume(&data, volume);
- =
+
if (!(si =3D pa_sink_input_new(sink->core, &data, 0)))
return -1;
=
si->peek =3D sink_input_peek;
si->drop =3D sink_input_drop;
si->kill =3D sink_input_kill;
- =
+
si->userdata =3D q;
=
pa_sink_notify(si->sink);
- =
+
return 0;
}
Modified: trunk/src/pulsecore/play-memblockq.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/play-memblo=
ckq.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/play-memblockq.h (original)
+++ trunk/src/pulsecore/play-memblockq.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/play-memchunk.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/play-memchu=
nk.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/play-memchunk.c (original)
+++ trunk/src/pulsecore/play-memchunk.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -54,7 +54,7 @@
=
if (c->length <=3D 0)
return -1;
- =
+
assert(c->memblock && c->memblock->length);
*chunk =3D *c;
pa_memblock_ref(c->memblock);
@@ -88,7 +88,7 @@
const pa_channel_map *map,
const pa_memchunk *chunk,
pa_cvolume *volume) {
- =
+
pa_sink_input *si;
pa_memchunk *nchunk;
pa_sink_input_new_data data;
@@ -107,20 +107,20 @@
pa_sink_input_new_data_set_sample_spec(&data, ss);
pa_sink_input_new_data_set_channel_map(&data, map);
pa_sink_input_new_data_set_volume(&data, volume);
- =
+
if (!(si =3D pa_sink_input_new(sink->core, &data, 0)))
return -1;
=
si->peek =3D sink_input_peek;
si->drop =3D sink_input_drop;
si->kill =3D sink_input_kill;
- =
+
si->userdata =3D nchunk =3D pa_xnew(pa_memchunk, 1);
*nchunk =3D *chunk;
- =
+
pa_memblock_ref(chunk->memblock);
=
pa_sink_notify(si->sink);
- =
+
return 0;
}
Modified: trunk/src/pulsecore/play-memchunk.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/play-memchu=
nk.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/play-memchunk.h (original)
+++ trunk/src/pulsecore/play-memchunk.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/poll.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/poll.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/poll.c (original)
+++ trunk/src/pulsecore/poll.c Thu Jan 4 14:43:45 2007
@@ -9,17 +9,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/poll.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/poll.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/poll.h (original)
+++ trunk/src/pulsecore/poll.h Thu Jan 4 14:43:45 2007
@@ -10,17 +10,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/props.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/props.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/props.c (original)
+++ trunk/src/pulsecore/props.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -36,7 +36,7 @@
static pa_property* property_new(const char *name, void *data) {
pa_property* p;
assert(name && data);
- =
+
p =3D pa_xmalloc(sizeof(pa_property));
p->name =3D pa_xstrdup(name);
p->data =3D data;
@@ -80,7 +80,7 @@
=
if (!(p =3D pa_hashmap_remove(c->properties, name)))
return -1;
- =
+
property_free(p);
return 0;
}
@@ -101,7 +101,7 @@
=
pa_hashmap_free(c->properties, NULL, NULL);
c->properties =3D NULL;
- =
+
}
=
void pa_property_dump(pa_core *c, pa_strbuf *s) {
Modified: trunk/src/pulsecore/props.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/props.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/props.h (original)
+++ trunk/src/pulsecore/props.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/protocol-cli.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-cl=
i.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/protocol-cli.c (original)
+++ trunk/src/pulsecore/protocol-cli.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -60,7 +60,7 @@
pa_iochannel_free(io);
return;
}
- =
+
c =3D pa_cli_new(p->core, io, p->module);
assert(c);
pa_cli_set_eof_callback(c, cli_eof_cb, p);
@@ -79,7 +79,7 @@
p->connections =3D pa_idxset_new(NULL, NULL);
=
pa_socket_server_set_callback(p->server, on_connection, p);
- =
+
return p;
}
=
Modified: trunk/src/pulsecore/protocol-cli.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-cl=
i.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/protocol-cli.h (original)
+++ trunk/src/pulsecore/protocol-cli.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/protocol-esound.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-es=
ound.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/protocol-esound.c (original)
+++ trunk/src/pulsecore/protocol-esound.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -93,7 +93,7 @@
pa_defer_event *defer_event;
=
char *original_name;
- =
+
struct {
pa_memblock *current_memblock;
size_t memblock_index, fragment_size;
@@ -177,7 +177,7 @@
=
{ 3 * sizeof(int), esd_proto_stream_pan, "stream pan"},
{ 3 * sizeof(int), NULL, "sample pan" },
- =
+
{ sizeof(int), NULL, "standby mode" },
{ 0, esd_proto_get_latency, "get latency"=
}
};
@@ -188,19 +188,19 @@
=
if (c->state =3D=3D ESD_STREAMING_DATA)
c->protocol->n_player--;
- =
+
pa_client_free(c->client);
=
if (c->sink_input) {
pa_sink_input_disconnect(c->sink_input);
pa_sink_input_unref(c->sink_input);
}
- =
+
if (c->source_output) {
pa_source_output_disconnect(c->source_output);
pa_source_output_unref(c->source_output);
}
- =
+
if (c->input_memblockq)
pa_memblockq_free(c->input_memblockq);
if (c->output_memblockq)
@@ -208,13 +208,13 @@
=
if (c->playback.current_memblock)
pa_memblock_unref(c->playback.current_memblock);
- =
+
pa_xfree(c->read_data);
pa_xfree(c->write_data);
=
if (c->io)
pa_iochannel_free(c->io);
- =
+
if (c->defer_event)
c->protocol->core->mainloop->defer_free(c->defer_event);
=
@@ -254,7 +254,7 @@
=
i =3D c->write_data_length;
c->write_data_length +=3D length;
- =
+
memcpy((char*)c->write_data + i, data, length);
}
=
@@ -270,7 +270,7 @@
=
static int format_native2esd(pa_sample_spec *ss) {
int format =3D 0;
- =
+
format =3D (ss->format =3D=3D PA_SAMPLE_U8) ? ESD_BITS8 : ESD_BITS16;
format |=3D (ss->channels >=3D 2) ? ESD_STEREO : ESD_MONO;
=
@@ -331,7 +331,7 @@
pa_sink_input_new_data sdata;
=
assert(c && length =3D=3D (sizeof(int32_t)*2+ESD_NAME_MAX));
- =
+
memcpy(&format, data, sizeof(int32_t));
format =3D MAYBE_INT32_SWAP(c->swap_byte_order, format);
data =3D (const char*)data + sizeof(int32_t);
@@ -356,7 +356,7 @@
utf8_name =3D pa_utf8_filter(name);
pa_client_set_name(c->client, utf8_name);
pa_xfree(utf8_name);
- =
+
c->original_name =3D pa_xstrdup(name);
=
assert(!c->sink_input && !c->input_memblockq);
@@ -368,11 +368,11 @@
pa_sink_input_new_data_set_sample_spec(&sdata, &ss);
sdata.module =3D c->protocol->module;
sdata.client =3D c->client;
- =
+
c->sink_input =3D pa_sink_input_new(c->protocol->core, &sdata, 0);
CHECK_VALIDITY(c->sink_input, "Failed to create sink input.");
=
- l =3D (size_t) (pa_bytes_per_second(&ss)*PLAYBACK_BUFFER_SECONDS); =
+ l =3D (size_t) (pa_bytes_per_second(&ss)*PLAYBACK_BUFFER_SECONDS);
c->input_memblockq =3D pa_memblockq_new(
0,
l,
@@ -393,7 +393,7 @@
c->state =3D ESD_STREAMING_DATA;
=
c->protocol->n_player++;
- =
+
return 0;
}
=
@@ -406,7 +406,7 @@
pa_source_output_new_data sdata;
=
assert(c && length =3D=3D (sizeof(int32_t)*2+ESD_NAME_MAX));
- =
+
memcpy(&format, data, sizeof(int32_t));
format =3D MAYBE_INT32_SWAP(c->swap_byte_order, format);
data =3D (const char*)data + sizeof(int32_t);
@@ -442,14 +442,14 @@
}
}
}
- =
+
strncpy(name, data, sizeof(name));
name[sizeof(name)-1] =3D 0;
=
utf8_name =3D pa_utf8_filter(name);
pa_client_set_name(c->client, utf8_name);
pa_xfree(utf8_name);
- =
+
c->original_name =3D pa_xstrdup(name);
=
assert(!c->output_memblockq && !c->source_output);
@@ -461,11 +461,11 @@
pa_source_output_new_data_set_sample_spec(&sdata, &ss);
sdata.module =3D c->protocol->module;
sdata.client =3D c->client;
- =
+
c->source_output =3D pa_source_output_new(c->protocol->core, &sdata, 9=
);
CHECK_VALIDITY(c->source_output, "Failed to create source_output.");
=
- l =3D (size_t) (pa_bytes_per_second(&ss)*RECORD_BUFFER_SECONDS); =
+ l =3D (size_t) (pa_bytes_per_second(&ss)*RECORD_BUFFER_SECONDS);
c->output_memblockq =3D pa_memblockq_new(
0,
l,
@@ -475,7 +475,7 @@
0,
NULL);
pa_iochannel_socket_set_sndbuf(c->io, l/RECORD_BUFFER_FRAGMENTS*2);
- =
+
c->source_output->push =3D source_output_push_cb;
c->source_output->kill =3D source_output_kill_cb;
c->source_output->get_latency =3D source_output_get_latency_cb;
@@ -484,7 +484,7 @@
c->state =3D ESD_STREAMING_DATA;
=
c->protocol->n_player++;
- =
+
return 0;
}
=
@@ -500,7 +500,7 @@
double usec =3D pa_sink_get_latency(sink);
latency =3D (int) ((usec*44100)/1000000);
}
- =
+
latency =3D MAYBE_INT32_SWAP(c->swap_byte_order, latency);
connection_write(c, &latency, sizeof(int32_t));
return 0;
@@ -538,7 +538,7 @@
char terminator[sizeof(int32_t)*6+ESD_NAME_MAX];
=
assert(c && data && length =3D=3D sizeof(int32_t));
- =
+
if (esd_proto_server_info(c, request, data, length) < 0)
return -1;
=
@@ -559,7 +559,7 @@
continue;
=
assert(t >=3D k*2+s);
- =
+
if (conn->sink_input) {
pa_cvolume volume =3D *pa_sink_input_get_volume(conn->sink_inp=
ut);
rate =3D conn->sink_input->sample_spec.rate;
@@ -567,7 +567,7 @@
rvolume =3D (volume.values[1]*ESD_VOLUME_BASE)/PA_VOLUME_NORM;
format =3D format_native2esd(&conn->sink_input->sample_spec);
}
- =
+
/* id */
id =3D MAYBE_INT32_SWAP(c->swap_byte_order, (int32_t) (conn->index=
+1));
connection_write(c, &id, sizeof(int32_t));
@@ -606,7 +606,7 @@
=
if (nsamples) {
pa_scache_entry *ce;
- =
+
idx =3D PA_IDXSET_INVALID;
for (ce =3D pa_idxset_first(c->protocol->core->scache, &idx); ce; =
ce =3D pa_idxset_next(c->protocol->core->scache, &idx)) {
int32_t id, rate, lvolume, rvolume, format, len;
@@ -617,7 +617,7 @@
/* id */
id =3D MAYBE_INT32_SWAP(c->swap_byte_order, (int) (ce->index+1=
));
connection_write(c, &id, sizeof(int32_t));
- =
+
/* name */
memset(name, 0, ESD_NAME_MAX); /* don't leak old data */
if (strncmp(ce->name, SCACHE_PREFIX, sizeof(SCACHE_PREFIX)-1) =
=3D=3D 0)
@@ -625,19 +625,19 @@
else
snprintf(name, ESD_NAME_MAX, "native.%s", ce->name);
connection_write(c, name, ESD_NAME_MAX);
- =
+
/* rate */
rate =3D MAYBE_UINT32_SWAP(c->swap_byte_order, ce->sample_spec=
.rate);
connection_write(c, &rate, sizeof(int32_t));
- =
+
/* left */
lvolume =3D MAYBE_UINT32_SWAP(c->swap_byte_order, (ce->volume.=
values[0]*ESD_VOLUME_BASE)/PA_VOLUME_NORM);
connection_write(c, &lvolume, sizeof(int32_t));
- =
+
/*right*/
rvolume =3D MAYBE_UINT32_SWAP(c->swap_byte_order, (ce->volume.=
values[0]*ESD_VOLUME_BASE)/PA_VOLUME_NORM);
connection_write(c, &rvolume, sizeof(int32_t));
- =
+
/*format*/
format =3D MAYBE_INT32_SWAP(c->swap_byte_order, format_native2=
esd(&ce->sample_spec));
connection_write(c, &format, sizeof(int32_t));
@@ -663,7 +663,7 @@
struct connection *conn;
=
assert(c && data && length =3D=3D sizeof(int32_t)*3);
- =
+
memcpy(&idx, data, sizeof(uint32_t));
idx =3D MAYBE_UINT32_SWAP(c->swap_byte_order, idx) - 1;
data =3D (const char*)data + sizeof(uint32_t);
@@ -687,7 +687,7 @@
ok =3D 0;
=
connection_write(c, &ok, sizeof(int32_t));
- =
+
return 0;
}
=
@@ -706,7 +706,7 @@
memcpy(&rate, data, sizeof(int32_t));
rate =3D MAYBE_INT32_SWAP(c->swap_byte_order, rate);
data =3D (const char*)data + sizeof(int32_t);
- =
+
ss.rate =3D rate;
format_esd2native(format, c->swap_byte_order, &ss);
=
@@ -723,7 +723,7 @@
name[sizeof(name)-1] =3D 0;
=
CHECK_VALIDITY(pa_utf8_valid(name), "Invalid UTF8 in sample name.");
- =
+
assert(!c->scache.memchunk.memblock);
c->scache.memchunk.memblock =3D pa_memblock_new(c->protocol->core->mem=
pool, sc_length);
c->scache.memchunk.index =3D 0;
@@ -731,14 +731,14 @@
c->scache.sample_spec =3D ss;
assert(!c->scache.name);
c->scache.name =3D pa_xstrdup(name);
- =
+
c->state =3D ESD_CACHING_SAMPLE;
=
pa_scache_add_item(c->protocol->core, c->scache.name, NULL, NULL, NULL=
, &idx);
=
idx +=3D 1;
connection_write(c, &idx, sizeof(uint32_t));
- =
+
return 0;
}
=
@@ -775,11 +775,11 @@
idx =3D MAYBE_UINT32_SWAP(c->swap_byte_order, idx) - 1;
=
ok =3D 0;
- =
+
if ((name =3D pa_scache_get_name_by_id(c->protocol->core, idx))) {
if (request =3D=3D ESD_PROTO_SAMPLE_PLAY) {
pa_sink *sink;
- =
+
if ((sink =3D pa_namereg_get(c->protocol->core, c->protocol->s=
ink_name, PA_NAMEREG_SINK, 1)))
if (pa_scache_play_item(c->protocol->core, name, sink, PA_=
VOLUME_NORM) >=3D 0)
ok =3D idx + 1;
@@ -790,7 +790,7 @@
ok =3D idx + 1;
}
}
- =
+
connection_write(c, &ok, sizeof(int32_t));
=
return 0;
@@ -821,7 +821,7 @@
assert(c && c->io);
=
/* pa_log("READ"); */
- =
+
if (c->state =3D=3D ESD_NEXT_REQUEST) {
ssize_t r;
assert(c->read_data_length < sizeof(c->request));
@@ -833,7 +833,7 @@
=
if ((c->read_data_length+=3D r) >=3D sizeof(c->request)) {
struct proto_handler *handler;
- =
+
c->request =3D MAYBE_INT32_SWAP(c->swap_byte_order, c->request=
);
=
if (c->request < ESD_PROTO_CONNECT || c->request > ESD_PROTO_M=
AX) {
@@ -849,18 +849,18 @@
pa_log("recieved unimplemented request #%u.", c->request);
return -1;
}
- =
+
if (handler->data_length =3D=3D 0) {
c->read_data_length =3D 0;
=
if (handler->proc(c, c->request, NULL, 0) < 0)
return -1;
- =
+
} else {
if (c->read_data_alloc < handler->data_length)
c->read_data =3D pa_xrealloc(c->read_data, c->read_dat=
a_alloc =3D handler->data_length);
assert(c->read_data);
- =
+
c->state =3D ESD_NEEDS_REQDATA;
c->read_data_length =3D 0;
}
@@ -871,7 +871,7 @@
struct proto_handler *handler =3D proto_map+c->request;
=
assert(handler->proc);
- =
+
assert(c->read_data && c->read_data_length < handler->data_length);
=
if ((r =3D pa_iochannel_read(c->io, (uint8_t*) c->read_data + c->r=
ead_data_length, handler->data_length - c->read_data_length)) <=3D 0) {
@@ -885,7 +885,7 @@
=
c->state =3D ESD_NEXT_REQUEST;
c->read_data_length =3D 0;
- =
+
if (handler->proc(c, c->request, c->read_data, l) < 0)
return -1;
}
@@ -893,7 +893,7 @@
ssize_t r;
=
assert(c->scache.memchunk.memblock && c->scache.name && c->scache.=
memchunk.index < c->scache.memchunk.length);
- =
+
if ((r =3D pa_iochannel_read(c->io, (uint8_t*) c->scache.memchunk.=
memblock->data+c->scache.memchunk.index, c->scache.memchunk.length-c->scach=
e.memchunk.index)) <=3D 0) {
pa_log_debug("read(): %s", r < 0 ? pa_cstrerror(errno) : "EOF"=
);
return -1;
@@ -901,10 +901,10 @@
=
c->scache.memchunk.index +=3D r;
assert(c->scache.memchunk.index <=3D c->scache.memchunk.length);
- =
+
if (c->scache.memchunk.index =3D=3D c->scache.memchunk.length) {
uint32_t idx;
- =
+
c->scache.memchunk.index =3D 0;
pa_scache_add_item(c->protocol->core, c->scache.name, &c->scac=
he.sample_spec, NULL, &c->scache.memchunk, &idx);
=
@@ -920,7 +920,7 @@
idx +=3D 1;
connection_write(c, &idx, sizeof(uint32_t));
}
- =
+
} else if (c->state =3D=3D ESD_STREAMING_DATA && c->sink_input) {
pa_memchunk chunk;
ssize_t r;
@@ -936,13 +936,13 @@
if (l > c->playback.fragment_size)
l =3D c->playback.fragment_size;
=
- if (c->playback.current_memblock) =
+ if (c->playback.current_memblock)
if (c->playback.current_memblock->length - c->playback.membloc=
k_index < l) {
pa_memblock_unref(c->playback.current_memblock);
c->playback.current_memblock =3D NULL;
c->playback.memblock_index =3D 0;
}
- =
+
if (!c->playback.current_memblock) {
c->playback.current_memblock =3D pa_memblock_new(c->protocol->=
core->mempool, c->playback.fragment_size*2);
assert(c->playback.current_memblock && c->playback.current_mem=
block->length >=3D l);
@@ -953,20 +953,20 @@
pa_log_debug("read(): %s", r < 0 ? pa_cstrerror(errno) : "EOF"=
);
return -1;
}
- =
+
chunk.memblock =3D c->playback.current_memblock;
chunk.index =3D c->playback.memblock_index;
chunk.length =3D r;
assert(chunk.memblock);
=
c->playback.memblock_index +=3D r;
- =
+
assert(c->input_memblockq);
pa_memblockq_push_align(c->input_memblockq, &chunk);
assert(c->sink_input);
pa_sink_notify(c->sink_input->sink);
}
- =
+
return 0;
}
=
@@ -974,19 +974,19 @@
assert(c && c->io);
=
/* pa_log("WRITE"); */
- =
+
if (c->write_data_length) {
ssize_t r;
- =
+
assert(c->write_data_index < c->write_data_length);
if ((r =3D pa_iochannel_write(c->io, (uint8_t*) c->write_data+c->w=
rite_data_index, c->write_data_length-c->write_data_index)) < 0) {
pa_log("write(): %s", pa_cstrerror(errno));
return -1;
}
- =
+
if ((c->write_data_index +=3Dr) >=3D c->write_data_length)
c->write_data_length =3D c->write_data_index =3D 0;
- =
+
} else if (c->state =3D=3D ESD_STREAMING_DATA && c->source_output) {
pa_memchunk chunk;
ssize_t r;
@@ -994,9 +994,9 @@
assert(c->output_memblockq);
if (pa_memblockq_peek(c->output_memblockq, &chunk) < 0)
return 0;
- =
+
assert(chunk.memblock && chunk.length);
- =
+
if ((r =3D pa_iochannel_write(c->io, (uint8_t*) chunk.memblock->da=
ta+chunk.index, chunk.length)) < 0) {
pa_memblock_unref(chunk.memblock);
pa_log("write(): %s", pa_cstrerror(errno));
@@ -1008,7 +1008,7 @@
=
pa_source_notify(c->source_output->source);
}
- =
+
return 0;
}
=
@@ -1035,7 +1035,7 @@
if (pa_iochannel_is_writable(c->io))
if (do_write(c) < 0)
goto fail;
- =
+
return;
=
fail:
@@ -1066,7 +1066,7 @@
assert(a && c && c->defer_event =3D=3D e);
=
/* pa_log("DEFER"); */
- =
+
do_work(c);
}
=
@@ -1076,12 +1076,12 @@
struct connection*c;
assert(i && i->userdata && chunk);
c =3D i->userdata;
- =
+
if (pa_memblockq_peek(c->input_memblockq, chunk) < 0) {
=
if (c->dead)
connection_free(c);
- =
+
return -1;
}
=
@@ -1093,7 +1093,7 @@
assert(i && c && length);
=
/* pa_log("DROP"); */
- =
+
pa_memblockq_drop(c->input_memblockq, chunk, length);
=
/* do something */
@@ -1163,7 +1163,7 @@
pa_iochannel_free(io);
return;
}
- =
+
c =3D pa_xnew(struct connection, 1);
c->protocol =3D p;
c->io =3D io;
@@ -1177,7 +1177,7 @@
c->client->owner =3D p->module;
c->client->kill =3D client_kill_cb;
c->client->userdata =3D c;
- =
+
c->authorized =3D !!p->public;
c->swap_byte_order =3D 0;
c->dead =3D 0;
@@ -1219,7 +1219,7 @@
c->auth_timeout_event =3D p->core->mainloop->time_new(p->core->mai=
nloop, &tv, auth_timeout, c);
} else
c->auth_timeout_event =3D NULL;
- =
+
c->defer_event =3D p->core->mainloop->defer_new(p->core->mainloop, def=
er_callback, c);
assert(c->defer_event);
p->core->mainloop->defer_enable(c->defer_event, 0);
@@ -1233,7 +1233,7 @@
pa_protocol_esound *p;
int public =3D 0;
const char *acl;
- =
+
assert(core);
assert(server);
assert(m);
@@ -1257,7 +1257,7 @@
}
} else
p->auth_ip_acl =3D NULL;
- =
+
p->module =3D m;
p->public =3D public;
p->server =3D server;
Modified: trunk/src/pulsecore/protocol-esound.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-es=
ound.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/protocol-esound.h (original)
+++ trunk/src/pulsecore/protocol-esound.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/protocol-http.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-ht=
tp.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/protocol-http.c (original)
+++ trunk/src/pulsecore/protocol-http.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -67,7 +67,7 @@
assert(msg);
assert(mime);
=
- snprintf(s, sizeof(s), =
+ snprintf(s, sizeof(s),
"HTTP/1.0 %i %s\n"
"Connection: close\n"
"Content-Type: %s\n"
@@ -137,16 +137,16 @@
}
=
case MIME_HEADER: {
- =
+
/* Ignore MIME headers */
if (strcspn(s, " \r\n") !=3D 0)
break;
- =
+
/* We're done */
c->state =3D DATA;
=
pa_log_info("request for %s", c->url);
- =
+
if (!strcmp(c->url, URL_ROOT)) {
char txt[256];
http_response(c, 200, "OK", "text/html");
@@ -168,18 +168,18 @@
PRINTF_FIELD("Default Sample Specification:", pa_sample_sp=
ec_snprint(txt, sizeof(txt), &c->protocol->core->default_sample_spec));
PRINTF_FIELD("Default Sink:", pa_namereg_get_default_sink_=
name(c->protocol->core));
PRINTF_FIELD("Default Source:", pa_namereg_get_default_sou=
rce_name(c->protocol->core));
- =
+
pa_ioline_puts(c->line, "</table>");
=
pa_ioline_puts(c->line, "<p><a href=3D\"/status\">Click he=
re</a> for an extensive server status report.</p>");
- =
+
pa_ioline_puts(c->line, "</body></html>\n");
- =
- pa_ioline_defer_close(c->line); =
+
+ pa_ioline_defer_close(c->line);
} else if (!strcmp(c->url, URL_CSS)) {
http_response(c, 200, "OK", "text/css");
=
- pa_ioline_puts(c->line, =
+ pa_ioline_puts(c->line,
"body { color: black; background-color: whi=
te; margin: 0.5cm; }\n"
"a:link, a:visited { color: #900000; }\n"
"p { margin-left: 0.5cm; margin-right: 0.5c=
m; }\n"
@@ -207,13 +207,13 @@
=
break;
}
- =
+
default:
;
}
=
return;
- =
+
fail:
internal_server_error(c);
}
Modified: trunk/src/pulsecore/protocol-http.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-ht=
tp.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/protocol-http.h (original)
+++ trunk/src/pulsecore/protocol-http.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/protocol-native.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-na=
tive.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/protocol-native.c (original)
+++ trunk/src/pulsecore/protocol-native.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -234,7 +234,7 @@
[PA_COMMAND_SET_SINK_VOLUME] =3D command_set_volume,
[PA_COMMAND_SET_SINK_INPUT_VOLUME] =3D command_set_volume,
[PA_COMMAND_SET_SOURCE_VOLUME] =3D command_set_volume,
- =
+
[PA_COMMAND_SET_SINK_MUTE] =3D command_set_mute,
[PA_COMMAND_SET_SOURCE_MUTE] =3D command_set_mute,
=
@@ -242,13 +242,13 @@
[PA_COMMAND_FLUSH_PLAYBACK_STREAM] =3D command_flush_playback_stream,
[PA_COMMAND_TRIGGER_PLAYBACK_STREAM] =3D command_trigger_or_prebuf_pla=
yback_stream,
[PA_COMMAND_PREBUF_PLAYBACK_STREAM] =3D command_trigger_or_prebuf_play=
back_stream,
- =
+
[PA_COMMAND_CORK_RECORD_STREAM] =3D command_cork_record_stream,
[PA_COMMAND_FLUSH_RECORD_STREAM] =3D command_flush_record_stream,
- =
+
[PA_COMMAND_SET_DEFAULT_SINK] =3D command_set_default_sink_or_source,
[PA_COMMAND_SET_DEFAULT_SOURCE] =3D command_set_default_sink_or_source,
- [PA_COMMAND_SET_PLAYBACK_STREAM_NAME] =3D command_set_stream_name, =
+ [PA_COMMAND_SET_PLAYBACK_STREAM_NAME] =3D command_set_stream_name,
[PA_COMMAND_SET_RECORD_STREAM_NAME] =3D command_set_stream_name,
[PA_COMMAND_KILL_CLIENT] =3D command_kill,
[PA_COMMAND_KILL_SINK_INPUT] =3D command_kill,
@@ -271,10 +271,10 @@
const pa_sample_spec *ss,
const pa_channel_map *map,
const char *name, size_t length) {
- =
+
struct upload_stream *s;
assert(c && ss && name && length);
- =
+
s =3D pa_xnew(struct upload_stream, 1);
s->type =3D UPLOAD_STREAM;
s->connection =3D c;
@@ -287,7 +287,7 @@
s->memchunk.length =3D 0;
=
s->length =3D length;
- =
+
pa_idxset_put(c->output_streams, s, &s->index);
return s;
}
@@ -298,10 +298,10 @@
pa_idxset_remove_by_data(o->connection->output_streams, o, NULL);
=
pa_xfree(o->name);
- =
+
if (o->memchunk.memblock)
pa_memblock_unref(o->memchunk.memblock);
- =
+
pa_xfree(o);
}
=
@@ -313,12 +313,12 @@
const char *name,
size_t maxlength,
size_t fragment_size) {
- =
+
struct record_stream *s;
pa_source_output *source_output;
size_t base;
pa_source_output_new_data data;
- =
+
assert(c && ss && name && maxlength);
=
pa_source_output_new_data_init(&data);
@@ -329,7 +329,7 @@
pa_source_output_new_data_set_channel_map(&data, map);
data.module =3D c->protocol->module;
data.client =3D c->client;
- =
+
if (!(source_output =3D pa_source_output_new(c->protocol->core, &data,=
0)))
return NULL;
=
@@ -381,19 +381,19 @@
size_t minreq,
pa_cvolume *volume,
uint32_t syncid) {
- =
+
struct playback_stream *s, *ssync;
pa_sink_input *sink_input;
pa_memblock *silence;
uint32_t idx;
int64_t start_index;
pa_sink_input_new_data data;
- =
+
assert(c && ss && name && maxlength);
=
/* Find syncid group */
for (ssync =3D pa_idxset_first(c->output_streams, &idx); ssync; ssync =
=3D pa_idxset_next(c->output_streams, &idx)) {
- =
+
if (ssync->type !=3D PLAYBACK_STREAM)
continue;
=
@@ -417,14 +417,14 @@
=
if (!(sink_input =3D pa_sink_input_new(c->protocol->core, &data, 0)))
return NULL;
- =
+
s =3D pa_xnew(struct playback_stream, 1);
s->type =3D PLAYBACK_STREAM;
s->connection =3D c;
s->syncid =3D syncid;
s->sink_input =3D sink_input;
s->underrun =3D 1;
- =
+
s->sink_input->peek =3D sink_input_peek_cb;
s->sink_input->drop =3D sink_input_drop_cb;
s->sink_input->kill =3D sink_input_kill_cb;
@@ -446,9 +446,9 @@
PA_LLIST_INIT(struct playback_stream, s);
start_index =3D 0;
}
- =
+
silence =3D pa_silence_memblock_new(c->protocol->core->mempool, ss, 0);
- =
+
s->memblockq =3D pa_memblockq_new(
start_index,
maxlength,
@@ -459,10 +459,10 @@
silence);
=
pa_memblock_unref(silence);
- =
+
s->requested_bytes =3D 0;
s->drain_request =3D 0;
- =
+
pa_idxset_put(c->output_streams, s, &s->index);
=
return s;
@@ -512,7 +512,7 @@
=
if (c->auth_timeout_event)
c->protocol->core->mainloop->time_free(c->auth_timeout_event);
- =
+
pa_xfree(c);
}
=
@@ -523,7 +523,7 @@
=
if (!(l =3D pa_memblockq_missing(s->memblockq)))
return;
- =
+
if (l <=3D s->requested_bytes)
return;
=
@@ -531,7 +531,7 @@
=
if (l < pa_memblockq_get_minreq(s->memblockq))
return;
- =
+
s->requested_bytes +=3D l;
=
t =3D pa_tagstruct_new(NULL, 0);
@@ -552,7 +552,7 @@
start =3D PA_IDXSET_INVALID;
for (;;) {
pa_memchunk chunk;
- =
+
if (!(r =3D pa_idxset_rrobin(c->record_streams, &c->rrobin_index)))
return;
=
@@ -563,14 +563,14 @@
=
if (pa_memblockq_peek(r->memblockq, &chunk) >=3D 0) {
pa_memchunk schunk =3D chunk;
- =
+
if (schunk.length > r->fragment_size)
schunk.length =3D r->fragment_size;
=
pa_pstream_send_memblock(c->pstream, r->index, 0, PA_SEEK_RELA=
TIVE, &schunk);
pa_memblockq_drop(r->memblockq, &chunk, schunk.length);
pa_memblock_unref(schunk.memblock);
- =
+
return;
}
}
@@ -618,14 +618,14 @@
=
s->underrun =3D 1;
}
- =
+
if (pa_memblockq_peek(s->memblockq, chunk) < 0) {
/* pa_log("peek: failure"); */
return -1;
}
=
/* pa_log("peek: %u", chunk->length); */
- =
+
return 0;
}
=
@@ -658,7 +658,7 @@
s =3D i->userdata;
=
/*pa_log("get_latency: %u", pa_memblockq_get_length(s->memblockq));*/
- =
+
return pa_bytes_to_usec(pa_memblockq_get_length(s->memblockq), &s->sin=
k_input->sample_spec);
}
=
@@ -668,12 +668,12 @@
struct record_stream *s;
assert(o && o->userdata && chunk);
s =3D o->userdata;
- =
+
if (pa_memblockq_push_align(s->memblockq, chunk) < 0) {
pa_log_warn("Failed to push data into output queue.");
return;
- } =
- =
+ }
+
if (!pa_pstream_is_pending(s->connection->pstream))
send_memblock(s->connection);
}
@@ -690,7 +690,7 @@
s =3D o->userdata;
=
/*pa_log("get_latency: %u", pa_memblockq_get_length(s->memblockq));*/
- =
+
return pa_bytes_to_usec(pa_memblockq_get_length(s->memblockq), &o->sam=
ple_spec);
}
=
@@ -710,7 +710,7 @@
=
static pa_tagstruct *reply_new(uint32_t tag) {
pa_tagstruct *reply;
- =
+
reply =3D pa_tagstruct_new(NULL, 0);
pa_tagstruct_putu32(reply, PA_COMMAND_REPLY);
pa_tagstruct_putu32(reply, tag);
@@ -728,9 +728,9 @@
pa_sink *sink =3D NULL;
pa_cvolume volume;
int corked;
- =
+
assert(c && t && c->protocol && c->protocol->core);
- =
+
if (pa_tagstruct_get(
t,
PA_TAG_STRING, &name,
@@ -773,7 +773,7 @@
CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_INVALID);
=
pa_sink_input_cork(s->sink_input, corked);
- =
+
reply =3D reply_new(tag);
pa_tagstruct_putu32(reply, s->index);
assert(s->sink_input);
@@ -788,7 +788,7 @@
pa_tagstruct_putu32(reply, (uint32_t) pa_memblockq_get_prebuf(s->m=
emblockq));
pa_tagstruct_putu32(reply, (uint32_t) pa_memblockq_get_minreq(s->m=
emblockq));
}
- =
+
pa_pstream_send_tagstruct(c->pstream, reply);
request_bytes(s);
}
@@ -797,7 +797,7 @@
struct connection *c =3D userdata;
uint32_t channel;
assert(c && t);
- =
+
if (pa_tagstruct_getu32(t, &channel) < 0 ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
@@ -832,7 +832,7 @@
=
upload_stream_free(s);
}
- =
+
pa_pstream_send_simple_ack(c->pstream, tag);
}
=
@@ -848,7 +848,7 @@
pa_source *source =3D NULL;
int corked;
assert(c && t && c->protocol && c->protocol->core);
- =
+
if (pa_tagstruct_gets(t, &name) < 0 ||
pa_tagstruct_get_sample_spec(t, &ss) < 0 ||
pa_tagstruct_get_channel_map(t, &map) < 0 ||
@@ -876,13 +876,13 @@
} else if (source_name) {
source =3D pa_namereg_get(c->protocol->core, source_name, PA_NAMER=
EG_SOURCE, 1);
CHECK_VALIDITY(c->pstream, source, tag, PA_ERR_NOENTITY);
- } =
- =
+ }
+
s =3D record_stream_new(c, source, &ss, &map, name, maxlength, fragmen=
t_size);
CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_INVALID);
- =
+
pa_source_output_cork(s->source_output, corked);
- =
+
reply =3D reply_new(tag);
pa_tagstruct_putu32(reply, s->index);
assert(s->source_output);
@@ -894,21 +894,21 @@
pa_tagstruct_putu32(reply, (uint32_t) pa_memblockq_get_maxlength(s=
->memblockq));
pa_tagstruct_putu32(reply, (uint32_t) s->fragment_size);
}
- =
+
pa_pstream_send_tagstruct(c->pstream, reply);
}
=
static void command_exit(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uin=
t32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
struct connection *c =3D userdata;
assert(c && t);
- =
+
if (!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
}
=
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
- =
+
assert(c->protocol && c->protocol->core && c->protocol->core->mainloop=
);
c->protocol->core->mainloop->quit(c->protocol->core->mainloop, 0);
pa_pstream_send_simple_ack(c->pstream, tag); /* nonsense */
@@ -935,7 +935,7 @@
=
if (!c->authorized) {
int success =3D 0;
- =
+
#ifdef HAVE_CREDS
const pa_creds *creds;
=
@@ -950,7 +950,7 @@
pa_log_warn("failed to get GID of group '%s'", c->prot=
ocol->auth_group);
else if (gid =3D=3D creds->gid)
success =3D 1;
- =
+
if (!success) {
if ((r =3D pa_uid_in_group(creds->uid, c->protocol->au=
th_group)) < 0)
pa_log_warn("failed to check group membership.");
@@ -958,7 +958,7 @@
success =3D 1;
}
}
- =
+
pa_log_info("Got credentials: uid=3D%lu gid=3D%lu success=3D%i=
",
(unsigned long) creds->uid,
(unsigned long) creds->gid,
@@ -971,7 +971,7 @@
pa_pstream_use_shm(c->pstream, 1);
pa_log_info("Enabled SHM for new connection");
}
- =
+
}
#endif
=
@@ -983,7 +983,7 @@
pa_pstream_send_error(c->pstream, tag, PA_ERR_ACCESS);
return;
}
- =
+
c->authorized =3D 1;
if (c->auth_timeout_event) {
c->protocol->core->mainloop->time_free(c->auth_timeout_event);
@@ -997,12 +997,12 @@
#ifdef HAVE_CREDS
{
/* SHM support is only enabled after both sides made sure they are the=
same user. */
- =
+
pa_creds ucred;
=
ucred.uid =3D getuid();
ucred.gid =3D getgid();
- =
+
pa_pstream_send_tagstruct_with_creds(c->pstream, reply, &ucred);
}
#else
@@ -1022,7 +1022,7 @@
}
=
CHECK_VALIDITY(c->pstream, name && pa_utf8_valid(name), tag, PA_ERR_IN=
VALID);
- =
+
pa_client_set_name(c->client, name);
pa_pstream_send_simple_ack(c->pstream, tag);
}
@@ -1079,11 +1079,11 @@
s =3D pa_idxset_get_by_index(c->output_streams, idx);
CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY);
CHECK_VALIDITY(c->pstream, s->type =3D=3D PLAYBACK_STREAM, tag, PA_ERR=
_NOENTITY);
- =
+
s->drain_request =3D 0;
=
pa_memblockq_prebuf_disable(s->memblockq);
- =
+
if (!pa_memblockq_is_readable(s->memblockq)) {
/* pa_log("immediate drain: %u", pa_memblockq_get_length(s->memblo=
ckq)); */
pa_pstream_send_simple_ack(c->pstream, tag);
@@ -1094,7 +1094,7 @@
=
pa_sink_notify(s->sink_input->sink);
}
-} =
+}
=
static void command_stat(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uin=
t32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
struct connection *c =3D userdata;
@@ -1110,7 +1110,7 @@
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
=
stat =3D pa_mempool_get_stat(c->protocol->core->mempool);
- =
+
reply =3D reply_new(tag);
pa_tagstruct_putu32(reply, (uint32_t) AO_load_acquire_read((AO_t*) &st=
at->n_allocated));
pa_tagstruct_putu32(reply, (uint32_t) AO_load_acquire_read((AO_t*) &st=
at->allocated_size));
@@ -1128,7 +1128,7 @@
uint32_t idx;
pa_usec_t latency;
assert(c && t);
- =
+
if (pa_tagstruct_getu32(t, &idx) < 0 ||
pa_tagstruct_get_timeval(t, &tv) < 0 ||
!pa_tagstruct_eof(t)) {
@@ -1147,7 +1147,7 @@
if (s->sink_input->resampled_chunk.memblock)
latency +=3D pa_bytes_to_usec(s->sink_input->resampled_chunk.lengt=
h, &s->sink_input->sample_spec);
pa_tagstruct_put_usec(reply, latency);
- =
+
pa_tagstruct_put_usec(reply, 0);
pa_tagstruct_put_boolean(reply, s->sink_input->state =3D=3D PA_SINK_IN=
PUT_RUNNING);
pa_tagstruct_put_timeval(reply, &tv);
@@ -1196,8 +1196,8 @@
pa_channel_map map;
pa_tagstruct *reply;
assert(c && t && c->protocol && c->protocol->core);
- =
- if (pa_tagstruct_gets(t, &name) < 0 || =
+
+ if (pa_tagstruct_gets(t, &name) < 0 ||
pa_tagstruct_get_sample_spec(t, &ss) < 0 ||
pa_tagstruct_get_channel_map(t, &map) < 0 ||
pa_tagstruct_getu32(t, &length) < 0 ||
@@ -1213,10 +1213,10 @@
CHECK_VALIDITY(c->pstream, (length % pa_frame_size(&ss)) =3D=3D 0 && l=
ength > 0, tag, PA_ERR_INVALID);
CHECK_VALIDITY(c->pstream, length <=3D PA_SCACHE_ENTRY_SIZE_MAX, tag, =
PA_ERR_TOOLARGE);
CHECK_VALIDITY(c->pstream, name && *name && pa_utf8_valid(name), tag, =
PA_ERR_INVALID);
- =
+
s =3D upload_stream_new(c, &ss, &map, name, length);
CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_INVALID);
- =
+
reply =3D reply_new(tag);
pa_tagstruct_putu32(reply, s->index);
pa_tagstruct_putu32(reply, length);
@@ -1229,7 +1229,7 @@
struct upload_stream *s;
uint32_t idx;
assert(c && t);
- =
+
if (pa_tagstruct_getu32(t, &channel) < 0 ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
@@ -1246,7 +1246,7 @@
pa_pstream_send_error(c->pstream, tag, PA_ERR_INTERNAL);
else
pa_pstream_send_simple_ack(c->pstream, tag);
- =
+
upload_stream_free(s);
}
=
@@ -1266,7 +1266,7 @@
protocol_error(c);
return;
}
- =
+
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
CHECK_VALIDITY(c->pstream, sink_index !=3D PA_INVALID_INDEX || !sink_n=
ame || (*sink_name && pa_utf8_valid(name)), tag, PA_ERR_INVALID);
CHECK_VALIDITY(c->pstream, name && *name && pa_utf8_valid(name), tag, =
PA_ERR_INVALID);
@@ -1455,7 +1455,7 @@
source =3D pa_namereg_get(c->protocol->core, name, PA_NAMEREG_=
SOURCE, 1);
} else if (command =3D=3D PA_COMMAND_GET_CLIENT_INFO)
client =3D pa_idxset_get_by_index(c->protocol->core->clients, idx);
- else if (command =3D=3D PA_COMMAND_GET_MODULE_INFO) =
+ else if (command =3D=3D PA_COMMAND_GET_MODULE_INFO)
module =3D pa_idxset_get_by_index(c->protocol->core->modules, idx);
else if (command =3D=3D PA_COMMAND_GET_SINK_INPUT_INFO)
si =3D pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx);
@@ -1468,7 +1468,7 @@
else
sce =3D pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SAM=
PLE, 0);
}
- =
+
if (!sink && !source && !client && !module && !si && !so && !sce) {
pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY);
return;
@@ -1538,7 +1538,7 @@
module_fill_tagstruct(reply, p);
else if (command =3D=3D PA_COMMAND_GET_SINK_INPUT_INFO_LIST)
sink_input_fill_tagstruct(reply, p);
- else if (command =3D=3D PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST=
) =
+ else if (command =3D=3D PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST)
source_output_fill_tagstruct(reply, p);
else {
assert(command =3D=3D PA_COMMAND_GET_SAMPLE_INFO_LIST);
@@ -1546,7 +1546,7 @@
}
}
}
- =
+
pa_pstream_send_tagstruct(c->pstream, reply);
}
=
@@ -1561,7 +1561,7 @@
protocol_error(c);
return;
}
- =
+
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
=
reply =3D reply_new(tag);
@@ -1577,7 +1577,7 @@
pa_tagstruct_puts(reply, n);
=
pa_tagstruct_putu32(reply, c->protocol->core->cookie);
- =
+
pa_pstream_send_tagstruct(c->pstream, reply);
}
=
@@ -1607,7 +1607,7 @@
=
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
CHECK_VALIDITY(c->pstream, (m & ~PA_SUBSCRIPTION_MASK_ALL) =3D=3D 0, t=
ag, PA_ERR_INVALID);
- =
+
if (c->subscription)
pa_subscription_free(c->subscription);
=
@@ -1626,7 +1626,7 @@
uint32_t tag,
pa_tagstruct *t,
void *userdata) {
- =
+
struct connection *c =3D userdata;
uint32_t idx;
pa_cvolume volume;
@@ -1644,7 +1644,7 @@
protocol_error(c);
return;
}
- =
+
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
CHECK_VALIDITY(c->pstream, idx !=3D PA_INVALID_INDEX || !name || (*nam=
e && pa_utf8_valid(name)), tag, PA_ERR_INVALID);
CHECK_VALIDITY(c->pstream, pa_cvolume_valid(&volume), tag, PA_ERR_INVA=
LID);
@@ -1682,7 +1682,7 @@
uint32_t tag,
pa_tagstruct *t,
void *userdata) {
- =
+
struct connection *c =3D userdata;
uint32_t idx;
int mute;
@@ -1698,7 +1698,7 @@
protocol_error(c);
return;
}
- =
+
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
CHECK_VALIDITY(c->pstream, idx !=3D PA_INVALID_INDEX || !name || (*nam=
e && pa_utf8_valid(name)), tag, PA_ERR_INVALID);
=
@@ -1758,9 +1758,9 @@
pa_sink_input_cork(ssync->sink_input, b);
pa_memblockq_prebuf_force(ssync->memblockq);
}
- =
+
pa_pstream_send_simple_ack(c->pstream, tag);
-} =
+}
=
static void command_flush_playback_stream(PA_GCC_UNUSED pa_pdispatch *pd, =
PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userda=
ta) {
struct connection *c =3D userdata;
@@ -1782,7 +1782,7 @@
=
pa_memblockq_flush(s->memblockq);
s->underrun =3D 0;
- =
+
/* Do the same for all other members in the sync group */
for (ssync =3D s->prev; ssync; ssync =3D ssync->prev) {
pa_memblockq_flush(ssync->memblockq);
@@ -1793,11 +1793,11 @@
pa_memblockq_flush(ssync->memblockq);
ssync->underrun =3D 0;
}
- =
+
pa_pstream_send_simple_ack(c->pstream, tag);
pa_sink_notify(s->sink_input->sink);
request_bytes(s);
- =
+
for (ssync =3D s->prev; ssync; ssync =3D ssync->prev)
request_bytes(ssync);
=
@@ -1827,11 +1827,11 @@
case PA_COMMAND_PREBUF_PLAYBACK_STREAM:
pa_memblockq_prebuf_force(s->memblockq);
break;
- =
+
case PA_COMMAND_TRIGGER_PLAYBACK_STREAM:
pa_memblockq_prebuf_disable(s->memblockq);
break;
- =
+
default:
abort();
}
@@ -1914,22 +1914,22 @@
protocol_error(c);
return;
}
- =
+
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
CHECK_VALIDITY(c->pstream, name && pa_utf8_valid(name), tag, PA_ERR_IN=
VALID);
=
if (command =3D=3D PA_COMMAND_SET_PLAYBACK_STREAM_NAME) {
struct playback_stream *s;
- =
+
s =3D pa_idxset_get_by_index(c->output_streams, idx);
CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY);
CHECK_VALIDITY(c->pstream, s->type =3D=3D PLAYBACK_STREAM, tag, PA=
_ERR_NOENTITY);
=
pa_sink_input_set_name(s->sink_input, name);
- =
+
} else {
struct record_stream *s;
- =
+
s =3D pa_idxset_get_by_index(c->record_streams, idx);
CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY);
=
@@ -1954,14 +1954,14 @@
=
if (command =3D=3D PA_COMMAND_KILL_CLIENT) {
pa_client *client;
- =
+
client =3D pa_idxset_get_by_index(c->protocol->core->clients, idx);
CHECK_VALIDITY(c->pstream, client, tag, PA_ERR_NOENTITY);
pa_client_kill(client);
- =
+
} else if (command =3D=3D PA_COMMAND_KILL_SINK_INPUT) {
pa_sink_input *s;
- =
+
s =3D pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx);
CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY);
=
@@ -1970,7 +1970,7 @@
pa_source_output *s;
=
assert(command =3D=3D PA_COMMAND_KILL_SOURCE_OUTPUT);
- =
+
s =3D pa_idxset_get_by_index(c->protocol->core->source_outputs, id=
x);
CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY);
=
@@ -1997,7 +1997,7 @@
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
CHECK_VALIDITY(c->pstream, name && *name && pa_utf8_valid(name) && !st=
rchr(name, '/'), tag, PA_ERR_INVALID);
CHECK_VALIDITY(c->pstream, !argument || pa_utf8_valid(argument), tag, =
PA_ERR_INVALID);
- =
+
if (!(m =3D pa_module_load(c->protocol->core, name, argument))) {
pa_pstream_send_error(c->pstream, tag, PA_ERR_MODINITFAILED);
return;
@@ -2019,7 +2019,7 @@
protocol_error(c);
return;
}
- =
+
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
m =3D pa_idxset_get_by_index(c->protocol->core->modules, idx);
CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOENTITY);
@@ -2036,15 +2036,15 @@
pa_tagstruct *reply;
assert(c && t);
=
- if (pa_tagstruct_gets(t, &name) < 0 || =
- pa_tagstruct_getu32(t, &type) < 0 || =
- pa_tagstruct_gets(t, &module) < 0 || =
+ if (pa_tagstruct_gets(t, &name) < 0 ||
+ pa_tagstruct_getu32(t, &type) < 0 ||
+ pa_tagstruct_gets(t, &module) < 0 ||
pa_tagstruct_gets(t, &argument) < 0 ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
}
- =
+
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
CHECK_VALIDITY(c->pstream, name && *name && pa_utf8_valid(name), tag, =
PA_ERR_INVALID);
CHECK_VALIDITY(c->pstream, type =3D=3D 0 || type =3D=3D 1, tag, PA_ERR=
_INVALID);
@@ -2075,12 +2075,12 @@
protocol_error(c);
return;
}
- =
+
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
CHECK_VALIDITY(c->pstream, name || idx !=3D PA_IDXSET_INVALID, tag, PA=
_ERR_INVALID);
CHECK_VALIDITY(c->pstream, !name || (*name && pa_utf8_valid(name) && (=
type =3D=3D 0 || type =3D=3D 1)), tag, PA_ERR_INVALID);
=
- if (name) =
+ if (name)
r =3D pa_autoload_remove_by_name(c->protocol->core, name, type =3D=
=3D 0 ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE);
else
r =3D pa_autoload_remove_by_index(c->protocol->core, idx);
@@ -2141,7 +2141,7 @@
protocol_error(c);
return;
}
- =
+
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
=
reply =3D reply_new(tag);
@@ -2153,7 +2153,7 @@
while ((a =3D pa_hashmap_iterate(c->protocol->core->autoload_hashm=
ap, &state, NULL)))
autoload_fill_tagstruct(reply, a);
}
- =
+
pa_pstream_send_tagstruct(c->pstream, reply);
}
=
@@ -2161,7 +2161,7 @@
struct connection *c =3D userdata;
uint32_t idx =3D PA_INVALID_INDEX, idx_device =3D PA_INVALID_INDEX;
const char *name =3D NULL;
- =
+
assert(c);
assert(t);
=
@@ -2172,7 +2172,7 @@
protocol_error(c);
return;
}
- =
+
CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
CHECK_VALIDITY(c->pstream, idx !=3D PA_INVALID_INDEX, tag, PA_ERR_INVA=
LID);
CHECK_VALIDITY(c->pstream, idx_device !=3D PA_INVALID_INDEX || !name |=
| (*name && pa_utf8_valid(name)), tag, PA_ERR_INVALID);
@@ -2182,7 +2182,7 @@
pa_sink *sink =3D NULL;
=
si =3D pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx);
- =
+
if (idx_device !=3D PA_INVALID_INDEX)
sink =3D pa_idxset_get_by_index(c->protocol->core->sinks, idx_=
device);
else
@@ -2199,7 +2199,7 @@
pa_source *source;
=
so =3D pa_idxset_get_by_index(c->protocol->core->source_outputs, i=
dx);
- =
+
if (idx_device !=3D PA_INVALID_INDEX)
source =3D pa_idxset_get_by_index(c->protocol->core->sources, =
idx_device);
else
@@ -2212,9 +2212,9 @@
return;
}
}
- =
+
pa_pstream_send_simple_ack(c->pstream, tag);
- =
+
}
=
/*** pstream callbacks ***/
@@ -2233,7 +2233,7 @@
struct connection *c =3D userdata;
struct output_stream *stream;
assert(p && chunk && userdata);
- =
+
if (!(stream =3D pa_idxset_get_by_index(c->output_streams, channel))) {
pa_log("client sent block for invalid stream.");
/* Ignoring */
@@ -2251,12 +2251,12 @@
=
if (pa_memblockq_push_align(ps->memblockq, chunk) < 0) {
pa_tagstruct *t;
- =
+
pa_log_warn("failed to push data into queue");
=
/* Pushing this block into the queue failed, so we simulate
* it by skipping ahead */
- =
+
pa_memblockq_seek(ps->memblockq, chunk->length, PA_SEEK_RELATI=
VE);
=
/* Notify the user */
@@ -2268,7 +2268,7 @@
}
=
ps->underrun =3D 0;
- =
+
pa_sink_notify(ps->sink_input->sink);
=
} else {
@@ -2286,10 +2286,10 @@
u->memchunk.index =3D u->memchunk.length =3D 0;
}
}
- =
+
assert(u->memchunk.memblock);
- =
- l =3D u->length; =
+
+ l =3D u->length;
if (l > chunk->length)
l =3D chunk->length;
=
@@ -2355,7 +2355,7 @@
pa_log_info("Client authenticated by IP ACL.");
c->authorized =3D 1;
}
- =
+
if (!c->authorized) {
struct timeval tv;
pa_gettimeofday(&tv);
@@ -2374,7 +2374,7 @@
c->client->kill =3D client_kill_cb;
c->client->userdata =3D c;
c->client->owner =3D p->module;
- =
+
c->pstream =3D pa_pstream_new(p->core->mainloop, io, p->core->mempool);
assert(c->pstream);
=
@@ -2399,7 +2399,7 @@
#ifdef HAVE_CREDS
if (pa_iochannel_creds_supported(io))
pa_iochannel_creds_enable(io);
- =
+
#endif
}
=
@@ -2409,14 +2409,14 @@
assert(p);
=
p->auth_cookie_in_property =3D 0;
- =
+
if (!fn && pa_authkey_prop_get(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME=
, p->auth_cookie, sizeof(p->auth_cookie)) >=3D 0) {
pa_log_info("using already loaded auth cookie.");
pa_authkey_prop_ref(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME);
p->auth_cookie_in_property =3D 1;
return 0;
}
- =
+
if (!fn)
fn =3D PA_NATIVE_COOKIE_FILE;
=
@@ -2427,7 +2427,7 @@
=
if (pa_authkey_prop_put(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME, p->au=
th_cookie, sizeof(p->auth_cookie)) >=3D 0)
p->auth_cookie_in_property =3D 1;
- =
+
return 0;
}
=
@@ -2435,7 +2435,7 @@
pa_protocol_native *p;
int public =3D 0;
const char *acl;
- =
+
assert(c);
assert(ma);
=
@@ -2443,14 +2443,14 @@
pa_log("auth-anonymous=3D expects a boolean argument.");
return NULL;
}
- =
+
p =3D pa_xnew(pa_protocol_native, 1);
p->core =3D c;
p->module =3D m;
p->public =3D public;
p->server =3D NULL;
p->auth_ip_acl =3D NULL;
- =
+
#ifdef HAVE_CREDS
{
int a =3D 1;
@@ -2498,7 +2498,7 @@
=
if (!(p =3D protocol_new_internal(core, m, ma)))
return NULL;
- =
+
p->server =3D server;
pa_socket_server_set_callback(p->server, on_connection, p);
=
@@ -2508,7 +2508,7 @@
l =3D pa_strlist_prepend(l, t);
pa_property_replace(core, PA_NATIVE_SERVER_PROPERTY_NAME, l);
}
- =
+
return p;
}
=
@@ -2522,7 +2522,7 @@
=
if (p->server) {
char t[256];
- =
+
if (pa_socket_server_get_address(p->server, t, sizeof(t))) {
pa_strlist *l;
l =3D pa_property_get(p->core, PA_NATIVE_SERVER_PROPERTY_NAME);
@@ -2533,7 +2533,7 @@
else
pa_property_remove(p->core, PA_NATIVE_SERVER_PROPERTY_NAME=
);
}
- =
+
pa_socket_server_unref(p->server);
}
=
@@ -2542,7 +2542,7 @@
=
if (p->auth_ip_acl)
pa_ip_acl_free(p->auth_ip_acl);
- =
+
#ifdef HAVE_CREDS
pa_xfree(p->auth_group);
#endif
@@ -2556,6 +2556,6 @@
return NULL;
=
on_connection(NULL, io, p);
- =
+
return p;
}
Modified: trunk/src/pulsecore/protocol-native.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-na=
tive.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/protocol-native.h (original)
+++ trunk/src/pulsecore/protocol-native.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/protocol-simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-si=
mple.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/protocol-simple.c (original)
+++ trunk/src/pulsecore/protocol-simple.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -55,7 +55,7 @@
pa_defer_event *defer_event;
=
int dead;
- =
+
struct {
pa_memblock *current_memblock;
size_t memblock_index, fragment_size;
@@ -120,7 +120,7 @@
if (l > c->playback.fragment_size)
l =3D c->playback.fragment_size;
=
- if (c->playback.current_memblock) =
+ if (c->playback.current_memblock)
if (c->playback.current_memblock->length - c->playback.memblock_in=
dex < l) {
pa_memblock_unref(c->playback.current_memblock);
c->playback.current_memblock =3D NULL;
@@ -132,7 +132,7 @@
assert(c->playback.current_memblock && c->playback.current_membloc=
k->length >=3D l);
c->playback.memblock_index =3D 0;
}
- =
+
if ((r =3D pa_iochannel_read(c->io, (uint8_t*) c->playback.current_mem=
block->data+c->playback.memblock_index, l)) <=3D 0) {
pa_log_debug("read(): %s", r =3D=3D 0 ? "EOF" : pa_cstrerror(errno=
));
return -1;
@@ -144,12 +144,12 @@
assert(chunk.memblock);
=
c->playback.memblock_index +=3D r;
- =
+
assert(c->input_memblockq);
pa_memblockq_push_align(c->input_memblockq, &chunk);
assert(c->sink_input);
pa_sink_notify(c->sink_input->sink);
- =
+
return 0;
}
=
@@ -158,25 +158,25 @@
ssize_t r;
=
if (!c->source_output)
- return 0; =
+ return 0;
=
assert(c->output_memblockq);
if (pa_memblockq_peek(c->output_memblockq, &chunk) < 0)
return 0;
- =
+
assert(chunk.memblock && chunk.length);
- =
+
if ((r =3D pa_iochannel_write(c->io, (uint8_t*) chunk.memblock->data+c=
hunk.index, chunk.length)) < 0) {
pa_memblock_unref(chunk.memblock);
pa_log("write(): %s", pa_cstrerror(errno));
return -1;
}
- =
+
pa_memblockq_drop(c->output_memblockq, &chunk, r);
pa_memblock_unref(chunk.memblock);
=
pa_source_notify(c->source_output->source);
- =
+
return 0;
}
=
@@ -188,7 +188,7 @@
=
if (c->dead)
return;
- =
+
if (pa_iochannel_is_readable(c->io)) {
if (do_read(c) < 0)
goto fail;
@@ -198,7 +198,7 @@
if (pa_iochannel_is_writable(c->io)) {
if (do_write(c) < 0)
goto fail;
- } =
+ }
=
return;
=
@@ -206,7 +206,7 @@
=
if (c->sink_input) {
c->dead =3D 1;
- =
+
pa_iochannel_free(c->io);
c->io =3D NULL;
=
@@ -222,12 +222,12 @@
struct connection*c;
assert(i && i->userdata && chunk);
c =3D i->userdata;
- =
+
if (pa_memblockq_peek(c->input_memblockq, chunk) < 0) {
- =
+
if (c->dead)
connection_free(c);
- =
+
return -1;
}
=
@@ -331,7 +331,7 @@
c->playback.memblock_index =3D 0;
c->playback.fragment_size =3D 0;
c->dead =3D 0;
- =
+
pa_iochannel_socket_peer_to_string(io, cname, sizeof(cname));
c->client =3D pa_client_new(p->core, __FILE__, cname);
assert(c->client);
@@ -354,7 +354,7 @@
pa_log("Failed to create sink input.");
goto fail;
}
- =
+
c->sink_input->peek =3D sink_input_peek_cb;
c->sink_input->drop =3D sink_input_drop_cb;
c->sink_input->kill =3D sink_input_kill_cb;
@@ -416,9 +416,9 @@
c->defer_event =3D p->core->mainloop->defer_new(p->core->mainloop, def=
er_callback, c);
assert(c->defer_event);
p->core->mainloop->defer_enable(c->defer_event, 0);
- =
+
return;
- =
+
fail:
if (c)
connection_free(c);
@@ -443,7 +443,7 @@
=
p->source_name =3D pa_xstrdup(pa_modargs_get_value(ma, "source", NULL)=
);
p->sink_name =3D pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL));
- =
+
enable =3D 0;
if (pa_modargs_get_value_boolean(ma, "record", &enable) < 0) {
pa_log("record=3D expects a numeric argument.");
@@ -462,9 +462,9 @@
pa_log("neither playback nor recording enabled for protocol.");
goto fail;
}
- =
+
pa_socket_server_set_callback(p->server, on_connection, p);
- =
+
return p;
=
fail:
@@ -481,7 +481,7 @@
if (p->connections) {
while((c =3D pa_idxset_first(p->connections, NULL)))
connection_free(c);
- =
+
pa_idxset_free(p->connections, NULL, NULL);
}
=
Modified: trunk/src/pulsecore/protocol-simple.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-si=
mple.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/protocol-simple.h (original)
+++ trunk/src/pulsecore/protocol-simple.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/pstream-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pstream-uti=
l.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/pstream-util.c (original)
+++ trunk/src/pulsecore/pstream-util.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/pstream-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pstream-uti=
l.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/pstream-util.h (original)
+++ trunk/src/pulsecore/pstream-util.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/pstream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pstream.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/pstream.c (original)
+++ trunk/src/pulsecore/pstream.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -111,7 +111,7 @@
=
struct pa_pstream {
PA_REFCNT_DECLARE;
- =
+
pa_mainloop_api *mainloop;
pa_defer_event *defer_event;
pa_iochannel *io;
@@ -171,7 +171,7 @@
pa_pstream_ref(p);
=
pa_mutex_lock(p->mutex);
- =
+
p->mainloop->defer_enable(p->defer_event, 0);
=
if (!p->dead && pa_iochannel_is_readable(p->io)) {
@@ -193,21 +193,21 @@
fail:
=
p->dead =3D 1;
- =
+
if (p->die_callback)
p->die_callback(p, p->die_callback_userdata);
- =
- pa_mutex_unlock(p->mutex);
- =
+
+ pa_mutex_unlock(p->mutex);
+
pa_pstream_unref(p);
}
=
static void io_callback(pa_iochannel*io, void *userdata) {
pa_pstream *p =3D userdata;
- =
+
assert(p);
assert(p->io =3D=3D io);
- =
+
do_something(p);
}
=
@@ -217,7 +217,7 @@
assert(p);
assert(p->defer_event =3D=3D e);
assert(p->mainloop =3D=3D m);
- =
+
do_something(p);
}
=
@@ -225,7 +225,7 @@
=
pa_pstream *pa_pstream_new(pa_mainloop_api *m, pa_iochannel *io, pa_mempoo=
l *pool) {
pa_pstream *p;
- =
+
assert(m);
assert(io);
assert(pool);
@@ -241,7 +241,7 @@
p->mainloop =3D m;
p->defer_event =3D m->defer_new(m, defer_callback, p);
m->defer_enable(p->defer_event, 0);
- =
+
p->send_queue =3D pa_queue_new();
assert(p->send_queue);
=
@@ -268,7 +268,7 @@
/* We do importing unconditionally */
p->import =3D pa_memimport_new(p->mempool, memimport_release_cb, p);
=
- pa_iochannel_socket_set_rcvbuf(io, 1024*8); =
+ pa_iochannel_socket_set_rcvbuf(io, 1024*8);
pa_iochannel_socket_set_sndbuf(io, 1024*8);
=
#ifdef HAVE_CREDS
@@ -297,7 +297,7 @@
assert(p);
=
pa_pstream_close(p);
- =
+
pa_queue_free(p->send_queue, item_free, NULL);
=
if (p->write.current)
@@ -305,7 +305,7 @@
=
if (p->read.memblock)
pa_memblock_unref(p->read.memblock);
- =
+
if (p->read.packet)
pa_packet_unref(p->read.packet);
=
@@ -323,14 +323,14 @@
assert(packet);
=
pa_mutex_lock(p->mutex);
- =
+
if (p->dead)
goto finish;
- =
+
i =3D pa_xnew(struct item_info, 1);
i->type =3D PA_PSTREAM_ITEM_PACKET;
i->packet =3D pa_packet_ref(packet);
- =
+
#ifdef HAVE_CREDS
if ((i->with_creds =3D !!creds))
i->creds =3D *creds;
@@ -346,14 +346,14 @@
=
void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offs=
et, pa_seek_mode_t seek_mode, const pa_memchunk *chunk) {
size_t length, idx;
- =
+
assert(p);
assert(PA_REFCNT_VALUE(p) > 0);
assert(channel !=3D (uint32_t) -1);
assert(chunk);
=
pa_mutex_lock(p->mutex);
- =
+
if (p->dead)
goto finish;
=
@@ -363,7 +363,7 @@
while (length > 0) {
struct item_info *i;
size_t n;
- =
+
i =3D pa_xnew(struct item_info, 1);
i->type =3D PA_PSTREAM_ITEM_MEMBLOCK;
=
@@ -371,24 +371,24 @@
i->chunk.index =3D chunk->index + idx;
i->chunk.length =3D n;
i->chunk.memblock =3D pa_memblock_ref(chunk->memblock);
- =
+
i->channel =3D channel;
i->offset =3D offset;
i->seek_mode =3D seek_mode;
#ifdef HAVE_CREDS
i->with_creds =3D 0;
#endif
- =
+
pa_queue_push(p->send_queue, i);
=
idx +=3D n;
length -=3D n;
}
- =
+
p->mainloop->defer_enable(p->defer_event, 1);
=
finish:
- =
+
pa_mutex_unlock(p->mutex);
}
=
@@ -400,7 +400,7 @@
assert(PA_REFCNT_VALUE(p) > 0);
=
pa_mutex_lock(p->mutex);
- =
+
if (p->dead)
goto finish;
=
@@ -429,12 +429,12 @@
assert(PA_REFCNT_VALUE(p) > 0);
=
pa_mutex_lock(p->mutex);
- =
+
if (p->dead)
goto finish;
=
/* pa_log("Revoking block %u", block_id); */
- =
+
item =3D pa_xnew(struct item_info, 1);
item->type =3D PA_PSTREAM_ITEM_SHMREVOKE;
item->block_id =3D block_id;
@@ -456,7 +456,7 @@
=
if (!(p->write.current =3D pa_queue_pop(p->send_queue)))
return;
- =
+
p->write.index =3D 0;
p->write.data =3D NULL;
=
@@ -465,9 +465,9 @@
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI] =3D 0;
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_LO] =3D 0;
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS] =3D 0;
- =
+
if (p->write.current->type =3D=3D PA_PSTREAM_ITEM_PACKET) {
- =
+
assert(p->write.current->packet);
p->write.data =3D p->write.current->packet->data;
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH] =3D htonl(p->wri=
te.current->packet->length);
@@ -481,14 +481,14 @@
=
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS] =3D htonl(PA_FLAG=
_SHMREVOKE);
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI] =3D htonl(p->=
write.current->block_id);
- =
+
} else {
uint32_t flags;
int send_payload =3D 1;
- =
+
assert(p->write.current->type =3D=3D PA_PSTREAM_ITEM_MEMBLOCK);
assert(p->write.current->chunk.memblock);
- =
+
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_CHANNEL] =3D htonl(p->wr=
ite.current->channel);
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI] =3D htonl((ui=
nt32_t) (((uint64_t) p->write.current->offset) >> 32));
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_LO] =3D htonl((ui=
nt32_t) ((uint64_t) p->write.current->offset));
@@ -507,15 +507,15 @@
&shm_id,
&offset,
&length) >=3D 0) {
- =
+
flags |=3D PA_FLAG_SHMDATA;
send_payload =3D 0;
- =
+
p->write.shm_info[PA_PSTREAM_SHM_BLOCKID] =3D htonl(block_=
id);
p->write.shm_info[PA_PSTREAM_SHM_SHMID] =3D htonl(shm_id);
p->write.shm_info[PA_PSTREAM_SHM_INDEX] =3D htonl((uint32_=
t) (offset + p->write.current->chunk.index));
p->write.shm_info[PA_PSTREAM_SHM_LENGTH] =3D htonl((uint32=
_t) p->write.current->chunk.length);
- =
+
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH] =3D hton=
l(sizeof(p->write.shm_info));
p->write.data =3D p->write.shm_info;
}
@@ -527,7 +527,7 @@
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH] =3D htonl(p-=
>write.current->chunk.length);
p->write.data =3D (uint8_t*) p->write.current->chunk.memblock-=
>data + p->write.current->chunk.index;
}
- =
+
p->write.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS] =3D htonl(flags);
}
=
@@ -541,7 +541,7 @@
void *d;
size_t l;
ssize_t r;
- =
+
assert(p);
assert(PA_REFCNT_VALUE(p) > 0);
=
@@ -556,13 +556,13 @@
l =3D PA_PSTREAM_DESCRIPTOR_SIZE - p->write.index;
} else {
assert(p->write.data);
- =
+
d =3D (uint8_t*) p->write.data + p->write.index - PA_PSTREAM_DESCR=
IPTOR_SIZE;
l =3D ntohl(p->write.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]) - (=
p->write.index - PA_PSTREAM_DESCRIPTOR_SIZE);
}
=
assert(l > 0);
- =
+
#ifdef HAVE_CREDS
if (p->send_creds_now) {
=
@@ -592,12 +592,12 @@
=
static int do_read(pa_pstream *p) {
void *d;
- size_t l; =
+ size_t l;
ssize_t r;
- =
- assert(p);
- assert(PA_REFCNT_VALUE(p) > 0);
- =
+
+ assert(p);
+ assert(PA_REFCNT_VALUE(p) > 0);
+
if (p->read.index < PA_PSTREAM_DESCRIPTOR_SIZE) {
d =3D (uint8_t*) p->read.descriptor + p->read.index;
l =3D PA_PSTREAM_DESCRIPTOR_SIZE - p->read.index;
@@ -610,7 +610,7 @@
#ifdef HAVE_CREDS
{
int b =3D 0;
- =
+
if ((r =3D pa_iochannel_read_with_creds(p->io, d, l, &p->read_cred=
s, &b)) <=3D 0)
return -1;
=
@@ -620,7 +620,7 @@
if ((r =3D pa_iochannel_read(p->io, d, l)) <=3D 0)
return -1;
#endif
- =
+
p->read.index +=3D r;
=
if (p->read.index =3D=3D PA_PSTREAM_DESCRIPTOR_SIZE) {
@@ -633,18 +633,18 @@
pa_log_warn("Recieved SHM frame on a socket where SHM is disab=
led.");
return -1;
}
- =
+
if (flags =3D=3D PA_FLAG_SHMRELEASE) {
=
/* This is a SHM memblock release frame with no payload */
=
/* pa_log("Got release frame for %u", ntohl(p->read.descriptor=
[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])); */
- =
+
assert(p->export);
pa_memexport_process_release(p->export, ntohl(p->read.descript=
or[PA_PSTREAM_DESCRIPTOR_OFFSET_HI]));
=
goto frame_done;
- =
+
} else if (flags =3D=3D PA_FLAG_SHMREVOKE) {
=
/* This is a SHM memblock revoke frame with no payload */
@@ -658,68 +658,68 @@
}
=
length =3D ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]);
- =
+
if (length > FRAME_SIZE_MAX_ALLOW) {
pa_log_warn("Recieved invalid frame size : %lu", (unsigned lon=
g) length);
return -1;
}
- =
+
assert(!p->read.packet && !p->read.memblock);
=
channel =3D ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_CHANNEL=
]);
- =
+
if (channel =3D=3D (uint32_t) -1) {
=
if (flags !=3D 0) {
pa_log_warn("Received packet frame with invalid flags valu=
e.");
return -1;
}
- =
+
/* Frame is a packet frame */
p->read.packet =3D pa_packet_new(length);
p->read.data =3D p->read.packet->data;
- =
+
} else {
=
if ((flags & PA_FLAG_SEEKMASK) > PA_SEEK_RELATIVE_END) {
pa_log_warn("Received memblock frame with invalid seek mod=
e.");
return -1;
}
- =
+
if ((flags & PA_FLAG_SHMMASK) =3D=3D PA_FLAG_SHMDATA) {
=
if (length !=3D sizeof(p->read.shm_info)) {
pa_log_warn("Recieved SHM memblock frame with Invalid =
frame length.");
return -1;
}
- =
+
/* Frame is a memblock frame referencing an SHM memblock */
p->read.data =3D p->read.shm_info;
=
} else if ((flags & PA_FLAG_SHMMASK) =3D=3D 0) {
=
/* Frame is a memblock frame */
- =
+
p->read.memblock =3D pa_memblock_new(p->mempool, length);
p->read.data =3D p->read.memblock->data;
} else {
- =
+
pa_log_warn("Recieved memblock frame with invalid flags va=
lue.");
return -1;
}
}
- =
+
} else if (p->read.index > PA_PSTREAM_DESCRIPTOR_SIZE) {
/* Frame payload available */
- =
+
if (p->read.memblock && p->recieve_memblock_callback) {
=
/* Is this memblock data? Than pass it to the user */
l =3D (p->read.index - r) < PA_PSTREAM_DESCRIPTOR_SIZE ? p->re=
ad.index - PA_PSTREAM_DESCRIPTOR_SIZE : (size_t) r;
- =
+
if (l > 0) {
pa_memchunk chunk;
- =
+
chunk.memblock =3D p->read.memblock;
chunk.index =3D p->read.index - PA_PSTREAM_DESCRIPTOR_SIZE=
- l;
chunk.length =3D l;
@@ -730,7 +730,7 @@
offset =3D (int64_t) (
(((uint64_t) ntohl(p->read.descriptor[PA_PSTRE=
AM_DESCRIPTOR_OFFSET_HI])) << 32) |
(((uint64_t) ntohl(p->read.descriptor[PA_PSTRE=
AM_DESCRIPTOR_OFFSET_LO]))));
- =
+
p->recieve_memblock_callback(
p,
ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_CHA=
NNEL]),
@@ -749,14 +749,14 @@
=
/* Frame complete */
if (p->read.index >=3D ntohl(p->read.descriptor[PA_PSTREAM_DESCRIP=
TOR_LENGTH]) + PA_PSTREAM_DESCRIPTOR_SIZE) {
- =
+
if (p->read.memblock) {
=
/* This was a memblock frame. We can unref the memblock no=
w */
pa_memblock_unref(p->read.memblock);
=
} else if (p->read.packet) {
- =
+
if (p->recieve_packet_callback)
#ifdef HAVE_CREDS
p->recieve_packet_callback(p, p->read.packet, p->read_=
creds_valid ? &p->read_creds : NULL, p->recieve_packet_callback_userdata);
@@ -767,7 +767,7 @@
pa_packet_unref(p->read.packet);
} else {
pa_memblock *b;
- =
+
assert((ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLA=
GS]) & PA_FLAG_SHMMASK) =3D=3D PA_FLAG_SHMDATA);
=
assert(p->import);
@@ -785,7 +785,7 @@
if (p->recieve_memblock_callback) {
int64_t offset;
pa_memchunk chunk;
- =
+
chunk.memblock =3D b;
chunk.index =3D 0;
chunk.length =3D b->length;
@@ -793,7 +793,7 @@
offset =3D (int64_t) (
(((uint64_t) ntohl(p->read.descriptor[PA_PSTRE=
AM_DESCRIPTOR_OFFSET_HI])) << 32) |
(((uint64_t) ntohl(p->read.descriptor[PA_PSTRE=
AM_DESCRIPTOR_OFFSET_LO]))));
- =
+
p->recieve_memblock_callback(
p,
ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR=
_CHANNEL]),
@@ -827,7 +827,7 @@
void pa_pstream_set_die_callback(pa_pstream *p, pa_pstream_notify_cb_t cb,=
void *userdata) {
assert(p);
assert(PA_REFCNT_VALUE(p) > 0);
- =
+
pa_mutex_lock(p->mutex);
p->die_callback =3D cb;
p->die_callback_userdata =3D userdata;
@@ -893,7 +893,7 @@
pa_pstream* pa_pstream_ref(pa_pstream*p) {
assert(p);
assert(PA_REFCNT_VALUE(p) > 0);
- =
+
PA_REFCNT_INC(p);
return p;
}
@@ -902,7 +902,7 @@
assert(p);
=
pa_mutex_lock(p->mutex);
- =
+
p->dead =3D 1;
=
if (p->import) {
@@ -942,7 +942,7 @@
p->use_shm =3D enable;
=
if (enable) {
- =
+
if (!p->export)
p->export =3D pa_memexport_new(p->mempool, memexport_revoke_cb=
, p);
=
Modified: trunk/src/pulsecore/pstream.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pstream.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/pstream.h (original)
+++ trunk/src/pulsecore/pstream.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/queue.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/queue.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/queue.c (original)
+++ trunk/src/pulsecore/queue.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -99,7 +99,7 @@
pa_xfree(e);
=
q->length--;
- =
+
return p;
}
=
Modified: trunk/src/pulsecore/queue.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/queue.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/queue.h (original)
+++ trunk/src/pulsecore/queue.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/random.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/random.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/random.c (original)
+++ trunk/src/pulsecore/random.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/random.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/random.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/random.h (original)
+++ trunk/src/pulsecore/random.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -26,5 +26,5 @@
=
void pa_random_seed(void);
void pa_random(void *ret_data, size_t length);
- =
+
#endif
Modified: trunk/src/pulsecore/refcnt.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/refcnt.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/refcnt.h (original)
+++ trunk/src/pulsecore/refcnt.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/resampler.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/resampler.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/resampler.c (original)
+++ trunk/src/pulsecore/resampler.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -54,7 +54,7 @@
pa_memblock *buf1_block, *buf2_block, *buf3_block, *buf4_block;
float* buf1, *buf2, *buf3, *buf4;
unsigned buf1_samples, buf2_samples, buf3_samples, buf4_samples;
- =
+
pa_convert_to_float32ne_func_t to_float32ne_func;
pa_convert_from_float32ne_func_t from_float32ne_func;
SRC_STATE *src_state;
@@ -78,7 +78,7 @@
const pa_sample_spec *b,
const pa_channel_map *bm,
pa_resample_method_t resample_method) {
- =
+
pa_resampler *r =3D NULL;
=
assert(pool);
@@ -110,7 +110,7 @@
r->o_cm =3D *bm;
else
pa_channel_map_init_auto(&r->o_cm, r->o_ss.channels, PA_CHANNEL_MA=
P_DEFAULT);
- =
+
r->i_fz =3D pa_frame_size(a);
r->o_fz =3D pa_frame_size(b);
=
@@ -126,19 +126,19 @@
=
if (libsamplerate_init(r) < 0)
goto fail;
- =
+
} else {
/* Use our own simple non-fp resampler for the trivial cases and w=
hen the user selects it */
if (trivial_init(r) < 0)
goto fail;
}
- =
+
return r;
- =
+
fail:
if (r)
pa_xfree(r);
- =
+
return NULL;
}
=
@@ -147,7 +147,7 @@
=
if (r->impl_free)
r->impl_free(r);
- =
+
pa_xfree(r);
}
=
@@ -157,9 +157,9 @@
=
if (r->i_ss.rate =3D=3D rate)
return;
- =
+
r->i_ss.rate =3D rate;
- =
+
if (r->impl_update_input_rate)
r->impl_update_input_rate(r, rate);
}
@@ -172,7 +172,7 @@
=
size_t pa_resampler_request(pa_resampler *r, size_t out_length) {
assert(r);
- =
+
return (((out_length / r->o_fz)*r->i_ss.rate)/r->o_ss.rate) * r->i_fz;
}
=
@@ -200,7 +200,7 @@
=
pa_resample_method_t pa_parse_resample_method(const char *string) {
pa_resample_method_t m;
- =
+
assert(string);
=
for (m =3D 0; m < PA_RESAMPLER_MAX; m++)
@@ -218,9 +218,9 @@
=
assert(r);
assert(r->impl_data);
- =
- u =3D r->impl_data;
- =
+
+ u =3D r->impl_data;
+
if (u->src_state)
src_delete(u->src_state);
=
@@ -251,16 +251,16 @@
=
for (ic =3D 0; ic < r->i_ss.channels; ic++) {
pa_channel_position_t a, b;
- =
+
a =3D r->i_cm.map[ic];
b =3D r->o_cm.map[oc];
- =
+
if (a =3D=3D b ||
(a =3D=3D PA_CHANNEL_POSITION_MONO && b =3D=3D PA_CHANNEL_=
POSITION_LEFT) ||
(a =3D=3D PA_CHANNEL_POSITION_MONO && b =3D=3D PA_CHANNEL_=
POSITION_RIGHT) ||
(a =3D=3D PA_CHANNEL_POSITION_LEFT && b =3D=3D PA_CHANNEL_=
POSITION_MONO) ||
(a =3D=3D PA_CHANNEL_POSITION_RIGHT && b =3D=3D PA_CHANNEL=
_POSITION_MONO))
- =
+
u->map_table[oc][i++] =3D ic;
}
=
@@ -278,12 +278,12 @@
assert(input);
assert(r->impl_data);
u =3D r->impl_data;
- =
+
/* Convert the incoming sample into floats and place them in buf1 */
=
if (!u->to_float32ne_func)
return input;
- =
+
n_samples =3D n_frames * r->i_ss.channels;
=
if (u->buf1_samples < n_samples) {
@@ -294,7 +294,7 @@
u->buf1_block =3D pa_memblock_new(r->mempool, sizeof(float) * n_sa=
mples);
u->buf1 =3D u->buf1_block->data;
}
- =
+
u->to_float32ne_func(n_samples, input, u->buf1);
=
return u->buf1;
@@ -305,14 +305,14 @@
unsigned n_samples;
int i_skip, o_skip;
unsigned oc;
- =
+
assert(r);
assert(input);
assert(r->impl_data);
u =3D r->impl_data;
=
/* Remap channels and place the result int buf2 */
- =
+
if (!u->map_required)
return input;
=
@@ -331,7 +331,7 @@
=
o_skip =3D sizeof(float) * r->o_ss.channels;
i_skip =3D sizeof(float) * r->i_ss.channels;
- =
+
for (oc =3D 0; oc < r->o_ss.channels; oc++) {
unsigned i;
static const float one =3D 1.0;
@@ -361,7 +361,7 @@
u =3D r->impl_data;
=
/* Resample the data and place the result in buf3 */
- =
+
if (!u->src_state)
return input;
=
@@ -376,16 +376,16 @@
u->buf3_block =3D pa_memblock_new(r->mempool, sizeof(float) * out_=
n_samples);
u->buf3 =3D u->buf3_block->data;
}
- =
+
data.data_in =3D input;
data.input_frames =3D *n_frames;
=
data.data_out =3D u->buf3;
data.output_frames =3D out_n_frames;
- =
+
data.src_ratio =3D (double) r->o_ss.rate / r->i_ss.rate;
data.end_of_input =3D 0;
- =
+
ret =3D src_process(u->src_state, &data);
assert(ret =3D=3D 0);
assert((unsigned) data.input_frames_used =3D=3D *n_frames);
@@ -398,17 +398,17 @@
static void *convert_from_float(pa_resampler *r, float *input, unsigned n_=
frames) {
struct impl_libsamplerate *u;
unsigned n_samples;
- =
+
assert(r);
assert(input);
assert(r->impl_data);
u =3D r->impl_data;
- =
+
/* Convert the data into the correct sample type and place the result =
in buf4 */
=
if (!u->from_float32ne_func)
return input;
- =
+
n_samples =3D n_frames * r->o_ss.channels;
=
if (u->buf4_samples < n_samples) {
@@ -419,7 +419,7 @@
u->buf4_block =3D pa_memblock_new(r->mempool, sizeof(float) * n_sa=
mples);
u->buf4 =3D u->buf4_block->data;
}
- =
+
u->from_float32ne_func(n_samples, input, u->buf4);
=
return u->buf4;
@@ -438,13 +438,13 @@
assert(in->memblock);
assert(in->length % r->i_fz =3D=3D 0);
assert(r->impl_data);
- =
+
u =3D r->impl_data;
=
input =3D ((uint8_t*) in->memblock->data + in->index);
n_frames =3D in->length / r->i_fz;
assert(n_frames > 0);
- =
+
buf =3D convert_to_float(r, input, n_frames);
buf =3D remap_channels(r, buf, n_frames);
buf =3D resample(r, buf, &n_frames);
@@ -461,7 +461,7 @@
out->length =3D n_frames * r->o_fz;
out->index =3D 0;
out->memblock =3D NULL;
- =
+
if (output =3D=3D u->buf1) {
u->buf1 =3D NULL;
u->buf1_samples =3D 0;
@@ -494,7 +494,7 @@
=
static void libsamplerate_update_input_rate(pa_resampler *r, uint32_t rate=
) {
struct impl_libsamplerate *u;
- =
+
assert(r);
assert(rate > 0);
assert(r->impl_data);
@@ -540,7 +540,7 @@
r->impl_run =3D libsamplerate_run;
=
calc_map_table(r);
- =
+
return 0;
=
fail:
@@ -559,7 +559,7 @@
assert(in);
assert(out);
assert(r->impl_data);
- =
+
u =3D r->impl_data;
=
fz =3D r->i_fz;
@@ -578,34 +578,34 @@
/* Do real resampling */
size_t l;
unsigned o_index;
- =
+
/* The length of the new memory block rounded up */
l =3D ((((n_frames+1) * r->o_ss.rate) / r->i_ss.rate) + 1) * fz;
- =
+
out->index =3D 0;
out->memblock =3D pa_memblock_new(r->mempool, l);
- =
+
for (o_index =3D 0;; o_index++, u->o_counter++) {
unsigned j;
- =
+
j =3D (u->o_counter * r->i_ss.rate / r->o_ss.rate);
j =3D j > u->i_counter ? j - u->i_counter : 0;
- =
+
if (j >=3D n_frames)
break;
=
assert(o_index*fz < out->memblock->length);
- =
+
memcpy((uint8_t*) out->memblock->data + fz*o_index,
(uint8_t*) in->memblock->data + in->index + fz*j, fz);
- =
+
}
- =
+
out->length =3D o_index*fz;
}
=
u->i_counter +=3D n_frames;
- =
+
/* Normalize counters */
while (u->i_counter >=3D r->i_ss.rate) {
u->i_counter -=3D r->i_ss.rate;
@@ -616,7 +616,7 @@
=
static void trivial_free(pa_resampler *r) {
assert(r);
- =
+
pa_xfree(r->impl_data);
}
=
@@ -634,7 +634,7 @@
=
static int trivial_init(pa_resampler*r) {
struct impl_trivial *u;
- =
+
assert(r);
assert(r->i_ss.format =3D=3D r->o_ss.format);
assert(r->i_ss.channels =3D=3D r->o_ss.channels);
@@ -645,7 +645,7 @@
r->impl_run =3D trivial_run;
r->impl_free =3D trivial_free;
r->impl_update_input_rate =3D trivial_update_input_rate;
- =
+
return 0;
}
=
Modified: trunk/src/pulsecore/resampler.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/resampler.h=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/resampler.h (original)
+++ trunk/src/pulsecore/resampler.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/sample-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sample-util=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sample-util.c (original)
+++ trunk/src/pulsecore/sample-util.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -78,7 +78,7 @@
default:
assert(0);
}
- =
+
memset(p, c, length);
}
=
@@ -90,42 +90,42 @@
const pa_sample_spec *spec,
const pa_cvolume *volume,
int mute) {
- =
+
assert(streams && data && length && spec);
=
switch (spec->format) {
case PA_SAMPLE_S16NE:{
size_t d;
unsigned channel =3D 0;
- =
+
for (d =3D 0;; d +=3D sizeof(int16_t)) {
int32_t sum =3D 0;
- =
+
if (d >=3D length)
return d;
=
if (!mute && volume->values[channel] !=3D PA_VOLUME_MUTED)=
{
unsigned i;
- =
+
for (i =3D 0; i < nstreams; i++) {
int32_t v;
pa_volume_t cvolume =3D streams[i].volume.values[c=
hannel];
- =
+
if (d >=3D streams[i].chunk.length)
return d;
- =
+
if (cvolume =3D=3D PA_VOLUME_MUTED)
v =3D 0;
else {
v =3D *((int16_t*) ((uint8_t*) streams[i].chun=
k.memblock->data + streams[i].chunk.index + d));
- =
+
if (cvolume !=3D PA_VOLUME_NORM)
v =3D (int32_t) (v * pa_sw_volume_to_linea=
r(cvolume));
}
- =
+
sum +=3D v;
}
- =
+
if (volume->values[channel] !=3D PA_VOLUME_NORM)
sum =3D (int32_t) (sum * pa_sw_volume_to_linear(vo=
lume->values[channel]));
=
@@ -133,10 +133,10 @@
if (sum > 0x7FFF) sum =3D 0x7FFF;
=
}
- =
+
*((int16_t*) data) =3D sum;
data =3D (uint8_t*) data + sizeof(int16_t);
- =
+
if (++channel >=3D spec->channels)
channel =3D 0;
}
@@ -145,35 +145,35 @@
case PA_SAMPLE_S16RE:{
size_t d;
unsigned channel =3D 0;
- =
+
for (d =3D 0;; d +=3D sizeof(int16_t)) {
int32_t sum =3D 0;
- =
+
if (d >=3D length)
return d;
=
if (!mute && volume->values[channel] !=3D PA_VOLUME_MUTED)=
{
unsigned i;
- =
+
for (i =3D 0; i < nstreams; i++) {
int32_t v;
pa_volume_t cvolume =3D streams[i].volume.values[c=
hannel];
- =
+
if (d >=3D streams[i].chunk.length)
return d;
- =
+
if (cvolume =3D=3D PA_VOLUME_MUTED)
v =3D 0;
else {
v =3D INT16_SWAP(*((int16_t*) ((uint8_t*) stre=
ams[i].chunk.memblock->data + streams[i].chunk.index + d)));
- =
+
if (cvolume !=3D PA_VOLUME_NORM)
v =3D (int32_t) (v * pa_sw_volume_to_linea=
r(cvolume));
}
- =
+
sum +=3D v;
}
- =
+
if (volume->values[channel] !=3D PA_VOLUME_NORM)
sum =3D (int32_t) (sum * pa_sw_volume_to_linear(vo=
lume->values[channel]));
=
@@ -181,40 +181,40 @@
if (sum > 0x7FFF) sum =3D 0x7FFF;
=
}
- =
+
*((int16_t*) data) =3D INT16_SWAP(sum);
data =3D (uint8_t*) data + sizeof(int16_t);
- =
- if (++channel >=3D spec->channels)
- channel =3D 0;
- }
- }
- =
+
+ if (++channel >=3D spec->channels)
+ channel =3D 0;
+ }
+ }
+
case PA_SAMPLE_U8: {
size_t d;
unsigned channel =3D 0;
- =
+
for (d =3D 0;; d ++) {
int32_t sum =3D 0;
- =
+
if (d >=3D length)
return d;
=
if (!mute && volume->values[channel] !=3D PA_VOLUME_MUTED)=
{
unsigned i;
- =
+
for (i =3D 0; i < nstreams; i++) {
int32_t v;
pa_volume_t cvolume =3D streams[i].volume.values[c=
hannel];
- =
+
if (d >=3D streams[i].chunk.length)
return d;
- =
+
if (cvolume =3D=3D PA_VOLUME_MUTED)
v =3D 0;
else {
v =3D (int32_t) *((uint8_t*) streams[i].chunk.=
memblock->data + streams[i].chunk.index + d) - 0x80;
- =
+
if (cvolume !=3D PA_VOLUME_NORM)
v =3D (int32_t) (v * pa_sw_volume_to_linea=
r(cvolume));
}
@@ -229,51 +229,51 @@
if (sum > 0x7F) sum =3D 0x7F;
=
}
- =
+
*((uint8_t*) data) =3D (uint8_t) (sum + 0x80);
data =3D (uint8_t*) data + 1;
- =
- if (++channel >=3D spec->channels)
- channel =3D 0;
- }
- }
- =
+
+ if (++channel >=3D spec->channels)
+ channel =3D 0;
+ }
+ }
+
case PA_SAMPLE_FLOAT32NE: {
size_t d;
unsigned channel =3D 0;
- =
+
for (d =3D 0;; d +=3D sizeof(float)) {
float sum =3D 0;
- =
+
if (d >=3D length)
return d;
- =
+
if (!mute && volume->values[channel] !=3D PA_VOLUME_MUTED)=
{
unsigned i;
- =
+
for (i =3D 0; i < nstreams; i++) {
float v;
pa_volume_t cvolume =3D streams[i].volume.values[c=
hannel];
- =
+
if (d >=3D streams[i].chunk.length)
return d;
- =
+
if (cvolume =3D=3D PA_VOLUME_MUTED)
v =3D 0;
else {
v =3D *((float*) ((uint8_t*) streams[i].chunk.=
memblock->data + streams[i].chunk.index + d));
- =
+
if (cvolume !=3D PA_VOLUME_NORM)
v *=3D pa_sw_volume_to_linear(cvolume);
}
- =
+
sum +=3D v;
}
- =
+
if (volume->values[channel] !=3D PA_VOLUME_NORM)
sum *=3D pa_sw_volume_to_linear(volume->values[cha=
nnel]);
}
- =
+
*((float*) data) =3D sum;
data =3D (uint8_t*) data + sizeof(float);
=
@@ -281,7 +281,7 @@
channel =3D 0;
}
}
- =
+
default:
pa_log_error("ERROR: Unable to mix audio data of format %s.", =
pa_sample_format_to_string(spec->format));
abort();
@@ -310,17 +310,17 @@
=
for (channel =3D 0; channel < spec->channels; channel++)
linear[channel] =3D pa_sw_volume_to_linear(volume->values[=
channel]);
- =
+
for (channel =3D 0, d =3D (int16_t*) ((uint8_t*) c->memblock->=
data+c->index), n =3D c->length/sizeof(int16_t); n > 0; d++, n--) {
int32_t t =3D (int32_t)(*d);
- =
+
t =3D (int32_t) (t * linear[channel]);
- =
+
if (t < -0x8000) t =3D -0x8000;
if (t > 0x7FFF) t =3D 0x7FFF;
- =
+
*d =3D (int16_t) t;
- =
+
if (++channel >=3D spec->channels)
channel =3D 0;
}
@@ -332,66 +332,66 @@
size_t n;
unsigned channel;
double linear[PA_CHANNELS_MAX];
- =
+
for (channel =3D 0; channel < spec->channels; channel++)
linear[channel] =3D pa_sw_volume_to_linear(volume->values[=
channel]);
- =
+
for (channel =3D 0, d =3D (int16_t*) ((uint8_t*) c->memblock->=
data+c->index), n =3D c->length/sizeof(int16_t); n > 0; d++, n--) {
int32_t t =3D (int32_t)(INT16_SWAP(*d));
- =
+
t =3D (int32_t) (t * linear[channel]);
- =
+
if (t < -0x8000) t =3D -0x8000;
if (t > 0x7FFF) t =3D 0x7FFF;
- =
+
*d =3D INT16_SWAP((int16_t) t);
- =
- if (++channel >=3D spec->channels)
- channel =3D 0;
- }
-
- break;
- }
- =
+
+ if (++channel >=3D spec->channels)
+ channel =3D 0;
+ }
+
+ break;
+ }
+
case PA_SAMPLE_U8: {
uint8_t *d;
size_t n;
unsigned channel =3D 0;
- =
+
for (d =3D (uint8_t*) c->memblock->data + c->index, n =3D c->l=
ength; n > 0; d++, n--) {
int32_t t =3D (int32_t) *d - 0x80;
- =
+
t =3D (int32_t) (t * pa_sw_volume_to_linear(volume->values=
[channel]));
- =
+
if (t < -0x80) t =3D -0x80;
if (t > 0x7F) t =3D 0x7F;
- =
+
*d =3D (uint8_t) (t + 0x80);
- =
- if (++channel >=3D spec->channels)
- channel =3D 0;
- }
- break;
- }
- =
+
+ if (++channel >=3D spec->channels)
+ channel =3D 0;
+ }
+ break;
+ }
+
case PA_SAMPLE_FLOAT32NE: {
float *d;
int skip;
unsigned n;
unsigned channel;
- =
+
d =3D (float*) ((uint8_t*) c->memblock->data + c->index);
skip =3D spec->channels * sizeof(float);
n =3D c->length/sizeof(float)/spec->channels;
- =
+
for (channel =3D 0; channel < spec->channels ; channel ++) {
float v, *t;
- =
+
if (volume->values[channel] =3D=3D PA_VOLUME_NORM)
continue;
- =
+
v =3D (float) pa_sw_volume_to_linear(volume->values[channe=
l]);
- =
+
t =3D d + channel;
oil_scalarmult_f32(t, skip, t, skip, &v, n);
}
Modified: trunk/src/pulsecore/sample-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sample-util=
.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sample-util.h (original)
+++ trunk/src/pulsecore/sample-util.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/sconv-s16be.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv-s16be=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sconv-s16be.c (original)
+++ trunk/src/pulsecore/sconv-s16be.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/sconv-s16be.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv-s16be=
.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sconv-s16be.h (original)
+++ trunk/src/pulsecore/sconv-s16be.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/sconv-s16le.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv-s16le=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sconv-s16le.c (original)
+++ trunk/src/pulsecore/sconv-s16le.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -58,7 +58,7 @@
assert(b);
=
#if SWAP_WORDS =3D=3D 1
- =
+
for (; n > 0; n--) {
int16_t s =3D *(ca++);
*(b++) =3D ((float) INT16_FROM(s))/0x7FFF;
@@ -74,19 +74,19 @@
=
void pa_sconv_s16le_from_float32ne(unsigned n, const float *a, void *b) {
int16_t *cb =3D b;
- =
+
assert(a);
assert(b);
=
#if SWAP_WORDS =3D=3D 1
- =
+
for (; n > 0; n--) {
int16_t s;
float v =3D *(a++);
=
if (v > 1)
v =3D 1;
- =
+
if (v < -1)
v =3D -1;
=
Modified: trunk/src/pulsecore/sconv-s16le.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv-s16le=
.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sconv-s16le.h (original)
+++ trunk/src/pulsecore/sconv-s16le.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/sconv.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sconv.c (original)
+++ trunk/src/pulsecore/sconv.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -41,12 +41,12 @@
static void u8_to_float32ne(unsigned n, const void *a, float *b) {
const uint8_t *ca =3D a;
static const double add =3D -128.0/127.0, factor =3D 1.0/127.0;
- =
+
assert(a);
assert(b);
=
oil_scaleconv_f32_u8(b, ca, n, &add, &factor);
-} =
+}
=
static void u8_from_float32ne(unsigned n, const float *a, void *b) {
uint8_t *cb =3D b;
@@ -93,7 +93,7 @@
=
assert(a);
assert(b);
- =
+
for (; n > 0; n--)
*(b++) =3D st_ulaw2linear16(*(ca++)) * 1.0F / 0x7FFF;
}
@@ -103,7 +103,7 @@
=
assert(a);
assert(b);
- =
+
for (; n > 0; n--) {
float v =3D *(a++);
=
@@ -132,7 +132,7 @@
=
assert(a);
assert(b);
- =
+
for (; n > 0; n--) {
float v =3D *(a++);
=
Modified: trunk/src/pulsecore/sconv.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sconv.h (original)
+++ trunk/src/pulsecore/sconv.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/shm.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/shm.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/shm.c (original)
+++ trunk/src/pulsecore/shm.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -45,7 +45,7 @@
=
#if defined(__linux__) && !defined(MADV_REMOVE)
#define MADV_REMOVE 9
-#endif =
+#endif
=
#define MAX_SHM_SIZE (1024*1024*20)
=
@@ -57,7 +57,7 @@
int pa_shm_create_rw(pa_shm *m, size_t size, int shared, mode_t mode) {
char fn[32];
int fd =3D -1;
- =
+
assert(m);
assert(size > 0);
assert(size < MAX_SHM_SIZE);
@@ -75,7 +75,7 @@
#elif defined(HAVE_POSIX_MEMALIGN)
{
int r;
- =
+
if ((r =3D posix_memalign(&m->ptr, sysconf(_SC_PAGESIZE), size=
)) < 0) {
pa_log("posix_memalign() failed: %s", pa_cstrerror(r));
goto fail;
@@ -84,9 +84,9 @@
#else
m->ptr =3D pa_xmalloc(m->size);
#endif
- =
+
m->do_unlink =3D 0;
- =
+
} else {
#ifdef HAVE_SHM_OPEN
pa_random(&m->id, sizeof(m->id));
@@ -96,12 +96,12 @@
pa_log("shm_open() failed: %s", pa_cstrerror(errno));
goto fail;
}
- =
+
if (ftruncate(fd, m->size =3D size) < 0) {
pa_log("ftruncate() failed: %s", pa_cstrerror(errno));
goto fail;
}
- =
+
if ((m->ptr =3D mmap(NULL, m->size, PROT_READ|PROT_WRITE, MAP_SHAR=
ED, fd, 0)) =3D=3D MAP_FAILED) {
pa_log("mmap() failed: %s", pa_cstrerror(errno));
goto fail;
@@ -115,9 +115,9 @@
}
=
m->shared =3D shared;
- =
+
return 0;
- =
+
fail:
=
#ifdef HAVE_SHM_OPEN
@@ -157,7 +157,7 @@
char fn[32];
=
segment_name(fn, sizeof(fn), m->id);
- =
+
if (shm_unlink(fn) < 0)
pa_log(" shm_unlink(%s) failed: %s", fn, pa_cstrer=
ror(errno));
}
@@ -172,7 +172,7 @@
=
void pa_shm_punch(pa_shm *m, size_t offset, size_t size) {
void *ptr;
- =
+
assert(m);
assert(m->ptr);
assert(m->size > 0);
@@ -186,7 +186,7 @@
* support it */
=
ptr =3D (uint8_t*) m->ptr + offset;
- =
+
#ifdef __linux__
{
/* On Linux ptr must be page aligned */
@@ -194,14 +194,14 @@
unsigned o;
=
o =3D ((unsigned long) ptr) - ((((unsigned long) ptr)/psz) * psz);
- =
+
if (o > 0) {
ptr =3D (uint8_t*) ptr + (psz - o);
size -=3D psz - o;
}
}
#endif
- =
+
#ifdef MADV_REMOVE
if (madvise(ptr, size, MADV_REMOVE) >=3D 0)
return;
@@ -210,8 +210,8 @@
#ifdef MADV_FREE
if (madvise(ptr, size, MADV_FREE) >=3D 0)
return;
-#endif =
- =
+#endif
+
#ifdef MADV_DONTNEED
madvise(ptr, size, MADV_DONTNEED);
#endif
@@ -244,7 +244,7 @@
}
=
m->size =3D st.st_size;
- =
+
if ((m->ptr =3D mmap(NULL, m->size, PROT_READ, MAP_SHARED, fd, 0)) =3D=
=3D MAP_FAILED) {
pa_log("mmap() failed: %s", pa_cstrerror(errno));
goto fail;
@@ -252,11 +252,11 @@
=
m->do_unlink =3D 0;
m->shared =3D 1;
- =
+
close(fd);
- =
+
return 0;
- =
+
fail:
if (fd >=3D 0)
close(fd);
Modified: trunk/src/pulsecore/shm.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/shm.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/shm.h (original)
+++ trunk/src/pulsecore/shm.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/sink-input.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sink-input.=
c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sink-input.c (original)
+++ trunk/src/pulsecore/sink-input.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -51,7 +51,7 @@
=
pa_sink_input_new_data* pa_sink_input_new_data_init(pa_sink_input_new_data=
*data) {
assert(data);
- =
+
memset(data, 0, sizeof(*data));
data->resample_method =3D PA_RESAMPLER_INVALID;
return data;
@@ -82,7 +82,7 @@
pa_core *core,
pa_sink_input_new_data *data,
pa_sink_input_flags_t flags) {
- =
+
pa_sink_input *i;
pa_resampler *resampler =3D NULL;
int r;
@@ -100,21 +100,21 @@
=
if (!data->sink)
data->sink =3D pa_namereg_get(core, NULL, PA_NAMEREG_SINK, 1);
- =
+
CHECK_VALIDITY_RETURN_NULL(data->sink);
CHECK_VALIDITY_RETURN_NULL(data->sink->state =3D=3D PA_SINK_RUNNING);
=
if (!data->sample_spec_is_set)
data->sample_spec =3D data->sink->sample_spec;
- =
+
CHECK_VALIDITY_RETURN_NULL(pa_sample_spec_valid(&data->sample_spec));
- =
+
if (!data->channel_map_is_set)
pa_channel_map_init_auto(&data->channel_map, data->sample_spec.cha=
nnels, PA_CHANNEL_MAP_DEFAULT);
- =
+
CHECK_VALIDITY_RETURN_NULL(pa_channel_map_valid(&data->channel_map));
CHECK_VALIDITY_RETURN_NULL(data->channel_map.channels =3D=3D data->sam=
ple_spec.channels);
- =
+
if (!data->volume_is_set)
pa_cvolume_reset(&data->volume, data->sample_spec.channels);
=
@@ -134,9 +134,9 @@
if ((flags & PA_SINK_INPUT_VARIABLE_RATE) ||
!pa_sample_spec_equal(&data->sample_spec, &data->sink->sample_spec=
) ||
!pa_channel_map_equal(&data->channel_map, &data->sink->channel_map=
))
- =
+
if (!(resampler =3D pa_resampler_new(
- core->mempool, =
+ core->mempool,
&data->sample_spec, &data->channel_map,
&data->sink->sample_spec, &data->sink->channel_map,
data->resample_method))) {
@@ -157,21 +157,21 @@
i->sample_spec =3D data->sample_spec;
i->channel_map =3D data->channel_map;
i->volume =3D data->volume;
- =
+
i->peek =3D NULL;
i->drop =3D NULL;
i->kill =3D NULL;
i->get_latency =3D NULL;
i->underrun =3D NULL;
i->userdata =3D NULL;
- =
+
i->move_silence =3D 0;
=
pa_memchunk_reset(&i->resampled_chunk);
i->resampler =3D resampler;
i->resample_method =3D data->resample_method;
i->silence_memblock =3D NULL;
- =
+
r =3D pa_idxset_put(core->sink_inputs, i, &i->index);
assert(r =3D=3D 0);
r =3D pa_idxset_put(i->sink->inputs, i, NULL);
@@ -182,13 +182,13 @@
i->name,
i->sink->name,
pa_sample_spec_snprint(st, sizeof(st), &i->sample_spec));
- =
+
pa_subscription_post(core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRI=
PTION_EVENT_NEW, i->index);
=
/* We do not call pa_sink_notify() here, because the virtual
* functions have not yet been initialized */
- =
- return i; =
+
+ return i;
}
=
void pa_sink_input_disconnect(pa_sink_input *i) {
@@ -218,17 +218,17 @@
if (i->state !=3D PA_SINK_INPUT_DISCONNECTED)
pa_sink_input_disconnect(i);
=
- pa_log_info("freed %u \"%s\"", i->index, i->name); =
- =
+ pa_log_info("freed %u \"%s\"", i->index, i->name);
+
if (i->resampled_chunk.memblock)
pa_memblock_unref(i->resampled_chunk.memblock);
- =
+
if (i->resampler)
pa_resampler_free(i->resampler);
=
if (i->silence_memblock)
pa_memblock_unref(i->silence_memblock);
- =
+
pa_xfree(i->name);
pa_xfree(i->driver);
pa_xfree(i);
@@ -245,7 +245,7 @@
pa_sink_input* pa_sink_input_ref(pa_sink_input *i) {
assert(i);
assert(i->ref >=3D 1);
- =
+
i->ref++;
return i;
}
@@ -260,10 +260,10 @@
=
pa_usec_t pa_sink_input_get_latency(pa_sink_input *i) {
pa_usec_t r =3D 0;
- =
- assert(i);
- assert(i->ref >=3D 1);
- =
+
+ assert(i);
+ assert(i->ref >=3D 1);
+
if (i->get_latency)
r +=3D i->get_latency(i);
=
@@ -280,7 +280,7 @@
int ret =3D -1;
int do_volume_adj_here;
int volume_is_norm;
- =
+
assert(i);
assert(i->ref >=3D 1);
assert(chunk);
@@ -297,7 +297,7 @@
=
/* We have just been moved and shall play some silence for a
* while until the old sink has drained its playback buffer */
- =
+
if (!i->silence_memblock)
i->silence_memblock =3D pa_silence_memblock_new(i->sink->core-=
>mempool, &i->sink->sample_spec, SILENCE_BUFFER_LENGTH);
=
@@ -309,7 +309,7 @@
do_volume_adj_here =3D 1;
goto finish;
}
- =
+
if (!i->resampler) {
do_volume_adj_here =3D 0;
ret =3D i->peek(i, chunk);
@@ -318,16 +318,16 @@
=
do_volume_adj_here =3D !pa_channel_map_equal(&i->channel_map, &i->sink=
->channel_map);
volume_is_norm =3D pa_cvolume_is_norm(&i->volume);
- =
+
while (!i->resampled_chunk.memblock) {
pa_memchunk tchunk;
size_t l;
- =
+
if ((ret =3D i->peek(i, &tchunk)) < 0)
goto finish;
=
assert(tchunk.length);
- =
+
l =3D pa_resampler_request(i->resampler, CONVERT_BUFFER_LENGTH);
=
if (l > tchunk.length)
@@ -348,7 +348,7 @@
=
assert(i->resampled_chunk.memblock);
assert(i->resampled_chunk.length);
- =
+
*chunk =3D i->resampled_chunk;
pa_memblock_ref(i->resampled_chunk.memblock);
=
@@ -375,9 +375,9 @@
/* We've both the same channel map, so let's have the sink do =
the adjustment for us*/
*volume =3D i->volume;
}
- =
+
pa_sink_input_unref(i);
- =
+
return ret;
}
=
@@ -392,13 +392,13 @@
=
if (chunk->memblock !=3D i->silence_memblock ||
chunk->index !=3D 0 ||
- (chunk->memblock && (chunk->length !=3D (i->silence_memblo=
ck->length < i->move_silence ? i->silence_memblock->length : i->move_silenc=
e)))) =
+ (chunk->memblock && (chunk->length !=3D (i->silence_memblo=
ck->length < i->move_silence ? i->silence_memblock->length : i->move_silenc=
e))))
return;
- =
+
}
=
assert(i->move_silence >=3D length);
- =
+
i->move_silence -=3D length;
=
if (i->move_silence <=3D 0) {
@@ -415,7 +415,7 @@
i->drop(i, chunk, length);
return;
}
- =
+
assert(i->resampled_chunk.memblock);
assert(i->resampled_chunk.length >=3D length);
=
@@ -437,7 +437,7 @@
=
if (pa_cvolume_equal(&i->volume, volume))
return;
- =
+
i->volume =3D *volume;
pa_subscription_post(i->sink->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|P=
A_SUBSCRIPTION_EVENT_CHANGE, i->index);
}
@@ -451,7 +451,7 @@
=
void pa_sink_input_cork(pa_sink_input *i, int b) {
int n;
- =
+
assert(i);
assert(i->ref >=3D 1);
=
@@ -491,7 +491,7 @@
=
if (i->name && name && !strcmp(i->name, name))
return;
- =
+
pa_xfree(i->name);
i->name =3D pa_xstrdup(name);
=
@@ -512,7 +512,7 @@
pa_resampler *new_resampler =3D NULL;
pa_memblockq *buffer =3D NULL;
pa_sink *origin;
- =
+
assert(i);
assert(dest);
=
@@ -532,13 +532,13 @@
=
/* Try to reuse the old resampler if possible */
new_resampler =3D i->resampler;
- =
+
else if ((i->flags & PA_SINK_INPUT_VARIABLE_RATE) ||
!pa_sample_spec_equal(&i->sample_spec, &dest->sample_spec) ||
!pa_channel_map_equal(&i->channel_map, &dest->channel_map)) {
=
/* Okey, we need a new resampler for the new sink */
- =
+
if (!(new_resampler =3D pa_resampler_new(
dest->core->mempool,
&i->sample_spec, &i->channel_map,
@@ -554,13 +554,13 @@
pa_usec_t silence_usec =3D 0;
=
buffer =3D pa_memblockq_new(0, MOVE_BUFFER_LENGTH, 0, pa_frame_siz=
e(&origin->sample_spec), 0, 0, NULL);
- =
+
/* Let's do a little bit of Voodoo for compensating latency
* differences */
=
old_latency =3D pa_sink_get_latency(origin);
new_latency =3D pa_sink_get_latency(dest);
- =
+
/* The already resampled data should go to the old sink */
=
if (old_latency >=3D new_latency) {
@@ -571,17 +571,17 @@
* while */
=
silence_usec =3D old_latency - new_latency;
- =
+
} else {
size_t l;
int volume_is_norm;
- =
+
/* The latency of new sink is larger than the latency of
* the old sink. Therefore we have to precompute a little
* and make sure that this is still played on the old
* sink, until we can play the first sample on the new
* sink.*/
- =
+
l =3D pa_usec_to_bytes(new_latency - old_latency, &origin->sam=
ple_spec);
=
volume_is_norm =3D pa_cvolume_is_norm(&i->volume);
@@ -655,7 +655,7 @@
i->resampled_chunk.memblock =3D NULL;
i->resampled_chunk.index =3D i->resampled_chunk.length =3D 0;
}
- =
+
/* Notify everyone */
pa_subscription_post(i->sink->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|P=
A_SUBSCRIPTION_EVENT_CHANGE, i->index);
pa_sink_notify(i->sink);
Modified: trunk/src/pulsecore/sink-input.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sink-input.=
h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sink-input.h (original)
+++ trunk/src/pulsecore/sink-input.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -52,13 +52,13 @@
uint32_t index;
pa_sink_input_state_t state;
pa_sink_input_flags_t flags;
- =
+
char *name, *driver; /* may be NULL */
- pa_module *module; /* may be NULL */ =
- pa_client *client; /* may be NULL */ =
+ pa_module *module; /* may be NULL */
+ pa_client *client; /* may be NULL */
=
pa_sink *sink;
- =
+
pa_sample_spec sample_spec;
pa_channel_map channel_map;
pa_cvolume volume;
@@ -67,7 +67,7 @@
* compensate for latency differences when moving a sink input
* "hot" between sinks. */
size_t move_silence;
- =
+
int (*peek) (pa_sink_input *i, pa_memchunk *chunk);
void (*drop) (pa_sink_input *i, const pa_memchunk *chunk, size_t lengt=
h);
void (*kill) (pa_sink_input *i); /* may be NULL */
@@ -88,16 +88,16 @@
const char *name, *driver;
pa_module *module;
pa_client *client;
- =
+
pa_sink *sink;
- =
+
pa_sample_spec sample_spec;
int sample_spec_is_set;
pa_channel_map channel_map;
int channel_map_is_set;
pa_cvolume volume;
int volume_is_set;
- =
+
pa_resample_method_t resample_method;
} pa_sink_input_new_data;
=
Modified: trunk/src/pulsecore/sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sink.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sink.c (original)
+++ trunk/src/pulsecore/sink.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -56,7 +56,7 @@
int fail,
const pa_sample_spec *spec,
const pa_channel_map *map) {
- =
+
pa_sink *s;
char *n =3D NULL;
char st[256];
@@ -68,7 +68,7 @@
assert(spec);
=
CHECK_VALIDITY_RETURN_NULL(pa_sample_spec_valid(spec));
- =
+
if (!map)
map =3D pa_channel_map_init_auto(&tmap, spec->channels, PA_CHANNEL=
_MAP_DEFAULT);
=
@@ -76,7 +76,7 @@
CHECK_VALIDITY_RETURN_NULL(map->channels =3D=3D spec->channels);
CHECK_VALIDITY_RETURN_NULL(!driver || pa_utf8_valid(driver));
CHECK_VALIDITY_RETURN_NULL(pa_utf8_valid(name) && *name);
- =
+
s =3D pa_xnew(pa_sink, 1);
=
if (!(name =3D pa_namereg_register(core, name, PA_NAMEREG_SINK, s, fai=
l))) {
@@ -94,7 +94,7 @@
=
s->sample_spec =3D *spec;
s->channel_map =3D *map;
- =
+
s->inputs =3D pa_idxset_new(NULL, NULL);
=
pa_cvolume_reset(&s->sw_volume, spec->channels);
@@ -103,7 +103,7 @@
s->hw_muted =3D 0;
=
s->is_hardware =3D 0;
- =
+
s->get_latency =3D NULL;
s->notify =3D NULL;
s->set_hw_volume =3D NULL;
@@ -114,12 +114,12 @@
=
r =3D pa_idxset_put(core->sinks, s, &s->index);
assert(s->index !=3D PA_IDXSET_INVALID && r >=3D 0);
- =
+
pa_sample_spec_snprint(st, sizeof(st), spec);
pa_log_info("created %u \"%s\" with sample spec \"%s\"", s->index, s->=
name, st);
=
n =3D pa_sprintf_malloc("%s.monitor", name);
- =
+
if (!(s->monitor_source =3D pa_source_new(core, driver, n, 0, spec, ma=
p)))
pa_log_warn("failed to create monitor source.");
else {
@@ -131,15 +131,15 @@
}
=
pa_xfree(n);
- =
+
pa_subscription_post(core, PA_SUBSCRIPTION_EVENT_SINK | PA_SUBSCRIPTIO=
N_EVENT_NEW, s->index);
- =
+
return s;
}
=
void pa_sink_disconnect(pa_sink* s) {
pa_sink_input *i, *j =3D NULL;
- =
+
assert(s);
assert(s->state =3D=3D PA_SINK_RUNNING);
=
@@ -147,7 +147,7 @@
pa_namereg_unregister(s->core, s->name);
=
pa_hook_fire(&s->core->hook_sink_disconnect, s);
- =
+
while ((i =3D pa_idxset_first(s->inputs, NULL))) {
assert(i !=3D j);
pa_sink_input_kill(i);
@@ -165,24 +165,24 @@
s->set_hw_volume =3D NULL;
s->set_hw_mute =3D NULL;
s->get_hw_mute =3D NULL;
- =
+
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK | PA_SUBSCRIP=
TION_EVENT_REMOVE, s->index);
}
=
static void sink_free(pa_sink *s) {
assert(s);
assert(!s->ref);
- =
+
if (s->state !=3D PA_SINK_DISCONNECTED)
pa_sink_disconnect(s);
=
- pa_log_info("freed %u \"%s\"", s->index, s->name); =
+ pa_log_info("freed %u \"%s\"", s->index, s->name);
=
if (s->monitor_source) {
pa_source_unref(s->monitor_source);
s->monitor_source =3D NULL;
}
- =
+
pa_idxset_free(s->inputs, NULL, NULL);
=
pa_xfree(s->name);
@@ -202,7 +202,7 @@
pa_sink* pa_sink_ref(pa_sink *s) {
assert(s);
assert(s->ref >=3D 1);
- =
+
s->ref++;
return s;
}
@@ -219,7 +219,7 @@
uint32_t idx =3D PA_IDXSET_INVALID;
pa_sink_input *i;
unsigned n =3D 0;
- =
+
assert(s);
assert(s->ref >=3D 1);
assert(info);
@@ -235,11 +235,11 @@
}
=
info->userdata =3D i;
- =
+
assert(info->chunk.memblock);
assert(info->chunk.memblock->data);
assert(info->chunk.length);
- =
+
info++;
maxinfo--;
n++;
@@ -255,7 +255,7 @@
=
for (; maxinfo > 0; maxinfo--, info++) {
pa_sink_input *i =3D info->userdata;
- =
+
assert(i);
assert(info->chunk.memblock);
=
@@ -268,19 +268,19 @@
info->userdata =3D NULL;
}
}
- =
+
int pa_sink_render(pa_sink*s, size_t length, pa_memchunk *result) {
pa_mix_info info[MAX_MIX_CHANNELS];
unsigned n;
int r =3D -1;
- =
+
assert(s);
assert(s->ref >=3D 1);
assert(length);
assert(result);
=
pa_sink_ref(s);
- =
+
n =3D fill_mix_info(s, info, MAX_MIX_CHANNELS);
=
if (n <=3D 0)
@@ -296,7 +296,7 @@
result->length =3D length;
=
pa_sw_cvolume_multiply(&volume, &s->sw_volume, &info[0].volume);
- =
+
if (s->sw_muted || !pa_cvolume_is_norm(&volume)) {
pa_memchunk_make_writable(result, 0);
if (s->sw_muted)
@@ -332,7 +332,7 @@
pa_mix_info info[MAX_MIX_CHANNELS];
unsigned n;
int r =3D -1;
- =
+
assert(s);
assert(s->ref >=3D 1);
assert(target);
@@ -341,7 +341,7 @@
assert(target->memblock->data);
=
pa_sink_ref(s);
- =
+
n =3D fill_mix_info(s, info, MAX_MIX_CHANNELS);
=
if (n <=3D 0)
@@ -352,7 +352,7 @@
=
if (target->length > info[0].chunk.length)
target->length =3D info[0].chunk.length;
- =
+
memcpy((uint8_t*) target->memblock->data + target->index,
(uint8_t*) info[0].chunk.memblock->data + info[0].chunk.ind=
ex,
target->length);
@@ -360,7 +360,7 @@
pa_sw_cvolume_multiply(&volume, &s->sw_volume, &info[0].volume);
=
if (s->sw_muted)
- pa_silence_memchunk(target, &s->sample_spec); =
+ pa_silence_memchunk(target, &s->sample_spec);
else if (!pa_cvolume_is_norm(&volume))
pa_volume_memchunk(target, &s->sample_spec, &volume);
} else
@@ -370,7 +370,7 @@
&s->sample_spec,
&s->sw_volume,
s->sw_muted);
- =
+
inputs_drop(s, info, n, target->length);
=
if (s->monitor_source)
@@ -380,14 +380,14 @@
=
finish:
pa_sink_unref(s);
- =
+
return r;
}
=
void pa_sink_render_into_full(pa_sink *s, pa_memchunk *target) {
pa_memchunk chunk;
size_t l, d;
- =
+
assert(s);
assert(s->ref >=3D 1);
assert(target);
@@ -396,14 +396,14 @@
assert(target->memblock->data);
=
pa_sink_ref(s);
- =
+
l =3D target->length;
d =3D 0;
while (l > 0) {
chunk =3D *target;
chunk.index +=3D d;
chunk.length -=3D d;
- =
+
if (pa_sink_render_into(s, &chunk) < 0)
break;
=
@@ -428,7 +428,7 @@
assert(result);
=
/*** This needs optimization ***/
- =
+
result->memblock =3D pa_memblock_new(s->core->mempool, result->length =
=3D length);
result->index =3D 0;
=
@@ -451,7 +451,7 @@
=
if (s->owner =3D=3D m)
return;
- =
+
s->owner =3D m;
=
if (s->monitor_source)
@@ -462,19 +462,19 @@
=
void pa_sink_set_volume(pa_sink *s, pa_mixer_t m, const pa_cvolume *volume=
) {
pa_cvolume *v;
- =
+
assert(s);
assert(s->ref >=3D 1);
assert(volume);
=
- if (m =3D=3D PA_MIXER_HARDWARE && s->set_hw_volume) =
+ if (m =3D=3D PA_MIXER_HARDWARE && s->set_hw_volume)
v =3D &s->hw_volume;
else
v =3D &s->sw_volume;
=
if (pa_cvolume_equal(v, volume))
return;
- =
+
*v =3D *volume;
=
if (v =3D=3D &s->hw_volume)
@@ -492,7 +492,7 @@
=
if (s->get_hw_volume)
s->get_hw_volume(s);
- =
+
return &s->hw_volume;
} else
return &s->sw_volume;
@@ -500,18 +500,18 @@
=
void pa_sink_set_mute(pa_sink *s, pa_mixer_t m, int mute) {
int *t;
- =
- assert(s);
- assert(s->ref >=3D 1);
-
- if (m =3D=3D PA_MIXER_HARDWARE && s->set_hw_mute) =
+
+ assert(s);
+ assert(s->ref >=3D 1);
+
+ if (m =3D=3D PA_MIXER_HARDWARE && s->set_hw_mute)
t =3D &s->hw_muted;
else
t =3D &s->sw_muted;
=
if (!!*t =3D=3D !!mute)
return;
- =
+
*t =3D !!mute;
=
if (t =3D=3D &s->hw_muted)
@@ -529,7 +529,7 @@
=
if (s->get_hw_mute)
s->get_hw_mute(s);
- =
+
return s->hw_muted;
} else
return s->sw_muted;
@@ -544,18 +544,18 @@
=
if (description && s->description && !strcmp(description, s->descripti=
on))
return;
- =
+
pa_xfree(s->description);
s->description =3D pa_xstrdup(description);
=
if (s->monitor_source) {
char *n;
- =
+
n =3D pa_sprintf_malloc("Monitor Source of %s", s->description? s-=
>description : s->name);
pa_source_set_description(s->monitor_source, n);
pa_xfree(n);
}
- =
+
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTI=
ON_EVENT_CHANGE, s->index);
}
=
Modified: trunk/src/pulsecore/sink.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sink.h?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sink.h (original)
+++ trunk/src/pulsecore/sink.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -59,7 +59,7 @@
=
pa_idxset *inputs;
pa_source *monitor_source; /* may be NULL */
- =
+
pa_cvolume hw_volume, sw_volume;
int hw_muted, sw_muted;
=
@@ -69,7 +69,7 @@
int (*get_hw_volume)(pa_sink *s); /* dito */
int (*set_hw_mute)(pa_sink *s); /* dito */
int (*get_hw_mute)(pa_sink *s); /* dito */
- =
+
void *userdata;
};
=
@@ -89,7 +89,7 @@
void pa_sink_render_full(pa_sink *s, size_t length, pa_memchunk *result);
int pa_sink_render_into(pa_sink*s, pa_memchunk *target);
void pa_sink_render_into_full(pa_sink *s, pa_memchunk *target);
- =
+
pa_usec_t pa_sink_get_latency(pa_sink *s);
=
void pa_sink_notify(pa_sink*s);
Modified: trunk/src/pulsecore/sioman.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sioman.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sioman.c (original)
+++ trunk/src/pulsecore/sioman.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -40,4 +40,4 @@
void pa_stdio_release(void) {
assert(stdio_inuse);
stdio_inuse =3D 0;
-} =
+}
Modified: trunk/src/pulsecore/sioman.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sioman.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sioman.h (original)
+++ trunk/src/pulsecore/sioman.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/socket-client.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-clie=
nt.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/socket-client.c (original)
+++ trunk/src/pulsecore/socket-client.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -110,17 +110,17 @@
=
static void free_events(pa_socket_client *c) {
assert(c);
- =
+
if (c->io_event) {
c->mainloop->io_free(c->io_event);
c->io_event =3D NULL;
}
- =
+
if (c->defer_event) {
c->mainloop->defer_free(c->defer_event);
c->defer_event =3D NULL;
}
- =
+
if (c->timeout_event) {
c->mainloop->time_free(c->timeout_event);
c->timeout_event =3D NULL;
@@ -137,7 +137,7 @@
=
if (c->fd < 0)
goto finish;
- =
+
lerror =3D sizeof(error);
if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void*)&error, &lerror) < =
0) {
pa_log("getsockopt(): %s", pa_cstrerror(errno));
@@ -157,17 +157,17 @@
=
io =3D pa_iochannel_new(c->mainloop, c->fd, c->fd);
assert(io);
- =
+
finish:
if (!io && c->fd >=3D 0)
close(c->fd);
c->fd =3D -1;
=
free_events(c);
- =
+
assert(c->callback);
c->callback(c, io, c->userdata);
- =
+
pa_socket_client_unref(c);
}
=
@@ -186,9 +186,9 @@
static int do_connect(pa_socket_client *c, const struct sockaddr *sa, sock=
len_t len) {
int r;
assert(c && sa && len);
- =
+
pa_make_nonblock_fd(c->fd);
- =
+
if ((r =3D connect(c->fd, sa, len)) < 0) {
#ifdef OS_IS_WIN32
if (WSAGetLastError() !=3D EWOULDBLOCK) {
@@ -227,7 +227,7 @@
pa_socket_client* pa_socket_client_new_unix(pa_mainloop_api *m, const char=
*filename) {
struct sockaddr_un sa;
assert(m && filename);
- =
+
memset(&sa, 0, sizeof(sa));
sa.sun_family =3D AF_UNIX;
strncpy(sa.sun_path, filename, sizeof(sa.sun_path)-1);
@@ -248,24 +248,24 @@
assert(c);
assert(sa);
assert(salen);
- =
+
switch (sa->sa_family) {
case AF_UNIX:
c->local =3D 1;
break;
- =
+
case AF_INET:
c->local =3D ((const struct sockaddr_in*) sa)->sin_addr.s_addr=
=3D=3D INADDR_LOOPBACK;
break;
- =
+
case AF_INET6:
c->local =3D memcmp(&((const struct sockaddr_in6*) sa)->sin6_a=
ddr, &in6addr_loopback, sizeof(struct in6_addr)) =3D=3D 0;
break;
- =
+
default:
c->local =3D 0;
}
- =
+
if ((c->fd =3D socket(sa->sa_family, SOCK_STREAM, 0)) < 0) {
pa_log("socket(): %s", pa_cstrerror(errno));
return -1;
@@ -291,13 +291,13 @@
=
if (sockaddr_prepare(c, sa, salen) < 0)
goto fail;
- =
+
return c;
=
fail:
pa_socket_client_unref(c);
return NULL;
- =
+
}
=
static void socket_client_free(pa_socket_client *c) {
@@ -305,7 +305,7 @@
=
=
free_events(c);
- =
+
if (c->fd >=3D 0)
close(c->fd);
=
@@ -317,7 +317,7 @@
if (c->asyncns_io_event)
c->mainloop->io_free(c->asyncns_io_event);
#endif
- =
+
pa_xfree(c);
}
=
@@ -342,7 +342,7 @@
=
pa_socket_client* pa_socket_client_new_ipv6(pa_mainloop_api *m, uint8_t ad=
dress[16], uint16_t port) {
struct sockaddr_in6 sa;
- =
+
memset(&sa, 0, sizeof(sa));
sa.sin6_family =3D AF_INET6;
sa.sin6_port =3D htons(port);
@@ -370,24 +370,24 @@
=
if (ret !=3D 0 || !res)
goto fail;
- =
+
if (res->ai_addr)
sockaddr_prepare(c, res->ai_addr, res->ai_addrlen);
- =
+
asyncns_freeaddrinfo(res);
=
m->io_free(c->asyncns_io_event);
c->asyncns_io_event =3D NULL;
return;
- =
+
fail:
m->io_free(c->asyncns_io_event);
c->asyncns_io_event =3D NULL;
- =
+
errno =3D EHOSTUNREACH;
do_call(c);
return;
- =
+
}
=
#endif
@@ -428,7 +428,7 @@
=
if (!a.port)
a.port =3D default_port;
- =
+
switch (a.type) {
case PA_PARSED_ADDRESS_UNIX:
if ((c =3D pa_socket_client_new_unix(m, a.path_or_host)))
@@ -447,11 +447,11 @@
memset(&hints, 0, sizeof(hints));
hints.ai_family =3D a.type =3D=3D PA_PARSED_ADDRESS_TCP4 ? PF_=
INET : (a.type =3D=3D PA_PARSED_ADDRESS_TCP6 ? PF_INET6 : PF_UNSPEC);
hints.ai_socktype =3D SOCK_STREAM;
- =
+
#ifdef HAVE_LIBASYNCNS
{
asyncns_t *asyncns;
- =
+
if (!(asyncns =3D asyncns_new(1)))
goto finish;
=
@@ -469,7 +469,7 @@
struct addrinfo *res =3D NULL;
=
ret =3D getaddrinfo(a.path_or_host, port, &hints, &res);
- =
+
if (ret < 0 || !res)
goto finish;
=
@@ -477,7 +477,7 @@
if ((c =3D pa_socket_client_new_sockaddr(m, res->ai_ad=
dr, res->ai_addrlen)))
start_timeout(c);
}
- =
+
freeaddrinfo(res);
#else /* HAVE_GETADDRINFO */
struct hostent *host =3D NULL;
@@ -514,7 +514,7 @@
finish:
pa_xfree(a.path_or_host);
return c;
- =
+
}
=
/* Return non-zero when the target sockaddr is considered
Modified: trunk/src/pulsecore/socket-client.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-clie=
nt.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/socket-client.h (original)
+++ trunk/src/pulsecore/socket-client.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/socket-server.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-serv=
er.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/socket-server.c (original)
+++ trunk/src/pulsecore/socket-server.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -94,14 +94,14 @@
assert(s && s->mainloop =3D=3D mainloop && s->io_event =3D=3D e && e &=
& fd >=3D 0 && fd =3D=3D s->fd);
=
pa_socket_server_ref(s);
- =
+
if ((nfd =3D accept(fd, NULL, NULL)) < 0) {
pa_log("accept(): %s", pa_cstrerror(errno));
goto finish;
}
=
pa_fd_set_cloexec(nfd, 1);
- =
+
if (!s->on_connection) {
close(nfd);
goto finish;
@@ -123,13 +123,13 @@
pa_log_info("TCP connection accepted by tcpwrap.");
}
#endif
- =
+
/* There should be a check for socket type here */
- if (s->type =3D=3D SOCKET_SERVER_IPV4) =
+ if (s->type =3D=3D SOCKET_SERVER_IPV4)
pa_socket_tcp_low_delay(fd);
else
pa_socket_low_delay(fd);
- =
+
io =3D pa_iochannel_new(s->mainloop, nfd, nfd);
assert(io);
s->on_connection(s, io, s->userdata);
@@ -141,7 +141,7 @@
pa_socket_server* pa_socket_server_new(pa_mainloop_api *m, int fd) {
pa_socket_server *s;
assert(m && fd >=3D 0);
- =
+
s =3D pa_xmalloc(sizeof(pa_socket_server));
s->ref =3D 1;
s->fd =3D fd;
@@ -155,7 +155,7 @@
assert(s->io_event);
=
s->type =3D SOCKET_SERVER_GENERIC;
- =
+
return s;
}
=
@@ -171,7 +171,7 @@
int fd =3D -1;
struct sockaddr_un sa;
pa_socket_server *s;
- =
+
assert(m && filename);
=
if ((fd =3D socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
@@ -197,7 +197,7 @@
* because not all OS check the access rights on the socket
* inodes. */
chmod(filename, 0777);
- =
+
if (listen(fd, 5) < 0) {
pa_log("listen(): %s", pa_cstrerror(errno));
goto fail;
@@ -208,9 +208,9 @@
=
s->filename =3D pa_xstrdup(filename);
s->type =3D SOCKET_SERVER_UNIX;
- =
+
return s;
- =
=
=
+
fail:
if (fd >=3D 0)
close(fd);
@@ -247,7 +247,7 @@
#endif
=
pa_socket_tcp_low_delay(fd);
- =
+
memset(&sa, 0, sizeof(sa));
sa.sin_family =3D AF_INET;
sa.sin_port =3D htons(port);
@@ -269,7 +269,7 @@
}
=
return ss;
- =
+
fail:
if (fd >=3D 0)
close(fd);
@@ -323,9 +323,9 @@
ss->type =3D SOCKET_SERVER_IPV6;
ss->tcpwrap_service =3D pa_xstrdup(tcpwrap_service);
}
- =
+
return ss;
- =
+
fail:
if (fd >=3D 0)
close(fd);
@@ -350,20 +350,20 @@
pa_socket_server* pa_socket_server_new_ipv4_any(pa_mainloop_api *m, uint16=
_t port, const char *tcpwrap_service) {
assert(m);
assert(port > 0);
- =
+
return pa_socket_server_new_ipv4(m, INADDR_ANY, port, tcpwrap_service);
}
=
pa_socket_server* pa_socket_server_new_ipv6_any(pa_mainloop_api *m, uint16=
_t port, const char *tcpwrap_service) {
assert(m);
assert(port > 0);
- =
+
return pa_socket_server_new_ipv6(m, in6addr_any.s6_addr, port, tcpwrap=
_service);
}
=
pa_socket_server* pa_socket_server_new_ipv4_string(pa_mainloop_api *m, con=
st char *name, uint16_t port, const char *tcpwrap_service) {
struct in_addr ipv4;
- =
+
assert(m);
assert(name);
assert(port > 0);
@@ -376,7 +376,7 @@
=
pa_socket_server* pa_socket_server_new_ipv6_string(pa_mainloop_api *m, con=
st char *name, uint16_t port, const char *tcpwrap_service) {
struct in6_addr ipv6;
- =
+
assert(m);
assert(name);
assert(port > 0);
@@ -419,7 +419,7 @@
=
char *pa_socket_server_get_address(pa_socket_server *s, char *c, size_t l)=
{
assert(s && c && l > 0);
- =
+
switch (s->type) {
case SOCKET_SERVER_IPV6: {
struct sockaddr_in6 sa;
@@ -434,23 +434,23 @@
char fqdn[256];
if (!pa_get_fqdn(fqdn, sizeof(fqdn)))
return NULL;
- =
+
snprintf(c, l, "tcp6:%s:%u", fqdn, (unsigned) ntohs(sa.sin=
6_port));
- =
+
} else if (memcmp(&in6addr_loopback, &sa.sin6_addr, sizeof(in6=
addr_loopback)) =3D=3D 0) {
char hn[256];
if (!pa_get_host_name(hn, sizeof(hn)))
return NULL;
- =
+
snprintf(c, l, "{%s}tcp6:localhost:%u", hn, (unsigned) nto=
hs(sa.sin6_port));
} else {
char ip[INET6_ADDRSTRLEN];
- =
+
if (!inet_ntop(AF_INET6, &sa.sin6_addr, ip, sizeof(ip))) {
pa_log("inet_ntop(): %s", pa_cstrerror(errno));
return NULL;
}
- =
+
snprintf(c, l, "tcp6:[%s]:%u", ip, (unsigned) ntohs(sa.sin=
6_port));
}
=
@@ -470,13 +470,13 @@
char fqdn[256];
if (!pa_get_fqdn(fqdn, sizeof(fqdn)))
return NULL;
- =
+
snprintf(c, l, "tcp:%s:%u", fqdn, (unsigned) ntohs(sa.sin_=
port));
} else if (sa.sin_addr.s_addr =3D=3D INADDR_LOOPBACK) {
char hn[256];
if (!pa_get_host_name(hn, sizeof(hn)))
return NULL;
- =
+
snprintf(c, l, "{%s}tcp:localhost:%u", hn, (unsigned) ntoh=
s(sa.sin_port));
} else {
char ip[INET_ADDRSTRLEN];
@@ -485,11 +485,11 @@
pa_log("inet_ntop(): %s", pa_cstrerror(errno));
return NULL;
}
- =
+
snprintf(c, l, "tcp:[%s]:%u", ip, (unsigned) ntohs(sa.sin_=
port));
=
}
- =
+
return c;
}
=
@@ -498,7 +498,7 @@
=
if (!s->filename)
return NULL;
- =
+
if (!pa_get_host_name(hn, sizeof(hn)))
return NULL;
=
Modified: trunk/src/pulsecore/socket-server.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-serv=
er.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/socket-server.h (original)
+++ trunk/src/pulsecore/socket-server.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/socket-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-util=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/socket-util.c (original)
+++ trunk/src/pulsecore/socket-util.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -78,7 +78,7 @@
struct stat st;
=
assert(c && l && fd >=3D 0);
- =
+
#ifndef OS_IS_WIN32
if (fstat(fd, &st) < 0) {
snprintf(c, l, "Invalid client fd");
@@ -88,7 +88,7 @@
=
#ifndef OS_IS_WIN32
if (S_ISSOCK(st.st_mode)) {
-#endif =
+#endif
union {
struct sockaddr sa;
struct sockaddr_in in;
@@ -98,12 +98,12 @@
#endif
} sa;
socklen_t sa_len =3D sizeof(sa);
- =
+
if (getpeername(fd, &sa.sa, &sa_len) >=3D 0) {
=
if (sa.sa.sa_family =3D=3D AF_INET) {
uint32_t ip =3D ntohl(sa.in.sin_addr.s_addr);
- =
+
snprintf(c, l, "TCP/IP client from %i.%i.%i.%i:%u",
ip >> 24,
(ip >> 16) & 0xFF,
@@ -159,7 +159,7 @@
assert(fd >=3D 0);
=
ret =3D pa_socket_low_delay(fd);
- =
+
on =3D 1;
tos =3D 0;
=
@@ -239,13 +239,13 @@
=
int pa_unix_socket_remove_stale(const char *fn) {
int r;
- =
+
if ((r =3D pa_unix_socket_is_stale(fn)) < 0)
return errno !=3D ENOENT ? -1 : 0;
=
if (!r)
return 0;
- =
+
/* Yes, here is a race condition. But who cares? */
if (unlink(fn) < 0)
return -1;
Modified: trunk/src/pulsecore/socket-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-util=
.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/socket-util.h (original)
+++ trunk/src/pulsecore/socket-util.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/sound-file-stream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sound-file-=
stream.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sound-file-stream.c (original)
+++ trunk/src/pulsecore/sound-file-stream.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -52,7 +52,7 @@
pa_sink_input_disconnect(u->sink_input);
pa_sink_input_unref(u->sink_input);
}
- =
+
if (u->memchunk.memblock)
pa_memblock_unref(u->memchunk.memblock);
if (u->sndfile)
@@ -86,10 +86,10 @@
} else {
if ((n =3D sf_read_raw(u->sndfile, u->memchunk.memblock->data,=
BUF_SIZE)) <=3D 0)
n =3D 0;
- =
+
u->memchunk.length =3D n;
}
- =
+
if (!u->memchunk.length) {
free_userdata(u);
return -1;
@@ -124,12 +124,12 @@
pa_sink *sink,
const char *fname,
const pa_cvolume *volume) {
- =
+
struct userdata *u =3D NULL;
SF_INFO sfinfo;
pa_sample_spec ss;
pa_sink_input_new_data data;
- =
+
assert(sink);
assert(fname);
=
@@ -147,7 +147,7 @@
}
=
u->readf_function =3D NULL;
- =
+
switch (sfinfo.format & 0xFF) {
case SF_FORMAT_PCM_16:
case SF_FORMAT_PCM_U8:
@@ -159,7 +159,7 @@
case SF_FORMAT_ULAW:
ss.format =3D PA_SAMPLE_ULAW;
break;
- =
+
case SF_FORMAT_ALAW:
ss.format =3D PA_SAMPLE_ALAW;
break;
@@ -170,7 +170,7 @@
u->readf_function =3D (sf_count_t (*)(SNDFILE *sndfile, void *=
ptr, sf_count_t frames)) sf_readf_float;
break;
}
- =
+
ss.rate =3D sfinfo.samplerate;
ss.channels =3D sfinfo.channels;
=
@@ -185,7 +185,7 @@
data.name =3D fname;
pa_sink_input_new_data_set_sample_spec(&data, &ss);
pa_sink_input_new_data_set_volume(&data, volume);
- =
+
if (!(u->sink_input =3D pa_sink_input_new(sink->core, &data, 0)))
goto fail;
=
@@ -193,7 +193,7 @@
u->sink_input->drop =3D sink_input_drop;
u->sink_input->kill =3D sink_input_kill;
u->sink_input->userdata =3D u;
- =
+
pa_sink_notify(u->sink_input->sink);
=
return 0;
@@ -201,6 +201,6 @@
fail:
if (u)
free_userdata(u);
- =
+
return -1;
}
Modified: trunk/src/pulsecore/sound-file-stream.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sound-file-=
stream.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sound-file-stream.h (original)
+++ trunk/src/pulsecore/sound-file-stream.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/sound-file.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sound-file.=
c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sound-file.c (original)
+++ trunk/src/pulsecore/sound-file.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -63,7 +63,7 @@
case SF_FORMAT_ULAW:
ss->format =3D PA_SAMPLE_ULAW;
break;
- =
+
case SF_FORMAT_ALAW:
ss->format =3D PA_SAMPLE_ALAW;
break;
@@ -86,7 +86,7 @@
=
if (map)
pa_channel_map_init_auto(map, ss->channels, PA_CHANNEL_MAP_DEFAULT=
);
- =
+
if ((l =3D pa_frame_size(ss)*sfinfo.frames) > PA_SCACHE_ENTRY_SIZE_MAX=
) {
pa_log("File too large");
goto finish;
@@ -102,7 +102,7 @@
pa_log("Premature file end");
goto finish;
}
- =
+
ret =3D 0;
=
finish:
@@ -112,9 +112,9 @@
=
if (ret !=3D 0 && chunk->memblock)
pa_memblock_unref(chunk->memblock);
- =
+
return ret;
- =
+
}
=
int pa_sound_file_too_big_to_cache(const char *fname) {
@@ -139,7 +139,7 @@
case SF_FORMAT_ULAW:
ss.format =3D PA_SAMPLE_ULAW;
break;
- =
+
case SF_FORMAT_ALAW:
ss.format =3D PA_SAMPLE_ALAW;
break;
Modified: trunk/src/pulsecore/sound-file.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sound-file.=
h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/sound-file.h (original)
+++ trunk/src/pulsecore/sound-file.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/source-output.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/source-outp=
ut.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/source-output.c (original)
+++ trunk/src/pulsecore/source-output.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -45,7 +45,7 @@
=
pa_source_output_new_data* pa_source_output_new_data_init(pa_source_output=
_new_data *data) {
assert(data);
- =
+
memset(data, 0, sizeof(*data));
data->resample_method =3D PA_RESAMPLER_INVALID;
return data;
@@ -69,7 +69,7 @@
pa_core *core,
pa_source_output_new_data *data,
pa_source_output_flags_t flags) {
- =
+
pa_source_output *o;
pa_resampler *resampler =3D NULL;
int r;
@@ -90,15 +90,15 @@
=
CHECK_VALIDITY_RETURN_NULL(data->source);
CHECK_VALIDITY_RETURN_NULL(data->source->state =3D=3D PA_SOURCE_RUNNIN=
G);
- =
+
if (!data->sample_spec_is_set)
data->sample_spec =3D data->source->sample_spec;
- =
+
CHECK_VALIDITY_RETURN_NULL(pa_sample_spec_valid(&data->sample_spec));
=
if (!data->channel_map_is_set)
pa_channel_map_init_auto(&data->channel_map, data->sample_spec.cha=
nnels, PA_CHANNEL_MAP_DEFAULT);
- =
+
CHECK_VALIDITY_RETURN_NULL(pa_channel_map_valid(&data->channel_map));
CHECK_VALIDITY_RETURN_NULL(data->channel_map.channels =3D=3D data->sam=
ple_spec.channels);
=
@@ -106,7 +106,7 @@
data->resample_method =3D core->resample_method;
=
CHECK_VALIDITY_RETURN_NULL(data->resample_method < PA_RESAMPLER_MAX);
- =
+
if (pa_idxset_size(data->source->outputs) >=3D PA_MAX_OUTPUTS_PER_SOUR=
CE) {
pa_log("Failed to create source output: too many outputs per sourc=
e.");
return NULL;
@@ -122,7 +122,7 @@
pa_log_warn("Unsupported resampling operation.");
return NULL;
}
- =
+
o =3D pa_xnew(pa_source_output, 1);
o->ref =3D 1;
o->state =3D PA_SOURCE_OUTPUT_RUNNING;
@@ -131,7 +131,7 @@
o->module =3D data->module;
o->source =3D data->source;
o->client =3D data->client;
- =
+
o->sample_spec =3D data->sample_spec;
o->channel_map =3D data->channel_map;
=
@@ -139,10 +139,10 @@
o->kill =3D NULL;
o->get_latency =3D NULL;
o->userdata =3D NULL;
- =
+
o->resampler =3D resampler;
o->resample_method =3D data->resample_method;
- =
+
r =3D pa_idxset_put(core->source_outputs, o, &o->index);
assert(r =3D=3D 0);
r =3D pa_idxset_put(o->source->outputs, o, NULL);
@@ -153,13 +153,13 @@
o->name,
o->source->name,
pa_sample_spec_snprint(st, sizeof(st), &o->sample_spec));
- =
+
pa_subscription_post(core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBS=
CRIPTION_EVENT_NEW, o->index);
=
/* We do not call pa_source_notify() here, because the virtual
* functions have not yet been initialized */
- =
- return o; =
+
+ return o;
}
=
void pa_source_output_disconnect(pa_source_output*o) {
@@ -167,7 +167,7 @@
assert(o->state !=3D PA_SOURCE_OUTPUT_DISCONNECTED);
assert(o->source);
assert(o->source->core);
- =
+
pa_idxset_remove_by_data(o->source->core->source_outputs, o, NULL);
pa_idxset_remove_by_data(o->source->outputs, o, NULL);
=
@@ -177,7 +177,7 @@
o->push =3D NULL;
o->kill =3D NULL;
o->get_latency =3D NULL;
- =
+
o->state =3D PA_SOURCE_OUTPUT_DISCONNECTED;
}
=
@@ -187,8 +187,8 @@
if (o->state !=3D PA_SOURCE_OUTPUT_DISCONNECTED)
pa_source_output_disconnect(o);
=
- pa_log_info("freed %u \"%s\"", o->index, o->name); =
- =
+ pa_log_info("freed %u \"%s\"", o->index, o->name);
+
if (o->resampler)
pa_resampler_free(o->resampler);
=
@@ -208,7 +208,7 @@
pa_source_output* pa_source_output_ref(pa_source_output *o) {
assert(o);
assert(o->ref >=3D 1);
- =
+
o->ref++;
return o;
}
@@ -223,7 +223,7 @@
=
void pa_source_output_push(pa_source_output *o, const pa_memchunk *chunk) {
pa_memchunk rchunk;
- =
+
assert(o);
assert(chunk);
assert(chunk->length);
@@ -231,7 +231,7 @@
=
if (o->state =3D=3D PA_SOURCE_OUTPUT_CORKED)
return;
- =
+
if (!o->resampler) {
o->push(o, chunk);
return;
@@ -240,7 +240,7 @@
pa_resampler_run(o->resampler, chunk, &rchunk);
if (!rchunk.length)
return;
- =
+
assert(rchunk.memblock);
o->push(o, &rchunk);
pa_memblock_unref(rchunk.memblock);
@@ -255,7 +255,7 @@
=
if (o->name && name && !strcmp(o->name, name))
return;
- =
+
pa_xfree(o->name);
o->name =3D pa_xstrdup(name);
=
@@ -265,7 +265,7 @@
pa_usec_t pa_source_output_get_latency(pa_source_output *o) {
assert(o);
assert(o->ref >=3D 1);
- =
+
if (o->get_latency)
return o->get_latency(o);
=
@@ -274,7 +274,7 @@
=
void pa_source_output_cork(pa_source_output *o, int b) {
int n;
- =
+
assert(o);
assert(o->ref >=3D 1);
=
@@ -282,9 +282,9 @@
return;
=
n =3D o->state =3D=3D PA_SOURCE_OUTPUT_CORKED && !b;
- =
+
o->state =3D b ? PA_SOURCE_OUTPUT_CORKED : PA_SOURCE_OUTPUT_RUNNING;
- =
+
if (n)
pa_source_notify(o->source);
}
@@ -292,7 +292,7 @@
pa_resample_method_t pa_source_output_get_resample_method(pa_source_output=
*o) {
assert(o);
assert(o->ref >=3D 1);
- =
+
if (!o->resampler)
return o->resample_method;
=
@@ -323,12 +323,12 @@
=
/* Try to reuse the old resampler if possible */
new_resampler =3D o->resampler;
- =
+
else if (!pa_sample_spec_equal(&o->sample_spec, &dest->sample_spec) ||
!pa_channel_map_equal(&o->channel_map, &dest->channel_map)) {
=
/* Okey, we need a new resampler for the new sink */
- =
+
if (!(new_resampler =3D pa_resampler_new(
dest->core->mempool,
&dest->sample_spec, &dest->channel_map,
Modified: trunk/src/pulsecore/source-output.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/source-outp=
ut.h?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/source-output.h (original)
+++ trunk/src/pulsecore/source-output.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -47,7 +47,7 @@
int ref;
uint32_t index;
pa_source_output_state_t state;
- =
+
char *name, *driver; /* may be NULL */
pa_module *module; /* may be NULL */
=
@@ -56,14 +56,14 @@
=
pa_sample_spec sample_spec;
pa_channel_map channel_map;
- =
+
void (*push)(pa_source_output *o, const pa_memchunk *chunk);
void (*kill)(pa_source_output* o); /* may be NULL */
pa_usec_t (*get_latency) (pa_source_output *o); /* may be NULL */
=
pa_resampler* resampler; /* may be NULL */
pa_resample_method_t resample_method;
- =
+
void *userdata;
};
=
Modified: trunk/src/pulsecore/source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/source.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/source.c (original)
+++ trunk/src/pulsecore/source.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -52,12 +52,12 @@
int fail,
const pa_sample_spec *spec,
const pa_channel_map *map) {
- =
+
pa_source *s;
char st[256];
int r;
pa_channel_map tmap;
- =
+
assert(core);
assert(name);
assert(spec);
@@ -86,7 +86,7 @@
s->description =3D NULL;
s->driver =3D pa_xstrdup(driver);
s->owner =3D NULL;
- =
+
s->sample_spec =3D *spec;
s->channel_map =3D *map;
=
@@ -112,16 +112,16 @@
assert(s->index !=3D PA_IDXSET_INVALID && r >=3D 0);
=
pa_sample_spec_snprint(st, sizeof(st), spec);
- pa_log_info("created %u \"%s\" with sample spec \"%s\"", s->index, s->=
name, st); =
+ pa_log_info("created %u \"%s\" with sample spec \"%s\"", s->index, s->=
name, st);
=
pa_subscription_post(core, PA_SUBSCRIPTION_EVENT_SOURCE | PA_SUBSCRIPT=
ION_EVENT_NEW, s->index);
- =
+
return s;
}
=
void pa_source_disconnect(pa_source *s) {
pa_source_output *o, *j =3D NULL;
- =
+
assert(s);
assert(s->state =3D=3D PA_SOURCE_RUNNING);
=
@@ -129,7 +129,7 @@
pa_namereg_unregister(s->core, s->name);
=
pa_hook_fire(&s->core->hook_source_disconnect, s);
- =
+
while ((o =3D pa_idxset_first(s->outputs, NULL))) {
assert(o !=3D j);
pa_source_output_kill(o);
@@ -144,18 +144,18 @@
s->set_hw_volume =3D NULL;
s->set_hw_mute =3D NULL;
s->get_hw_mute =3D NULL;
- =
+
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE | PA_SUBSCR=
IPTION_EVENT_REMOVE, s->index);
}
=
static void source_free(pa_source *s) {
assert(s);
assert(!s->ref);
- =
+
if (s->state !=3D PA_SOURCE_DISCONNECTED)
pa_source_disconnect(s);
- =
- pa_log_info("freed %u \"%s\"", s->index, s->name); =
+
+ pa_log_info("freed %u \"%s\"", s->index, s->name);
=
pa_idxset_free(s->outputs, NULL, NULL);
=
@@ -176,7 +176,7 @@
pa_source* pa_source_ref(pa_source *s) {
assert(s);
assert(s->ref >=3D 1);
- =
+
s->ref++;
return s;
}
@@ -192,7 +192,7 @@
static int do_post(void *p, PA_GCC_UNUSED uint32_t idx, PA_GCC_UNUSED int =
*del, void*userdata) {
pa_source_output *o =3D p;
const pa_memchunk *chunk =3D userdata;
- =
+
assert(o);
assert(chunk);
=
@@ -209,7 +209,7 @@
=
if (s->sw_muted || !pa_cvolume_is_norm(&s->sw_volume)) {
pa_memchunk vchunk =3D *chunk;
- =
+
pa_memblock_ref(vchunk.memblock);
pa_memchunk_make_writable(&vchunk, 0);
if (s->sw_muted)
@@ -230,7 +230,7 @@
=
if (m =3D=3D s->owner)
return;
- =
+
s->owner =3D m;
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIP=
TION_EVENT_CHANGE, s->index);
}
@@ -247,19 +247,19 @@
=
void pa_source_set_volume(pa_source *s, pa_mixer_t m, const pa_cvolume *vo=
lume) {
pa_cvolume *v;
- =
+
assert(s);
assert(s->ref >=3D 1);
assert(volume);
=
- if (m =3D=3D PA_MIXER_HARDWARE && s->set_hw_volume) =
+ if (m =3D=3D PA_MIXER_HARDWARE && s->set_hw_volume)
v =3D &s->hw_volume;
else
v =3D &s->sw_volume;
=
if (pa_cvolume_equal(v, volume))
return;
- =
+
*v =3D *volume;
=
if (v =3D=3D &s->hw_volume)
@@ -277,7 +277,7 @@
=
if (s->get_hw_volume)
s->get_hw_volume(s);
- =
+
return &s->hw_volume;
} else
return &s->sw_volume;
@@ -285,18 +285,18 @@
=
void pa_source_set_mute(pa_source *s, pa_mixer_t m, int mute) {
int *t;
- =
- assert(s);
- assert(s->ref >=3D 1);
-
- if (m =3D=3D PA_MIXER_HARDWARE && s->set_hw_mute) =
+
+ assert(s);
+ assert(s->ref >=3D 1);
+
+ if (m =3D=3D PA_MIXER_HARDWARE && s->set_hw_mute)
t =3D &s->hw_muted;
else
t =3D &s->sw_muted;
=
if (!!*t =3D=3D !!mute)
return;
- =
+
*t =3D !!mute;
=
if (t =3D=3D &s->hw_muted)
@@ -314,7 +314,7 @@
=
if (s->get_hw_mute)
s->get_hw_mute(s);
- =
+
return s->hw_muted;
} else
return s->sw_muted;
@@ -329,7 +329,7 @@
=
if (description && s->description && !strcmp(description, s->descripti=
on))
return;
- =
+
pa_xfree(s->description);
s->description =3D pa_xstrdup(description);
=
Modified: trunk/src/pulsecore/source.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/source.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/source.h (original)
+++ trunk/src/pulsecore/source.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -49,10 +49,10 @@
uint32_t index;
pa_core *core;
pa_source_state_t state;
- =
+
char *name;
char *description, *driver; /* may be NULL */
- =
+
pa_module *owner; /* may be NULL */
=
pa_sample_spec sample_spec;
@@ -65,14 +65,14 @@
int hw_muted, sw_muted;
=
int is_hardware;
- =
+
void (*notify)(pa_source*source); /* may be NULL */
pa_usec_t (*get_latency)(pa_source *s); /* dito */
int (*set_hw_volume)(pa_source *s); /* dito */
- int (*get_hw_volume)(pa_source *s); /* dito */ =
+ int (*get_hw_volume)(pa_source *s); /* dito */
int (*set_hw_mute)(pa_source *s); /* dito */
int (*get_hw_mute)(pa_source *s); /* dito */
- =
+
void *userdata;
};
=
Modified: trunk/src/pulsecore/strbuf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/strbuf.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/strbuf.c (original)
+++ trunk/src/pulsecore/strbuf.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -84,7 +84,7 @@
*e =3D 0;
=
assert(e =3D=3D t+sb->length);
- =
+
return t;
}
=
@@ -124,10 +124,10 @@
void pa_strbuf_putsn(pa_strbuf *sb, const char *t, size_t l) {
struct chunk *c;
assert(sb && t);
- =
+
if (!l)
return;
- =
+
c =3D pa_xmalloc(sizeof(struct chunk)+l);
c->length =3D l;
memcpy(CHUNK_TO_TEXT(c), t, l);
@@ -142,7 +142,7 @@
struct chunk *c =3D NULL;
=
assert(sb);
- =
+
for(;;) {
va_list ap;
int r;
@@ -152,7 +152,7 @@
va_start(ap, format);
r =3D vsnprintf(CHUNK_TO_TEXT(c), size, format, ap);
va_end(ap);
- =
+
if (r > -1 && r < size) {
c->length =3D r;
append(sb, c);
@@ -160,7 +160,7 @@
}
=
if (r > -1) /* glibc 2.1 */
- size =3D r+1; =
+ size =3D r+1;
else /* glibc 2.0 */
size *=3D 2;
}
Modified: trunk/src/pulsecore/strbuf.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/strbuf.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/strbuf.h (original)
+++ trunk/src/pulsecore/strbuf.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/strlist.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/strlist.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/strlist.c (original)
+++ trunk/src/pulsecore/strlist.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -69,7 +69,7 @@
while (l) {
if (!strcmp(l->str, s)) {
pa_strlist *n =3D l->next;
- =
+
if (!prev) {
assert(ret =3D=3D l);
ret =3D n;
@@ -80,7 +80,7 @@
pa_xfree(l);
=
l =3D n;
- =
+
} else {
prev =3D l;
l =3D l->next;
@@ -103,12 +103,12 @@
pa_strlist* pa_strlist_pop(pa_strlist *l, char **s) {
pa_strlist *r;
assert(s);
- =
+
if (!l) {
*s =3D NULL;
return NULL;
}
- =
+
*s =3D l->str;
r =3D l->next;
pa_xfree(l);
Modified: trunk/src/pulsecore/strlist.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/strlist.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/strlist.h (original)
+++ trunk/src/pulsecore/strlist.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/tagstruct.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/tagstruct.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/tagstruct.c (original)
+++ trunk/src/pulsecore/tagstruct.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -53,7 +53,7 @@
pa_tagstruct*t;
=
assert(!data || (data && length));
- =
+
t =3D pa_xmalloc(sizeof(pa_tagstruct));
t->data =3D (uint8_t*) data;
t->allocated =3D t->length =3D data ? length : 0;
@@ -61,7 +61,7 @@
t->dynamic =3D !data;
return t;
}
- =
+
void pa_tagstruct_free(pa_tagstruct*t) {
assert(t);
if (t->dynamic)
@@ -203,13 +203,13 @@
=
void pa_tagstruct_put_channel_map(pa_tagstruct *t, const pa_channel_map *m=
ap) {
unsigned i;
- =
+
assert(t);
extend(t, 2 + map->channels);
=
t->data[t->length++] =3D PA_TAG_CHANNEL_MAP;
t->data[t->length++] =3D map->channels;
- =
+
for (i =3D 0; i < map->channels; i ++)
t->data[t->length++] =3D (uint8_t) map->map[i];
}
@@ -217,13 +217,13 @@
void pa_tagstruct_put_cvolume(pa_tagstruct *t, const pa_cvolume *cvolume) {
unsigned i;
pa_volume_t vol;
- =
+
assert(t);
extend(t, 2 + cvolume->channels * sizeof(pa_volume_t));
=
t->data[t->length++] =3D PA_TAG_CVOLUME;
t->data[t->length++] =3D cvolume->channels;
- =
+
for (i =3D 0; i < cvolume->channels; i ++) {
vol =3D htonl(cvolume->values[i]);
memcpy(t->data + t->length, &vol, sizeof(pa_volume_t));
@@ -245,10 +245,10 @@
*s =3D NULL;
return 0;
}
- =
+
if (t->rindex+2 > t->length)
return -1;
- =
+
if (t->data[t->rindex] !=3D PA_TAG_STRING)
return -1;
=
@@ -305,7 +305,7 @@
=
if (t->data[t->rindex] !=3D PA_TAG_SAMPLE_SPEC)
return -1;
- =
+
ss->format =3D t->data[t->rindex+1];
ss->channels =3D t->data[t->rindex+2];
memcpy(&ss->rate, t->data+t->rindex+3, 4);
@@ -318,7 +318,7 @@
int pa_tagstruct_get_arbitrary(pa_tagstruct *t, const void **p, size_t len=
gth) {
uint32_t len;
assert(t && p);
- =
+
if (t->rindex+5+length > t->length)
return -1;
=
@@ -357,7 +357,7 @@
*b =3D 0;
else
return -1;
- =
+
t->rindex +=3D1;
return 0;
}
@@ -434,7 +434,7 @@
=
int pa_tagstruct_get_channel_map(pa_tagstruct *t, pa_channel_map *map) {
unsigned i;
- =
+
assert(t);
assert(map);
=
@@ -449,7 +449,7 @@
=
if (t->rindex+2+map->channels > t->length)
return -1;
- =
+
for (i =3D 0; i < map->channels; i ++)
map->map[i] =3D (int8_t) t->data[t->rindex + 2 + i];
=
@@ -460,7 +460,7 @@
int pa_tagstruct_get_cvolume(pa_tagstruct *t, pa_cvolume *cvolume) {
unsigned i;
pa_volume_t vol;
- =
+
assert(t);
assert(cvolume);
=
@@ -475,7 +475,7 @@
=
if (t->rindex+2+cvolume->channels*sizeof(pa_volume_t) > t->length)
return -1;
- =
+
for (i =3D 0; i < cvolume->channels; i ++) {
memcpy(&vol, t->data + t->rindex + 2 + i * sizeof(pa_volume_t), si=
zeof(pa_volume_t));
cvolume->values[i] =3D (pa_volume_t) ntohl(vol);
@@ -488,7 +488,7 @@
void pa_tagstruct_put(pa_tagstruct *t, ...) {
va_list va;
assert(t);
- =
+
va_start(va, t);
=
for (;;) {
@@ -551,16 +551,16 @@
abort();
}
}
- =
+
va_end(va);
}
=
int pa_tagstruct_get(pa_tagstruct *t, ...) {
va_list va;
int ret =3D 0;
- =
- assert(t);
- =
+
+ assert(t);
+
va_start(va, t);
while (ret =3D=3D 0) {
int tag =3D va_arg(va, int);
@@ -618,11 +618,11 @@
ret =3D pa_tagstruct_get_cvolume(t, va_arg(va, pa_cvolume =
*));
break;
=
- =
+
default:
abort();
}
- =
+
}
=
va_end(va);
Modified: trunk/src/pulsecore/tagstruct.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/tagstruct.h=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/tagstruct.h (original)
+++ trunk/src/pulsecore/tagstruct.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/thread-posix.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/thread-posi=
x.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/thread-posix.c (original)
+++ trunk/src/pulsecore/thread-posix.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -58,8 +58,8 @@
pa_thread *t =3D p;
=
assert(t);
- =
- if (!t->thread_func) =
+
+ if (!t->thread_func)
/* This is a foreign thread, we need to free the struct */
pa_xfree(t);
}
@@ -76,13 +76,13 @@
t->id =3D pthread_self();
=
pa_once(&thread_tls_once, thread_tls_once_func);
- =
+
pa_tls_set(thread_tls, t);
- =
+
pa_atomic_inc(&t->running);
t->thread_func(t->userdata);
pa_atomic_add(&t->running, -2);
- =
+
return NULL;
}
=
@@ -90,7 +90,7 @@
pa_thread *t;
=
assert(thread_func);
- =
+
t =3D pa_xnew(pa_thread, 1);
t->thread_func =3D thread_func;
t->userdata =3D userdata;
@@ -116,7 +116,7 @@
=
int policy;
struct sched_param param;
- =
+
return pthread_getschedparam(t->id, &policy, ¶m) >=3D 0 || err=
no !=3D ESRCH;
}
=
@@ -125,20 +125,20 @@
=
void pa_thread_free(pa_thread *t) {
assert(t);
- =
+
pa_thread_join(t);
pa_xfree(t);
}
=
int pa_thread_join(pa_thread *t) {
assert(t);
- =
+
return pthread_join(t->id, NULL);
}
=
pa_thread* pa_thread_self(void) {
pa_thread *t;
- =
+
pa_once(&thread_tls_once, thread_tls_once_func);
=
if ((t =3D pa_tls_get(thread_tls)))
@@ -146,7 +146,7 @@
=
/* This is a foreign thread, let's create a pthread structure to
* make sure that we can always return a sensible pointer */
- =
+
t =3D pa_xnew(pa_thread, 1);
t->id =3D pthread_self();
t->thread_func =3D NULL;
@@ -154,7 +154,7 @@
pa_atomic_store(&t->running, 2);
=
pa_tls_set(thread_tls, t);
- =
+
return t;
}
=
@@ -187,7 +187,7 @@
pa_xfree(t);
return NULL;
}
- =
+
return t;
}
=
@@ -200,13 +200,13 @@
=
void *pa_tls_get(pa_tls *t) {
assert(t);
- =
+
return pthread_getspecific(t->key);
}
=
void *pa_tls_set(pa_tls *t, void *userdata) {
void *r;
- =
+
r =3D pthread_getspecific(t->key);
ASSERT_SUCCESS(pthread_setspecific(t->key, userdata));
return r;
Modified: trunk/src/pulsecore/thread-win32.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/thread-win3=
2.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/thread-win32.c (original)
+++ trunk/src/pulsecore/thread-win32.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/thread.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/thread.h?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/thread.h (original)
+++ trunk/src/pulsecore/thread.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/tokenizer.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/tokenizer.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/tokenizer.c (original)
+++ trunk/src/pulsecore/tokenizer.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -69,7 +69,7 @@
=
pa_tokenizer* pa_tokenizer_new(const char *s, unsigned args) {
pa_tokenizer *t;
- =
+
t =3D pa_xmalloc(sizeof(pa_tokenizer));
t->dynarray =3D pa_dynarray_new();
assert(t->dynarray);
Modified: trunk/src/pulsecore/tokenizer.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/tokenizer.h=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/tokenizer.h (original)
+++ trunk/src/pulsecore/tokenizer.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/pulsecore/x11prop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/x11prop.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/x11prop.c (original)
+++ trunk/src/pulsecore/x11prop.c Thu Jan 4 14:43:45 2007
@@ -48,7 +48,7 @@
unsigned long nbytes_after;
unsigned char *prop =3D NULL;
char *ret =3D NULL;
- =
+
Atom a =3D XInternAtom(d, name, False);
if (XGetWindowProperty(d, RootWindow(d, 0), a, 0, (l+2)/4, False, XA_S=
TRING, &actual_type, &actual_format, &nitems, &nbytes_after, &prop) !=3D Su=
ccess)
goto finish;
@@ -65,6 +65,6 @@
=
if (prop)
XFree(prop);
- =
+
return ret;
}
Modified: trunk/src/pulsecore/x11wrap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/x11wrap.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/x11wrap.c (original)
+++ trunk/src/pulsecore/x11wrap.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -42,7 +42,7 @@
struct pa_x11_wrapper {
pa_core *core;
int ref;
- =
+
char *property_name;
Display *display;
=
@@ -63,7 +63,7 @@
/* Dispatch all pending X11 events */
static void work(pa_x11_wrapper *w) {
assert(w && w->ref >=3D 1);
- =
+
while (XPending(w->display)) {
pa_x11_client *c;
XEvent e;
@@ -90,7 +90,7 @@
assert(m && e && w && w->ref >=3D 1);
=
m->defer_enable(e, 0);
- =
+
work(w);
}
=
@@ -154,7 +154,7 @@
w->ref =3D 1;
w->property_name =3D pa_xstrdup(t);
w->display =3D d;
- =
+
PA_LLIST_HEAD_INIT(pa_x11_client, w->clients);
PA_LLIST_HEAD_INIT(pa_x11_internal, w->internals);
=
@@ -162,10 +162,10 @@
w->io_event =3D c->mainloop->io_new(c->mainloop, ConnectionNumber(d), =
PA_IO_EVENT_INPUT, display_io_event, w);
=
XAddConnectionWatch(d, x11_watch, (XPointer) w);
- =
+
r =3D pa_property_set(c, w->property_name, w);
assert(r >=3D 0);
- =
+
return w;
}
=
@@ -180,13 +180,13 @@
=
XRemoveConnectionWatch(w->display, x11_watch, (XPointer) w);
XCloseDisplay(w->display);
- =
+
w->core->mainloop->io_free(w->io_event);
w->core->mainloop->defer_free(w->defer_event);
=
while (w->internals)
x11_internal_remove(w, w->internals);
- =
+
pa_xfree(w->property_name);
pa_xfree(w);
}
@@ -195,7 +195,7 @@
char t[256];
pa_x11_wrapper *w;
assert(c);
- =
+
snprintf(t, sizeof(t), "x11-wrapper%s%s", name ? "-" : "", name ? name=
: "");
if ((w =3D pa_property_get(c, t)))
return pa_x11_wrapper_ref(w);
@@ -221,7 +221,7 @@
=
/* Somebody is using us, schedule a output buffer flush */
w->core->mainloop->defer_enable(w->defer_event, 1);
- =
+
return w->display;
}
=
Modified: trunk/src/pulsecore/x11wrap.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/x11wrap.h?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/x11wrap.h (original)
+++ trunk/src/pulsecore/x11wrap.h Thu Jan 4 14:43:45 2007
@@ -5,17 +5,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/tests/channelmap-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/channelmap-test=
.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/channelmap-test.c (original)
+++ trunk/src/tests/channelmap-test.c Thu Jan 4 14:43:45 2007
@@ -11,23 +11,23 @@
pa_channel_map map, map2;
=
pa_channel_map_init_auto(&map, 6, PA_CHANNEL_MAP_AIFF);
- =
+
fprintf(stderr, "map: <%s>\n", pa_channel_map_snprint(cm, sizeof(cm), =
&map));
=
pa_channel_map_init_auto(&map, 6, PA_CHANNEL_MAP_AUX);
- =
+
fprintf(stderr, "map: <%s>\n", pa_channel_map_snprint(cm, sizeof(cm), =
&map));
=
pa_channel_map_init_auto(&map, 6, PA_CHANNEL_MAP_ALSA);
- =
+
fprintf(stderr, "map: <%s>\n", pa_channel_map_snprint(cm, sizeof(cm), =
&map));
- =
+
pa_channel_map_parse(&map2, cm);
=
assert(pa_channel_map_equal(&map, &map2));
=
pa_channel_map_parse(&map2, "left,test");
=
- =
+
return 0;
}
Modified: trunk/src/tests/cpulimit-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/cpulimit-test.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/cpulimit-test.c (original)
+++ trunk/src/tests/cpulimit-test.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -47,7 +47,7 @@
static void func(pa_mainloop_api *m, PA_GCC_UNUSED pa_signal_event *e, PA_=
GCC_UNUSED int sig, PA_GCC_UNUSED void *userdata) {
time_t now;
time(&now);
- =
+
if ((now - start) >=3D 30) {
m->quit(m, 1);
fprintf(stderr, "Test failed\n");
@@ -59,7 +59,7 @@
=
int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
pa_mainloop *m;
- =
+
m =3D pa_mainloop_new();
assert(m);
=
@@ -77,7 +77,7 @@
for (;;) {
time_t now;
time(&now);
- =
+
if ((now - start) >=3D 30) {
fprintf(stderr, "Test failed\n");
break;
@@ -86,7 +86,7 @@
#endif
=
pa_cpu_limit_done();
- =
+
pa_mainloop_free(m);
=
return 0;
Modified: trunk/src/tests/flist-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/flist-test.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/flist-test.c (original)
+++ trunk/src/tests/flist-test.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -41,7 +41,7 @@
=
static void spin(void) {
int k;
- =
+
/* Spin a little */
k =3D rand() % 10000;
for (; k > 0; k--)
@@ -100,6 +100,6 @@
pa_thread_free(threads[i]);
=
pa_flist_free(flist, pa_xfree);
- =
+
return 0;
}
Modified: trunk/src/tests/get-binary-name-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/get-binary-name=
-test.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/get-binary-name-test.c (original)
+++ trunk/src/tests/get-binary-name-test.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
Modified: trunk/src/tests/hook-list-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/hook-list-test.=
c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/hook-list-test.c (original)
+++ trunk/src/tests/hook-list-test.c Thu Jan 4 14:43:45 2007
@@ -22,7 +22,7 @@
pa_hook_connect(&hook, (pa_hook_cb_t) func1, (void*) "slot1");
slot =3D pa_hook_connect(&hook, (pa_hook_cb_t) func2, (void*) "slot2");
pa_hook_connect(&hook, (pa_hook_cb_t) func1, (void*) "slot3");
- =
+
pa_hook_fire(&hook, (void*) "call1");
=
pa_hook_slot_free(slot);
@@ -30,6 +30,6 @@
pa_hook_fire(&hook, (void*) "call2");
=
pa_hook_free(&hook);
- =
+
return 0;
}
Modified: trunk/src/tests/interpol-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/interpol-test.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/interpol-test.c (original)
+++ trunk/src/tests/interpol-test.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -57,7 +57,7 @@
case PA_CONTEXT_AUTHORIZING:
case PA_CONTEXT_SETTING_NAME:
break;
- =
+
case PA_CONTEXT_READY: {
=
static const pa_sample_spec ss =3D {
@@ -65,18 +65,18 @@
.rate =3D 44100,
.channels =3D 1
};
- =
+
fprintf(stderr, "Connection established.\n");
=
stream =3D pa_stream_new(c, "interpol-test", &ss, NULL);
assert(stream);
- =
+
pa_stream_connect_playback(stream, NULL, NULL, PA_STREAM_INTER=
POLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL);
pa_stream_set_write_callback(stream, stream_write_cb, NULL);
- =
+
break;
}
- =
+
case PA_CONTEXT_TERMINATED:
break;
=
@@ -108,19 +108,19 @@
assert(r >=3D 0);
=
pa_gettimeofday(&start);
- =
+
pa_threaded_mainloop_start(m);
=
for (k =3D 0; k < 5000; k++) {
int success =3D 0, changed =3D 0;
pa_usec_t t, rtc;
struct timeval now, tv;
- =
+
pa_threaded_mainloop_lock(m);
=
if (stream) {
const pa_timing_info *info;
- =
+
if (pa_stream_get_time(stream, &t) >=3D 0)
success =3D 1;
=
@@ -130,9 +130,9 @@
last_info =3D info->timestamp;
}
}
- =
+
pa_threaded_mainloop_unlock(m);
- =
+
if (success) {
pa_gettimeofday(&now);
=
@@ -156,7 +156,7 @@
pa_stream_disconnect(stream);
pa_stream_unref(stream);
}
- =
+
if (context) {
pa_context_disconnect(context);
pa_context_unref(context);
@@ -164,6 +164,6 @@
=
if (m)
pa_threaded_mainloop_free(m);
- =
+
return 0;
}
Modified: trunk/src/tests/ipacl-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/ipacl-test.c?re=
v=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/ipacl-test.c (original)
+++ trunk/src/tests/ipacl-test.c Thu Jan 4 14:43:45 2007
@@ -37,13 +37,13 @@
int r;
pa_ip_acl *acl;
=
- fd =3D socket(PF_INET, SOCK_STREAM, 0); =
+ fd =3D socket(PF_INET, SOCK_STREAM, 0);
assert(fd >=3D 0);
- =
+
sa.sin_family =3D AF_INET;
sa.sin_port =3D htons(22);
sa.sin_addr.s_addr =3D inet_addr("127.0.0.1");
- =
+
r =3D connect(fd, (struct sockaddr*) &sa, sizeof(sa));
assert(r >=3D 0);
=
@@ -66,7 +66,7 @@
assert(acl);
printf("result=3D%u (should be 1)\n", pa_ip_acl_check(acl, fd));
pa_ip_acl_free(acl);
- =
+
acl =3D pa_ip_acl_new("127.0.0.2");
assert(acl);
printf("result=3D%u (should be 0)\n", pa_ip_acl_check(acl, fd));
@@ -86,7 +86,7 @@
assert(acl);
printf("result=3D%u (should be 0)\n", pa_ip_acl_check(acl, fd));
pa_ip_acl_free(acl);
- =
+
close(fd);
=
fd =3D socket(PF_INET6, SOCK_STREAM, 0);
@@ -96,7 +96,7 @@
sa6.sin6_family =3D AF_INET6;
sa6.sin6_port =3D htons(22);
inet_pton(AF_INET6, "::1", &sa6.sin6_addr);
- =
+
r =3D connect(fd, (struct sockaddr*) &sa6, sizeof(sa6));
assert(r >=3D 0);
=
@@ -131,6 +131,6 @@
pa_ip_acl_free(acl);
=
close(fd);
- =
+
return 0;
}
Modified: trunk/src/tests/mainloop-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/mainloop-test.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/mainloop-test.c (original)
+++ trunk/src/tests/mainloop-test.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -121,6 +121,6 @@
#else
pa_mainloop_free(m);
#endif
- =
+
return 0;
}
Modified: trunk/src/tests/mcalign-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/mcalign-test.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/mcalign-test.c (original)
+++ trunk/src/tests/mcalign-test.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -45,7 +45,7 @@
p =3D pa_mempool_new(0);
=
a =3D pa_mcalign_new(11);
- =
+
pa_memchunk_reset(&c);
=
srand(time(NULL));
@@ -64,7 +64,7 @@
l =3D c.memblock->length - c.index;
=
l =3D l <=3D 1 ? l : rand() % (l-1) +1 ;
- =
+
if ((r =3D read(STDIN_FILENO, (uint8_t*) c.memblock->data + c.inde=
x, l)) <=3D 0) {
fprintf(stderr, "read() failed: %s\n", r < 0 ? strerror(errno)=
: "EOF");
break;
Modified: trunk/src/tests/memblock-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/memblock-test.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/memblock-test.c (original)
+++ trunk/src/tests/memblock-test.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -78,7 +78,7 @@
size_t offset, size;
=
const char txt[] =3D "This is a test!";
- =
+
pool_a =3D pa_mempool_new(1);
pool_b =3D pa_mempool_new(1);
pool_c =3D pa_mempool_new(1);
@@ -86,9 +86,9 @@
pa_mempool_get_shm_id(pool_a, &id_a);
pa_mempool_get_shm_id(pool_b, &id_b);
pa_mempool_get_shm_id(pool_c, &id_c);
- =
+
assert(pool_a && pool_b && pool_c);
- =
+
blocks[0] =3D pa_memblock_new_fixed(pool_a, (void*) txt, sizeof(txt), =
1);
blocks[1] =3D pa_memblock_new(pool_a, sizeof(txt));
snprintf(blocks[1]->data, blocks[1]->length, "%s", txt);
@@ -102,23 +102,23 @@
=
mb_a =3D blocks[i];
assert(mb_a);
- =
+
export_a =3D pa_memexport_new(pool_a, revoke_cb, (void*) "A");
export_b =3D pa_memexport_new(pool_b, revoke_cb, (void*) "B");
- =
+
assert(export_a && export_b);
- =
+
import_b =3D pa_memimport_new(pool_b, release_cb, (void*) "B");
import_c =3D pa_memimport_new(pool_c, release_cb, (void*) "C");
- =
+
assert(import_b && import_c);
- =
+
r =3D pa_memexport_put(export_a, mb_a, &id, &shm_id, &offset, &siz=
e);
assert(r >=3D 0);
assert(shm_id =3D=3D id_a);
=
printf("A: Memory block exported as %u\n", id);
- =
+
mb_b =3D pa_memimport_get(import_b, id, shm_id, offset, size);
assert(mb_b);
r =3D pa_memexport_put(export_b, mb_b, &id, &shm_id, &offset, &siz=
e);
@@ -127,7 +127,7 @@
pa_memblock_unref(mb_b);
=
printf("B: Memory block exported as %u\n", id);
- =
+
mb_c =3D pa_memimport_get(import_c, id, shm_id, offset, size);
assert(mb_c);
printf("1 data=3D%s\n", (char*) mb_c->data);
@@ -135,21 +135,21 @@
print_stats(pool_a, "A");
print_stats(pool_b, "B");
print_stats(pool_c, "C");
- =
+
pa_memexport_free(export_b);
printf("2 data=3D%s\n", (char*) mb_c->data);
pa_memblock_unref(mb_c);
- =
+
pa_memimport_free(import_b);
- =
+
pa_memblock_unref(mb_a);
- =
+
pa_memimport_free(import_c);
pa_memexport_free(export_a);
}
=
printf("vaccuuming...\n");
- =
+
pa_mempool_vacuum(pool_a);
pa_mempool_vacuum(pool_b);
pa_mempool_vacuum(pool_c);
Modified: trunk/src/tests/memblockq-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/memblockq-test.=
c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/memblockq-test.c (original)
+++ trunk/src/tests/memblockq-test.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -41,7 +41,7 @@
pa_log_set_maximal_level(PA_LOG_DEBUG);
=
p =3D pa_mempool_new(0);
- =
+
silence =3D pa_memblock_new_fixed(p, (char*) "__", 2, 1);
assert(silence);
=
@@ -52,7 +52,7 @@
chunk1.index =3D 0;
chunk1.length =3D 2;
assert(chunk1.memblock);
- =
+
chunk2.memblock =3D pa_memblock_new_fixed(p, (char*) "TTBB", 4, 1);
chunk2.index =3D 2;
chunk2.length =3D 2;
@@ -70,13 +70,13 @@
=
ret =3D pa_memblockq_push(bq, &chunk1);
assert(ret =3D=3D 0);
- =
+
ret =3D pa_memblockq_push(bq, &chunk1);
assert(ret =3D=3D 0);
- =
+
ret =3D pa_memblockq_push(bq, &chunk2);
assert(ret =3D=3D 0);
- =
+
ret =3D pa_memblockq_push(bq, &chunk2);
assert(ret =3D=3D 0);
=
@@ -115,19 +115,19 @@
=
chunk3.index +=3D 2;
chunk3.length -=3D 2;
- =
+
ret =3D pa_memblockq_push(bq, &chunk3);
assert(ret =3D=3D 0);
- =
+
printf(">");
=
pa_memblockq_shorten(bq, 6);
- =
+
for (;;) {
pa_memchunk out;
char *e;
size_t n;
- =
+
if (pa_memblockq_peek(bq, &out) < 0)
break;
=
@@ -137,15 +137,15 @@
pa_memblock_unref(out.memblock);
pa_memblockq_drop(bq, &out, out.length);
}
- =
+
printf("<\n");
- =
+
pa_memblockq_free(bq);
pa_memblock_unref(silence);
pa_memblock_unref(chunk1.memblock);
pa_memblock_unref(chunk2.memblock);
pa_memblock_unref(chunk3.memblock);
pa_memblock_unref(chunk4.memblock);
- =
+
return 0;
}
Modified: trunk/src/tests/pacat-simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/pacat-simple.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/pacat-simple.c (original)
+++ trunk/src/tests/pacat-simple.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -43,7 +43,7 @@
.rate =3D 44100,
.channels =3D 2
};
- =
+
pa_simple *s =3D NULL;
int ret =3D 1;
int error;
@@ -61,10 +61,10 @@
fprintf(stderr, __FILE__": dup2() failed: %s\n", strerror(errn=
o));
goto finish;
}
- =
+
close(fd);
}
- =
+
/* Create a new playback stream */
if (!(s =3D pa_simple_new(NULL, argv[0], PA_STREAM_PLAYBACK, NULL, "pl=
ayback", &ss, NULL, NULL, &error))) {
fprintf(stderr, __FILE__": pa_simple_new() failed: %s\n", pa_strer=
ror(error));
@@ -90,7 +90,7 @@
if ((r =3D read(STDIN_FILENO, buf, sizeof(buf))) <=3D 0) {
if (r =3D=3D 0) /* EOF */
break;
- =
+
fprintf(stderr, __FILE__": read() failed: %s\n", strerror(errn=
o));
goto finish;
}
@@ -114,6 +114,6 @@
=
if (s)
pa_simple_free(s);
- =
+
return ret;
}
Modified: trunk/src/tests/parec-simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/parec-simple.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/parec-simple.c (original)
+++ trunk/src/tests/parec-simple.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -46,7 +46,7 @@
=
if (r =3D=3D 0)
break;
- =
+
ret +=3D r;
data =3D (const uint8_t*) data + r;
size -=3D r;
@@ -95,6 +95,6 @@
=
if (s)
pa_simple_free(s);
- =
+
return ret;
}
Modified: trunk/src/tests/strlist-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/strlist-test.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/strlist-test.c (original)
+++ trunk/src/tests/strlist-test.c Thu Jan 4 14:43:45 2007
@@ -16,7 +16,7 @@
=
t =3D pa_strlist_tostring(l);
pa_strlist_free(l);
- =
+
fprintf(stderr, "1: %s\n", t);
=
l =3D pa_strlist_parse(t);
@@ -29,9 +29,9 @@
l =3D pa_strlist_pop(l, &u);
fprintf(stderr, "3: %s\n", u);
pa_xfree(u);
- =
+
l =3D pa_strlist_remove(l, "c");
- =
+
t =3D pa_strlist_tostring(l);
fprintf(stderr, "4: %s\n", t);
pa_xfree(t);
Modified: trunk/src/tests/sync-playback.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/sync-playback.c=
?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/sync-playback.c (original)
+++ trunk/src/tests/sync-playback.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -67,7 +67,7 @@
int i =3D (int) (long) userdata;
=
fprintf(stderr, "Stream %i finished\n", i);
- =
+
if (++n_streams_ready >=3D 2*NSTREAMS) {
fprintf(stderr, "We're done\n");
mainloop_api->quit(mainloop_api, 0);
@@ -89,19 +89,19 @@
int r, i =3D (int) (long) userdata;
=
fprintf(stderr, "Writing data to stream %i.\n", i);
- =
+
r =3D pa_stream_write(s, data, sizeof(data), nop_free_cb, size=
of(data) * i, PA_SEEK_ABSOLUTE);
assert(r =3D=3D 0);
=
/* Be notified when this stream is drained */
pa_stream_set_underflow_callback(s, underflow_cb, userdata);
- =
+
/* All streams have been set up, let's go! */
if (++n_streams_ready >=3D NSTREAMS) {
fprintf(stderr, "Uncorking\n");
pa_operation_unref(pa_stream_cork(s, 0, NULL, NULL));
}
- =
+
break;
}
=
@@ -121,7 +121,7 @@
case PA_CONTEXT_AUTHORIZING:
case PA_CONTEXT_SETTING_NAME:
break;
- =
+
case PA_CONTEXT_READY: {
=
int i;
@@ -131,18 +131,18 @@
char name[64];
=
fprintf(stderr, "Creating stream %i\n", i);
- =
+
snprintf(name, sizeof(name), "stream #%i", i);
- =
+
streams[i] =3D pa_stream_new(c, name, &sample_spec, NULL);
assert(streams[i]);
pa_stream_set_state_callback(streams[i], stream_state_call=
back, (void*) (long) i);
pa_stream_connect_playback(streams[i], NULL, &buffer_attr,=
PA_STREAM_START_CORKED, NULL, i =3D=3D 0 ? NULL : streams[0]);
}
- =
+
break;
}
- =
+
case PA_CONTEXT_TERMINATED:
mainloop_api->quit(mainloop_api, 0);
break;
@@ -163,7 +163,7 @@
=
for (i =3D 0; i < NSTREAMS; i++)
streams[i] =3D NULL;
- =
+
/* Set up a new main loop */
m =3D pa_mainloop_new();
assert(m);
@@ -187,6 +187,6 @@
pa_stream_unref(streams[i]);
=
pa_mainloop_free(m);
- =
+
return ret;
}
Modified: trunk/src/tests/thread-mainloop-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/thread-mainloop=
-test.c?rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/thread-mainloop-test.c (original)
+++ trunk/src/tests/thread-mainloop-test.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -53,19 +53,19 @@
pa_threaded_mainloop_start(m);
=
pa_threaded_mainloop_lock(m);
- =
+
pa_gettimeofday(&tv);
tv.tv_sec +=3D 5;
a->time_new(a, &tv, tcb, m);
- =
+
fprintf(stderr, "waiting 5s (signal)\n");
pa_threaded_mainloop_wait(m);
fprintf(stderr, "wait completed\n");
pa_threaded_mainloop_accept(m);
fprintf(stderr, "signal accepted\n");
- =
+
pa_threaded_mainloop_unlock(m);
- =
+
fprintf(stderr, "waiting 5s (sleep)\n");
pa_msleep(5000);
=
Modified: trunk/src/tests/thread-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/thread-test.c?r=
ev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/thread-test.c (original)
+++ trunk/src/tests/thread-test.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -48,7 +48,7 @@
pa_tls_set(tls, data);
=
pa_log("thread_func() for %s starting...", (char*) pa_tls_get(tls));
- =
+
pa_mutex_lock(mutex);
=
for (;;) {
@@ -57,13 +57,13 @@
pa_log("%s waiting ...", (char*) pa_tls_get(tls));
=
for (;;) {
- =
+
if (magic_number < 0)
goto quit;
=
if (magic_number !=3D 0)
break;
- =
+
pa_cond_wait(cond1, mutex);
}
=
@@ -75,18 +75,18 @@
pa_once(&once, once_func);
=
pa_cond_signal(cond2, 0);
- =
+
pa_log("%s got number %i", (char*) pa_tls_get(tls), k);
- =
+
/* Spin! */
for (n =3D 0; n < k; n++)
pa_thread_yield();
- =
+
pa_mutex_lock(mutex);
}
=
quit:
- =
+
pa_mutex_unlock(mutex);
=
pa_log("thread_func() for %s done...", (char*) pa_tls_get(tls));
@@ -97,25 +97,25 @@
pa_thread* t[THREADS_MAX];
=
assert(pa_thread_is_running(pa_thread_self()));
- =
+
mutex =3D pa_mutex_new(0);
cond1 =3D pa_cond_new();
cond2 =3D pa_cond_new();
tls =3D pa_tls_new(pa_xfree);
- =
+
for (i =3D 0; i < THREADS_MAX; i++) {
t[i] =3D pa_thread_new(thread_func, pa_sprintf_malloc("Thread #%i"=
, i+1));
assert(t[i]);
}
=
pa_mutex_lock(mutex);
- =
+
pa_log("loop-init");
=
for (k =3D 0; k < 100; k++) {
assert(magic_number =3D=3D 0);
=
- =
+
magic_number =3D (int) rand() % 0x10000;
=
pa_log("iteration %i (%i)", k, magic_number);
@@ -126,10 +126,10 @@
}
=
pa_log("loop-exit");
- =
+
magic_number =3D -1;
pa_cond_signal(cond1, 1);
- =
+
pa_mutex_unlock(mutex);
=
for (i =3D 0; i < THREADS_MAX; i++)
Modified: trunk/src/tests/utf8-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/utf8-test.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/utf8-test.c (original)
+++ trunk/src/tests/utf8-test.c Thu Jan 4 14:43:45 2007
@@ -8,13 +8,13 @@
=
int main(int argc, char *argv[]) {
char *c;
- =
+
assert(pa_utf8_valid("hallo"));
assert(pa_utf8_valid("hallo\n"));
assert(!pa_utf8_valid("h=C3=BCpfburg\n"));
assert(pa_utf8_valid("hallo\n"));
assert(pa_utf8_valid("h=C3=83=C2=BCpfburg\n"));
- =
+
printf("LATIN1: %s\n", c =3D pa_utf8_filter("h=C3=BCpfburg"));
pa_xfree(c);
printf("UTF8: %sx\n", c =3D pa_utf8_filter("h=C3=83=C2=BCpfburg"));
Modified: trunk/src/tests/voltest.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/voltest.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/tests/voltest.c (original)
+++ trunk/src/tests/voltest.c Thu Jan 4 14:43:45 2007
@@ -12,7 +12,7 @@
=
double dB =3D pa_sw_volume_to_dB(v);
double f =3D pa_sw_volume_to_linear(v);
- =
+
printf("Volume: %3i; percent: %i%%; decibel %0.2f; linear =3D %0.2=
f; volume(decibel): %3i; volume(linear): %3i\n",
v, (v*100)/PA_VOLUME_NORM, dB, f, pa_sw_volume_from_dB(dB),=
pa_sw_volume_from_linear(f));
=
Modified: trunk/src/utils/pabrowse.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pabrowse.c?rev=
=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/utils/pabrowse.c (original)
+++ trunk/src/utils/pabrowse.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -40,7 +40,7 @@
=
if (i->cookie)
snprintf(t, sizeof(t), "0x%08x", *i->cookie);
- =
+
printf("server: %s\n"
"server-version: %s\n"
"user-name: %s\n"
@@ -65,7 +65,7 @@
i->device,
i->description ? i->description : "n/a",
i->sample_spec ? ss : "n/a");
- =
+
}
=
static void browser_callback(pa_browser *b, pa_browse_opcode_t c, const pa=
_browse_info *i, void *userdata) {
@@ -89,7 +89,7 @@
dump_server(i);
dump_device(i);
break;
- =
+
case PA_BROWSE_REMOVE_SERVER:
printf("\n=3D> removed server <%s>\n", i->name);
break;
@@ -109,7 +109,7 @@
=
static void error_callback(pa_browser *b, const char *s, void *userdata) {
pa_mainloop_api*m =3D userdata;
- =
+
fprintf(stderr, "Failure: %s\n", s);
m->quit(m, 1);
}
@@ -128,7 +128,7 @@
pa_signal_new(SIGINT, exit_signal_callback, NULL);
pa_signal_new(SIGTERM, exit_signal_callback, NULL);
signal(SIGPIPE, SIG_IGN);
- =
+
if (!(browser =3D pa_browser_new_full(pa_mainloop_get_api(mainloop), P=
A_BROWSE_FOR_SERVERS|PA_BROWSE_FOR_SINKS|PA_BROWSE_FOR_SOURCES, &s))) {
fprintf(stderr, "pa_browse_new_full(): %s\n", s);
goto finish;
@@ -136,7 +136,7 @@
=
pa_browser_set_callback(browser, browser_callback, NULL);
pa_browser_set_error_callback(browser, error_callback, pa_mainloop_get=
_api(mainloop));
- =
+
ret =3D 0;
pa_mainloop_run(mainloop, &ret);
=
Modified: trunk/src/utils/pacat.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pacat.c?rev=3D1=
418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/utils/pacat.c (original)
+++ trunk/src/utils/pacat.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -79,20 +79,20 @@
=
if (!buffer || !buffer_length)
return;
- =
+
l =3D length;
if (l > buffer_length)
l =3D buffer_length;
- =
+
if (pa_stream_write(stream, (uint8_t*) buffer + buffer_index, l, NULL,=
0, PA_SEEK_RELATIVE) < 0) {
fprintf(stderr, "pa_stream_write() failed: %s\n", pa_strerror(pa_c=
ontext_errno(context)));
quit(1);
return;
}
- =
+
buffer_length -=3D l;
buffer_index +=3D l;
- =
+
if (!buffer_length) {
pa_xfree(buffer);
buffer =3D NULL;
@@ -126,7 +126,7 @@
quit(1);
return;
}
- =
+
assert(data && length);
=
if (buffer) {
@@ -156,7 +156,7 @@
case PA_STREAM_READY:
if (verbose) {
const pa_buffer_attr *a;
- =
+
fprintf(stderr, "Stream successfully created.\n");
=
if (!(a =3D pa_stream_get_buffer_attr(s)))
@@ -169,13 +169,13 @@
assert(mode =3D=3D RECORD);
fprintf(stderr, "Buffer metrics: maxlength=3D%u, f=
ragsize=3D%u\n", a->maxlength, a->fragsize);
}
- =
+
}
=
}
- =
+
break;
- =
+
case PA_STREAM_FAILED:
default:
fprintf(stderr, "Stream error: %s\n", pa_strerror(pa_context_e=
rrno(pa_stream_get_context(s))));
@@ -192,10 +192,10 @@
case PA_CONTEXT_AUTHORIZING:
case PA_CONTEXT_SETTING_NAME:
break;
- =
+
case PA_CONTEXT_READY: {
int r;
- =
+
assert(c && !stream);
=
if (verbose)
@@ -216,17 +216,17 @@
fprintf(stderr, "pa_stream_connect_playback() failed: =
%s\n", pa_strerror(pa_context_errno(c)));
goto fail;
}
- =
+
} else {
if ((r =3D pa_stream_connect_record(stream, device, NULL, =
0)) < 0) {
fprintf(stderr, "pa_stream_connect_record() failed: %s=
\n", pa_strerror(pa_context_errno(c)));
goto fail;
}
}
- =
+
break;
}
- =
+
case PA_CONTEXT_TERMINATED:
quit(0);
break;
@@ -238,10 +238,10 @@
}
=
return;
- =
+
fail:
quit(1);
- =
+
}
=
/* Connection draining complete */
@@ -257,14 +257,14 @@
fprintf(stderr, "Failed to drain stream: %s\n", pa_strerror(pa_con=
text_errno(context)));
quit(1);
}
- =
- if (verbose) =
+
+ if (verbose)
fprintf(stderr, "Playback stream drained.\n");
=
pa_stream_disconnect(stream);
pa_stream_unref(stream);
stream =3D NULL;
- =
+
if (!(o =3D pa_context_drain(context, context_drain_complete, NULL)))
pa_context_disconnect(context);
else {
@@ -286,7 +286,7 @@
=
if (!stream || pa_stream_get_state(stream) !=3D PA_STREAM_READY || !(l=
=3D w =3D pa_stream_writable_size(stream)))
l =3D 4096;
- =
+
buffer =3D pa_xmalloc(l);
=
if ((r =3D read(fd, buffer, l)) <=3D 0) {
@@ -296,17 +296,17 @@
=
if (stream) {
pa_operation *o;
- =
+
if (!(o =3D pa_stream_drain(stream, stream_drain_complete,=
NULL))) {
fprintf(stderr, "pa_stream_drain(): %s\n", pa_strerror=
(pa_context_errno(context)));
quit(1);
return;
}
- =
+
pa_operation_unref(o);
} else
quit(0);
- =
+
} else {
fprintf(stderr, "read() failed: %s\n", strerror(errno));
quit(1);
@@ -335,7 +335,7 @@
}
=
assert(buffer_length);
- =
+
if ((r =3D write(fd, (uint8_t*) buffer+buffer_index, buffer_length)) <=
=3D 0) {
fprintf(stderr, "write() failed: %s\n", strerror(errno));
quit(1);
@@ -366,7 +366,7 @@
static void stream_update_timing_callback(pa_stream *s, int success, void =
*userdata) {
pa_usec_t latency, usec;
int negative =3D 0;
- =
+
assert(s);
=
if (!success ||
@@ -387,13 +387,13 @@
=
if (!stream)
return;
- =
+
pa_operation_unref(pa_stream_update_timing_info(stream, stream_update_=
timing_callback, NULL));
}
=
static void time_event_callback(pa_mainloop_api*m, pa_time_event *e, const=
struct timeval *tv, void *userdata) {
struct timeval next;
- =
+
if (stream && pa_stream_get_state(stream) =3D=3D PA_STREAM_READY) {
pa_operation *o;
if (!(o =3D pa_stream_update_timing_info(stream, stream_update_tim=
ing_callback, NULL)))
@@ -481,7 +481,7 @@
help(bn);
ret =3D 0;
goto quit;
- =
+
case ARG_VERSION:
printf("pacat "PACKAGE_VERSION"\nCompiled with libpulse %s=
\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_vers=
ion());
ret =3D 0;
@@ -525,7 +525,7 @@
break;
}
=
- case ARG_CHANNELS: =
+ case ARG_CHANNELS:
sample_spec.channels =3D atoi(optarg);
break;
=
@@ -545,7 +545,7 @@
=
channel_map_set =3D 1;
break;
- =
+
default:
goto quit;
}
@@ -560,7 +560,7 @@
fprintf(stderr, "Channel map doesn't match sample specification\n"=
);
goto quit;
}
- =
+
if (verbose) {
char t[PA_SAMPLE_SPEC_SNPRINT_MAX];
pa_sample_spec_snprint(t, sizeof(t), &sample_spec);
@@ -570,22 +570,22 @@
if (!(optind >=3D argc)) {
if (optind+1 =3D=3D argc) {
int fd;
- =
+
if ((fd =3D open(argv[optind], mode =3D=3D PLAYBACK ? O_RDONLY=
: O_WRONLY|O_TRUNC|O_CREAT, 0666)) < 0) {
fprintf(stderr, "open(): %s\n", strerror(errno));
goto quit;
}
- =
+
if (dup2(fd, mode =3D=3D PLAYBACK ? 0 : 1) < 0) {
fprintf(stderr, "dup2(): %s\n", strerror(errno));
goto quit;
}
- =
+
close(fd);
=
if (!stream_name)
stream_name =3D pa_xstrdup(argv[optind]);
- =
+
} else {
fprintf(stderr, "Too many arguments.\n");
goto quit;
@@ -616,7 +616,7 @@
#ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN);
#endif
- =
+
if (!(stdio_event =3D mainloop_api->io_new(mainloop_api,
mode =3D=3D PLAYBACK ? STDIN_=
FILENO : STDOUT_FILENO,
mode =3D=3D PLAYBACK ? PA_IO_=
EVENT_INPUT : PA_IO_EVENT_OUTPUT,
@@ -641,7 +641,7 @@
=
pa_gettimeofday(&tv);
pa_timeval_add(&tv, TIME_EVENT_USEC);
- =
+
if (!(time_event =3D mainloop_api->time_new(mainloop_api, &tv, tim=
e_event_callback, NULL))) {
fprintf(stderr, "time_new() failed.\n");
goto quit;
@@ -653,7 +653,7 @@
fprintf(stderr, "pa_mainloop_run() failed.\n");
goto quit;
}
- =
+
quit:
if (stream)
pa_stream_unref(stream);
@@ -670,7 +670,7 @@
assert(mainloop_api);
mainloop_api->time_free(time_event);
}
- =
+
if (m) {
pa_signal_done();
pa_mainloop_free(m);
@@ -682,6 +682,6 @@
pa_xfree(device);
pa_xfree(client_name);
pa_xfree(stream_name);
- =
+
return ret;
}
Modified: trunk/src/utils/pacmd.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pacmd.c?rev=3D1=
418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/utils/pacmd.c (original)
+++ trunk/src/utils/pacmd.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -64,12 +64,12 @@
=
for (i =3D 0; i < 5; i++) {
int r;
- =
+
if ((r =3D connect(fd, (struct sockaddr*) &sa, sizeof(sa))) < 0 &&=
(errno !=3D ECONNREFUSED && errno !=3D ENOENT)) {
pa_log("connect(): %s", strerror(errno));
goto fail;
}
- =
+
if (r >=3D 0)
break;
=
@@ -94,7 +94,7 @@
FD_SET(fd, &ifds);
=
FD_ZERO(&ofds);
- =
+
for (;;) {
if (select(FD_SETSIZE, &ifds, &ofds, NULL, NULL) < 0) {
pa_log("select(): %s", strerror(errno));
@@ -104,19 +104,19 @@
if (FD_ISSET(0, &ifds)) {
ssize_t r;
assert(!ibuf_length);
- =
+
if ((r =3D read(0, ibuf, sizeof(ibuf))) <=3D 0) {
if (r =3D=3D 0)
break;
- =
+
pa_log("read(): %s", strerror(errno));
goto fail;
}
- =
+
ibuf_length =3D (size_t) r;
ibuf_index =3D 0;
}
- =
+
if (FD_ISSET(fd, &ifds)) {
ssize_t r;
assert(!obuf_length);
@@ -124,7 +124,7 @@
if ((r =3D read(fd, obuf, sizeof(obuf))) <=3D 0) {
if (r =3D=3D 0)
break;
- =
+
pa_log("read(): %s", strerror(errno));
goto fail;
}
@@ -136,12 +136,12 @@
if (FD_ISSET(1, &ofds)) {
ssize_t r;
assert(obuf_length);
- =
+
if ((r =3D write(1, obuf + obuf_index, obuf_length)) < 0) {
pa_log("write(): %s", strerror(errno));
goto fail;
}
- =
+
obuf_length -=3D (size_t) r;
obuf_index +=3D obuf_index;
=
@@ -150,12 +150,12 @@
if (FD_ISSET(fd, &ofds)) {
ssize_t r;
assert(ibuf_length);
- =
+
if ((r =3D write(fd, ibuf + ibuf_index, ibuf_length)) < 0) {
pa_log("write(): %s", strerror(errno));
goto fail;
}
- =
+
ibuf_length -=3D (size_t) r;
ibuf_index +=3D obuf_index;
=
@@ -163,24 +163,24 @@
=
FD_ZERO(&ifds);
FD_ZERO(&ofds);
- =
+
if (obuf_length <=3D 0)
FD_SET(fd, &ifds);
else
FD_SET(1, &ofds);
- =
+
if (ibuf_length <=3D 0)
FD_SET(0, &ifds);
else
FD_SET(fd, &ofds);
}
- =
+
=
ret =3D 0;
- =
+
fail:
if (fd >=3D 0)
close(fd);
- =
+
return ret;
}
Modified: trunk/src/utils/pactl.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pactl.c?rev=3D1=
418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/utils/pactl.c (original)
+++ trunk/src/utils/pactl.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -112,13 +112,13 @@
=
pa_bytes_snprint(s, sizeof(s), i->scache_size);
printf("Sample cache size: %s\n", s);
- =
+
complete_action();
}
=
static void get_server_info_callback(pa_context *c, const pa_server_info *=
i, void *useerdata) {
char s[PA_SAMPLE_SPEC_SNPRINT_MAX];
- =
+
if (!i) {
fprintf(stderr, "Failed to get server information: %s\n", pa_strer=
ror(pa_context_errno(c)));
quit(1);
@@ -149,7 +149,7 @@
=
static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, i=
nt is_last, void *userdata) {
char s[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], cm[PA_=
CHANNEL_MAP_SNPRINT_MAX];
- =
+
if (is_last < 0) {
fprintf(stderr, "Failed to get sink information: %s\n", pa_strerro=
r(pa_context_errno(c)));
quit(1);
@@ -160,7 +160,7 @@
complete_action();
return;
}
- =
+
assert(i);
=
if (nl)
@@ -207,7 +207,7 @@
complete_action();
return;
}
- =
+
assert(i);
=
if (nl)
@@ -215,7 +215,7 @@
nl =3D 1;
=
snprintf(t, sizeof(t), "%u", i->monitor_of_sink);
- =
+
printf("*** Source #%u ***\n"
"Name: %s\n"
"Driver: %s\n"
@@ -256,7 +256,7 @@
complete_action();
return;
}
- =
+
assert(i);
=
if (nl)
@@ -264,7 +264,7 @@
nl =3D 1;
=
snprintf(t, sizeof(t), "%u", i->n_used);
- =
+
printf("*** Module #%u ***\n"
"Name: %s\n"
"Argument: %s\n"
@@ -290,7 +290,7 @@
complete_action();
return;
}
- =
+
assert(i);
=
if (nl)
@@ -298,7 +298,7 @@
nl =3D 1;
=
snprintf(t, sizeof(t), "%u", i->owner_module);
- =
+
printf("*** Client #%u ***\n"
"Name: %s\n"
"Driver: %s\n"
@@ -322,7 +322,7 @@
complete_action();
return;
}
- =
+
assert(i);
=
if (nl)
@@ -331,7 +331,7 @@
=
snprintf(t, sizeof(t), "%u", i->owner_module);
snprintf(k, sizeof(k), "%u", i->client);
- =
+
printf("*** Sink Input #%u ***\n"
"Name: %s\n"
"Driver: %s\n"
@@ -372,17 +372,17 @@
complete_action();
return;
}
- =
+
assert(i);
=
if (nl)
printf("\n");
nl =3D 1;
=
- =
+
snprintf(t, sizeof(t), "%u", i->owner_module);
snprintf(k, sizeof(k), "%u", i->client);
- =
+
printf("*** Source Output #%u ***\n"
"Name: %s\n"
"Driver: %s\n"
@@ -420,16 +420,16 @@
complete_action();
return;
}
- =
+
assert(i);
=
if (nl)
printf("\n");
nl =3D 1;
=
- =
+
pa_bytes_snprint(t, sizeof(t), i->bytes);
- =
+
printf("*** Sample #%u ***\n"
"Name: %s\n"
"Volume: %s\n"
@@ -461,7 +461,7 @@
complete_action();
return;
}
- =
+
assert(i);
=
if (nl)
@@ -497,11 +497,11 @@
case PA_STREAM_CREATING:
case PA_STREAM_READY:
break;
- =
+
case PA_STREAM_TERMINATED:
drain();
break;
- =
+
case PA_STREAM_FAILED:
default:
fprintf(stderr, "Failed to upload sample: %s\n", pa_strerror(p=
a_context_errno(pa_stream_get_context(s))));
@@ -524,7 +524,7 @@
fprintf(stderr, "Premature end of file\n");
quit(1);
}
- =
+
pa_stream_write(s, d, length, pa_xfree, 0, PA_SEEK_RELATIVE);
=
sample_length -=3D length;
@@ -551,7 +551,7 @@
pa_operation_unref(pa_context_get_server_info(c, get_s=
erver_info_callback, NULL));
break;
=
- case PLAY_SAMPLE: =
+ case PLAY_SAMPLE:
pa_operation_unref(pa_context_play_sample(c, sample_na=
me, device, PA_VOLUME_NORM, simple_callback, NULL));
break;
=
@@ -562,12 +562,12 @@
case UPLOAD_SAMPLE:
sample_stream =3D pa_stream_new(c, sample_name, &sampl=
e_spec, NULL);
assert(sample_stream);
- =
+
pa_stream_set_state_callback(sample_stream, stream_sta=
te_callback, NULL);
pa_stream_set_write_callback(sample_stream, stream_wri=
te_callback, NULL);
pa_stream_connect_upload(sample_stream, sample_length);
break;
- =
+
case EXIT:
pa_operation_unref(pa_context_exit_daemon(c, NULL, NUL=
L));
drain();
@@ -578,7 +578,7 @@
pa_operation_unref(pa_context_get_sink_info_list(c, ge=
t_sink_info_callback, NULL));
pa_operation_unref(pa_context_get_source_info_list(c, =
get_source_info_callback, NULL));
pa_operation_unref(pa_context_get_sink_input_info_list=
(c, get_sink_input_info_callback, NULL));
- pa_operation_unref(pa_context_get_source_output_info_l=
ist(c, get_source_output_info_callback, NULL)); =
+ pa_operation_unref(pa_context_get_source_output_info_l=
ist(c, get_source_output_info_callback, NULL));
pa_operation_unref(pa_context_get_client_info_list(c, =
get_client_info_callback, NULL));
pa_operation_unref(pa_context_get_sample_info_list(c, =
get_sample_info_callback, NULL));
pa_operation_unref(pa_context_get_autoload_info_list(c=
, get_autoload_info_callback, NULL));
@@ -591,7 +591,7 @@
case MOVE_SOURCE_OUTPUT:
pa_operation_unref(pa_context_move_source_output_by_na=
me(c, source_output_idx, source_name, simple_callback, NULL));
break;
- =
+
default:
assert(0);
}
@@ -650,14 +650,14 @@
bn =3D argv[0];
else
bn++;
- =
+
while ((c =3D getopt_long(argc, argv, "s:n:h", long_options, NULL)) !=
=3D -1) {
switch (c) {
case 'h' :
help(bn);
ret =3D 0;
goto quit;
- =
+
case ARG_VERSION:
printf("pactl "PACKAGE_VERSION"\nCompiled with libpulse %s=
\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_vers=
ion());
ret =3D 0;
@@ -680,7 +680,7 @@
=
if (!client_name)
client_name =3D pa_xstrdup(bn);
- =
+
if (optind < argc) {
if (!strcmp(argv[optind], "stat"))
action =3D STAT;
@@ -712,13 +712,13 @@
tmp[n] =3D 0;
sample_name =3D pa_xstrdup(tmp);
}
- =
+
memset(&sfinfo, 0, sizeof(sfinfo));
if (!(sndfile =3D sf_open(argv[optind+1], SFM_READ, &sfinfo)))=
{
fprintf(stderr, "Failed to open sound file.\n");
goto quit;
}
- =
+
sample_spec.format =3D PA_SAMPLE_FLOAT32;
sample_spec.rate =3D sfinfo.samplerate;
sample_spec.channels =3D sfinfo.channels;
@@ -735,7 +735,7 @@
=
if (optind+2 < argc)
device =3D pa_xstrdup(argv[optind+2]);
- =
+
} else if (!strcmp(argv[optind], "remove-sample")) {
action =3D REMOVE_SAMPLE;
if (optind+1 >=3D argc) {
@@ -783,7 +783,7 @@
#ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN);
#endif
- =
+
if (!(context =3D pa_context_new(mainloop_api, client_name))) {
fprintf(stderr, "pa_context_new() failed.\n");
goto quit;
@@ -808,7 +808,7 @@
pa_signal_done();
pa_mainloop_free(m);
}
- =
+
if (sndfile)
sf_close(sndfile);
=
Modified: trunk/src/utils/padsp.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/padsp.c?rev=3D1=
418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/utils/padsp.c (original)
+++ trunk/src/utils/padsp.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -69,7 +69,7 @@
pthread_mutex_t mutex;
int ref;
int unusable;
- =
+
fd_info_type_t type;
int app_fd, thread_fd;
=
@@ -95,7 +95,7 @@
int volume_modify_count;
=
int optr_n_blocks;
- =
+
PA_LLIST_FIELDS(fd_info);
};
=
@@ -248,7 +248,7 @@
* -> disable /dev/dsp emulation, bit 2 -> disable /dev/sndstat
* emulation, bit 3 -> disable /dev/mixer emulation. Hence a value
* of 7 disables padsp entirely. */
- =
+
pthread_mutex_lock(&func_mutex);
if (!sym_resolved) {
sym =3D (int*) dlsym(RTLD_DEFAULT, "__padsp_disabled__");
@@ -259,14 +259,14 @@
=
if (!sym)
return 0;
- =
+
return *sym;
}
=
static int dsp_cloak_enable(void) {
if (padsp_disabled() & 1)
return 0;
- =
+
if (getenv("PADSP_NO_DSP"))
return 0;
=
@@ -302,7 +302,7 @@
/* Avoid recursive calls */
static pthread_once_t recursion_key_once =3D PTHREAD_ONCE_INIT;
pthread_once(&recursion_key_once, recursion_key_alloc);
- =
+
if (pthread_getspecific(recursion_key))
return 0;
=
@@ -320,10 +320,10 @@
debug(DEBUG_LEVEL_NORMAL, __FILE__": freeing fd info (fd=3D%i)\n", i->=
app_fd);
=
dsp_drain(i);
- =
+
if (i->mainloop)
pa_threaded_mainloop_stop(i->mainloop);
- =
+
if (i->play_stream) {
pa_stream_disconnect(i->play_stream);
pa_stream_unref(i->play_stream);
@@ -338,7 +338,7 @@
pa_context_disconnect(i->context);
pa_context_unref(i->context);
}
- =
+
if (i->mainloop)
pa_threaded_mainloop_free(i->mainloop);
=
@@ -360,7 +360,7 @@
=
static fd_info *fd_info_ref(fd_info *i) {
assert(i);
- =
+
pthread_mutex_lock(&i->mutex);
assert(i->ref >=3D 1);
i->ref++;
@@ -404,7 +404,7 @@
=
static void reset_params(fd_info *i) {
assert(i);
- =
+
i->sample_spec.format =3D PA_SAMPLE_U8;
i->sample_spec.channels =3D 1;
i->sample_spec.rate =3D 8000;
@@ -418,7 +418,7 @@
=
if ((e =3D getenv("PADSP_CLIENT_NAME")))
return e;
- =
+
if (pa_get_binary_name(p, sizeof(p)))
snprintf(buf, n, "OSS Emulation[%s]", p);
else
@@ -440,7 +440,7 @@
fd_info *i;
=
debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_prepare() enter\n");
- =
+
function_enter();
=
pthread_mutex_lock(&fd_infos_mutex);
@@ -452,13 +452,13 @@
=
pthread_mutex_lock(&func_mutex);
=
- =
+
debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_prepare() exit\n");
}
=
static void atfork_parent(void) {
fd_info *i;
- =
+
debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_parent() enter\n");
=
pthread_mutex_unlock(&func_mutex);
@@ -471,19 +471,19 @@
pthread_mutex_unlock(&fd_infos_mutex);
=
function_exit();
- =
+
debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_parent() exit\n");
}
=
static void atfork_child(void) {
fd_info *i;
- =
+
debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_child() enter\n");
=
/* We do only the bare minimum to get all fds closed */
pthread_mutex_init(&func_mutex, NULL);
pthread_mutex_init(&fd_infos_mutex, NULL);
- =
+
for (i =3D fd_infos; i; i =3D i->next) {
pthread_mutex_init(&i->mutex, NULL);
=
@@ -556,7 +556,7 @@
signal(SIGPIPE, SIG_IGN); /* Yes, ugly as hell */
=
pthread_once(&install_atfork_once, install_atfork);
- =
+
if (!(i =3D malloc(sizeof(fd_info)))) {
*_errno =3D ENOMEM;
goto fail;
@@ -638,12 +638,12 @@
unlock_and_fail:
=
pa_threaded_mainloop_unlock(i->mainloop);
- =
+
fail:
=
if (i)
fd_info_unref(i);
- =
+
return NULL;
}
=
@@ -671,7 +671,7 @@
fd_info *i;
=
pthread_mutex_lock(&fd_infos_mutex);
- =
+
for (i =3D fd_infos; i; i =3D i->next)
if (i->app_fd =3D=3D fd && !i->unusable) {
fd_info_ref(i);
@@ -679,7 +679,7 @@
}
=
pthread_mutex_unlock(&fd_infos_mutex);
- =
+
return i;
}
=
@@ -907,7 +907,7 @@
case PA_STREAM_READY:
debug(DEBUG_LEVEL_NORMAL, __FILE__": stream established.\n");
break;
- =
+
case PA_STREAM_FAILED:
debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_connect_playbac=
k() failed: %s\n", pa_strerror(pa_context_errno(i->context)));
fd_info_shutdown(i);
@@ -923,7 +923,7 @@
static int create_playback_stream(fd_info *i) {
pa_buffer_attr attr;
int n;
- =
+
assert(i);
=
fix_metrics(i);
@@ -942,7 +942,7 @@
attr.tlength =3D i->fragment_size * i->n_fragments;
attr.prebuf =3D i->fragment_size;
attr.minreq =3D i->fragment_size;
- =
+
if (pa_stream_connect_playback(i->play_stream, NULL, &attr, PA_STREAM_=
INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0) {
debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_connect_playback() =
failed: %s\n", pa_strerror(pa_context_errno(i->context)));
goto fail;
@@ -952,7 +952,7 @@
setsockopt(i->app_fd, SOL_SOCKET, SO_SNDBUF, &n, sizeof(n));
n =3D i->fragment_size;
setsockopt(i->thread_fd, SOL_SOCKET, SO_RCVBUF, &n, sizeof(n));
- =
+
return 0;
=
fail:
@@ -962,7 +962,7 @@
static int create_record_stream(fd_info *i) {
pa_buffer_attr attr;
int n;
- =
+
assert(i);
=
fix_metrics(i);
@@ -979,7 +979,7 @@
memset(&attr, 0, sizeof(attr));
attr.maxlength =3D i->fragment_size * (i->n_fragments+1);
attr.fragsize =3D i->fragment_size;
- =
+
if (pa_stream_connect_record(i->rec_stream, NULL, &attr, PA_STREAM_INT=
ERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE) < 0) {
debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_connect_playback() =
failed: %s\n", pa_strerror(pa_context_errno(i->context)));
goto fail;
@@ -989,7 +989,7 @@
setsockopt(i->app_fd, SOL_SOCKET, SO_RCVBUF, &n, sizeof(n));
n =3D i->fragment_size;
setsockopt(i->thread_fd, SOL_SOCKET, SO_SNDBUF, &n, sizeof(n));
- =
+
return 0;
=
fail:
@@ -1025,7 +1025,7 @@
fd_info *i =3D userdata;
=
pa_threaded_mainloop_signal(i->mainloop, 0);
- =
+
if (flags & PA_IO_EVENT_INPUT) {
=
if (!i->play_stream) {
@@ -1035,7 +1035,7 @@
if (fd_info_copy_data(i, 0) < 0)
goto fail;
}
- =
+
} else if (flags & PA_IO_EVENT_OUTPUT) {
=
if (!i->rec_stream) {
@@ -1050,7 +1050,7 @@
goto fail;
=
return;
- =
+
fail:
/* We can't do anything better than removing the event source */
fd_info_shutdown(i);
@@ -1100,7 +1100,7 @@
=
if (!(i->io_event =3D api->io_new(api, i->thread_fd, i->io_flags, io_e=
vent_cb, i)))
goto fail;
- =
+
pa_threaded_mainloop_unlock(i->mainloop);
=
debug(DEBUG_LEVEL_NORMAL, __FILE__": dsp_open() succeeded, fd=3D%i\n",=
i->app_fd);
@@ -1108,7 +1108,7 @@
fd_info_add_to_list(i);
ret =3D i->app_fd;
fd_info_unref(i);
- =
+
return ret;
=
fail:
@@ -1116,7 +1116,7 @@
=
if (i)
fd_info_unref(i);
- =
+
*_errno =3D EIO;
=
debug(DEBUG_LEVEL_NORMAL, __FILE__": dsp_open() failed\n");
@@ -1138,7 +1138,7 @@
=
if (!pa_cvolume_equal(&i->sink_volume, &si->volume))
i->volume_modify_count++;
- =
+
i->sink_volume =3D si->volume;
i->sink_index =3D si->index;
=
@@ -1160,7 +1160,7 @@
=
if (!pa_cvolume_equal(&i->source_volume, &si->volume))
i->volume_modify_count++;
- =
+
i->source_volume =3D si->volume;
i->source_index =3D si->index;
=
@@ -1193,13 +1193,13 @@
=
debug(DEBUG_LEVEL_NORMAL, __FILE__": mixer_open()\n");
=
- if (!(i =3D fd_info_new(FD_INFO_MIXER, _errno))) =
+ if (!(i =3D fd_info_new(FD_INFO_MIXER, _errno)))
return -1;
- =
+
pa_threaded_mainloop_lock(i->mainloop);
=
pa_context_set_subscribe_callback(i->context, subscribe_cb, i);
- =
+
if (!(o =3D pa_context_subscribe(i->context, PA_SUBSCRIPTION_MASK_SINK=
| PA_SUBSCRIPTION_MASK_SOURCE, context_success_cb, i))) {
debug(DEBUG_LEVEL_NORMAL, __FILE__": Failed to subscribe to events=
: %s", pa_strerror(pa_context_errno(i->context)));
*_errno =3D EIO;
@@ -1274,7 +1274,7 @@
fd_info_add_to_list(i);
ret =3D i->app_fd;
fd_info_unref(i);
- =
+
return ret;
=
fail:
@@ -1285,7 +1285,7 @@
=
if (i)
fd_info_unref(i);
- =
+
*_errno =3D EIO;
=
debug(DEBUG_LEVEL_NORMAL, __FILE__": mixer_open() failed\n");
@@ -1323,7 +1323,7 @@
int e;
=
debug(DEBUG_LEVEL_NORMAL, __FILE__": sndstat_open()\n");
- =
+
if (flags !=3D O_RDONLY
#ifdef O_LARGEFILE
&& flags !=3D (O_RDONLY|O_LARGEFILE)
@@ -1401,16 +1401,16 @@
}
=
function_exit();
- =
+
if (_errno)
errno =3D _errno;
- =
+
return r;
}
=
static int mixer_ioctl(fd_info *i, unsigned long request, void*argp, int *=
_errno) {
int ret =3D -1;
- =
+
switch (request) {
case SOUND_MIXER_READ_DEVMASK :
debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_READ_DEVMASK\=
n");
@@ -1423,7 +1423,7 @@
=
*(int*) argp =3D SOUND_MASK_IGAIN;
break;
- =
+
case SOUND_MIXER_READ_STEREODEVS:
debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_READ_STEREODE=
VS\n");
=
@@ -1434,7 +1434,7 @@
if (i->source_volume.channels > 1)
*(int*) argp |=3D SOUND_MASK_IGAIN;
pa_threaded_mainloop_unlock(i->mainloop);
- =
+
break;
=
case SOUND_MIXER_READ_RECSRC:
@@ -1452,7 +1452,7 @@
=
*(int*) argp =3D 0;
break;
- =
+
case SOUND_MIXER_READ_PCM:
case SOUND_MIXER_READ_IGAIN: {
pa_cvolume *v;
@@ -1515,23 +1515,23 @@
i->operation_success =3D 0;
while (pa_operation_get_state(o) !=3D PA_OPERATION_DON=
E) {
CONTEXT_CHECK_DEAD_GOTO(i, exit_loop);
- =
+
pa_threaded_mainloop_wait(i->mainloop);
}
exit_loop:
- =
+
if (!i->operation_success)
debug(DEBUG_LEVEL_NORMAL, __FILE__": Failed to set=
volume: %s\n", pa_strerror(pa_context_errno(i->context)));
=
pa_operation_unref(o);
}
- =
+
/* We don't wait for completion here */
i->volume_modify_count++;
}
- =
+
pa_threaded_mainloop_unlock(i->mainloop);
- =
+
break;
}
=
@@ -1548,7 +1548,7 @@
pa_threaded_mainloop_unlock(i->mainloop);
break;
}
- =
+
default:
debug(DEBUG_LEVEL_NORMAL, __FILE__": unknown ioctl 0x%08lx\n",=
request);
=
@@ -1557,44 +1557,44 @@
}
=
ret =3D 0;
- =
+
fail:
- =
+
return ret;
}
=
static int map_format(int *fmt, pa_sample_spec *ss) {
- =
+
switch (*fmt) {
case AFMT_MU_LAW:
ss->format =3D PA_SAMPLE_ULAW;
break;
- =
+
case AFMT_A_LAW:
ss->format =3D PA_SAMPLE_ALAW;
break;
- =
+
case AFMT_S8:
*fmt =3D AFMT_U8;
/* fall through */
case AFMT_U8:
ss->format =3D PA_SAMPLE_U8;
break;
- =
+
case AFMT_U16_BE:
*fmt =3D AFMT_S16_BE;
/* fall through */
case AFMT_S16_BE:
ss->format =3D PA_SAMPLE_S16BE;
break;
- =
+
case AFMT_U16_LE:
*fmt =3D AFMT_S16_LE;
/* fall through */
case AFMT_S16_LE:
ss->format =3D PA_SAMPLE_S16LE;
break;
- =
+
default:
ss->format =3D PA_SAMPLE_S16NE;
*fmt =3D AFMT_S16_NE;
@@ -1666,14 +1666,14 @@
static int dsp_empty_socket(fd_info *i) {
#ifdef SIOCINQ
int ret =3D -1;
- =
+
/* Empty the socket */
for (;;) {
int l;
- =
+
if (i->thread_fd < 0)
break;
- =
+
if (ioctl(i->thread_fd, SIOCINQ, &l) < 0) {
debug(DEBUG_LEVEL_NORMAL, __FILE__": SIOCINQ: %s\n", strerror(=
errno));
break;
@@ -1683,7 +1683,7 @@
ret =3D 0;
break;
}
- =
+
pa_threaded_mainloop_wait(i->mainloop);
}
=
@@ -1700,19 +1700,19 @@
=
if (!i->mainloop)
return 0;
- =
+
debug(DEBUG_LEVEL_NORMAL, __FILE__": Draining.\n");
=
pa_threaded_mainloop_lock(i->mainloop);
=
if (dsp_empty_socket(i) < 0)
goto fail;
- =
+
if (!i->play_stream)
goto fail;
=
debug(DEBUG_LEVEL_NORMAL, __FILE__": Really draining.\n");
- =
+
if (!(o =3D pa_stream_drain(i->play_stream, stream_success_cb, i))) {
debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_drain(): %s\n", pa_=
strerror(pa_context_errno(i->context)));
goto fail;
@@ -1721,7 +1721,7 @@
i->operation_success =3D 0;
while (pa_operation_get_state(o) !=3D PA_OPERATION_DONE) {
PLAYBACK_STREAM_CHECK_DEAD_GOTO(i, fail);
- =
+
pa_threaded_mainloop_wait(i->mainloop);
}
=
@@ -1731,9 +1731,9 @@
}
=
r =3D 0;
- =
+
fail:
- =
+
if (o)
pa_operation_unref(o);
=
@@ -1755,7 +1755,7 @@
goto fail;
=
debug(DEBUG_LEVEL_NORMAL, __FILE__": Triggering.\n");
- =
+
if (!(o =3D pa_stream_trigger(i->play_stream, stream_success_cb, i))) {
debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_trigger(): %s\n", p=
a_strerror(pa_context_errno(i->context)));
goto fail;
@@ -1764,7 +1764,7 @@
i->operation_success =3D 0;
while (!pa_operation_get_state(o) !=3D PA_OPERATION_DONE) {
PLAYBACK_STREAM_CHECK_DEAD_GOTO(i, fail);
- =
+
pa_threaded_mainloop_wait(i->mainloop);
}
=
@@ -1774,9 +1774,9 @@
}
=
r =3D 0;
- =
+
fail:
- =
+
if (o)
pa_operation_unref(o);
=
@@ -1787,11 +1787,11 @@
=
static int dsp_ioctl(fd_info *i, unsigned long request, void*argp, int *_e=
rrno) {
int ret =3D -1;
- =
+
switch (request) {
case SNDCTL_DSP_SETFMT: {
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_SETFMT: %i\n",=
*(int*) argp);
- =
+
pa_threaded_mainloop_lock(i->mainloop);
=
if (*(int*) argp =3D=3D AFMT_QUERY)
@@ -1804,12 +1804,12 @@
pa_threaded_mainloop_unlock(i->mainloop);
break;
}
- =
+
case SNDCTL_DSP_SPEED: {
pa_sample_spec ss;
int valid;
char t[256];
- =
+
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_SPEED: %i\n", =
*(int*) argp);
=
pa_threaded_mainloop_lock(i->mainloop);
@@ -1821,7 +1821,7 @@
i->sample_spec =3D ss;
free_streams(i);
}
- =
+
debug(DEBUG_LEVEL_NORMAL, __FILE__": ss: %s\n", pa_sample_spec=
_snprint(t, sizeof(t), &i->sample_spec));
=
pa_threaded_mainloop_unlock(i->mainloop);
@@ -1833,24 +1833,24 @@
=
break;
}
- =
+
case SNDCTL_DSP_STEREO:
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_STEREO: %i\n",=
*(int*) argp);
- =
+
pa_threaded_mainloop_lock(i->mainloop);
- =
+
i->sample_spec.channels =3D *(int*) argp ? 2 : 1;
free_streams(i);
- =
+
pa_threaded_mainloop_unlock(i->mainloop);
return 0;
=
case SNDCTL_DSP_CHANNELS: {
pa_sample_spec ss;
int valid;
- =
+
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_CHANNELS: %i\n=
", *(int*) argp);
- =
+
pa_threaded_mainloop_lock(i->mainloop);
=
ss =3D i->sample_spec;
@@ -1860,7 +1860,7 @@
i->sample_spec =3D ss;
free_streams(i);
}
- =
+
pa_threaded_mainloop_unlock(i->mainloop);
=
if (!valid) {
@@ -1878,16 +1878,16 @@
=
fix_metrics(i);
*(int*) argp =3D i->fragment_size;
- =
+
pa_threaded_mainloop_unlock(i->mainloop);
- =
+
break;
=
case SNDCTL_DSP_SETFRAGMENT:
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_SETFRAGMENT: 0=
x%08x\n", *(int*) argp);
- =
+
pa_threaded_mainloop_lock(i->mainloop);
- =
+
i->fragment_size =3D 1 << ((*(int*) argp) & 31);
i->n_fragments =3D (*(int*) argp) >> 16;
=
@@ -1896,14 +1896,14 @@
i->n_fragments =3D 12;
=
free_streams(i);
- =
+
pa_threaded_mainloop_unlock(i->mainloop);
- =
- break;
- =
+
+ break;
+
case SNDCTL_DSP_GETCAPS:
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_CAPS\n");
- =
+
*(int*) argp =3D DSP_CAP_DUPLEX
#ifdef DSP_CAP_MULTI
| DSP_CAP_MULTI
@@ -1913,13 +1913,13 @@
=
case SNDCTL_DSP_GETODELAY: {
int l;
- =
+
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_GETODELAY\n");
- =
+
pa_threaded_mainloop_lock(i->mainloop);
=
*(int*) argp =3D 0;
- =
+
for (;;) {
pa_usec_t usec;
=
@@ -1937,10 +1937,10 @@
=
pa_threaded_mainloop_wait(i->mainloop);
}
- =
+
exit_loop:
=
-#ifdef SIOCINQ =
+#ifdef SIOCINQ
if (ioctl(i->thread_fd, SIOCINQ, &l) < 0)
debug(DEBUG_LEVEL_NORMAL, __FILE__": SIOCINQ failed: %s\n"=
, strerror(errno));
else
@@ -1955,39 +1955,39 @@
=
break;
}
- =
+
case SNDCTL_DSP_RESET: {
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_RESET\n");
- =
+
pa_threaded_mainloop_lock(i->mainloop);
=
free_streams(i);
dsp_flush_socket(i);
=
i->optr_n_blocks =3D 0;
- =
+
pa_threaded_mainloop_unlock(i->mainloop);
break;
}
- =
+
case SNDCTL_DSP_GETFMTS: {
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_GETFMTS\n");
- =
+
*(int*) argp =3D AFMT_MU_LAW|AFMT_A_LAW|AFMT_U8|AFMT_S16_LE|AF=
MT_S16_BE;
break;
}
=
case SNDCTL_DSP_POST:
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_POST\n");
- =
- if (dsp_trigger(i) < 0) =
+
+ if (dsp_trigger(i) < 0)
*_errno =3D EIO;
break;
=
- case SNDCTL_DSP_SYNC: =
+ case SNDCTL_DSP_SYNC:
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_SYNC\n");
- =
- if (dsp_drain(i) < 0) =
+
+ if (dsp_drain(i) < 0)
*_errno =3D EIO;
=
break;
@@ -2055,36 +2055,36 @@
=
case SOUND_PCM_READ_RATE:
debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n");
- =
+
pa_threaded_mainloop_lock(i->mainloop);
*(int*) argp =3D i->sample_spec.rate;
pa_threaded_mainloop_unlock(i->mainloop);
- break; =
+ break;
=
case SOUND_PCM_READ_CHANNELS:
debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_CHANNELS\n=
");
- =
+
pa_threaded_mainloop_lock(i->mainloop);
*(int*) argp =3D i->sample_spec.channels;
pa_threaded_mainloop_unlock(i->mainloop);
- break; =
+ break;
=
case SOUND_PCM_READ_BITS:
debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_BITS\n");
- =
+
pa_threaded_mainloop_lock(i->mainloop);
*(int*) argp =3D pa_sample_size(&i->sample_spec)*8;
pa_threaded_mainloop_unlock(i->mainloop);
- break; =
- =
+ break;
+
case SNDCTL_DSP_GETOPTR: {
count_info *info;
- =
+
debug(DEBUG_LEVEL_NORMAL, __FILE__": SNDCTL_DSP_GETOPTR\n");
=
info =3D (count_info*) argp;
memset(info, 0, sizeof(*info));
- =
+
pa_threaded_mainloop_lock(i->mainloop);
=
for (;;) {
@@ -2095,7 +2095,7 @@
if (pa_stream_get_time(i->play_stream, &usec) >=3D 0) {
size_t k =3D pa_usec_to_bytes(usec, &i->sample_spec);
int m;
- =
+
info->bytes =3D (int) k;
m =3D k / i->fragment_size;
info->blocks =3D m - i->optr_n_blocks;
@@ -2111,7 +2111,7 @@
=
pa_threaded_mainloop_wait(i->mainloop);
}
- =
+
pa_threaded_mainloop_unlock(i->mainloop);
=
debug(DEBUG_LEVEL_NORMAL, __FILE__": GETOPTR bytes=3D%i, block=
s=3D%i, ptr=3D%i\n", info->bytes, info->blocks, info->ptr);
@@ -2122,7 +2122,7 @@
case SNDCTL_DSP_GETIPTR:
debug(DEBUG_LEVEL_NORMAL, __FILE__": invalid ioctl SNDCTL_DSP_=
GETIPTR\n");
goto inval;
- =
+
default:
debug(DEBUG_LEVEL_NORMAL, __FILE__": unknown ioctl 0x%08lx\n",=
request);
=
@@ -2132,9 +2132,9 @@
}
=
ret =3D 0;
- =
+
fail:
- =
+
return ret;
}
=
@@ -2165,14 +2165,14 @@
r =3D mixer_ioctl(i, request, argp, &_errno);
else
r =3D dsp_ioctl(i, request, argp, &_errno);
- =
+
fd_info_unref(i);
=
if (_errno)
errno =3D _errno;
=
function_exit();
- =
+
return r;
}
=
@@ -2194,7 +2194,7 @@
=
fd_info_remove_from_list(i);
fd_info_unref(i);
- =
+
function_exit();
=
return 0;
@@ -2207,7 +2207,7 @@
errno =3D EFAULT;
return -1;
}
- =
+
debug(DEBUG_LEVEL_VERBOSE, __FILE__": access(%s)\n", pathname);
=
if (strcmp(pathname, "/dev/dsp") !=3D 0 &&
@@ -2236,7 +2236,7 @@
mode_t mode =3D 0;
=
debug(DEBUG_LEVEL_VERBOSE, __FILE__": open64(%s)\n", filename);
- =
+
va_start(args, flags);
if (flags & O_CREAT)
mode =3D va_arg(args, mode_t);
@@ -2259,7 +2259,7 @@
FILE *f =3D NULL;
int fd;
mode_t m;
- =
+
debug(DEBUG_LEVEL_VERBOSE, __FILE__": fopen(%s)\n", filename);
=
if (strcmp(filename, "/dev/dsp") !=3D 0 &&
@@ -2293,7 +2293,7 @@
close(fd);
return NULL;
}
- =
+
return f;
}
=
@@ -2337,9 +2337,9 @@
/* Dirty trick to avoid that the fd is not freed twice, once by us
* and once by the real fclose() */
i->app_fd =3D -1;
- =
+
fd_info_unref(i);
- =
+
function_exit();
=
LOAD_FCLOSE_FUNC();
Modified: trunk/src/utils/paplay.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/paplay.c?rev=3D=
1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/utils/paplay.c (original)
+++ trunk/src/utils/paplay.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -77,14 +77,14 @@
fprintf(stderr, "Failed to drain stream: %s\n", pa_strerror(pa_con=
text_errno(context)));
quit(1);
}
- =
- if (verbose) =
+
+ if (verbose)
fprintf(stderr, "Playback stream drained.\n");
=
pa_stream_disconnect(stream);
pa_stream_unref(stream);
stream =3D NULL;
- =
+
if (!(o =3D pa_context_drain(context, context_drain_complete, NULL)))
pa_context_disconnect(context);
else {
@@ -111,7 +111,7 @@
=
if ((bytes =3D readf_function(sndfile, data, length/k)) > 0)
bytes *=3D k;
- =
+
} else
bytes =3D sf_read_raw(sndfile, data, length);
=
@@ -140,7 +140,7 @@
if (verbose)
fprintf(stderr, "Stream successfully created\n");
break;
- =
+
case PA_STREAM_FAILED:
default:
fprintf(stderr, "Stream errror: %s\n", pa_strerror(pa_context_=
errno(pa_stream_get_context(s))));
@@ -157,10 +157,10 @@
case PA_CONTEXT_AUTHORIZING:
case PA_CONTEXT_SETTING_NAME:
break;
- =
+
case PA_CONTEXT_READY: {
pa_cvolume cv;
- =
+
assert(c && !stream);
=
if (verbose)
@@ -172,10 +172,10 @@
pa_stream_set_state_callback(stream, stream_state_callback, NU=
LL);
pa_stream_set_write_callback(stream, stream_write_callback, NU=
LL);
pa_stream_connect_playback(stream, device, NULL, 0, pa_cvolume=
_set(&cv, sample_spec.channels, volume), NULL);
- =
+
break;
}
- =
+
case PA_CONTEXT_TERMINATED:
quit(0);
break;
@@ -192,7 +192,7 @@
if (verbose)
fprintf(stderr, "Got SIGINT, exiting.\n");
quit(0);
- =
+
}
=
static void help(const char *argv0) {
@@ -251,7 +251,7 @@
help(bn);
ret =3D 0;
goto quit;
- =
+
case ARG_VERSION:
printf("paplay "PACKAGE_VERSION"\nCompiled with libpulse %=
s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_ver=
sion());
ret =3D 0;
@@ -302,7 +302,7 @@
}
=
filename =3D optind < argc ? argv[optind] : "STDIN";
- =
+
memset(&sfinfo, 0, sizeof(sfinfo));
=
if (optind < argc)
@@ -317,9 +317,9 @@
=
sample_spec.rate =3D sfinfo.samplerate;
sample_spec.channels =3D sfinfo.channels;
- =
+
readf_function =3D NULL;
- =
+
switch (sfinfo.format & 0xFF) {
case SF_FORMAT_PCM_16:
case SF_FORMAT_PCM_U8:
@@ -327,11 +327,11 @@
sample_spec.format =3D PA_SAMPLE_S16NE;
readf_function =3D (sf_count_t (*)(SNDFILE *_sndfile, void *pt=
r, sf_count_t frames)) sf_readf_short;
break;
- =
+
case SF_FORMAT_ULAW:
sample_spec.format =3D PA_SAMPLE_ULAW;
break;
- =
+
case SF_FORMAT_ALAW:
sample_spec.format =3D PA_SAMPLE_ALAW;
break;
@@ -369,13 +369,13 @@
if (!stream_name)
stream_name =3D pa_utf8_filter(n);
}
- =
+
if (verbose) {
char t[PA_SAMPLE_SPEC_SNPRINT_MAX];
pa_sample_spec_snprint(t, sizeof(t), &sample_spec);
fprintf(stderr, "Using sample spec '%s'\n", t);
}
- =
+
/* Set up a new main loop */
if (!(m =3D pa_mainloop_new())) {
fprintf(stderr, "pa_mainloop_new() failed.\n");
@@ -390,7 +390,7 @@
#ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN);
#endif
- =
+
/* Create a new connection context */
if (!(context =3D pa_context_new(mainloop_api, client_name))) {
fprintf(stderr, "pa_context_new() failed.\n");
@@ -407,7 +407,7 @@
fprintf(stderr, "pa_mainloop_run() failed.\n");
goto quit;
}
- =
+
quit:
if (stream)
pa_stream_unref(stream);
@@ -427,6 +427,6 @@
=
if (sndfile)
sf_close(sndfile);
- =
+
return ret;
}
Modified: trunk/src/utils/pax11publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pax11publish.c?=
rev=3D1418&root=3Dpulseaudio&r1=3D1417&r2=3D1418&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/utils/pax11publish.c (original)
+++ trunk/src/utils/pax11publish.c Thu Jan 4 14:43:45 2007
@@ -2,17 +2,17 @@
=
/***
This file is part of PulseAudio.
- =
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
- =
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- =
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -99,7 +99,7 @@
switch (mode) {
case DUMP: {
char t[1024];
- if (pa_x11_get_prop(d, "PULSE_SERVER", t, sizeof(t))) =
+ if (pa_x11_get_prop(d, "PULSE_SERVER", t, sizeof(t)))
printf("Server: %s\n", t);
if (pa_x11_get_prop(d, "PULSE_SOURCE", t, sizeof(t)))
printf("Source: %s\n", t);
@@ -110,10 +110,10 @@
=
break;
}
- =
+
case IMPORT: {
char t[1024];
- if (pa_x11_get_prop(d, "PULSE_SERVER", t, sizeof(t))) =
+ if (pa_x11_get_prop(d, "PULSE_SERVER", t, sizeof(t)))
printf("PULSE_SERVER=3D'%s'\nexport PULSE_SERVER\n", t);
if (pa_x11_get_prop(d, "PULSE_SOURCE", t, sizeof(t)))
printf("PULSE_SOURCE=3D'%s'\nexport PULSE_SOURCE\n", t);
@@ -158,7 +158,7 @@
pa_x11_del_prop(d, "PULSE_SOURCE");
pa_x11_del_prop(d, "PULSE_ID");
pa_x11_del_prop(d, "PULSE_COOKIE");
- =
+
if (server)
pa_x11_set_prop(d, "PULSE_SERVER", server);
else if (conf->default_server)
@@ -169,7 +169,7 @@
fprintf(stderr, "Failed to get FQDN.\n");
goto finish;
}
- =
+
pa_x11_set_prop(d, "PULSE_SERVER", hn);
}
=
@@ -184,7 +184,7 @@
pa_x11_set_prop(d, "PULSE_SOURCE", conf->default_source);
=
pa_client_conf_free(conf);
- =
+
if (pa_authkey_load_auto(cookie_file, cookie, sizeof(cookie)) =
< 0) {
fprintf(stderr, "Failed to load cookie data\n");
goto finish;
@@ -201,20 +201,20 @@
pa_x11_del_prop(d, "PULSE_ID");
pa_x11_del_prop(d, "PULSE_COOKIE");
break;
- =
+
default:
fprintf(stderr, "No yet implemented.\n");
goto finish;
}
=
ret =3D 0;
- =
+
finish:
=
if (d) {
XSync(d, False);
XCloseDisplay(d);
}
- =
+
return ret;
}
More information about the pulseaudio-commits
mailing list