- 26 Aug, 2008 40 commits
-
-
Max Kellermann authored
Continuing the effort to rename InputPlugin to decoder_plugin...
-
Max Kellermann authored
Since inputPlugin.c manages the list of registered decoders, we should rename the source file.
-
Max Kellermann authored
The decoder_plugin instances are only used inputPlugin.c, so move them from the header file.
-
Max Kellermann authored
"decoder plugin" is a better name than "input plugin", since the plugin does not actually do the input - InputStream does. Also don't use typedef, so we can forward-declare it if required.
-
Max Kellermann authored
The function player_command() inherited the busy-waiting algorithm from the old code; throw in a wait_main_task() to do idle waiting.
-
Max Kellermann authored
Don't write CPP when you can express the same in C... macros vs enum is a good example for that.
-
Max Kellermann authored
PlayerControl.command replaces the old attributes play, stop, pause, closeAudio, lockQueue, unlockQueue, seek. The main thread waits for each command synchronously, so there can only be one command enabled at a time anyway.
-
Max Kellermann authored
(Ab)use the decoder_command enumeration, which has nearly the same values and the same meaning.
-
Max Kellermann authored
The wavpack decoder plugin implements a hack, and it needs the song URL for that. This API (and the hack) should be revised later, but add that function for now.
-
Max Kellermann authored
dc->seekable is already set by decodeStart().
-
Max Kellermann authored
Since we want to hide mpd internals from the decoder plugins, the plugins should not check dc->state whether they have already called decoder_initialized(). Use a local variable to track that.
-
Max Kellermann authored
Provide access to seeking for the decoder plugins; they have to know where to seek, and they need a way to tell us that seeking has failed.
-
Max Kellermann authored
Some decoder commands are implemented in the decoder plugins, thus they need to have an API call to signal that their current command has been finished. Let them use the new decoder_command_finished() instead of the internal dc_command_finished().
-
Max Kellermann authored
Another big patch which hides internal mpd APIs from decoder plugins: decoder plugins regularly poll dc->command; expose it with a decoder_api.h function.
-
Max Kellermann authored
Since we moved all PCM conversions to decoder_data(), the attribute convState isn't being used anymore by the OutputBuffer code. Move it to struct decoder.
-
Max Kellermann authored
We want to expose the AudioFormat structure to plugins; remove some clutter by moving its declaration to a separate header file.
-
Max Kellermann authored
InputPlugin is the API which is implemented by a decoder plugin. This belongs to the public API/ABI, so move it to decoder_api.h. It will later be renamed to something like "decoder_plugin".
-
Max Kellermann authored
Anonymous code blocks just to declare variables look ugly. Move the variable declarations up and disband the code block.
-
Max Kellermann authored
Similar to previous patch: eliminate one variable by using "break". This also simplifies the code since we can remove one level of indent.
-
Max Kellermann authored
"break" is so much easier than "eof=1; continue;", when "!eof" is the loop condition.
-
Max Kellermann authored
Since we have merged dc->stop, dc->seek into one variable, we don't have to check both conditions at a time; we can replace "!stop && !seek" with "none".
-
Max Kellermann authored
Similar to the previous patch: pass total_time instead of manipulating dc->totalTime directly.
-
Max Kellermann authored
dc->audioFormat is set once by the decoder plugins before invoking decoder_initialized(); hide dc->audioFormat and let the decoder pass an AudioFormat pointer to decoder_initialized().
-
Max Kellermann authored
We are now beginning to remove direct structure accesses from the decoder plugins. decoder_clear() and decoder_flush() mask two very common buffer functions.
-
Max Kellermann authored
Code simplification: since we are not using in-band signalling with the chunk index anymore, we can just return a pointer to the tail chunk instead of the index.
-
Max Kellermann authored
OutputBuffer should be a more generic low-level library, without dependencies to the other headers. This patch adds the field "notify", which is used to signal the player thread. It is passed in the constructor, and removes the need to compile with the decode.h header.
-
Max Kellermann authored
Moved all of the player-waiting code to decoder_data(), to make OutputBuffer more generic.
-
Max Kellermann authored
Avoid some duplicated code in main_notify.c.
-
Max Kellermann authored
After the decoder has been initialized and the audio device has been opened, don't sleep. The decoder plugin won't do anything special nor will it care to wake us up for some reason.
-
Max Kellermann authored
decoder_initialized() sets the state to DECODE_STATE_DECODE and wakes up the player thread. It is called by the decoder plugin after its internal initialization is finished. More arguments will be added later to prevent direct accesses to the DecoderControl struct.
-
Max Kellermann authored
The decoder struct should later be made opaque to the decoder plugin, because maintaining a stable struct ABI is quite difficult. The ABI should only consist of a small number of stable functions.
-
Max Kellermann authored
Don't use wrappers like player_wakeup_decoder_nb(). These have been wrappers calling notify.c functions, for compatibility with the existing code when we migrated to notify.c.
-
Max Kellermann authored
The "if" block breaked out of the loop. That means we can move the code out of the "else" block.
-
Max Kellermann authored
dc_command_finished() is invoked by the decoder thread when it has finished a command (sent by the player thread). It resets dc.command and wakes up the player thread. This combination was used at a lot of places, and by introducing this function, the code will be more readable.
-
Max Kellermann authored
Busy wait loops are a bad thing, especially when the response time can be very long - busy waits eat a lot of CPU, and thus slow down the other thread. Since the other thread will notify us when it's ready, we can use notify_wait() instead.
-
Max Kellermann authored
Much of the existing code queries all three variables sequentially. Since only one of them can be set at a time, this can be optimized and unified by merging all of them into one enum variable. Later, the "command" checks can be expressed in a "switch" statement.
-
Max Kellermann authored
pc->errored_song is already set by decodeParent() in the player thread when we set dc->error; no need to set it in the decoder thread.
-
Max Kellermann authored
Since pc->current_song denotes the song which the decoder should use next, we should move it to DecoderControl. This removes one internal PlayerControl struct access from the decoder code. Also add pc.next_song, which is manipulated by the playlist code, and gets copied to dc.next_song as soon as the decoder is started.
-
Max Kellermann authored
Include only headers which are really required. This speeds up compilation and helps detect cross-layer accesses.
-
Max Kellermann authored
Also enable -Wunused-parameter - this forces us to add the gcc "unused" attribute to a lot of parameters (mostly library callback functions), but it's worth it during code refactorizations.
-