← Back to branch summary

~ubuntu-branches/ubuntu/saucy/mpd/saucy

~ubuntu-branches/ubuntu/saucy/mpd/saucy

« back to all changes in this revision

Viewing changes to src/zeroconf-avahi.c

Committer: Bazaar Package Importer
Author(s): Angel Abad
Date: 2011-02-02 12:26:30 UTC
mfrom: (1.5.11 upstream)
Revision ID: james.westby@ubuntu.com-20110202122630-bdyx8w4k94doz4fs

Tags: 0.16.1-1ubuntu1

* Merge from debian unstable. Remaining changes:
  - debian/control:
    + Don't build-depend 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.
  - debian/control, debian/rules:
    + Add libmp3lame-dev to the build dependencies and enable lame.

files added:
m4/libwrap.m4

m4/pretty_print.m4

src/AudioCompress

src/AudioCompress/compress.c

src/AudioCompress/compress.h

src/AudioCompress/config.h

src/ape.c

src/ape.h

src/archive/bz2_archive_plugin.c

src/archive/bz2_archive_plugin.h

src/archive/iso9660_archive_plugin.c

src/archive/iso9660_archive_plugin.h

src/archive/zzip_archive_plugin.c

src/archive/zzip_archive_plugin.h

src/archive_plugin.c

src/archive_plugin.h

src/audio_check.c

src/audio_check.h

src/audio_format.c

src/check.h

src/client_event.c

src/client_expire.c

src/client_global.c

src/client_idle.c

src/client_internal.h

src/client_list.c

src/client_new.c

src/client_process.c

src/client_read.c

src/client_write.c

src/decoder/audiofile_decoder_plugin.c

src/decoder/faad_decoder_plugin.c

src/decoder/ffmpeg_decoder_plugin.c

src/decoder/flac_compat.h

src/decoder/flac_decoder_plugin.c

src/decoder/flac_metadata.c

src/decoder/flac_metadata.h

src/decoder/flac_pcm.c

src/decoder/flac_pcm.h

src/decoder/fluidsynth_decoder_plugin.c

src/decoder/gme_decoder_plugin.c

src/decoder/mad_decoder_plugin.c

src/decoder/mikmod_decoder_plugin.c

src/decoder/modplug_decoder_plugin.c

src/decoder/mp4ff_decoder_plugin.c

src/decoder/mpcdec_decoder_plugin.c

src/decoder/mpg123_decoder_plugin.c

src/decoder/oggflac_decoder_plugin.c

src/decoder/sidplay_decoder_plugin.cxx

src/decoder/sndfile_decoder_plugin.c

src/decoder/vorbis_decoder_plugin.c

src/decoder/wavpack_decoder_plugin.c

src/decoder/wildmidi_decoder_plugin.c

src/decoder_plugin.c

src/decoder_print.c

src/decoder_print.h

src/encoder/flac_encoder.c

src/encoder/null_encoder.c

src/encoder/twolame_encoder.c

src/encoder/wave_encoder.c

src/exclude.c

src/exclude.h

src/fd_util.c

src/fd_util.h

src/filter

src/filter/autoconvert_filter_plugin.c

src/filter/autoconvert_filter_plugin.h

src/filter/chain_filter_plugin.c

src/filter/chain_filter_plugin.h

src/filter/convert_filter_plugin.c

src/filter/convert_filter_plugin.h

src/filter/normalize_filter_plugin.c

src/filter/null_filter_plugin.c

src/filter/replay_gain_filter_plugin.c

src/filter/replay_gain_filter_plugin.h

src/filter/route_filter_plugin.c

src/filter/volume_filter_plugin.c

src/filter/volume_filter_plugin.h

src/filter_config.c

src/filter_config.h

src/filter_internal.h

src/filter_plugin.c

src/filter_plugin.h

src/filter_registry.c

src/filter_registry.h

src/glib_compat.h

src/inotify_queue.c

src/inotify_queue.h

src/inotify_source.c

src/inotify_source.h

src/inotify_update.c

src/inotify_update.h

src/input/ffmpeg_input_plugin.c

src/input/ffmpeg_input_plugin.h

src/input_init.c

src/input_init.h

src/input_registry.c

src/input_registry.h

src/main_win32.c

src/mixer/alsa_mixer_plugin.c

src/mixer/oss_mixer_plugin.c

src/mixer/pulse_mixer_plugin.c

src/mixer/pulse_mixer_plugin.h

src/mixer/software_mixer_plugin.c

src/mixer/software_mixer_plugin.h

src/mixer/winmm_mixer_plugin.c

src/mixer_type.c

src/mixer_type.h

src/mpd_error.h

src/open.h

src/output/ffado_output_plugin.c

src/output/fifo_output_plugin.c

src/output/jack_output_plugin.c

src/output/openal_plugin.c

src/output/pulse_output_plugin.c

src/output/pulse_output_plugin.h

src/output/recorder_output_plugin.c

src/output/winmm_output_plugin.c

src/output/winmm_output_plugin.h

src/pcm_byteswap.c

src/pcm_byteswap.h

src/pcm_pack.c

src/pcm_pack.h

src/playlist

src/playlist/asx_playlist_plugin.c

src/playlist/asx_playlist_plugin.h

src/playlist/cue_playlist_plugin.c

src/playlist/cue_playlist_plugin.h

src/playlist/extm3u_playlist_plugin.c

src/playlist/extm3u_playlist_plugin.h

src/playlist/flac_playlist_plugin.c

src/playlist/flac_playlist_plugin.h

src/playlist/lastfm_playlist_plugin.c

src/playlist/lastfm_playlist_plugin.h

src/playlist/m3u_playlist_plugin.c

src/playlist/m3u_playlist_plugin.h

src/playlist/pls_playlist_plugin.c

src/playlist/pls_playlist_plugin.h

src/playlist/rss_playlist_plugin.c

src/playlist/rss_playlist_plugin.h

src/playlist/xspf_playlist_plugin.c

src/playlist/xspf_playlist_plugin.h

src/playlist_any.c

src/playlist_any.h

src/playlist_database.c

src/playlist_database.h

src/playlist_list.c

src/playlist_list.h

src/playlist_mapper.c

src/playlist_mapper.h

src/playlist_plugin.h

src/playlist_queue.c

src/playlist_queue.h

src/playlist_song.c

src/playlist_song.h

src/playlist_vector.c

src/playlist_vector.h

src/refcount.h

src/replay_gain_ape.c

src/replay_gain_ape.h

src/replay_gain_config.c

src/replay_gain_config.h

src/replay_gain_info.c

src/replay_gain_info.h

src/server_socket.c

src/server_socket.h

src/song_update.c

src/tag_rva2.c

src/tag_rva2.h

src/text_file.c

src/text_file.h

src/text_input_stream.c

src/text_input_stream.h

src/tokenizer.c

src/tokenizer.h

src/update_internal.h

src/update_queue.c

src/update_remove.c

src/update_walk.c

test/dump_playlist.c

test/run_convert.c

test/run_filter.c

test/run_inotify.c

test/run_normalize.c

files removed:
doc/sticker.xml

m4/lame.m4

m4/libOggFLAC.m4

src/archive/bz2_plugin.c

src/archive/iso_plugin.c

src/archive/zip_plugin.c

src/buffer2array.c

src/buffer2array.h

src/compress.c

src/compress.h

src/decoder/audiofile_plugin.c

src/decoder/faad_plugin.c

src/decoder/ffmpeg_plugin.c

src/decoder/flac_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/oggflac_plugin.c

src/decoder/sidplay_plugin.cxx

src/decoder/vorbis_plugin.c

src/decoder/wavpack_plugin.c

src/decoder/wildmidi_plugin.c

src/input/lastfm_input_plugin.c

src/input/lastfm_input_plugin.h

src/mixer/alsa_mixer.c

src/mixer/oss_mixer.c

src/mixer/pulse_mixer.c

src/normalize.c

src/normalize.h

src/output/fifo_plugin.c

src/output/jack_plugin.c

src/output/pulse_plugin.c

src/replay_gain.c

src/replay_gain.h

files modified:
AUTHORS

INSTALL

Makefile.am

Makefile.in

NEWS

aclocal.m4

autogen.sh

config.h.in

configure

configure.ac

debian/changelog

debian/control

depcomp

doc/doxygen.conf

doc/mpd.1

doc/mpd.conf.5

doc/mpdconf.example

doc/protocol.xml

doc/user.xml

m4/faad.m4

m4/mpd_check_cflag.m4

missing

scripts/test.sh

src/ack.h

src/aiff.c

src/aiff.h

src/archive_api.c

src/archive_api.h

src/archive_internal.h

src/archive_list.c

src/archive_list.h

src/audio.c

src/audio.h

src/audio_format.h

src/audio_parser.c

src/audio_parser.h

src/buffer.c

src/buffer.h

src/chunk.c

src/chunk.h

src/client.c

src/client.h

src/cmdline.c

src/cmdline.h

src/command.c

src/command.h

src/conf.c

src/conf.h

src/crossfade.c

src/crossfade.h

src/cue/cue_tag.c

src/cue/cue_tag.h

src/daemon.c

src/daemon.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_api.c

src/decoder_api.h

src/decoder_buffer.c

src/decoder_buffer.h

src/decoder_command.h

src/decoder_control.c

src/decoder_control.h

src/decoder_internal.c

src/decoder_internal.h

src/decoder_list.c

src/decoder_list.h

src/decoder_plugin.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/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/gcc.h

src/icy_metadata.c

src/icy_metadata.h

src/icy_server.c

src/icy_server.h

src/idle.c

src/idle.h

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/mms_input_plugin.c

src/input/mms_input_plugin.h

src/input/rewind_input_plugin.c

src/input/rewind_input_plugin.h

src/input_plugin.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/main.h

src/mapper.c

src/mapper.h

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/notify.c

src/notify.h

src/output/alsa_plugin.c

src/output/ao_plugin.c

src/output/httpd_client.c

src/output/httpd_client.h

src/output/httpd_internal.h

src/output/httpd_output_plugin.c

src/output/mvp_plugin.c

src/output/null_plugin.c

src/output/oss_plugin.c

src/output/osx_plugin.c

src/output/pipe_output_plugin.c

src/output/shout_plugin.c

src/output/solaris_output_plugin.c

src/output_all.c

src/output_all.h

src/output_api.h

src/output_command.c

src/output_command.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_plugin.h

src/output_print.c

src/output_print.h

src/output_state.c

src/output_state.h

src/output_thread.c

src/output_thread.h

src/page.c

src/page.h

src/path.c

src/path.h

src/pcm_buffer.h

src/pcm_channels.c

src/pcm_channels.h

src/pcm_convert.c

src/pcm_convert.h

src/pcm_dither.c

src/pcm_dither.h

src/pcm_format.c

src/pcm_format.h

src/pcm_mix.c

src/pcm_mix.h

src/pcm_prng.h

src/pcm_resample.c

src/pcm_resample.h

src/pcm_resample_fallback.c

src/pcm_resample_internal.h

src/pcm_resample_libsamplerate.c

src/pcm_utils.h

src/pcm_volume.c

src/pcm_volume.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_control.c

src/playlist_edit.c

src/playlist_global.c

src/playlist_internal.h

src/playlist_print.c

src/playlist_print.h

src/playlist_save.c

src/playlist_save.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/sig_handlers.c

src/sig_handlers.h

src/socket_util.c

src/socket_util.h

src/song.c

src/song.h

src/song_print.c

src/song_print.h

src/song_save.c

src/song_save.h

src/song_sticker.c

src/song_sticker.h

src/songvec.c

src/songvec.h

src/state_file.c

src/state_file.h

src/stats.c

src/stats.h

src/sticker.c

src/sticker.h

src/sticker_print.c

src/sticker_print.h

src/stored_playlist.c

src/stored_playlist.h

src/strset.c

src/strset.h

src/tag.c

src/tag.h

src/tag_ape.c

src/tag_ape.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/uri.c

src/uri.h

src/utils.c

src/utils.h

src/volume.c

src/volume.h

src/zeroconf-avahi.c

src/zeroconf-bonjour.c

src/zeroconf-internal.h

src/zeroconf.c

src/zeroconf.h

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

Show diffs side-by-side

added added

removed removed

src/zeroconf-avahi.c

1

1

/*

2

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

2

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

3

3

* http://www.musicpd.org

4

4

*

5

5

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

17

17

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

18

18

*/

19

19

20

#include "config.h"

20

21

#include "zeroconf-internal.h"

21

22

#include "listen.h"

23

#include "mpd_error.h"

22

24

23

25

#include <glib.h>

24

26

217

219

g_debug("Initializing interface");

218

220

219

221

if (!avahi_is_valid_service_name(serviceName))

220

g_error("Invalid zeroconf_name \"%s\"", serviceName);

222

MPD_ERROR("Invalid zeroconf_name \"%s\"", serviceName);

221

223

222

224

avahiName = avahi_strdup(serviceName);

223

225

Older »