~ubuntu-dev/ubuntu/lucid/mpd/lucid-201002101854

Committer: Bazaar Package Importer
Author(s): Alessio Treglia
Date: 2009-10-23 12:38:20 UTC
mfrom: (1.1.12 upstream) (2.2.6 sid)
Revision ID: james.westby@ubuntu.com-20091023123820-rxt21lmekscxbkbt

Tags: 0.15.4-1ubuntu1

* Merge from debian unstable, Ubuntu remaining changes:
  - debian/control:
    + Don't build-depends on libmikmod2-dev (Debian bug #510675).
    + Move avahi-daemon from Suggests field to Recommends field.
  - debian/mpd.init.d:
    + Read mpd user from mpd.conf.
* Also fixes LP: #332332.

files added:
doc/developer.xml

doc/doxygen.conf

doc/sticker.xml

doc/user.xml

m4/faad.m4

m4/mpd_auto.m4

src/aiff.c

src/aiff.h

src/archive

src/archive/bz2_plugin.c

src/archive/iso_plugin.c

src/archive/zip_plugin.c

src/archive_api.c

src/archive_api.h

src/archive_internal.h

src/archive_list.c

src/archive_list.h

src/audio_parser.c

src/audio_parser.h

src/buffer.c

src/buffer.h

src/chunk.c

src/chunk.h

src/cmdline.c

src/cmdline.h

src/cue

src/cue/cue_tag.c

src/cue/cue_tag.h

src/daemon.c

src/daemon.h

src/decoder/faad_plugin.c

src/decoder/fluidsynth_plugin.c

src/decoder/mad_plugin.c

src/decoder/mikmod_plugin.c

src/decoder/modplug_plugin.c

src/decoder/mp4ff_plugin.c

src/decoder/mpcdec_plugin.c

src/decoder/sidplay_plugin.cxx

src/decoder/vorbis_plugin.c

src/decoder/wildmidi_plugin.c

src/decoder_buffer.c

src/decoder_buffer.h

src/decoder_command.h

src/decoder_internal.c

src/decoder_plugin.h

src/encoder

src/encoder/lame_encoder.c

src/encoder/vorbis_encoder.c

src/encoder_api.h

src/encoder_list.c

src/encoder_list.h

src/encoder_plugin.h

src/event_pipe.c

src/event_pipe.h

src/fifo_buffer.c

src/fifo_buffer.h

src/icy_metadata.c

src/icy_metadata.h

src/icy_server.c

src/icy_server.h

src/input

src/input/archive_input_plugin.c

src/input/archive_input_plugin.h

src/input/curl_input_plugin.c

src/input/curl_input_plugin.h

src/input/file_input_plugin.c

src/input/file_input_plugin.h

src/input/lastfm_input_plugin.c

src/input/lastfm_input_plugin.h

src/input/mms_input_plugin.c

src/input/mms_input_plugin.h

src/input_plugin.h

src/main.h

src/mixer

src/mixer/alsa_mixer.c

src/mixer/oss_mixer.c

src/mixer/pulse_mixer.c

src/mixer_all.c

src/mixer_all.h

src/mixer_api.c

src/mixer_api.h

src/mixer_control.c

src/mixer_control.h

src/mixer_list.h

src/mixer_plugin.h

src/output/httpd_client.c

src/output/httpd_client.h

src/output/httpd_internal.h

src/output/httpd_output_plugin.c

src/output/pipe_output_plugin.c

src/output/solaris_output_plugin.c

src/output_all.c

src/output_all.h

src/output_command.c

src/output_command.h

src/output_plugin.h

src/output_print.c

src/output_print.h

src/output_state.c

src/output_state.h

src/page.c

src/page.h

src/pcm_buffer.h

src/pcm_convert.c

src/pcm_convert.h

src/pcm_format.c

src/pcm_format.h

src/pcm_mix.c

src/pcm_mix.h

src/pcm_resample_internal.h

src/pcm_volume.c

src/pcm_volume.h

src/playlist_control.c

src/playlist_edit.c

src/playlist_global.c

src/playlist_internal.h

src/playlist_print.c

src/playlist_print.h

src/playlist_state.c

src/playlist_state.h

src/poison.h

src/queue.c

src/queue.h

src/queue_print.c

src/queue_print.h

src/queue_save.c

src/queue_save.h

src/riff.c

src/riff.h

src/socket_util.c

src/socket_util.h

src/song_sticker.c

src/song_sticker.h

src/sticker.c

src/sticker.h

src/sticker_print.c

src/sticker_print.h

src/tag_ape.c

src/tag_ape.h

src/uri.c

src/uri.h

src/zeroconf-avahi.c

src/zeroconf-bonjour.c

src/zeroconf-internal.h

test

test/read_conf.c

test/read_mixer.c

test/read_tags.c

test/run_decoder.c

test/run_encoder.c

test/run_input.c

test/run_output.c

test/software_volume.c

files removed:
TODO

doc/Makefile.am

doc/Makefile.in

m4/acx_pthread.m4

m4/codeset.m4

scripts/makerpm.sh

scripts/mpd.spec

src/Makefile.am

src/Makefile.in

src/audioOutput.c

src/audioOutput.h

src/condition.c

src/condition.h

src/decoder/aac_plugin.c

src/decoder/mod_plugin.c

src/decoder/mp3_plugin.c

src/decoder/mp4_plugin.c

src/decoder/mpc_plugin.c

src/decoder/oggvorbis_plugin.c

src/dlist.h

src/input_curl.c

src/input_curl.h

src/input_file.c

src/input_file.h

src/ioops.c

src/ioops.h

src/list.c

src/list.h

src/main_notify.c

src/main_notify.h

src/os_compat.h

src/output/shout_mp3.c

src/output/shout_ogg.c

src/output/shout_plugin.h

src/output_api.c

src/pcm_utils.c

src/playerData.c

src/playerData.h

src/signal_check.c

src/signal_check.h

files modified:
AUTHORS

INSTALL

Makefile.am

Makefile.in

NEWS

aclocal.m4

config.guess

config.h.in

config.sub

configure

configure.ac

debian/changelog

debian/control

debian/mpd.conf

debian/mpd.init.d

debian/rules

doc/mpd.1

doc/mpd.conf.5

doc/mpdconf.example

doc/protocol.xml

m4/lame.m4

m4/libOggFLAC.m4

m4/mpd_check_cflag.m4

scripts/test.sh

src/ack.h

src/audio.c

src/audio.h

src/audio_format.h

src/buffer2array.c

src/buffer2array.h

src/client.c

src/client.h

src/command.c

src/command.h

src/compress.c

src/compress.h

src/conf.c

src/conf.h

src/crossfade.c

src/crossfade.h

src/database.c

src/database.h

src/dbUtils.c

src/dbUtils.h

src/decoder/_flac_common.c

src/decoder/_flac_common.h

src/decoder/_ogg_common.c

src/decoder/_ogg_common.h

src/decoder/audiofile_plugin.c

src/decoder/ffmpeg_plugin.c

src/decoder/flac_plugin.c

src/decoder/oggflac_plugin.c

src/decoder/wavpack_plugin.c

src/decoder_api.c

src/decoder_api.h

src/decoder_control.c

src/decoder_control.h

src/decoder_internal.h

src/decoder_list.c

src/decoder_list.h

src/decoder_thread.c

src/decoder_thread.h

src/directory.c

src/directory.h

src/directory_print.c

src/directory_print.h

src/directory_save.c

src/directory_save.h

src/dirvec.c

src/dirvec.h

src/gcc.h

src/idle.c

src/idle.h

src/input_stream.c

src/input_stream.h

src/listen.c

src/listen.h

src/locate.c

src/locate.h

src/log.c

src/log.h

src/ls.c

src/ls.h

src/main.c

src/mapper.c

src/mapper.h

src/normalize.c

src/normalize.h

src/notify.c

src/notify.h

src/output/alsa_plugin.c

src/output/ao_plugin.c

src/output/fifo_plugin.c

src/output/jack_plugin.c

src/output/mvp_plugin.c

src/output/null_plugin.c

src/output/oss_plugin.c

src/output/osx_plugin.c

src/output/pulse_plugin.c

src/output/shout_plugin.c

src/output_api.h

src/output_control.c

src/output_control.h

src/output_init.c

src/output_internal.h

src/output_list.c

src/output_list.h

src/output_thread.c

src/output_thread.h

src/path.c

src/path.h

src/pcm_channels.c

src/pcm_channels.h

src/pcm_dither.c

src/pcm_dither.h

src/pcm_prng.h

src/pcm_resample.c

src/pcm_resample.h

src/pcm_resample_fallback.c

src/pcm_resample_libsamplerate.c

src/pcm_utils.h

src/permission.c

src/permission.h

src/pipe.c

src/pipe.h

src/player_control.c

src/player_control.h

src/player_thread.c

src/player_thread.h

src/playlist.c

src/playlist.h

src/playlist_save.c

src/playlist_save.h

src/replay_gain.c

src/replay_gain.h

src/sig_handlers.c

src/sig_handlers.h

src/song.c

src/song.h

src/song_print.c

src/song_print.h

src/song_save.c

src/song_save.h

src/songvec.c

src/songvec.h

src/state_file.c

src/state_file.h

src/stats.c

src/stats.h

src/stored_playlist.c

src/stored_playlist.h

src/strset.c

src/strset.h

src/tag.c

src/tag.h

src/tag_id3.c

src/tag_id3.h

src/tag_internal.h

src/tag_pool.c

src/tag_pool.h

src/tag_print.c

src/tag_print.h

src/tag_save.c

src/tag_save.h

src/timer.c

src/timer.h

src/update.c

src/update.h

src/utils.c

src/utils.h

src/volume.c

src/volume.h

src/zeroconf.c

src/zeroconf.h

Show diffs side-by-side

added added

removed removed

src/output_control.c

/* the Music Player Daemon (MPD)

* This project's homepage is: http://www.musicpd.org

* http://www.musicpd.org

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

* 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 General Public License

* along with this program; if not, write to the Free Software

* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

* You should have received a copy of the GNU General Public License along

* with this program; if not, write to the Free Software Foundation, Inc.,

* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include "output_control.h"

#include "output_api.h"

#include "output_internal.h"

#include "output_thread.h"

#include "pcm_utils.h"

#include "mixer_control.h"

#include "mixer_plugin.h"

#include <pthread.h>

#include <assert.h>

#include <stdlib.h>

struct notify audio_output_client_notify = NOTIFY_INITIALIZER;

enum {

/** after a failure, wait this number of seconds before

automatically reopening the device */

REOPEN_AFTER = 10,

};

struct notify audio_output_client_notify;

static void ao_command_wait(struct audio_output *ao)

{

notify_signal(&ao->notify);

}

static bool

audio_output_open(struct audio_output *ao,

const struct audio_format *audio_format,

const struct music_pipe *mp)

{

bool open;

assert(mp != NULL);

if (ao->fail_timer != NULL) {

g_timer_destroy(ao->fail_timer);

ao->fail_timer = NULL;

}

if (ao->open &&

audio_format_equals(audio_format, &ao->in_audio_format)) {

assert(ao->pipe == mp);

if (ao->pause) {

/* unpause with the CANCEL command; this is a

hack, but suits well for forcing the thread

to leave the ao_pause() thread, and we need

to flush the device buffer anyway */

/* we're not using audio_output_cancel() here,

because that function is asynchronous */

ao_command(ao, AO_COMMAND_CANCEL);

}

return true;

}

ao->in_audio_format = *audio_format;

ao->chunk = NULL;

if (!ao->config_audio_format) {

if (ao->open)

audio_output_close(ao);

100

/* no audio format is configured: copy in->out, let

101

the output's open() method determine the effective

102

out_audio_format */

103

ao->out_audio_format = ao->in_audio_format;

104

}

105

106

ao->pipe = mp;

107

108

if (ao->thread == NULL)

109

audio_output_thread_start(ao);

110

111

open = ao->open;

112

if (!open) {

113

ao_command(ao, AO_COMMAND_OPEN);

114

open = ao->open;

115

}

116

117

if (open && ao->mixer != NULL)

118

mixer_open(ao->mixer);

119

120

return open;

121

}

122

123

bool

audio_output_open(struct audio_output *audioOutput,

const struct audio_format *audioFormat)

{

audioOutput->reopen_after = 0;

if (audioOutput->open &&

audio_format_equals(audioFormat, &audioOutput->inAudioFormat)) {

return true;

}

audioOutput->inAudioFormat = *audioFormat;

if (audio_format_defined(&audioOutput->reqAudioFormat)) {

/* copy reqAudioFormat to outAudioFormat only if the

device is not yet open; if it is already open,

plugin->open() may have modified outAudioFormat,

and the value is already ok */

if (!audioOutput->open)

audioOutput->outAudioFormat =

audioOutput->reqAudioFormat;

} else {

audioOutput->outAudioFormat = audioOutput->inAudioFormat;

if (audioOutput->open)

audio_output_close(audioOutput);

}

if (audioOutput->thread == 0)

audio_output_thread_start(audioOutput);

if (!audioOutput->open)

ao_command(audioOutput, AO_COMMAND_OPEN);

return audioOutput->open;

}

void

124

audio_output_update(struct audio_output *ao,

const struct audio_format *audio_format)

125

const struct audio_format *audio_format,

126

const struct music_pipe *mp)

127

{

128

assert(mp != NULL);

129

130

if (ao->enabled) {

if (ao->reopen_after == 0 || time(NULL) > ao->reopen_after)

audio_output_open(ao, audio_format);

131

if (ao->fail_timer == NULL ||

132

g_timer_elapsed(ao->fail_timer, NULL) > REOPEN_AFTER)

133

return audio_output_open(ao, audio_format, mp);

134

} else if (audio_output_is_open(ao))

135

audio_output_close(ao);

136

137

return false;

138

}

100

139

101

140

void

102

audio_output_signal(struct audio_output *ao)

141

audio_output_play(struct audio_output *ao)

103

142

{

143

if (!ao->open)

144

return;

145

104

146

notify_signal(&ao->notify);

105

147

}

106

148

107

void audio_output_play(struct audio_output *audioOutput,

108

const char *playChunk, size_t size)

109

{

110

assert(size > 0);

111

112

if (!audioOutput->open)

113

return;

114

115

audioOutput->args.play.data = playChunk;

116

audioOutput->args.play.size = size;

117

ao_command_async(audioOutput, AO_COMMAND_PLAY);

118

}

119

120

void audio_output_pause(struct audio_output *audioOutput)

121

{

122

ao_command_async(audioOutput, AO_COMMAND_PAUSE);

123

}

124

125

void audio_output_cancel(struct audio_output *audioOutput)

126

{

127

ao_command_async(audioOutput, AO_COMMAND_CANCEL);

128

}

129

130

void audio_output_close(struct audio_output *audioOutput)

131

{

132

if (audioOutput->open)

133

ao_command(audioOutput, AO_COMMAND_CLOSE);

134

}

135

136

void audio_output_finish(struct audio_output *audioOutput)

137

{

138

audio_output_close(audioOutput);

139

if (audioOutput->thread != 0)

140

ao_command(audioOutput, AO_COMMAND_KILL);

141

if (audioOutput->plugin->finish)

142

audioOutput->plugin->finish(audioOutput->data);

143

if (audioOutput->convBuffer)

144

free(audioOutput->convBuffer);

145

}

146

147

void audio_output_send_tag(struct audio_output *audioOutput,

148

const struct tag *tag)

149

{

150

if (audioOutput->plugin->send_tag == NULL)

151

return;

152

153

audioOutput->args.tag = tag;

154

ao_command_async(audioOutput, AO_COMMAND_SEND_TAG);

149

void audio_output_pause(struct audio_output *ao)

150

{

151

if (ao->mixer != NULL && ao->plugin->pause == NULL)

152

/* the device has no pause mode: close the mixer,

153

unless its "global" flag is set (checked by

154

mixer_auto_close()) */

155

mixer_auto_close(ao->mixer);

156

157

ao_command_async(ao, AO_COMMAND_PAUSE);

158

}

159

160

void audio_output_cancel(struct audio_output *ao)

161

{

162

ao_command_async(ao, AO_COMMAND_CANCEL);

163

}

164

165

void audio_output_close(struct audio_output *ao)

166

{

167

assert(!ao->open || ao->fail_timer == NULL);

168

169

if (ao->mixer != NULL)

170

mixer_auto_close(ao->mixer);

171

172

if (ao->open)

173

ao_command(ao, AO_COMMAND_CLOSE);

174

else if (ao->fail_timer != NULL) {

175

g_timer_destroy(ao->fail_timer);

176

ao->fail_timer = NULL;

177

}

178

}

179

180

void audio_output_finish(struct audio_output *ao)

181

{

182

audio_output_close(ao);

183

184

assert(ao->fail_timer == NULL);

185

186

if (ao->thread != NULL) {

187

ao_command(ao, AO_COMMAND_KILL);

188

g_thread_join(ao->thread);

189

}

190

191

if (ao->mixer != NULL)

192

mixer_free(ao->mixer);

193

194

ao_plugin_finish(ao->plugin, ao->data);

195

196

notify_deinit(&ao->notify);

197

g_mutex_free(ao->mutex);

155

198

}

Older »