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

57 Commits

Author SHA1 Message Date
Max Kellermann
b6b181ca87 decoder_thread: re-enable file decoders 
By accident, I committed a debug flag, which disallowed the decoder
thread to play files locally.  Undo this hunk.
 2009-02-11 19:58:50 +01:00
Max Kellermann
82cfce76eb archive: replaced setup_stream() with open_stream() 
The open_stream() method opens the input_stream.  This allows the
archive plugin to do its own initialization, and it also allows it to
use input_stream.data.  We can remove input_stream.archive now, which
was unnatural to have in the first place.
 2009-01-30 00:53:32 +01:00
Max Kellermann
ac0e799965 decoder_control: added decoder_control.thread 
decoder_control.thread contains the handle of the decoder thread, or
NULL if the decoder thread isn't running.
 2009-01-25 13:44:27 +01:00
Max Kellermann
7f34e9410e pcm: added pcm_convert_deinit(), pcm_resample_deinit() 
Free memory allocated by libsamplerate when the output or the decoder
is closed.
 2009-01-07 22:20:30 +01:00
Max Kellermann
5e6ac50583 initialize GError pointers 
GLib mandates that you initialize all GError objects with NULL prior
to passing it.
 2009-01-04 19:51:54 +01:00
Max Kellermann
fed719197c song: allocate the result of song_get_url() 2009-01-04 19:09:34 +01:00
Max Kellermann
45597cc571 ls: renamed functions, no CamelCase 2009-01-04 17:46:42 +01:00
Max Kellermann
77d3643036 ls: include cleanup 
Don't include headers which are not used.  Fix some includes in
decoder_thread.c.
 2009-01-04 17:26:12 +01:00
Max Kellermann
700bd44fda input_stream: added tag() method 
The tag() method reads a tag from the stream.  This replaces the
meta_name and meta_title attributes.
 2009-01-03 23:29:45 +01:00
Max Kellermann
daf7c3db5a mapper: allocate the result of map_directory_child_fs(), map_song_fs() 
Don't use fixed stack buffers.
 2009-01-02 10:48:55 +01:00
Thomas Jansen
c01ad37d3b decoder_thread: migrate from pthread to glib threads 2008-12-28 22:09:33 +01:00
Thomas Jansen
5e3dc6946f Include <pthread.h> where it is necessary only 2008-12-28 21:02:05 +01:00
Max Kellermann
8fe03b8bce decoder: terminate decoder thread before MPD cleanup 
When MPD exits, it should manually free all resources in use, to allow
easy memory leak debugging.  Make the decoder thread terminate during
that.
 2008-12-28 19:48:53 +01:00
Max Kellermann
bc55d8d78e decoder: added missing glib.h include 2008-11-25 15:12:00 +01:00
Thomas Jansen
3d258504a1 decoder_thread.c: replaced mpd_unused by G_GNUC_UNUSED 2008-11-24 14:41:53 +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
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
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
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
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
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
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
863badd91e decoder: no CamelCase 
Renamed variables and functions.
 2008-11-03 21:43:02 +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
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
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
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
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
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
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
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
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
528b7c3f5e decoder: automatically flush the output buffer after decoder exits 
A decoder_flush() invocation was missing in the FLAC plugin, resulting
in casual assertion failures due to a wrong assumption about the last
chunk's audio format.  It's much easier to remove that decoder_flush()
function and make the decoder thread call ob_flush().
 2008-10-29 17:29:06 +01:00
Max Kellermann
5c19776f2f input_stream: use "bool" instead of "int" 
For boolean values and success flags, use bool instead of integer (1/0
for true/false, 0/-1 for success/failure).
 2008-10-26 20:56:46 +01:00
Max Kellermann
dbc7e9ba2f input_stream: no CamelCase 
Renamed all functions and variables.
 2008-10-26 20:34:47 +01:00
Max Kellermann
1d385190a0 path: removed pathcpy_trunc() 
There was only one user of pathcpy_trunc(), which can be eliminated.
 2008-10-20 22:18:42 +02:00
Max Kellermann
b73ecbb073 input: declare struct input_stream 
Provide a struct type which can be forward-declared.  The typedef
InputStream is deprecated now.
 2008-10-17 17:53:48 +02:00
Max Kellermann
bae98f777b decoder: notify player after entering decodeStart() 
Wake up the player as soon as the decoder thread has entered its loop.
This fixes a dead lock when the input is blocking.
 2008-10-17 17:53:44 +02:00
Max Kellermann
5b71d5f6f7 mapper: new song-to-filesystem mapper library 
The mapper library maps directory and song objects to file system
paths.  With this central library, the code mixture in path.c should
be cleaned up, and we will be able to add neat features like aliasing.
 2008-10-14 11:10:49 +02:00
Max Kellermann
e1a4474ad4 song: don't allow calling song_get_url(NULL) 
The runtime check suggests that the author has somehow thought
song_get_url(NULL) might be valid.  It should not be.  Replace it with
an assertion.
 2008-10-08 11:06:37 +02:00
Max Kellermann
5e7b18f874 song: removed CamelCase 
CamelCase is ugly...  rename all functions.
 2008-10-08 11:05:34 +02:00
Max Kellermann
b084bc28ed use the "bool" data type instead of "int" 
"bool" should be used in C99 programs for boolean values.
 2008-10-08 11:03:39 +02:00