~diwic/ubuntu/lucid/pulseaudio/bugfixes

« back to all changes in this revision

Viewing changes to src/pulsecore/sink.c

Committer: Bazaar Package Importer
Author(s): Daniel T Chen
Date: 2007-12-04 00:56:08 UTC
mto: (1.15.1 sid)
mto: This revision was merged to the branch mainline in revision 15.
Revision ID: james.westby@ubuntu.com-20071204005608-3lzrrrpxi186kgx4

Tags: upstream-0.9.8

Import upstream version 0.9.8

files added:
man

man/Makefile.am

man/Makefile.in

man/default.pa.5

man/default.pa.5.xml.in

man/esdcompat.1

man/esdcompat.1.xml.in

man/pabrowse.1

man/pabrowse.1.xml.in

man/pacat.1

man/pacat.1.xml.in

man/pacmd.1

man/pacmd.1.xml.in

man/pactl.1

man/pactl.1.xml.in

man/padsp.1

man/padsp.1.xml.in

man/paplay.1

man/paplay.1.xml.in

man/pasuspender.1

man/pasuspender.1.xml.in

man/pax11publish.1

man/pax11publish.1.xml.in

man/pulse-client.conf.5

man/pulse-client.conf.5.xml.in

man/pulse-daemon.conf.5

man/pulse-daemon.conf.5.xml.in

man/pulseaudio.1

man/pulseaudio.1.xml.in

man/xmltoman.css

man/xmltoman.dtd

man/xmltoman.xsl

src/daemon/PulseAudio.policy

src/daemon/polkit.c

src/daemon/polkit.h

src/map-file

src/modules/bt-proximity-helper.c

src/modules/module-bt-proximity-symdef.h

src/modules/module-bt-proximity.c

src/pulsecore/start-child.c

src/pulsecore/start-child.h

src/tests/mix-test.c

src/tests/remix-test.c

files modified:
ChangeLog

Makefile.am

Makefile.in

config.h.in

configure

configure.ac

doxygen/Makefile.in

libpulse-browse.pc.in

libpulse-mainloop-glib.pc.in

libpulse-simple.pc.in

libpulse.pc.in

src/Makefile.am

src/Makefile.in

src/daemon/cmdline.c

src/daemon/cpulimit.c

src/daemon/daemon-conf.c

src/daemon/daemon-conf.h

src/daemon/daemon.conf.in

src/daemon/dumpmodules.c

src/daemon/main.c

src/modules/alsa-util.c

src/modules/alsa-util.h

src/modules/gconf/module-gconf-symdef.h

src/modules/gconf/module-gconf.c

src/modules/module-alsa-sink-symdef.h

src/modules/module-alsa-sink.c

src/modules/module-alsa-source-symdef.h

src/modules/module-alsa-source.c

src/modules/module-cli-protocol-tcp-symdef.h

src/modules/module-cli-protocol-unix-symdef.h

src/modules/module-cli-symdef.h

src/modules/module-cli.c

src/modules/module-combine-symdef.h

src/modules/module-combine.c

src/modules/module-default-device-restore-symdef.h

src/modules/module-default-device-restore.c

src/modules/module-defs.h.m4

src/modules/module-detect-symdef.h

src/modules/module-detect.c

src/modules/module-esound-compat-spawnfd-symdef.h

src/modules/module-esound-compat-spawnfd.c

src/modules/module-esound-compat-spawnpid-symdef.h

src/modules/module-esound-compat-spawnpid.c

src/modules/module-esound-protocol-tcp-symdef.h

src/modules/module-esound-protocol-unix-symdef.h

src/modules/module-esound-sink-symdef.h

src/modules/module-esound-sink.c

src/modules/module-hal-detect-symdef.h

src/modules/module-hal-detect.c

src/modules/module-http-protocol-tcp-symdef.h

src/modules/module-http-protocol-unix-symdef.h

src/modules/module-jack-sink-symdef.h

src/modules/module-jack-sink.c

src/modules/module-jack-source-symdef.h

src/modules/module-jack-source.c

src/modules/module-ladspa-sink-symdef.h

src/modules/module-ladspa-sink.c

src/modules/module-lirc-symdef.h

src/modules/module-lirc.c

src/modules/module-match-symdef.h

src/modules/module-match.c

src/modules/module-mmkbd-evdev-symdef.h

src/modules/module-mmkbd-evdev.c

src/modules/module-native-protocol-fd-symdef.h

src/modules/module-native-protocol-fd.c

src/modules/module-native-protocol-tcp-symdef.h

src/modules/module-native-protocol-unix-symdef.h

src/modules/module-null-sink-symdef.h

src/modules/module-null-sink.c

src/modules/module-oss-symdef.h

src/modules/module-oss.c

src/modules/module-pipe-sink-symdef.h

src/modules/module-pipe-sink.c

src/modules/module-pipe-source-symdef.h

src/modules/module-pipe-source.c

src/modules/module-protocol-stub.c

src/modules/module-remap-sink-symdef.h

src/modules/module-remap-sink.c

src/modules/module-rescue-streams-symdef.h

src/modules/module-rescue-streams.c

src/modules/module-simple-protocol-tcp-symdef.h

src/modules/module-simple-protocol-unix-symdef.h

src/modules/module-sine-symdef.h

src/modules/module-sine.c

src/modules/module-solaris-symdef.h

src/modules/module-suspend-on-idle-symdef.h

src/modules/module-suspend-on-idle.c

src/modules/module-tunnel-sink-symdef.h

src/modules/module-tunnel-source-symdef.h

src/modules/module-tunnel.c

src/modules/module-volume-restore-symdef.h

src/modules/module-volume-restore.c

src/modules/module-waveout-symdef.h

src/modules/module-x11-bell-symdef.h

src/modules/module-x11-bell.c

src/modules/module-x11-publish-symdef.h

src/modules/module-x11-publish.c

src/modules/module-x11-xsmp-symdef.h

src/modules/module-x11-xsmp.c

src/modules/module-zeroconf-discover-symdef.h

src/modules/module-zeroconf-discover.c

src/modules/module-zeroconf-publish-symdef.h

src/modules/module-zeroconf-publish.c

src/modules/oss-util.c

src/modules/rtp/module-rtp-recv-symdef.h

src/modules/rtp/module-rtp-recv.c

src/modules/rtp/module-rtp-send-symdef.h

src/modules/rtp/module-rtp-send.c

src/pulse/channelmap.c

src/pulse/client-conf.c

src/pulse/client-conf.h

src/pulse/client.conf.in

src/pulse/context.c

src/pulse/def.h

src/pulse/internal.h

src/pulse/mainloop-signal.c

src/pulse/operation.c

src/pulse/sample.c

src/pulse/sample.h

src/pulse/stream.c

src/pulse/stream.h

src/pulse/thread-mainloop.c

src/pulse/version.h

src/pulsecore/cli-command.c

src/pulsecore/cli-command.h

src/pulsecore/cli-text.c

src/pulsecore/cli.c

src/pulsecore/conf-parser.c

src/pulsecore/core-util.c

src/pulsecore/core-util.h

src/pulsecore/core.c

src/pulsecore/core.h

src/pulsecore/endianmacros.h

src/pulsecore/fdsem.c

src/pulsecore/gccmacro.h

src/pulsecore/iochannel.c

src/pulsecore/macro.h

src/pulsecore/memblockq.c

src/pulsecore/memblockq.h

src/pulsecore/modargs.c

src/pulsecore/modargs.h

src/pulsecore/modinfo.c

src/pulsecore/modinfo.h

src/pulsecore/module.c

src/pulsecore/module.h

src/pulsecore/native-common.h

src/pulsecore/pdispatch.c

src/pulsecore/pid.c

src/pulsecore/pid.h

src/pulsecore/protocol-esound.c

src/pulsecore/protocol-native.c

src/pulsecore/protocol-simple.c

src/pulsecore/resampler.c

src/pulsecore/resampler.h

src/pulsecore/sample-util.c

src/pulsecore/sample-util.h

src/pulsecore/sconv-s16be.c

src/pulsecore/sconv-s16be.h

src/pulsecore/sconv-s16le.c

src/pulsecore/sconv-s16le.h

src/pulsecore/sconv.c

src/pulsecore/sink-input.c

src/pulsecore/sink-input.h

src/pulsecore/sink.c

src/pulsecore/source-output.c

src/pulsecore/source-output.h

src/pulsecore/source.c

src/tests/resampler-test.c

src/utils/pacat.c

src/utils/pacmd.c

src/utils/pactl.c

src/utils/paplay.c

src/utils/pasuspender.c

Show diffs side-by-side

added added

removed removed

src/pulsecore/sink.c

/* $Id: sink.c 1971 2007-10-28 19:13:50Z lennart $ */

/* $Id: sink.c 2067 2007-11-21 01:30:40Z lennart $ */

/***

This file is part of PulseAudio.

149

150

static int sink_set_state(pa_sink *s, pa_sink_state_t state) {

151

int ret;

152

pa_bool_t suspend_change;

152

153

154

pa_assert(s);

154

155

156

if (s->state == state)

156

157

return 0;

157

158

if ((s->state == PA_SINK_SUSPENDED && PA_SINK_OPENED(state)) ||

159

(PA_SINK_OPENED(s->state) && state == PA_SINK_SUSPENDED)) {

159

suspend_change =

160

(s->state == PA_SINK_SUSPENDED && PA_SINK_OPENED(state)) ||

161

(PA_SINK_OPENED(s->state) && state == PA_SINK_SUSPENDED);

162

163

if (s->set_state)

164

if ((ret = s->set_state(s, state)) < 0)

165

return -1;

166

167

if (pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_STATE, PA_UINT_TO_PTR(state), 0, NULL) < 0)

168

return -1;

169

170

s->state = state;

171

172

if (suspend_change) {

160

173

pa_sink_input *i;

161

174

uint32_t idx;

162

175

167

180

i->suspend(i, state == PA_SINK_SUSPENDED);

168

181

}

169

182

170

if (s->set_state)

171

if ((ret = s->set_state(s, state)) < 0)

172

return -1;

173

174

if (pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_STATE, PA_UINT_TO_PTR(state), 0, NULL) < 0)

175

return -1;

176

177

s->state = state;

178

179

183

if (state != PA_SINK_UNLINKED) /* if we enter UNLINKED state pa_sink_unlink() will fire the apropriate events */

180

184

pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_STATE_CHANGED], s);

185

181

186

return 0;

182

187

}

183

188

Older »