aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* moved enum decoder_command to decoder_api.hMax Kellermann2008-08-262-8/+9
| | | | | | The decoder plugins need this type, so export it in the public API. This allows is to remove "decode.h" from "decoder_api.h", uncluttering the API namespace some more.
* moved variable "dc" to decode.hMax Kellermann2008-08-268-22/+27
| | | | | Now that "dc" is available here, we don't have to pass it to decoder_is_idle() and decoder_is_starting() anymore.
* player_thread: removed decode(), renamed decodeParent()Max Kellermann2008-08-261-15/+4
| | | | | decode() is a trivial wrapper for decodeParent(). Merge both and rename them to do_play().
* hide DecoderControl accesses in inline functionsMax Kellermann2008-08-262-10/+27
| | | | | | Unfortunately, we have to pass the DecoderControl pointer to these inline functions, because the global variable "dc" may not be available here. This will be fixed later.
* check for decoder error before state!=STARTMax Kellermann2008-08-261-9/+8
| | | | | When dc->error!=NOERROR, we do not need to check state!=START. Simplify the checks by moving the error check to the top.
* don't reset dc->command in quitDecode()Max Kellermann2008-08-261-1/+0
| | | | | | The decoder thread is responsible for resetting dc->command after a command was executed. As a consequence, we can assume that dc->command is already NONE after decoder_stop().
* added decoder_control.cMax Kellermann2008-08-264-50/+110
| | | | | | The source "decoder_control.c" provides an API for controlling the decoder. This replaces various direct accesses to the DecoderControl struct.
* removed the "queue" parameter from syncPlaylistWithQueue()Max Kellermann2008-08-261-12/+11
| | | | | There is only one caller which passes "true", so we can move the queueNextSongInPlaylist() invocation there.
* merge the playlist lock functions into clearPlayerQueue()Max Kellermann2008-08-261-24/+11
| | | | | | There is no unlocked caller of clearPlayerQueue(), and the functions lockPlaylistInteraction() and unlockPlaylistInteraction() are trivial - merge them.
* use switch/case in syncPlaylistWithQueue()Max Kellermann2008-08-261-8/+18
|
* don't call playerStop() before playerPlay()Max Kellermann2008-08-263-12/+3
| | | | | | | Since playerPlay() already calls playerStop(), we can remove its invocation of playerStop() from playPlaylistOrderNumber(). We can also make playerStop a static function.
* assert locked/unlocked in queue lock functionsMax Kellermann2008-08-261-2/+5
| | | | | There are no nested queue locks in mpd, thus replace the locked checks in playerQueueLock(), playerQueueUnlock() with assertions.
* don't unlock player queue in playerStop(), playerWait()Max Kellermann2008-08-261-2/+6
| | | | | There is no caller of these two functions which locks the player queue; replace the playerQueueUnlock() call with an assertion.
* queueSong() cannot failMax Kellermann2008-08-263-21/+8
| | | | | | | All (indirect) callers of queueSong() ensure that the queue state is BLANK, so there is no need to check it in queueSong() again. As a side effect, queueSong() cannot fail anymore, and can return void. Also, playlist_queueError and all its error handling can go away.
* fix a comment regarding the player queueMax Kellermann2008-08-261-1/+1
|
* document the PLAYER_QUEUE_ constantsMax Kellermann2008-08-261-0/+15
|
* added enum player_queue_stateMax Kellermann2008-08-263-11/+19
|
* rewrote playerKill()Max Kellermann2008-08-263-2/+11
| | | | | | | playerKill() was marked as deprecated, but it seems like a good idea to do proper cleanup in all threads (e.g. for usable valgrind results). Introduce the command "EXIT" which makes the player thread exit cleanly.
* player: don't call STOP before CLOSE_AUDIOMax Kellermann2008-08-262-15/+10
| | | | | | | | | playerWait() stops the player thread (twice!) and closes the output device. It should be well enough to just send CLOSE_AUDIO, without STOP. This requires a tiny change to the player thread code: make it break when CLOSE_AUDIO is sent.
* playlist: eliminate unused fd parametersMax Kellermann2008-08-263-49/+46
| | | | | Again, remove file descriptor parameters, which are not actually used. These functions can also be converted to return void.
* player: no "fd" and no return valueMax Kellermann2008-08-264-47/+30
| | | | | Most player*() functions do not actually use the file descriptor, and always return 0 (success). Eliminate them to get a leaner interface.
* flac: decoder command means EOFMax Kellermann2008-08-262-11/+9
| | | | | | | It was possible for the decoder thread to go into an endless loop (flac and oggflac decoders): when a "STOP" command arrived, the Read() callback would return 0, but the EOF() callback returned false. Fix: when decoder_get_command()!=NONE, return EOF==true.
* made "sample_size" static constMax Kellermann2008-08-261-1/+1
| | | | | sample_size is a variable which is computed at compile time. Declare it "static const", so the compiler can optimize it away.
* moved jack configuration to the JackData structMax Kellermann2008-08-261-49/+64
| | | | | | Storing local configuration in global (static) variables is obviously a bad idea. Move all those variables into the JackData struct, including the locks.
* jack: removed unused macrosMax Kellermann2008-08-261-10/+0
|
* jack: don't set audioOutput->data=NULLMax Kellermann2008-08-261-5/+5
| | | | | | | There is only one caller of freeJackData() left: jack_finishDriver(). This function is called by the mpd core, and is called exactly once for every successful jack_initDriver(). We do not need to clear audioOutput->data, since this variable is invalidated anyway.
* jack: initialize JackData in jack_initDriver()Max Kellermann2008-08-261-6/+2
| | | | | | | | Over the lifetime of the jack AudioOutput object, we want a single valid JackData object, so we can persistently store data there (configuration etc.). Allocate JackData in jack_initDriver(). After that, we can safely remove all audioOutput->data==NULL checks (and replace them with assertions).
* jack: added freeJackClient()Max Kellermann2008-08-261-13/+25
| | | | | | | No need to destroy the JackData object when an error occurs, since jack_finishDriver() already frees it. Only deinitialize the jack library, introduce freeJackClient() for that, and move code from freeJackData().
* jack: initialize jd->client after !jd checkMax Kellermann2008-08-261-5/+5
| | | | | | Prepare the next patch: make the "!jd" check independent of the jd->client initialization. This way we can change the "jd" initialization semantics later.
* jack: eliminate superfluous freeJackData() callsMax Kellermann2008-08-261-6/+0
| | | | | | | connect_jack() invokes freeJackData() in every error handler, although its caller also invokes this function after a failure. We can save a lot of lines in connect_jack() by removing these redundant freeJackData() invocations.
* mp3, flac: check for seek command after decoder_read()Max Kellermann2008-08-262-4/+16
| | | | | | | When we introduced decoder_read(), we added code which aborts the read operation when a decoder command arrives. Several plugins however did not expect that when they were converted to decoder_read(). Add proper checks to the mp3 and flac decoder plugins.
* check decoder_command!=NONE instead of decoder_command==STOPMax Kellermann2008-08-265-13/+14
| | | | | | The code said "decoder_command==STOP" because that was a conversion from the old "dc->stop" test. As we can now check for all commands in one test, we can simply rewrite that to decoder_command!=NONE.
* mp3: converted the MUTEFRAME_ macros to an enumMax Kellermann2008-08-261-9/+12
| | | | Also introduce MUTEFRAME_NONE; previously, the code used "0".
* mp3: converted the DECODE_ constants to an enumMax Kellermann2008-08-261-8/+13
|
* added flag "decoder.seeking"Max Kellermann2008-08-263-1/+12
| | | | | | | | | | This flag is used internally; it is set by decoder_seek_where(), and indicates that the decoder plugin has begun the seek process. It is used for the case that the decoder plugin has to read data during the seek process. Before this patch, that was impossible, because decoder_read() would refuse to read data unless dc->command is NONE. This patch is kind of a dirty workaround, and needs to be redesigned later.
* wavpack: don't use "isp" before initializationMax Kellermann2008-08-261-4/+1
| | | | | | The old code called can_seek() with the uninitialized pointer "isp.is". Has this ever worked? Anyway, initialize "isp" first, then call can_seek(&isp).
* wavpack: moved code to wavpack_open_wvc()Max Kellermann2008-08-261-79/+66
| | | | | | Move everything related to finding and initializing the WVC stream to wavpack_open_wvc(). This greatly simplifies its error handling and the function wavpack_streamdecode().
* simplified code in the ogg decoder pluginMax Kellermann2008-08-261-25/+25
| | | | | Return early when the player thread sent us a command. This saves one level of indentation.
* added decoder_read()Max Kellermann2008-08-2610-66/+50
| | | | | | | | | On our way to stabilize the decoder API, we will one day remove the input stream functions. The most basic function, read() will be provided by decoder_api.h with this patch. It already contains a loop (still with manual polling), error/eof handling and decoder command checks. This kind of code used to be duplicated in all decoder plugins.
* wavpack: added InputStreamPlus.decoderMax Kellermann2008-08-261-4/+7
| | | | The "decoder" object reference will be used by another patch.
* oggvorbis: don't detect OGG header if stream is not seekableMax Kellermann2008-08-262-0/+10
| | | | | | | | | If the input stream is not seekable, the try_decode() function consumes valuable data, which is not available to the decode() function anymore. This means that the decode() function does not parse the header correctly. Better skip the detection if we cannot seek. Or implement better buffering, something like unread() or buffered rewind().
* added AacBuffer.decoderMax Kellermann2008-08-261-4/+7
| | | | | | We need the decoder object at several places in the AAC plugin. Add it to mp3DecodeData, so we don't have to pass it around in every function.
* mp3: added mp3DecodeData.decoderMax Kellermann2008-08-261-9/+13
| | | | | | We need the decoder object at several places in the mp3 plugin. Add it to mp3DecodeData, so we don't have to pass it around in every function.
* mp3: audio_linear_dither() returns mpd_sint16Max Kellermann2008-08-261-11/+9
| | | | | | The return value of audio_linear_dither() is always casted to mpd_sint16. Returning long does not make sense, and consumed 8 bytes on a 64 bit platform.
* mp3: changed outputBuffer's type to mpd_sint16[]Max Kellermann2008-08-261-3/+3
| | | | | The output buffer always contains mpd_sint16; declaring it with that type saves several casts.
* mp3: moved num_samples calculation out of the loopMax Kellermann2008-08-261-5/+7
| | | | | The previous patch removed all loop specific dependencies from the num_samples formula; we can now calculate it before entering the loop.
* mp3: eliminated outputPtrMax Kellermann2008-08-261-14/+3
| | | | | | The output buffer is always flushed after being appended to, which allows us to assume it is always empty. Always start writing at outputBuffer, don't remember outputPtr.
* mp3: don't do a second flush in mp3_decode()Max Kellermann2008-08-261-17/+1
| | | | | | The previous patch made mp3Read() flush the output buffer in every iteration, which means we can eliminate the flush check after invoking mp3Read().
* mp3: always flush directly after decoding/ditheringMax Kellermann2008-08-261-15/+13
| | | | | Since we try to fill the buffer in every iteration, we assume that we should flush the output buffer at the end of each iteration.
* mp3: dither a whole block at a timeMax Kellermann2008-08-261-3/+9
| | | | | | Fill the whole output buffer at a time by using dither_buffer()'s ability to decode blocks. Calculate how many samples fit into the output buffer before each invocation.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:13:18 +0000