oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity
3,245 Commits 1 Branch 144 Tags 56 MiB
7d87f71d83
Commit Graph

2732 Commits

Author SHA1 Message Date
Max Kellermann
bc55d8d78e decoder: added missing glib.h include 2008-11-25 15:12:00 +01:00
Thomas Jansen
2555176854 tag_id3.h: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:57:30 +01:00
Thomas Jansen
bc74503a69 command.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:55:32 +01:00
Thomas Jansen
843ed730c0 client.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:48:32 +01:00
Thomas Jansen
b9fefc4564 player_thread.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:47:44 +01:00
Thomas Jansen
3742cf3abb update.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:46:10 +01:00
Thomas Jansen
02273d96c3 sig_handlers.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:45:32 +01:00
Thomas Jansen
87751ddbd0 pcm_resample_fallback.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:44:17 +01:00
Thomas Jansen
34b1a9061e dbUtils.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:42:47 +01:00
Thomas Jansen
3d258504a1 decoder_thread.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:41:53 +01:00
Thomas Jansen
f7d995f807 zeroconf.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:40:40 +01:00
Thomas Jansen
b31b334ba6 input_file.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:33:46 +01:00
Thomas Jansen
f0e621bcdb input_curl.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:33:25 +01:00
Thomas Jansen
7c7b0431fe decoder_api.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:32:53 +01:00
Thomas Jansen
c6a63f1397 main_notify.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:32:02 +01:00
Max Kellermann
14e121af90 flac, mpc, ogg, wavpack: include unistd.h for SEEK_SET 
SEEK_SET is defined by unistd.h.  Explicitly include it.
 2008-11-24 10:33:08 +01:00
Max Kellermann
acbfba0698 player: disable music_pipe_check_format() 
The music pipe audio format bugs seem to be fixed (hopefully).
Disable music_pipe_check_format() for now, since it consumes a lot of
CPU cycles.
 2008-11-24 09:25:48 +01:00
Max Kellermann
116662e5a9 update: fixed shadow warning on "basename" 
Renamed the local variable "basename", which shadows the POSIX
function basename().
 2008-11-22 14:57:08 +01:00
Max Kellermann
d0779e71ab command: format strerror() with "%s" 
We shouldn't pass strerror() where a format string is expected.
 2008-11-22 14:57:00 +01:00
Laszlo Ashin
a493aafe02 wavpack: use assert_static() 2008-11-22 14:28:11 +01:00
Laszlo Ashin
457a6f4bee utils: introduce assert_static() 
assert_static() will help us to find false asserts in compile time. Of
course it only works in case of expressions which can be evaluated
compile time. It cannot be used in global scope.
 2008-11-22 14:28:11 +01:00
Marc Pavot
0bad84066b command: allow clients to subscribe to specific idle events 
The client may provide the names of idle events as arguments to the
"idle" command to inform MPD that it is only interested in these
events.
 2008-11-22 13:26:21 +01:00
Max Kellermann
976d5045c6 decoder: check audio_format_valid() in all decoders 
Refuse to play audio formats which are not supported by MPD.
 2008-11-21 20:27:30 +01:00
Max Kellermann
be9e60d55e audio_format: added audio_format_valid() 2008-11-21 20:27:05 +01:00
Max Kellermann
774417f12f decoder: ignore decoder_data() calls with length==0 
Pushing buffers with a zero length into the MPD core causes failures;
don't let them pass beyond the decoder plugi API.
 2008-11-21 20:26:57 +01:00
Max Kellermann
63c3ebee46 flac, oggflac: use GLib instead of utils.h/log.h 2008-11-21 20:15:50 +01:00
Max Kellermann
f15fc4e99a ffmpeg: use GLib instead of log.h 2008-11-21 20:13:41 +01:00
Max Kellermann
4a3a621caf audiofile: use GLib instead of log.h 2008-11-21 20:13:36 +01:00
Max Kellermann
7a2fe930b8 aac: use GLib instead of utils.h/log.h 
Removed the superfluous my_usleep() call.
 2008-11-21 20:13:26 +01:00
Max Kellermann
0243e1e26d log: print the log_domain 2008-11-21 20:13:00 +01:00
Max Kellermann
1c0c583216 state_file: save state_file every 5 minutes 
When MPD quits in a non-clean way, the state file isn't written, and
on the next start, MPD time warps to the previous clean shutdown.
Save the state file every 5 minutes; this will probably be
configurable at a later time.

Note that we don't set a wakeup timer for that: when there is no MPD
traffic, MPD won't wake up to save the state file.  This minor bug is
tolerated, because usually there is no change in MPD's state when the
main thread is idle.
 2008-11-21 18:36:33 +01:00
Max Kellermann
695d8051d2 input_curl: try to seek by fast-forwarding the buffer 
If the caller attempts to seek only a few bytes forward, chances are
good that the offset is already in the buffer.  In this case, simply
fast-forward the buffer.
 2008-11-21 17:10:20 +01:00
Max Kellermann
46df0fd7dc input_curl: moved code to consume_buffer() 
Added some assertions.
 2008-11-21 16:57:55 +01:00
Max Kellermann
7779e4133a input_curl: don't do temporary calculations with input_stream.offset 
If someone calls seek() with an invalid (negative) offset, the curl
implementation of that method returned false, but left this invalid
offset in input_stream.offset.  Move the calculation to a temporary
variable.
 2008-11-21 16:56:10 +01:00
Max Kellermann
61ba50a9bc decoder: ignore the SEEK command during startup 
While waiting for the input stream to become ready, ignore all
commands except STOP.  This fixes seeking errors with (remote) songs
which the decoder has already finished.
 2008-11-20 21:08:16 +01:00
Max Kellermann
927bf45f84 ogg: moved the "errorStr" variable into the error handler 2008-11-20 20:11:00 +01:00
Laszlo Ashin
65a8822a0b aac: get rid of gcc warnings 2008-11-20 19:20:25 +01:00
Konstantin Sobolev
7ac3abf499 update: pass UTF-8 path to skip_symlink() 
skip_symlinks() expects an UTF-8 encoded file name, but
updateDirectory() passed ent->d_name (in file system encoding) to it.
Convert it to UTF-8 first.
 2008-11-20 18:22:07 +01:00
Konstantin Sobolev
23b097593e mapper: use the utf8_to_fs_charset() result 
In map_directory_child_fs(), the result of utf8_to_fs_charset() was
never used, because it passed the unmodified "name" parameter to
pfx_dir().
 2008-11-20 18:10:18 +01:00
Konstantin Sobolev
ddab531b4a path: fix g_convert() argument order 
g_convert() wants the destination character set first.  This was mixed
up.
 2008-11-20 17:48:11 +01:00
Max Kellermann
1f50146e29 ogg: check the ov_read() return value before the vorbis_info evaluation 
The ov_info() return value may be corrupt when ov_read() did not
return a positive value.  First check for success, then check
ov_info().
 2008-11-20 12:45:17 +01:00
Max Kellermann
a8f69429b0 input_curl: don't fail when seek to EOF is requested 
HTTP servers respond with "416 Requested Range Not Satisfiable" when a
client attempts to seek to the end of the file.  Catch this special
case in input_curl_seek().  This fixes a glitch in the ogg vorbis
decoder plugin.
 2008-11-20 12:45:17 +01:00
Max Kellermann
a0dd5b7f2f curl: don't check running_handles for EOF 
Since we are using curl_multi_info_read() / CURLMSG_DONE for detecting
end-of-response, we can remove all running_handles==0 checks.  For
some reason, that has never worked correctly.
 2008-11-20 12:42:42 +01:00
Max Kellermann
f61904db33 input_curl: always set eof=true on CURLMSG_DONE 
curl_multi_info_read() is the authoritative source of the
"end-of-response" information.  Always set c->eof when a CURLMSG_DONE
message is received, and check the result (success/failure) after
that.
 2008-11-20 12:41:59 +01:00
Laszlo Ashin
05f4629fa3 wavpack: redo using audio_format_frame_size() 
Somehow we lost 600e1322 after renaming some variables in ed6f6046.
 2008-11-19 00:02:06 +01:00
Max Kellermann
362ca300d6 decoder: pass the correct buffer length to pcm_convert() 
When a global audio format is configured (setting
"audio_output_format"), decoder_data() overwrote the "length"
parameter with the size of the output buffer (result of
pcm_convert_size()).  Declare a separate variable for the output
buffer length.
 2008-11-18 22:45:51 +01:00
Viliam Mateicka
33b5015469 ffmpeg: read tags from AVFormatContext 
The ffmpeg library provides some of the song metadata in the
AVFormatContext struct.  Pass it from there to MPD.
 2008-11-18 20:03:00 +01:00
Viliam Mateicka
eac4ed2241 audiofile: fixed misplaced if 
[mk: by definition, tag_new() cannot fail - removed check]
 2008-11-18 19:54:42 +01:00
Max Kellermann
63272d6888 music_pipe: narrowed assertion on chunk index 
The chunk index passed to successor() must be valid, i.e. it must be
smaller than num_chunks.
 2008-11-18 19:54:39 +01:00
Max Kellermann
7591403566 input_stream: size==-1 means unknown size 
Define the special value "-1" as "unknown size".  Previously, there
was no indicator for streams with unknown size, which might confuse
some decoders.
 2008-11-16 20:42:08 +01:00
Max Kellermann
8882f06200 ffmpeg: fixed AVSEEK_SIZE 
With whence==AVSEEK_SIZE, the seek function should return the file
size, not the current offset.  Check the return value of
input_stream_seek().
 2008-11-16 20:25:31 +01:00
Max Kellermann
9c4e97a61b aac: detect whether to pass "uint32_t*" to NeAACDecInit2() 
neaacdec.h declares all arguments as "unsigned long", but internally
expects uint32_t pointers.  This triggers gcc warnings on 64 bit
architectures.  To avoid that, make configure.ac detect whether we're
using Debian's corrected headers or the original libfaad headers.  In
any case, pass a pointer to an uint32_t, conditionally casted to
"unsigned long*".
 2008-11-16 20:04:49 +01:00
Max Kellermann
acfba02310 decoder: check length==0 in decoder_read() 
When the caller passes length==0, decoder_read() entered an endless
loop.  Check that condition before entering the "while" loop.
 2008-11-15 19:27:30 +01:00
Laszlo Ashin
c368a2f91c aac: fix compiler warnings on amd64 2008-11-15 11:54:22 +01:00
Laszlo Ashin
00da7db1e3 aac: don't try to free static buffer 
In 432da18e a dynamic buffer was replaced by a static one but some
frees were accidently left there which caused some segfaults.
 2008-11-15 11:50:25 +01:00
Max Kellermann
4a1ad61e8e log: check the log threshold in log_func() 
The threshold was only checked in the deprecated logging functions
(ERROR(), WARNING(), ...).  Add the check to the GLib logging handler.
 2008-11-14 18:27:11 +01:00
Max Kellermann
7720a1195a volume: eliminate alloca() usage 
alloca() is not a portable function.  Don't use it.  Using
strncasecmp() is much more efficient anyway, because no memory needs
to be allocated and copied.
 2008-11-14 18:15:33 +01:00
Max Kellermann
19131f1eda volume: moved code to oss_mixer_find() 2008-11-14 18:05:13 +01:00
Max Kellermann
eb199ca207 player: don't queue song when there are 2 songs in the pipe 
Don't send a "next song" request to the main thread when the current
song hasn't started playing yet, i.e. there are already two different
songs in the music pipe.  This would erase information about the song
boundary within the music pipe, and thus triggered an assertion
failure.  The bug could occur when playing very short songs which fit
into the pipe as a whole.
 2008-11-14 17:55:51 +01:00
Max Kellermann
418dac6f94 player: wake up decoder before waiting for xfade chunks 
Fix a deadlock: when the decoder waited for buffer space, the player
could enter a deadlock situation because it waits for more chunks for
crossfading chunks.  Signal the decoder before entering notify_wait().
 2008-11-14 17:55:45 +01:00
László Áshin
440b1ea3ea wavpack: be more robust if the underlying stream is not seekable 
The wavpack open function gives us an option called OPEN_STREAMING. This
provides more robust and error tolerant playback, but it automatically
disables seeking. (More exactly the wavpack lib will not return the
length information.) So, if the stream is already not seekable we can
use this option safely.
 2008-11-14 15:23:18 +01:00
László Áshin
c495c6f5af wavpack: tolerate less decoded data than requested 
Wavpack plugin doesn't stop decoding if a block couldn't be fully
decoded, rather it tries to go on.
 2008-11-14 15:23:13 +01:00
László Áshin
ed6f60460d wavpack: renamed variables and modified coding style slightly 2008-11-14 15:21:44 +01:00
Max Kellermann
7b7340f703 mp3: fix SEEK command check after mp3_synth_and_send() 
mp3 seeking was broken, because the command==SEEK check was never
reached.  Swap the command check order (==SEEK before !=NONE) to fix
that.
 2008-11-13 14:43:19 +01:00
Max Kellermann
2dacd16b5b decoder: additional dc.command checks in decoder_data() 
When a command is sent while the decoder waits for a free chunk in the
music pipe, it was not returned by decoder_data().
 2008-11-13 14:43:19 +01:00
Max Kellermann
2860b1b60f decoder: wait for the player only if the music pipe is full 
Prevent superfluous wakeups and a deadlock condition.
 2008-11-13 02:54:56 +01:00
Max Kellermann
1a3945b563 decoder: check dc.command at the beginning of decoder_data() 
Seeking was somewhat broken in some decoder plugins because they sent
empty chunks, and never got a command.  Check the decoder command
before doing anything else in decoder_data().
 2008-11-13 02:42:40 +01:00
Max Kellermann
709640422c player: chop the tail of the music pipe after CANCEL 
When a CANCEL command is received, the player should drop all chunks
of the next song.  Added new funciton music_pipe_chop() which is used
for that.
 2008-11-13 02:09:33 +01:00
Max Kellermann
66ce1495f0 music_pipe: continuously check the sample format of all chunks 
Provide a debug function which asserts on the sample format of all
chunks.  Call this function in each iteration of the player main loop.
 2008-11-13 02:06:58 +01:00
Max Kellermann
998d9a8225 decoder: ignore SEEK commands during initialization 
When the decoder receives a SEEK during initialization, it should
ignore that for now.  The old code made most decoders abort.
 2008-11-13 02:06:55 +01:00
Max Kellermann
1178e485cb music_pipe: check for partial frames in appended chunk 
Added an additional assertion which checks partial frames in the
existing tail chunk.
 2008-11-13 02:06:52 +01:00
Max Kellermann
df09075afc player: assert that there was no previous "next song chunk" 
When assigning the next_song_chunk variable, it must have been empty.
If not, there may be 3 songs overlapping in the music pipe.
 2008-11-13 01:57:15 +01:00
Max Kellermann
ae9bb92952 playlist: call clearPlayerQueue() only if song is queued II 
This patch extends commit 35a16b99, and amends several 2 missing
checks.  It simplifies 2 more checks by merging "if" conditions.
 2008-11-12 21:55:13 +01:00
Max Kellermann
93f488f034 wavpack: remove commented debug messages 2008-11-12 21:25:08 +01:00
Max Kellermann
600e132280 wavpack: calculate outsamplesize with audio_format_frame_size() 2008-11-12 21:25:02 +01:00
Max Kellermann
ef80464c0c ogg: revert "use ogg_fopen() instead of ogg_open()" 
Unfortunately, ov_fopen() is not supported by libvorbis versions older
than 1.2.
 2008-11-12 08:38:04 +01:00
Max Kellermann
b67a8e4d6e aac: shift the input buffer before the full check 
When the buffer was full, but everything was already consumed,
fillAacBuffer() would not attempt to flush and refill it.
 2008-11-12 08:32:21 +01:00
Max Kellermann
432da18e44 aac: make the input buffer static 
Allocate the input buffer within the AacBuffer struct.
 2008-11-12 08:29:40 +01:00
Max Kellermann
487e05c67d aac: reject SEEK commands 
The aac plugin does not support seeking.  Reject SEEK requests by
calling decoder_seek_error().  Quit the plugin's main loop only when
STOP is received.
 2008-11-12 08:25:09 +01:00
Max Kellermann
a9723e661a aac: get decoder command from decoder_data() 
Removed a superfluous decoder_get_command() call.
 2008-11-12 08:25:06 +01:00
Max Kellermann
35a4ca2421 aac: convert audio_format to temporary variable 
The audio_format variable is only used and initialized for
decoder_initialized().  Move it into that block to save some bytes on
the stack.
 2008-11-12 08:21:00 +01:00
Max Kellermann
39fa60769c aac: removed method file_decode() 
aac_stream_decode() was basically copy+pasted from aac_decode().
Since stream_decode() can also decode files, eliminate aac_decode().
 2008-11-12 08:17:50 +01:00
Max Kellermann
e19b53f814 aac: check the buffer length in the ADIF parser 
Check whether enough data has been read yet.
 2008-11-12 08:16:54 +01:00
Max Kellermann
b30ec73099 aac: use unsigned integers and size_t where appropriate 2008-11-12 08:16:38 +01:00
Max Kellermann
9806355d4c aac: check if the stream is seekable before length check 
If the stream is not seekable, don't try to decode all frames to find
out the total song time.
 2008-11-12 07:46:01 +01:00
Max Kellermann
f6765c4d8b aac: removed attribute "atEof" 
Use input_stream_eof() instead.
 2008-11-12 07:41:54 +01:00
Max Kellermann
eff21067f0 mpc: assume the result fo of mpc_decoder_decode() is unsigned 
According to the documentation, mpc_decoder_decode() returns an
mpc_uint32_t.  Since the special return value (mpc_uint32_t)-1
translates to a very large long integer, this may cause segmentation
faults if not interpreted properly.
 2008-11-12 07:14:18 +01:00
Max Kellermann
0a6f4048d0 mpc: don't assume the stream is stereo 
Don't hard-code the factor "2".
 2008-11-12 07:07:40 +01:00
Max Kellermann
8d1ffb1684 mpc: get decoder command from decoder_data() 
Removed 3 superfluous decoder_get_command() invocations.
 2008-11-12 07:07:12 +01:00
Max Kellermann
731e99c26e mpc: moved code to mpc_to_mpd_buffer() 
mpc_to_mpd_buffer() converts a whole chunk at a time.  This eliminates
3 local variables in mpc_decode().
 2008-11-12 07:06:47 +01:00
Max Kellermann
975d5cd77e mpc: make the buffer large enough for one mpc frame 
Don't split the buffer conversion loop.  When libmpcdec returns a
chunk, convert and send the whole chunk at a time.  This moves several
checks out of the loop, and greatly improves performance.
 2008-11-12 07:03:44 +01:00
Max Kellermann
865757835e mpc: use GLib instead of utils.h/log.h 
Don't use deprecated MPD libraries.
 2008-11-12 07:02:29 +01:00
Max Kellermann
1414a3de4c mpc: declare buffer as int32_t[] 
The buffer is always casted to int32_t* anyway; declare it as int32_t
array, and remove the cast.
 2008-11-12 07:02:06 +01:00
Max Kellermann
06c60888dc mpc: eliminated the local variable "eof" 
Since each "eof=true" is followed by "break", the variable is
superfluous.
 2008-11-11 21:39:50 +01:00
Max Kellermann
97080b796c ogg: removed stray "}" 
Due to an unnoticed merge error, there was a superfluous "}".  Remove
it.
 2008-11-11 21:39:31 +01:00
Max Kellermann
53c17db5e9 ogg: use ogg_fopen() instead of ogg_open() 
Move the reponsibility for freeing the file handle to libvorbis.
 2008-11-11 21:33:10 +01:00
Max Kellermann
448ff32c96 ogg: use GLib instead of utils.h/log.h 2008-11-11 21:33:01 +01:00
Max Kellermann
401e77b258 decoder: fixed typo in assertion 
decoder_file_decode() should check for plugin->file_decode, not
plugin->stream_decode().
 2008-11-11 21:23:30 +01:00
Max Kellermann
0cba1ae312 ogg: get decoder command from decoder_data() 
Eliminate two decoder_get_command() invocations from the main loop.
 2008-11-11 21:21:54 +01:00
Max Kellermann
7b575b55c2 ogg: flush buffer after every ov_read() call 
Don't let the buffer grow until it is full, flush it whenever there is
data available.
 2008-11-11 21:15:01 +01:00
Max Kellermann
67814eddff mp3: support stream tags 
Parse ID3 tags, even when they are in the middle of the stream.  Very
few streams provide embedded ID3 tags.  Most of them send only
Shoutcast "icy" tags, which limits the practical usefulness of this
patch.
 2008-11-11 20:53:24 +01:00
Max Kellermann
514c37b0cd mp3: eliminated duplicate command check 
When a command is received, decode_next_frame_header() and
decodeNextFrame() return DECODE_BREAK.  This is already checked by
both callers, which means that we can eliminate lots of
decoder_get_command() checks.
 2008-11-11 20:50:37 +01:00
Max Kellermann
1bfa6a94e2 player: fix race condition during tag update 
When a tag is updated, the old tag was freed before the new one was
created.  Reverse the order to be sure that other threads always see a
valid pointer.

This still leaves a possible race condition, but it will be addressed
later.
 2008-11-11 20:46:55 +01:00
Max Kellermann
acf0d141be playlist: track song metadata changes 
When the tag of the current song changes (e.g. a new tag was sent in
the stream), update the playlist, so clients pick up the new tag.
 2008-11-11 20:46:55 +01:00
Max Kellermann
81d2076bcf oggflac: removed the obsolete try_decode() method 2008-11-11 17:17:06 +01:00
Max Kellermann
9eed41911f decoder: return void from decode() methods 
The stream_decode() and file_decode() methods returned a boolean,
indicating whether they were able to decode the song.  This is
redundant, since we already know that: if decoder_initialized() has
been called (and dc.state==DECODE), the plugin succeeded.  Change both
methods to return void.
 2008-11-11 17:13:44 +01:00
Max Kellermann
05e69ac086 replay_gain: don't include os_compat.h 
os_compat.h is deprecated and should be replaced with well-defined
standard headers.
 2008-11-11 16:38:33 +01:00
Max Kellermann
bc1999f815 replay_gain: use GLib instead of utils.h/log.h 
Eliminated deprecated libraries.
 2008-11-11 16:38:26 +01:00
Max Kellermann
8a40e0b495 replay_gain: use pcm_volume() to apply replay gain 
The currently replay_gain_apply() implementation duplicates code from
pcm_volume(), except that it uses a floating point scale.  Eliminate
all duplicated code from and make it utilize the pcm_volume() library
function.  This introduces replay gain support for 24 bit audio.
 2008-11-11 16:38:12 +01:00
Max Kellermann
cb28487d10 pcm_utils: allow volume levels greater than 100% in pcm_volume() 
Allow pcm_volume() to increase volume.
 2008-11-11 16:38:10 +01:00
Max Kellermann
edcd45df94 pcm_volume: added constant PCM_VOLUME_1 
It may be desirable to change the range of integer volume levels
(e.g. to 1024, which may utilize shifts instead of expensive integer
divisions).  Introduce the constant PCM_VOLUME_1 which describes the
integer value for "100% volume".  This is currently 1000.
 2008-11-11 16:32:32 +01:00
Max Kellermann
ad77a3e0ac pcm_utils: added inline function pcm_float_to_volume() 2008-11-11 16:29:02 +01:00
Max Kellermann
5ddde0aac7 replay_gain: converted struct replay_gain_info elements to an array 
Having an array instead of individual variables allows the use of the
replay_gain_mode enum as an array index.
 2008-11-11 16:24:27 +01:00
Max Kellermann
5e686add91 wavpack: added wavpack_tag_float() 
The function simplifies wavpack_replaygain(), because it already
contains the float parser, and it works with a fixed buffer instead of
doing expensive heap allocations.
 2008-11-11 16:21:09 +01:00
Max Kellermann
c883d761ab wavpack: make the "key" argument to wavpack_tag() const 
This allows us to remove the "static char[]" hack.
 2008-11-11 16:19:29 +01:00
Max Kellermann
e2c07dbbbc ogg: ogg_getReplayGainInfo() returns replay_gain_info pointer 
Some code simplification.  Avoid pointers to pointers.
 2008-11-11 16:19:00 +01:00
Max Kellermann
837cefdb04 replay_gain: converted replay_gain_mode to an enum 
Prefer C enums over CPP macros.
 2008-11-11 16:18:31 +01:00
Max Kellermann
e9c3497cd2 replay_gain: removed superfluous author name comment 
The author's name is already mentioned in the copyright declaration.
 2008-11-11 15:55:34 +01:00
Max Kellermann
114b3c1e78 replay_gain: no CamelCase 
Renamed functions and variables.
 2008-11-11 15:55:34 +01:00
Max Kellermann
54ad08ab37 replay_gain: renamed sources to replay_gain.c, replay_gain.h 
No CamelCase file names.
 2008-11-11 15:55:34 +01:00
Max Kellermann
130659e856 decoder: fixed assertion failure for decoder==NULL in decoder_read() 
The assertion on dc.state in decoder_read() was too strict: when a
decoder tried to call decoder_read() from tag_dup(), the decoder state
was NONE.  Allow this special case.
 2008-11-11 15:55:28 +01:00
Max Kellermann
ff1acefb21 decoder: removed plugin method try_decode() 
Instead of having a seprate try_decode() method, let the
stream_decode() and file_decode() methods decide whether they are able
to decode the song.
 2008-11-10 15:07:01 +01:00
Max Kellermann
10eea9d981 decoder: fall back to next plugin 
When a plugin is unable to decode a song, try the other plugins.
 2008-11-10 15:02:47 +01:00
Max Kellermann
cad37b2e5a decoder: wrapper functions for methods stream_decode() and file_decode() 
Added lots of assertions to the wrapper functions.
 2008-11-10 15:02:38 +01:00
Max Kellermann
84b540f435 decoder: added more assertions 
Added a lot of assertions checking the state of the decoder plugin.
 2008-11-10 15:02:26 +01:00
Max Kellermann
23a4ce4444 flac: call flac_process_metadata() for ogg files 
The flac plugin wasn't initialized properly when an OGG file was being
decoded.  For some reason, flac_process_metadata() was explicitly not
called for OGG files.  Since that seems to fix the issue, make it
always call flac_process_metadata().
 2008-11-10 14:49:34 +01:00
Max Kellermann
0e87f85598 flac: enable the oggflac plugin with older libflac versions 
Since decoder_list.c does not include the libflac headers, it cannot
know whether to add the oggflac plugin to the decoder list.  Solve
this by always enabling the oggflac sub-plugin, even with older
libflac versions.  When the libflac API cannot support oggflac,
disable the plugin at runtime by returning "false" from its init()
method.
 2008-11-10 14:39:42 +01:00
Max Kellermann
505959f74d flac: enable oggflac with libflac 
The "oggflac" plugin was enabled only if HAVE_FLAC_COMMON was
defined.  HAVE_FLAC_COMMON however is only an automake variable, and
is never available in decoder_list.c.  Make decoder_list.c depend on
HAVE_FLAC||HAVE_OGGFLAC instead.
 2008-11-10 14:37:37 +01:00
Daniel Schömer
1256f90825 log: properly check log_threshold 2008-11-09 22:27:58 +01:00
Max Kellermann
c9c7dc6e00 decoder: updated API documentation 
Updated documentation on the stream_decode() and file_decode() return
values.
 2008-11-09 22:10:48 +01:00
Max Kellermann
ab24e203cd wavpack: removed try_decode() method 
Wavpack's try_decode() implementation does nothing useful, it only
duplicates code already in stream_decode() / file_decode(), and slows
down MPD.
 2008-11-09 22:10:48 +01:00
Max Kellermann
b054ad0ea6 flac: make the init() method check for oggflac support 
Disable flac's "oggflac" sub-plugin when libflac does not support
ogg-flac files.
 2008-11-09 22:01:47 +01:00
Max Kellermann
72eba30cf4 decoder: converted dc.error to a dc.state value 
The player did not care about the exact error value, it only checked
whether an error has occured.  This could fit well into
decoder_control.state - introduce a new state "DECODE_STATE_ERROR".
 2008-11-08 15:48:00 +01:00
Max Kellermann
8cbdc2667e decoder: removed "plugin" from the decoder struct 
decoder.plugin was a write-only attribute.
 2008-11-08 13:33:44 +01:00
Laszlo Ashin
343a8a20e3 wavpack: make 24-bit samples available for mpd 
This patch makes 24-bit samples available for mpd. I tested with the
WavPack Test Suite found on wavpack.com:

 http://www.rarewares.org/wavpack/test_suite.zip

Every test file worked fine.
 2008-11-08 13:11:10 +01:00
Laszlo Ashin
3e338da871 wavpack: check last_byte in push_back_byte() method 
At this moment the wavpack lib doesn't use the return value of the
push_back function, which has an equivalent meaning of the return
value of ungetc().  This is a lucky situation, because so far it
simply returned with 1 as a hard coded value.  From now on the
function will return EOF on error.  (This function makes exactly one
byte pushable back.)
 2008-11-08 13:10:15 +01:00
Laszlo Ashin
cfd55b29bd wavpack: wrapper for converting void* to struct wavpack_input* 
A new function has been added to do a cast and a little check in the
wavpack-mpd input stream wrapper.
 2008-11-08 13:09:07 +01:00
Laszlo Ashin
2b4a410bb0 wavpack: put braces around one line code blocks 
I think this makes the code more easily modifiable and prevents some
annoying mistakes.
 2008-11-08 13:08:21 +01:00
Laszlo Ashin
d68df99ef4 wavpack: added prefix to local function names 
There are some functions in the wavpack-mpd input streams wrapper
which had too commonly used names (especially can_seek). I prefixed
these with "wavpack_input_".
 2008-11-08 13:07:40 +01:00
Laszlo Ashin
ff2e69c003 wavpack: unified code style 
Not every function header has its return type in a distinct line. This
patch corrects that.  This way there is more space for the arguments.
 2008-11-08 13:07:09 +01:00
Tom Servo
ea92576219 listen: fix namespace collision on OpenSolaris 
The listen.c module breaks the build because the variable name used
("sun") for the Unix domain socket part collides with something else
on an OpenSolaris system, likely Sun specific.  Renaming it to _sun
(or something else of choice) fixes the build.

[mk: renamed to "s_un"]
 2008-11-07 10:33:48 +01:00
Laszlo Ashin
2e0ba90208 wavpack: check wvc seekability 
Using wvc streams the seekableness depends on the seekability of the
wvc stream as well.
 2008-11-06 06:48:33 +01:00
Laszlo Ashin
56d2b51056 wavpack: close wvc stream on error 
The input stream opened for wvc is not closed in an if branch.  A
close call has been added.
 2008-11-06 06:48:33 +01:00
Laszlo Ashin
089c9b7e5c wavpack: enable seeking 
Somehow seeking is disabled on all kinds of wavpack playbacks now in
the git version.  This patch corrects that.
 2008-11-06 06:48:33 +01:00
Max Kellermann
dcfb205c46 input_curl: retrieve error message from ERRORBUFFER 
libcurl provides better error messages than curl_multi_strerror() when
you set the ERRORBUFFER option.
 2008-11-06 06:48:30 +01:00
Max Kellermann
e2d7318a18 input_curl: return 0 on error from read() 
The read() method must not return a negative value.  Make it return 0
on error, just like the file input stream.  Also set the "error"
attribute to -1.
 2008-11-06 06:44:19 +01:00
Max Kellermann
a8e81326d0 input_curl: enable FAILONERROR 
I had this option enabled during development, but at some point, it
must have gotten lost.  FAILONERROR makes the curl stream fail when
the server returns a status code 400 or higher.  We are not interested
in the server's error document.
 2008-11-06 06:36:25 +01:00
Max Kellermann
19d3345ab8 path: removed superfluous error check in path_set_fs_charset() 
The code which had a possible error condition had been removed.
 2008-11-05 21:42:55 +01:00
Max Kellermann
5b2e981253 log: check if log_charset is set 
When logging to a file, log_charset would be NULL and g_convert()
would abort.
 2008-11-05 21:40:08 +01:00
Max Kellermann
b0f1bc4856 Makefile.am: distribute input_curl.h 
input_curl.h was missing in the tarball because it was not listed in
$(mpd_headers).
 2008-11-05 21:23:56 +01:00
Max Kellermann
7f880ab8ba main: print usage to stdout 
Using the logging library here is inappropriate.
 2008-11-05 20:52:14 +01:00
Max Kellermann
130fa94423 log: convert messages to system charset 
When logging to the terminal, we should print messages in the system
character set.  Convert all messages in this case.
 2008-11-05 18:39:13 +01:00
Max Kellermann
787c6f5e18 log: use bool 
Use the bool data type for flags.
 2008-11-05 18:39:10 +01:00
Max Kellermann
4c967a6ba2 log: provide a GLib logging handler 
Install a default handler which writes to stdout or stderr, and
prepends a time stamp.  This looks just like the 0.13.x logger.
 2008-11-05 18:38:55 +01:00
Max Kellermann
a5348a3786 log: use GLib message logging 
The logging functions from log.h are deprecated, and the code should
use GLib logging instead.  Make ERROR(), WARNING() etc. call g_logv()
internally.
 2008-11-05 18:38:30 +01:00
Max Kellermann
a05fa5cdbb log: no CamelCase 
Renamed the variable "logLevel" to "log_threshold".
 2008-11-05 18:38:23 +01:00
Max Kellermann
08aaf57ff0 log: removed warning buffer 
The warning buffer is a complex piece of code for no good reason.
Remove it and find a better solution, e.g. open the log file earlier.
 2008-11-05 18:37:40 +01:00
Max Kellermann
b35ca9e5c4 main: initialize locale (LC_CTYPE) 
Initialize libc's locale functions.  Currently, we are only interested
in LC_CTYPE (character classification), because this is what is used
by GLib's g_get_charset().
 2008-11-05 18:37:39 +01:00
Max Kellermann
2a1a37107f path: don't allocate charset twice 
Make the local variable "charset" const, and don't duplicate its
value.  It is already duplicated by path_set_fs_charset().
 2008-11-05 18:26:45 +01:00
Max Kellermann
6a7a26fe42 path: get filesystem charset from GLib 
GLib provides the function g_get_filename_charsets() which determines
the file system character set.  This changes MPD's fallback: GLib
prefers UTF-8 as a fallback.  MPD used to fall back to ISO Latin 1.
 2008-11-05 18:25:57 +01:00
Max Kellermann
3002fd18cb path: no CamelCase 
Rename variables and functions.
 2008-11-05 18:21:52 +01:00
Max Kellermann
259c6ed164 enable GLib threading 
Call g_thread_init() from main() to enable the GLib features which
make it thread safe.
 2008-11-05 18:21:49 +01:00
Max Kellermann
06f9b6c379 main: don't close all file descriptors on startup 
Removed closeAllFDs().  The caller is responsible for closing all file
handles.
 2008-11-05 18:21:36 +01:00
Max Kellermann
5d6e96e986 pulse: removed reconnect interval 
The output thread automatically waits some time before retrying to
open the device.  Don't duplicate this check in the pulse plugin.
 2008-11-05 08:10:13 +01:00
Max Kellermann
3defcef5f3 pulse: check if connection is open in pulse_cancel() 
The pulse plugin crashed with a segmentation fault when the pulse
server was killed.
 2008-11-05 08:06:39 +01:00
Max Kellermann
eedbd28ec9 wavpack: read_bytes() should not return after partial reads 
libwavpack expects the read_bytes() stream method to fill the whole
buffer, and fails badly when we return a partial read (i.e. not enough
data available yet).  This caused wavpack streams to break.
Re-implement the buffer filling loop.
 2008-11-05 07:24:57 +01:00
Max Kellermann
010a27cd95 wavpack: don't close the stream 
The input_stream object is opened and closed by the caller.
 2008-11-05 07:13:55 +01:00
Max Kellermann
85a7d1a148 decoder: removed stream_types 
Instead of checking the stream_types bit set, we can simply check
whether the methods stream_decode() and file_decode() are implemented.
 2008-11-04 17:10:19 +01:00
Max Kellermann
59c20e5afe wavpack: removed NULL element from tagtypes 
The number of tag types is known at compile time.  Use the GLib macro
G_N_ELEMENTS instead of having a NULL element at the end.
 2008-11-04 17:10:17 +01:00
Max Kellermann
66eb3e90c3 wavpack: use enum tag_type 
Don't store tag type values in a plain integer, use the proper enum.
 2008-11-04 17:10:13 +01:00
Max Kellermann
946e69b2f6 wavpack: use GLib instead of utils.h / log.h 
Replace deprecated code with GLib.
 2008-11-04 17:10:10 +01:00
Max Kellermann
097bccd4ae wavpack: read first byte from wvc stream 
Instead of manually waiting for the input stream to become ready (to
catch server errors), just read the first byte.  Since the
wavpack_input has the capability to push back one byte, we can simply
re-feed it.  Advantage is: decoder_read() handles everything for us,
i.e. waiting for the stream, polling for decoder commands and error
handling.
 2008-11-04 17:10:03 +01:00
Max Kellermann
3cf54591e9 wavpack: use the bool data type 
Use boolean true/false instead of 1/0.
 2008-11-04 17:10:01 +01:00
Max Kellermann
b6ea410ca7 wavpack: no CamelCase 
Renamed functions and variables.
 2008-11-04 17:08:59 +01:00
Max Kellermann
c1dfa52cbf wavpack: fix indent 
Fixed the indent of the switch statement in format_samples_int().
 2008-11-04 17:08:57 +01:00
Max Kellermann
fef14683ae mp4: get decoder command from decoder_data() 
Eliminate a superfluous decoder_get_command() call.  decoder_data()
already returns the command.
 2008-11-04 17:05:08 +01:00
Max Kellermann
11404b5d10 mp4: initialize audio_format before decoder_initialized() 
Removed the duplicate audio_format initialization.
 2008-11-04 17:05:05 +01:00
Max Kellermann
290347c482 mp4: use decoder_read() instead of input_stream_read() 
decoder_read() handles decoder commands, and should be used in decoder
plugins.
 2008-11-04 17:05:02 +01:00
Max Kellermann
9ecfc57c3a mp4: pass struct mp4_context to the mp4ff_callback_t methods 
We need the decoder object, so we have to begin passing a new struct
to these callbacks, instead of only the pointer to the input_stream
object.
 2008-11-04 17:05:00 +01:00
Max Kellermann
632dc7c96b mp4: use GLib instead of utils.h / log.h 
Replace deprecated code with GLib.
 2008-11-04 17:04:57 +01:00
Max Kellermann
01706dd46c mp4: use tag_is_empty() instead of passing the tag_is_found flag 
The API of mp4_load_tag() was strange: it always returned a tag
object, no matter if a tag was found in the file; the existence of a
tag was indicated with the tag_found integer reference.  This flag is
superfluous, since we can simply check whether the tag is empty or
not.
 2008-11-04 17:04:54 +01:00
Max Kellermann
02a172f2c2 mp4: static mp4ff_callback_t variables 
Allocate the mp4ff_callback_t object on the stack.  This is easier to
handle, since we don't have to free it.  Incidentally, this fixes a
memory leak in mp4_load_tag().
 2008-11-04 16:55:12 +01:00
Max Kellermann
8712a1f7bf mp4: no CamelCasee 
Renamed functions and variables.
 2008-11-04 16:55:12 +01:00
Max Kellermann
ab07cdd453 ffmpeg: removed loop from mpd_ffmpeg_read() 
The function decoder_read() already cares about the decoder command,
and loops until data is available.  Reduced mpd_ffmpeg_read() to no
more than the decoder_read() call.
 2008-11-04 16:55:12 +01:00
Max Kellermann
292334a27a ffmpeg: removed ffmpeg_context.codec 
That variable is never used except during initialization in
ffmpeg_helper().
 2008-11-04 16:55:12 +01:00
Max Kellermann
7e84c73b17 ffmpeg: moved code to ffmpeg_find_audio_stream() 2008-11-04 16:55:12 +01:00
Max Kellermann
5e486964e8 ffmpeg: no CamelCase 
Renamed variables.
 2008-11-04 16:55:11 +01:00
Max Kellermann
e26bff9b92 tag: added tag_is_empty() 2008-11-04 16:55:11 +01:00
Max Kellermann
d7b2d93ccc osx: fix gcc warnings 
Fix prototypes and unused variables.
 2008-11-04 11:26:04 +01:00
Max Kellermann
37696dcbbf osx: adapt to new output plugin API 
The OS X output plugin wasn't adapted to the new output plugin yet,
because I had no Mac to test...
 2008-11-04 11:19:37 +01:00
Max Kellermann
095a62a1d0 decoder: update dc.error after input stream failure 
dc.error wasn't updated when the input stream failed to initialize.
 2008-11-03 21:49:47 +01:00
Max Kellermann
75d2a39768 input_curl: use curl_multi_info_read() 
The function curl_multi_info_read() provides access to errors from the
curl easy interface.
 2008-11-03 21:49:43 +01:00
Max Kellermann
fdf0d46e3d player: converted PLAYER_ERROR_* to enum 2008-11-03 21:49:40 +01:00
Max Kellermann
eca0e6db3b player: removed "volatile" attributes 
Removed the "volatile" attributes from several variables which are not
important for synchronization.
 2008-11-03 21:49:36 +01:00
Max Kellermann
862bbc21a1 player: no CamelCase 
Renamed variables and internal functions.  Most of the
player_control.h API remains in CamelCase for now.
 2008-11-03 21:49:29 +01:00
Max Kellermann
cfaf85e37d decoder: converted DECODE_ERROR_* to enum 2008-11-03 21:48:17 +01:00
Max Kellermann
ec6d26788a decoder: removed "volatile" modifier 
The variable "next_song" is already protected by a memory barrier.
"total_time" is not important for synchronization, and we don't need
"volatile" here.
 2008-11-03 21:44:12 +01:00
Max Kellermann
863badd91e decoder: no CamelCase 
Renamed variables and functions.
 2008-11-03 21:43:02 +01:00
Max Kellermann
b3dfcfef52 decoder_api: send song tag in decoder_data() 
Before passing the first chunk to the audio output device, send the
current song's tag.
 2008-11-03 20:20:09 +01:00
Max Kellermann
ac96022c1d decoder_api: automatically send stream tag 
If an input stream provides tags (e.g. from an icecast server), send
them in the decoder_data() and decoder_tag() methods.  Removed the
according code from the mp3 and oggvorbis plugins - decoders shouldn't
have to care about stream tags.

This patch also adds the missing decoder_tag() invocation to the mp3
plugin.
 2008-11-03 18:24:01 +01:00
Max Kellermann
8bb2da063f tag: added function tag_has_type() 
tag_has_type() checks whether the tag contains one or more items with
the specified type.
 2008-11-03 18:24:00 +01:00
Max Kellermann
b9d456a041 decoder_api: no CamelCase 
Renamed variables.
 2008-11-03 17:56:41 +01:00
Max Kellermann
f70dccdce1 configure.ac: separate the "aac" and "mp4" decoder tests 
MPD used to have a copy of the mp4ff library.  Since that has been
removed, AAC suport was disabled when there was no libmp4ff.  Separate
the libmp4ff test, and enable AAC support no matter if libmp4ff is
available.
 2008-11-03 16:48:12 +01:00
Max Kellermann
9074f924e9 alsa: initialize "device" with NULL 
When using autodetection, AlsaData.device wasn't properly initialized
with NULL.  This broke autodetection randomly.
 2008-11-03 07:40:54 +01:00
Max Kellermann
e6f334a088 mod: removed boolean globals for lazy init 
The variables mod_mikModInitiated and mod_mikModInitError were used to
control lazy initialization, but they are superfluous now.
 2008-11-03 07:32:02 +01:00
Max Kellermann
bb15c3bd45 mod: always initialize libmikmod 
The "mod" decoder plugin was being initialized lazily, but was
deinitialized unconditionally.  That led to segmentation faults.
Convert mod_initMikMod() to be the global module initialization
method.  The MPD core should care about lazy initialization.
 2008-11-03 07:30:42 +01:00
Max Kellermann
79d70f124d output: don't allow length==0 
Nobody should call playAudio() with an empty chunk.  Add some
assertions on that.
 2008-11-02 20:16:56 +01:00
Max Kellermann
cc164cc884 player: don't play empty chunks 
An empty chunk may happen when it only contains a tag, but no PCM
data.  Don't call playAudio() then.
 2008-11-02 20:14:55 +01:00
Max Kellermann
e5137706d1 ffmpeg: fix boolean inversion in ffmpeg_tag() 
ffmpeg_tag() deleted the tag when ffmpeg_helper() returned success.
The return value was interpreted incorrectly, it should return the tag
on success.
 2008-11-02 17:32:40 +01:00
Max Kellermann
1e0acb2e1a removed unused sources 
Cleaning up artifacts from a merge gone wrong.  Also remove the
ringbuf library, which is not being used.
 2008-11-02 17:16:07 +01:00
Max Kellermann
fb233df7a9 player: copy stream tag to the song struct 
Non-local songs used to have no tags.  If the decoder sends us a tag,
we should incorporate it into the song struct.  This way, clients can
always show the correct song name (if provided by the server).
 2008-11-02 17:13:26 +01:00
Max Kellermann
7e7704e42b player: added player.song 
Always remember which song is currently being sent to the audio
device.
 2008-11-02 17:10:26 +01:00
Max Kellermann
accc82cd6c ffmpeg: don't rewind stream in url_close() 
Rewinding the stream here is not useful, but may consume valuable
resources (and time).
 2008-11-02 17:10:12 +01:00
Max Kellermann
2124df1390 decoder: rewind input stream after try_decode() 
The try_decode() method may have read some data from the stream, which
is now lost.  To make this data available to other methods, get it
back by rewinding the input stream after each try_decode() invocation.

The ogg and wavpack plugins did this manually and inconsistently; this
code can now be removed.
 2008-11-02 17:10:02 +01:00
Max Kellermann
395aa4e847 decoder: moved code to decoder_try_decode() 2008-11-02 17:07:39 +01:00
Max Kellermann
5183d85886 player: send chunk tag to audio device 
If a chunk contains a tag, send it to the audio output device.  Few
output plugins support this, e.g. shout has support for sending tags.
 2008-11-02 17:07:31 +01:00
Max Kellermann
aa9b31f1cf crossfade: copy tag 
If the source chunk has a tag, merge it into the destination chunk.
The source chunk gets deleted after that, and this is our last chance
to grab the tag.
 2008-11-02 17:07:13 +01:00
Max Kellermann
0f80428fda ffmpeg: use decoder_read() wrapper instead of direct input_stream_read() 
decoder_read() checks the decoder command.  Without this patch, the
ffmpeg plugin could become unresponsive.
 2008-11-02 17:06:53 +01:00
Max Kellermann
4d069b4991 ogg, ffmpeg: try to decode, even when the stream is not seekable 
Ogg and ffmpeg detection was disabled when the stream was not
seekable, because the detection was too expensive.  Since the curl
input stream can now rewind the stream cheaply, we can re-enable
detection on streams.
 2008-11-02 17:06:32 +01:00
Max Kellermann
460b15d29c input_curl: buffered rewinding 
During codec detection, the beginning of the stream is consumed.  This
is a common operation, which takes a lot of time when handling remote
resources.  To optimize this, remember the first 64 kB of a stream.
This way, we can rewind the stream without actually fetching the start
of the stream again.
 2008-11-02 17:06:15 +01:00
Max Kellermann
020c04e702 decoder_api: added decoder_tag() 
Provide an API for submitting additional tags from the stream.
 2008-11-02 17:02:28 +01:00
Max Kellermann
5b13f067cd aac, mod: moved decoder command check into loop condition 
Avoid while(true) loops, and convert them to a loop with a proper
condition.
 2008-11-02 17:02:23 +01:00
Max Kellermann
3f6fcfd38e aac, mod: don't check for SEEK command 
Since the aac and mod plugins have told MPD that they cannot seek, MPD
will never send a SEEK command to them.  Removed the SEEK comand
checks from both plugins.
 2008-11-02 17:02:00 +01:00
Max Kellermann
c9e15bc418 decoder_api: pass "seekable" flag to decoder_initialized() 
Don't pass the "seekable" flag with every decoder_data() invocation.
Since that flag won't change within the file, it is enough to pass it
to decoder_initialized() once per file.
 2008-11-02 17:01:51 +01:00
Max Kellermann
c7a374bdcb music_pipe: add tag pointer to the music_chunk struct 
Each music chunk can now carry a tag object.  Decoder plugins which
support it (e.g. oggvorbis) may use this to inject decoded tags into
their output.
 2008-11-02 17:01:00 +01:00
Max Kellermann
fcc11bc9d8 music_pipe: added functions chunk_init() and chunk_free() 
These two functions will care about memory allocation and deallocation
in the future.
 2008-11-02 16:58:49 +01:00
Max Kellermann
85b6ff7b59 music_pipe: document struct music_chunk 
Add doxygen compatible comments.
 2008-11-02 16:58:45 +01:00
Max Kellermann
b42dad9b05 music_pipe: removed "volatile" 
The "volatile" keyword doesn't help here, because we have proper
memory barriers, but it disables some optimizations.  Remove it.
 2008-11-02 16:58:42 +01:00
Max Kellermann
39bf84aa9f music_pipe: renamed "size" to "num_chunks" 
The name "num_chunks" expresses the meaning of the variable better.
 2008-11-02 16:57:37 +01:00
Max Kellermann
5347cca29d music_pipe: no CamelCase 
Rename all variables and struct members.
 2008-11-02 16:57:16 +01:00
Max Kellermann
8490c1b4cf music_pipe: set bit_rate and time in music_pipe_append() 
Don't bother to pass these values as parameters to tail_chunk().
 2008-11-02 16:57:15 +01:00
Max Kellermann
cd61f6570f music_pipe: moved code to music_chunk_append() 2008-11-02 16:56:49 +01:00
Max Kellermann
e9e9d2bc2d music_pipe: renamed "ob" to "music_pipe" 
Last music_pipe rename patch: renamed the global variable (singleton).
 2008-11-02 16:56:09 +01:00
Max Kellermann
d430b1dc54 music_pipe: more wrapper functions 
Replace all direct music_pipe struct accesses with wrapper functions.
The compiled machine code is the same, but this way, we can change
struct internals more easily.
 2008-11-02 16:55:53 +01:00
Max Kellermann
260a0cc33c music_pipe: use GLib instead of utils.h 
Eliminate the deprecated utils.h memory allocation functions.
 2008-11-02 16:55:48 +01:00
Max Kellermann
8b1f6ff3c8 decoder: replaced music_pipe.audioFormat with dc.out_audio_format 
.. and rename dc.audioFormat to dc.in_audio_format.  The music pipe
does not need to know the audio format, and its former "audioFormat"
property indicated the format of the most recently added chunk, which
might be confusing when you are reading the oldest chunks.
 2008-11-02 16:55:43 +01:00
Max Kellermann
30fca5e5a9 music_pipe: pass frame size to tail_chunk() 
Don't make tail_chunk() calculate the frame size again.
 2008-11-02 14:18:34 +01:00
Max Kellermann
fd0f195bb7 music_pipe: renamed ob_* functions to music_pipe_* 
Rename all functions to the new prefix.
 2008-11-02 14:18:34 +01:00
Max Kellermann
8964c69a64 music_pipe: renamed struct output_buffer to struct music_pipe 
.. and rename ob_chunk to struct music_chunk.
 2008-11-02 14:15:47 +01:00
Max Kellermann
767b4c95bd renamed outputBuffer.[ch] to pipe.[ch] 
No CamelCase in the file name.  The output_buffer struct is going to
be renamed to music_pipe.  There are so many buffer levels in MPD, and
calling this one "output buffer" is wrong, because it's not the last
buffer before the music reaches the output devices.
 2008-11-02 14:12:52 +01:00
Max Kellermann
b48ae8c26f decoder: enable decoders even if they have no init() method 
Commit 1a4a3e1f moved decoders into a static array, but failed to
enable those plugins who did not have an init() method at all.
This patch corrects the "enabled" check.
 2008-11-02 13:30:26 +01:00
Max Kellermann
4c1b96c307 decoder: make the suffixes and mime_types arrays really const 
The strings were constant, but the pointers weren't.  C syntax is
somewhat tricky..
 2008-11-01 14:55:23 +01:00
Max Kellermann
0b614fbaae decoder: make all decoder_plugin structs const 
All decoder_plugin structs are initialized at compile time, and must
never change.
 2008-11-01 14:54:09 +01:00
Max Kellermann
1a4a3e1f1f decoder: manage decoder list in a static array 
Currently, there is no way to dynamically load decoder plugins, thus
we don't need a dynamic list to manage them.
 2008-11-01 14:53:30 +01:00
Max Kellermann
5036368f54 decoder: return const decoder_plugin structs 
The decoder_plugin structs must never change.  Don't work with
non-const pointers.
 2008-11-01 14:51:41 +01:00
Max Kellermann
83f6222ae7 permission: store passwords in GHashTable 
Eliminating the deprecated linked list library.
 2008-11-01 14:33:25 +01:00
Max Kellermann
aa772ebc02 tag: use GLib instead of utils.h 
Don't use the deprecated functions from utils.h.
 2008-11-01 14:33:14 +01:00
Max Kellermann
35710a81ea utils: use GUINT32_FROM_LE() instead of readLEuint32() 
Eliminate code already provided by GLib.
 2008-11-01 14:11:19 +01:00
Max Kellermann
b996108675 tag: don't return const string from fix_utf8() 
Return NULL instead of the input value if there is nothing to fix.
This way, the caller doesn't have to use the xfree() hack.
 2008-11-01 14:04:15 +01:00
Max Kellermann
aa33422de6 alsa, jack: no const pointers for allocated strings 
Make the pointers "device" and "name" non-const, so we don't need the
xfree() hack.  The default value is expressed as NULL.
 2008-11-01 14:04:14 +01:00
Max Kellermann
9fdac529b4 path: removed sanitizePathDup() 
We don't need to sanitize the path, because the mapper already checks
for malformed paths.
 2008-10-31 16:50:51 +01:00
Max Kellermann
f291876772 mapper: check for "." and ".." 
Make map_directory_child_fs() refuse the names "." and "..".  This is
currently the interface where an attacker may inject a manipulated
path (through the "update" command).
 2008-10-31 16:48:58 +01:00
Max Kellermann
a5f8d4386c update: check return values 
Nearly all mapper functions can fail and will then return NULL.  Add
checks to all callers.
 2008-10-31 16:47:21 +01:00
Max Kellermann
d8e877e335 path: moved playlist_dir to mapper.c 
Added the function map_spl_utf8_to_fs() which replaces
utf8_to_fs_playlist_path().
 2008-10-31 16:47:14 +01:00
Max Kellermann
ef54271619 mapper: use g_warning() for logging 
g_error() is fatal by default.  Use g_warning() for non-fatal
initialization errors.
 2008-10-31 16:46:46 +01:00
Max Kellermann
f098db149e decoder: eliminate gotos in decodeStart() 
http://xkcd.com/292/
 2008-10-31 16:29:45 +01:00
Max Kellermann
a1ca32168c decoder: don't wake up player when command==NONE 
If nobody sent a command, the player isn't waiting for the decoder.
Don't wake it up.
 2008-10-31 16:29:39 +01:00
Max Kellermann
63682eb1b8 decoder: notify player after stop 
The player should always be woken up when the decoder quits.
 2008-10-31 16:29:34 +01:00
Max Kellermann
347e816247 decoder: reset state and command in decoder_task() 
Eliminate one goto in decodeStart() by moving some cleanup to
decoder_task().
 2008-10-31 16:29:24 +01:00
Max Kellermann
86fbac54fd decoder: introduce switch statement in decoder_task() 
switch looks much nicer than if/elseif/... and gcc generates nice
warnings when a new command is added to the enum.
 2008-10-31 16:29:22 +01:00
Max Kellermann
78448fe1a5 decoder_api: pass constant path pointers 2008-10-31 15:56:43 +01:00
Max Kellermann
6d6e615825 input_stream: pass const url to input_stream_open() 2008-10-31 15:50:59 +01:00
Max Kellermann
a92903983d client: use bool 
Return bool instead of int.
 2008-10-31 13:58:00 +01:00
Max Kellermann
6757c17689 removed UTF-8 library, use GLib instead 
Removed duplicated code.
 2008-10-31 13:57:10 +01:00
Alam Arias
78f60c9c6d removed unneed check for protocol in shout plugin, will assume icecast2 protocol if not exist in config 2008-10-31 12:20:49 +01:00
Max Kellermann
71fe7ad81a path: free GLib error in fs_charset_to_utf8() 
g_error_free() was missing in case g_convert() failed.
 2008-10-31 12:20:48 +01:00
Max Kellermann
8f9d9cc042 directory: directory_free() frees children 
directory_free() should free all of its children (subdirectories and
songs).  This way, db_finish() properly frees all allocated memory.
 2008-10-31 09:20:02 +01:00
Max Kellermann
ea515494cb added prefix to header macros 
"LOG_H" is a macro which is also used by ffmpeg/log.h.  This is
ffmpeg's fault, because short macros should be reserved for
applications, but since it's always a good idea to choose prefixed
macro names, even for applications, we are going to do that in MPD.
 2008-10-31 09:19:53 +01:00
Max Kellermann
5ef17ac1aa client: don't try again after partial write 
After a partial write, chances are vanishing that another write() will
succeed.  Don't try immediately.
 2008-10-31 09:19:40 +01:00
Max Kellermann
b7ee6febaa removed the sllist library 
The "simple singly-linked-list" library has been replaced with GLib's
GList and GQueue.
 2008-10-31 09:19:34 +01:00
Max Kellermann
94cbdffb72 client: use GQueue instead of sllist.h for deferred_send 
Another custom data structore converted to GLib.
 2008-10-31 09:18:11 +01:00
Max Kellermann
90e9079142 client: use GSList instead of struct strnode for command lists 
Replace a custom data structure with a GLib one.
 2008-10-31 09:17:56 +01:00
Max Kellermann
e5ef2d8a37 client: removed list_cache 
The list cache aims to save memory allocations, and complicates the
code a bit.  We should rather use GLib slices later, which are easy to
use.
 2008-10-31 09:17:52 +01:00
Max Kellermann
8f37f7c838 ogg: don't include _flac_common.h 
The source _ogg_common.c does not need any symbols from
_flac_common.h, but including it leads to compiler errors when libflac
isn't available.
 2008-10-31 08:52:09 +01:00
Max Kellermann
d65d6548a3 oggflac: adapt to new API 
Again, I forgot to adapt oggflac to the new API (struct input_stream,
bool return values).
 2008-10-31 08:52:09 +01:00
Max Kellermann
5024f0b6cc ffmpeg: pass input_stream pointer to decoder_data() 
decoder_data() uses wait times to let the input stream continue its
transfer.
 2008-10-30 19:09:20 +01:00
Max Kellermann
b15c4cdeb5 ffmpeg: use return value of decoder_data() 
decoder_data() always returns the current command.  If we use this, we
can save a lot of decoder_get_command() calls.
 2008-10-30 19:03:41 +01:00
Max Kellermann
f3b4a28518 ffmpeg: output buffer size cannot be negative 
Converted the runtime check to an assertion.
 2008-10-30 19:03:38 +01:00
Max Kellermann
130fc58b36 ffmpeg: break immediately after av_read_frame() 
Remove one indent level.
 2008-10-30 19:03:31 +01:00
Max Kellermann
5f1df0a927 ffmpeg: moved code to ffmpeg_send_frame() 
Move code from ffmpeg_decode_internal() to make it smaller and more
readable.
 2008-10-30 19:03:20 +01:00
Max Kellermann
048d62a628 ffmpeg: report seek errors to MPD 
The decoder API provides the function decoder_seek_error() to report
seek errors.  Use this function instead of logging the error.
 2008-10-30 19:02:38 +01:00
Max Kellermann
cd7a720426 ffmpeg: simplified mpdurl_read() 
The function mpdurl_read() is too complicated, and uses the wrong data
types.
 2008-10-30 19:02:01 +01:00
Max Kellermann
964442c5ad ffmpeg: call tag_free() instead of free() 
tag objects must be freed with tag_free() to ensure that all resources
are freed.
 2008-10-30 19:01:36 +01:00
Max Kellermann
25f4efcdb8 ffmpeg: eliminated local variable "tag" 
The function ffmpeg_tag() already has the variable base.tag, which can
be used for this.
 2008-10-30 19:01:31 +01:00
Max Kellermann
7cbd9821c6 ffmpeg: make ffmpeg_helper() return bool 
ffmpeg_try_decode() did not interpret ffmpeg_helper()'s return value
properly; migrate everything to bool to make it consistent.
 2008-10-30 19:01:23 +01:00
Max Kellermann
078d83ca13 ffmpeg: removed debug messages 
We don't need those anymore, they just fill the log.
 2008-10-30 19:01:18 +01:00
Max Kellermann
b180d0b47f ffmpeg: initialize base.decoder 
ffmpeg_tag() did not initialize base.decoder, which made valgrind
unhappy, and can lead to a egmentation fault.
 2008-10-30 18:08:52 +01:00
Max Kellermann
4d72bda4c3 listen: set file mode 666 on the unix socket 
Depending on MPD's umask, the file permissions of the unix socket were
too restrictive, and many clients were not able to connect.  Do a
chmod(0666) on the socket, to allow everybody to connect.
 2008-10-30 18:03:18 +01:00
Max Kellermann
9ec695559f pulse: fix segfault without sink name 
Commit d692e9 broke configurations without explicit server or sink
configuration.  Check for getBlockParam()==NULL.
 2008-10-30 17:46:56 +01:00
Max Kellermann
5f6383d68c mpc: provide 24 bit samples 
Similar to libmad, libmpcdec provides samples with higher quality than
16 bit.  Send 24 bit samples to MPD, which allows MPD to apply
dithering just in case the output devices are only 16 bit capable.
 2008-10-30 08:45:00 +01:00
Max Kellermann
0db07a920e mpc: moved sample size into a constant 
Don't hard-code the "16 bits" or "2 bytes" in multiple locations.
 2008-10-30 08:44:51 +01:00
Max Kellermann
6773dea5b0 mpc: renamed variable "s16" to "dest" 
The name "s16" implies 16 bit integers.  To make the code more
generic, rename it to "dest".
 2008-10-30 08:44:43 +01:00
Max Kellermann
51348d6992 mpc: fix broken integer sample conversion 
The conversion of integer samples was completely broken, which
presumably didn't annoy anybody because libmpcdec provides float
samples on most installations.
 2008-10-30 08:44:28 +01:00
Max Kellermann
ecd485acbd mpc: fix boolean interpretation of input_stream_seek() 
When input_stream_seek() was converted to return a bool, this wasn't
adjusted in the musepack plugin.
 2008-10-30 08:42:18 +01:00
Max Kellermann
62d4fa9306 decoder: use bool for return values and flags 
Don't return 0/-1 on success/error, but true/false.  Instead of int,
use bool for storing flags.
 2008-10-30 08:38:54 +01:00
Max Kellermann
d29bad4410 mp3: make mp3_read() return bool 
Its only caller in mp3_decode() just compared its value with
DECODE_BREAK.  Convert that to bool, and return false if the loop
should be ended.  Also eliminate some superfluous command checking
code, which was already done in the preceding while loop.
 2008-10-30 06:09:28 +01:00
Max Kellermann
f8722913cf output: removed audio_output.result 
Since open() and play() close the device on error, we can simply check
audio_output.open instead of audio_output.result after a call.
 2008-10-29 22:34:37 +01:00
Max Kellermann
7da0e005f3 output: delay reopen after device failure 
When one of several output devices failed, MPD tried to reopen it
quite often, wasting a lot of resources.  This patch adds a delay:
wait 10 seconds before retrying.  This might be changed to exponential
delays later, but for now, it makes the problem go away.
 2008-10-29 22:32:50 +01:00
Max Kellermann
0eae1c55ad output: moved code to audio_output_update() 
Moved code from syncAudioDeviceStates() to audio_output_update().
 2008-10-29 22:17:44 +01:00
Max Kellermann
678314534a output: always call cancel() before stop() 
Stopping an audio output device without cancelling its buffer doesn't
make sense.  Combine the two operations, which saves several cancel
calls.
 2008-10-29 22:17:42 +01:00