aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* client: return early on error in client_defer_output()Max Kellermann2008-08-281-5/+7
| | | | | Exit the function when an error occurs, and move the rest of the following code one indent level left.
* client: moved code to client_defer_output()Max Kellermann2008-08-281-20/+27
| | | | | Split the large function client_write_output() into two parts; this is the first code moving patch.
* don't free client resources except in client_close()Max Kellermann2008-08-281-15/+0
| | | | | | All of the client's resources are freed in client_close(). It is enough to set the "expired" flag, no need to duplicate lots of destruction code again and again.
* client: allocate clients dynamicallyMax Kellermann2008-08-281-90/+76
| | | | | | Due to the large buffers in the client struct, the static client array eats several megabytes of RAM with a maximum of only 10 clients. Stop this waste and allocate each client struct from the heap.
* client: added function client_by_fd()Max Kellermann2008-08-281-13/+21
| | | | | The code becomes less complex and more readable when we move this linear search into a separate mini function.
* client: return early in client_new()Max Kellermann2008-08-281-30/+31
| | | | This saves one level of indent.
* client: renamed all public functionsMax Kellermann2008-08-286-19/+19
| | | | | | Functions which operate on the whole client list are prefixed with "client_manager_", and functions which handle just one client just get "client_".
* client: renamed internal functions and variablesMax Kellermann2008-08-281-297/+296
| | | | | Rename all static functions, variables and macros which have "interface" in their name to something nicer prefixed with "client_".
* client: renamed Interface to struct clientMax Kellermann2008-08-281-19/+19
| | | | | | | Second patch: rename the internal struct name. We will eventually export this type as an opaque forward-declared struct later, so we can pass a struct pointer instead of a file descriptor, which would save us an expensive linear lookup.
* renamed interface.c to client.cMax Kellermann2008-08-287-7/+7
| | | | | | | I don't believe "interface" is a good name for something like "connection by a client to MPD", let's call it "client". This is the first patch in the series which changes the name, beginning with the file name.
* imported list.h from the Linux kernel sourcesMax Kellermann2008-08-282-0/+485
| | | | | | | linux/list.h is a nice doubly linked list library - it is lightweight and powerful at the same time. It will be useful later, when we begin to allocate client structures dynamically. Import it, and strip out all the stuff which we are not going to use.
* const pointersMax Kellermann2008-08-286-16/+16
| | | | The usual bunch of pointer arguments which should be const.
* unsigned integers and size_tMax Kellermann2008-08-283-11/+11
| | | | | Use "unsigned int" whenever negative values are not meaningful. Use size_t whenever we are going to describe buffer sizes.
* include cleanupMax Kellermann2008-08-284-2/+3
| | | | Only include headers which are really needed.
* protect locate.h from double inclusionMax Kellermann2008-08-281-0/+5
|
* moved player_command_finished() to player_thread.cMax Kellermann2008-08-263-10/+8
|
* moved code to pc_init(), dc_init()Max Kellermann2008-08-268-24/+37
|
* renamed player.c to player_control.cMax Kellermann2008-08-2613-272/+252
| | | | | Give player.c a better name, meaning that the code is used to control the player thread.
* no commandError() in playerSeek()Max Kellermann2008-08-263-9/+9
| | | | | | We should avoid having protocol specific code in player.c. Just return success or failure, and let the caller send the error code to the MPD client.
* don't initialize "i" if we overwrite it anywayMax Kellermann2008-08-261-1/+3
|
* renamed decoderInit() to decoder_thread_start()Max Kellermann2008-08-263-3/+3
|
* renamed decode.h to decoder_control.hMax Kellermann2008-08-267-6/+7
|
* renamed decode.c to decoder_thread.cMax Kellermann2008-08-265-4/+30
| | | | | | It should be obvious in which thread or context a function is being executed at runtime. The code which was left in decode.c is for the decoder thread itself; give the file a better name.
* moved global variable "pc" to player.hMax Kellermann2008-08-2611-9/+32
| | | | | This is the last of the three variables. Now we don't need playerData.h anymore in most sources.
* moved global variable "ob" to outputBuffer.hMax Kellermann2008-08-267-6/+14
| | | | | | | This releases several include file dependencies. As a side effect, "CHUNK_SIZE" isn't defined by decoder_api.h anymore, so we have to define it directly in the plugins which need it. It just isn't worth it to add it to the decoder plugin API.
* 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
|