← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to src/decoder_control.c

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

https://launchpad.net/bugs/332332

* 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/decoder_control.c

1

/* the Music Player Daemon (MPD)

2

* Copyright (C) 2008 Max Kellermann <max@duempel.org>

3

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

1

/*

2

* Copyright (C) 2003-2009 The Music Player Daemon Project

3

* http://www.musicpd.org

4

4

*

5

5

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

6

6

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

11

11

* but WITHOUT ANY WARRANTY; without even the implied warranty of

12

12

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

13

13

* GNU General Public License for more details.

14

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

15

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

16

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

14

*

15

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

16

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

17

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

17

18

*/

18

19

19

20

#include "decoder_control.h"

59

60

void

60

61

dc_start(struct notify *notify, struct song *song)

61

62

{

63

assert(dc.pipe != NULL);

62

64

assert(song != NULL);

63

65

64

66

dc.next_song = song;

68

70

void

69

71

dc_start_async(struct song *song)

70

72

{

73

assert(dc.pipe != NULL);

71

74

assert(song != NULL);

72

75

73

76

dc.next_song = song;

77

80

void

78

81

dc_stop(struct notify *notify)

79

82

{

80

if (dc.command == DECODE_COMMAND_START ||

81

(dc.state != DECODE_STATE_STOP && dc.state != DECODE_STATE_ERROR))

83

if (dc.command != DECODE_COMMAND_NONE)

84

/* Attempt to cancel the current command. If it's too

85

late and the decoder thread is already executing

86

the old command, we'll call STOP again in this

87

function (see below). */

88

dc_command(notify, DECODE_COMMAND_STOP);

89

90

if (dc.state != DECODE_STATE_STOP && dc.state != DECODE_STATE_ERROR)

82

91

dc_command(notify, DECODE_COMMAND_STOP);

83

92

}

84

93

85

94

bool

86

95

dc_seek(struct notify *notify, double where)

87

96

{

97

assert(dc.state != DECODE_STATE_START);

88

98

assert(where >= 0.0);

89

99

90

100

if (dc.state == DECODE_STATE_STOP ||

100

110

101

111

return true;

102

112

}

113

114

void

115

dc_quit(void)

116

{

117

assert(dc.thread != NULL);

118

119

dc.quit = true;

120

dc_command_async(DECODE_COMMAND_STOP);

121

122

g_thread_join(dc.thread);

123

dc.thread = NULL;

124

}

Older »