aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* song: stop storing song_typeEric Wong2008-10-055-29/+22
| | | | | | | We already know if a song is a URL or not based on whether it has parentDir defined or not. Hopefully one day in the future we can drop HTTP support from MPD entirely when an HTTP filesystem comes along and we can access streams via open(2).
* song: use flex arrays to store song->urlEric Wong2008-10-053-19/+24
| | | | | | Reduce the number of allocations we make, so there's less pressure on the allocator and less overhead to keep track of the allocations in.
* song: converted "type" to enumMax Kellermann2008-10-052-5/+8
| | | | | | Having an enum type is much nicer than an anonymous integer plus CPP macros. Note that the old code didn't save any space by declaring the variable 8 bit, due to padding.
* song: get rid of newNullSong()Eric Wong2008-10-051-15/+4
| | | | | It didn't save us any lines of code nor did it do anything useful since we would overwrite everything anyways.
* song: call freeJustSong if newSong failsEric Wong2008-10-051-1/+1
| | | | | There's no reason to scan the playlist for a song we just allocated.
* playlist.h: fix build for folks that don't -DMPD_PATH_MAX=...Eric Wong2008-10-051-0/+1
| | | | Thanks (again) to unK for the report :x
* decode: fix build for folks that don't -DMPD_PATH_MAX=...Eric Wong2008-10-051-0/+1
| | | | Thanks to unK for the report
* directory: fix writeDirectoryDBEric Wong2008-10-051-2/+4
| | | | Wow, I must have been halfway asleep when I did that...
* command: fix return statusEric Wong2008-10-051-16/+6
| | | | | | This got broken when listHandlerFunc was removed. Since we no longer need it and it's confusing, remove processCommandInternal and just use process_command.
* Merge commit '1533279fb18b2b0f53345f0e0727d2f0f968c00d'Eric Wong2008-10-0515-393/+283
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1533279fb18b2b0f53345f0e0727d2f0f968c00d': directory: reuse existing directory if found on update song: better handling of existing songs when rereading DB tag: merge clearMpdTag into tag_free song: start avoiding race in updateSongInfo command: get rid of specialized list handlers directory: simplify list update handling logic main_notify: define main_task so we can use it for assertions directory: streamline deletes song: start avoiding race in updateSongInfo playlist: small lines of code reduction Revert "Start using song pointers in core data structures" Conflicts: src/playlist.c
| * Merge commit 'box/song-locks' into ew/song-locksEric Wong2008-10-043-20/+24
| |\ | | | | | | | | | | | | | | | | | | | | | * commit 'box/song-locks-wip': directory: reuse existing directory if found on update song: better handling of existing songs when rereading DB tag: merge clearMpdTag into tag_free song: start avoiding race in updateSongInfo
| | * directory: reuse existing directory if found on updateEric Wong2008-10-041-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of allocating a new one, just reuse an existing one if one is found when rereading the DB. This is a small makes the previous commit work on subdirectories of the root music directory. [1] "song: better handling of existing songs when rereading DB"
| | * song: better handling of existing songs when rereading DBEric Wong2008-10-041-4/+13
| | | | | | | | | | | | | | | | | | Don't reallocate existing tags if they haven't changed. This isn't used as often anymore, but we still take HUP signals to reread the DB if other processes changed it.
| | * tag: merge clearMpdTag into tag_freeEric Wong2008-10-031-12/+2
| | | | | | | | | | | | | | | avoid some redundant clearing logic as well, since the tag is getting freed.
| | * song: start avoiding race in updateSongInfoEric Wong2008-10-031-9/+12
| | | | | | | | | | | | | | | This is still not SMP-safe yet, as it needs at least a barrier before calling tag_free(old_tag).
| * | Merge commit 'box/directory' into ew/song-locksEric Wong2008-10-045-225/+159
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'box/directory': command: get rid of specialized list handlers directory: simplify list update handling logic main_notify: define main_task so we can use it for assertions directory: streamline deletes Conflicts: src/command.c
| | * | command: get rid of specialized list handlersEric Wong2008-10-031-106/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commands should really not behave differently if they're issued inside a command list or not; so stop having special handler functions to deal with them. "update" was the only command that used this functionality and I changed that in the last commit to serialize access.
| | * | directory: simplify list update handling logicEric Wong2008-10-033-100/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the "update" command can be issued multiple times regardless of whether the client is in list mode or not. We serialize the update tasks to prevent updates from trampling over each other and will spawn another update task once the current one is finished updating and reaped. Right now we cap the queue size to 32 which is probably enough (I bet most people usually run update with no argument anyways); but we can make it grow/shrink dynamically if needed. There'll still be a hard-coded limit to prevent DoS attacks, though.
| | * | main_notify: define main_task so we can use it for assertionsEric Wong2008-10-032-0/+7
| | | | | | | | | | | | | | | | | | | | It'll be easier to keep track of what code runs in what task/thread this way.
| | * | directory: streamline deletesEric Wong2008-10-031-17/+15
| | | | | | | | | | | | | | | | | | | | Instead of relying on the shortname, just pass the song pointer to prevent redundant lookups during deletes.
| * | | song: start avoiding race in updateSongInfoEric Wong2008-10-031-9/+12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This is still not SMP-safe yet, as it needs at least a barrier before calling tag_free(old_tag). Locks may be simpler to implement and the potential performance gain of avoiding locks may not be worth it on infrequently modified data structures...
| * | playlist: small lines of code reductionEric Wong2008-10-031-96/+47
| | | | | | | | | | | | Hopefully this makes the code feel less claustrophobic...
| * | Revert "Start using song pointers in core data structures"Eric Wong2008-10-028-49/+44
| | | | | | | | | | | | | | | | | | | | | This actually opened us up to making lock dependencies more difficult than they needed to be now that we have threaded updates. We would always use the memory anyways, just in the stack instead of bss.
* | | playlist: fix "currentsong" at end-of-playlistEric Wong2008-10-041-4/+11
|/ / | | | | | | | | | | | | The current song information could get cleared if we got to the end of the playlist and mpd is not in repeat mode. This also prevents "currentsong" from returning information if mpd is not playing.
* | Switch to C99 types (retaining compat with old compilers)Eric Wong2008-09-2931-132/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seeing the "mpd_" prefix _everywhere_ is mind-numbing as the mind needs to retrain itself to skip over the first 4 tokens of a type to get to its meaning. So avoid having extra characters on my terminal to make it easier to follow code at 2:30 am in the morning. Please report any new issues you may come across on Free toolchains. I realize how difficult it can be to build/maintain cross-compiling toolchains and I have no intention of forcing people to upgrade their toolchains to build mpd. Tested with gcc 2.95.4 and and gcc 4.3.1 on x86-32.
* | allow searching for albums with an empty tagEric Wong2008-09-292-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tfing wrote: > I have quite some files with an empty album tag as they do not come > from a particular album. > > If I want to look for those files and browse them, this happens: > :: nc localhost 6600 > OK MPD 0.12.0 > find album "" > ACK [2@0] {find} too few arguments for "find" > > I'd like to be able to browse those files in a client like gmpc. > So these 2 items would have to be developed: > - list album should report that some files have an empty tag > - it should be possible to search for an empty tag with the find command Patch-by: Marc Pavot ref: http://musicpd.org/mantis/view.php?id=464
* | Merge branch 'ew/directory'Eric Wong2008-09-2912-375/+341
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ew/directory: directory: remove redundant sanitizePathDup update: move path sanitation up the stack to avoid extra copies clean up updateInit calling and error handling directory: isRootDirectory() is a one-liner directory: writeDirectoryInfo propagates errors directory: make it clear that DIRECTORY_MTIME is deprecated directory: remove "Mp3" references playlist: deleteASongFromPlaylist takes a const Song * songvec: songvec_delete takes a const Song pointer directory: remove shortname arguments everywhere path: add mpd_basename() function directory.h: remove directory_sigChldHandler decl directory: replace DirectoryList with dirvec directory: remove unused CPP defines songvec_free => songvec_destroy directory.c: kill unnecessary includes
| * directory: remove redundant sanitizePathDupEric Wong2008-09-291-15/+7
| | | | | | | | | | | | | | We already sanitize and duplicated our paths before calling updateInit() to get pre-pthread_create() error-checking along with heap allocation reduction because we don't have to redupe because our parent stack went away.
| * update: move path sanitation up the stack to avoid extra copiesEric Wong2008-09-293-30/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove yet another use of our old malloc-happy linked list implementation and replace it with a simple array of strings. This also implements more eager error handling of invalid paths (still centralized in updateInit) so we can filter out bad paths before we spawn a thread. This also does its part to fix the "update" command inside list mode which lost its static variable in ada24f9a921ff95d874195acf253b5a9dd12213d (although it was broken and requires the fix in 769939b62f7557f8e7c483223d68a8b39af43e37, too).
| * clean up updateInit calling and error handlingEric Wong2008-09-283-13/+22
| | | | | | | | | | Move error reporting to command.c so directory.c does not deal with client error handling any more.
| * directory: isRootDirectory() is a one-linerEric Wong2008-09-281-4/+1
| | | | | | | | Improving the signal to noise ratio...
| * directory: writeDirectoryInfo propagates errorsEric Wong2008-09-281-28/+19
| | | | | | | | | | If a write failed, it's a good sign subsequent writes will fail, too, so propgate errors all the way up the stack.
| * directory: make it clear that DIRECTORY_MTIME is deprecatedEric Wong2008-09-281-1/+1
| | | | | | | | A long time ago in an mpd far away...
| * directory: remove "Mp3" referencesEric Wong2008-09-283-22/+22
| | | | | | | | | | MPD has supported more audio formats than just MP3 for over five years...
| * playlist: deleteASongFromPlaylist takes a const Song *Eric Wong2008-09-282-2/+2
| | | | | | | | We don't change the song pointer there, either.
| * songvec: songvec_delete takes a const Song pointerEric Wong2008-09-282-2/+2
| | | | | | | | We don't modify the Song when we delete it
| * directory: remove shortname arguments everywhereEric Wong2008-09-281-79/+40
| | | | | | | | | | | | It was a huge confusing mess of parameter passing around and around. Add a few extra assertions to ensure we're handling parent/child relationships properly.
| * path: add mpd_basename() functionEric Wong2008-09-282-0/+20
| | | | | | | | | | | | | | This is like basename(3) but with predictable semantics independent of C library or build options used. This is also much more strict and does not account for trailing slashes (mpd should never deal with trailing slashes on internal functions).
| * directory.h: remove directory_sigChldHandler declEric Wong2008-09-281-2/+0
| | | | | | | | | | We no longer fork for directory updates, so we no longer have children to reap.
| * directory: replace DirectoryList with dirvecEric Wong2008-09-284-197/+175
| | | | | | | | | | Small memory reduction compared to songvec since most users have much fewer dirs than songs, but still nice to have.
| * directory: remove unused CPP definesEric Wong2008-09-281-4/+0
| | | | | | | | We no longer for for updates
| * songvec_free => songvec_destroyEric Wong2008-09-283-3/+3
| | | | | | | | | | "free" implies the songvec structure itself is freed, which is not the case.
| * directory.c: kill unnecessary includesEric Wong2008-09-281-4/+0
| |
* | Merge branch 'mk/flac'Eric Wong2008-09-294-128/+131
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mk/flac: flac: removed FlacData.chunk_length flac: merged flacSendChunk() into flac_common_write() flac: removed generic sample size support flac: added special functions for 8 and 32 bit flac: added optimized converter for 16 bit flac: use signed integers in flac_convert_stereo16() flac: moved code from flacWrite() to _flac_common.c flac: assume the buffer is empty in flacWrite() II
| * | flac: removed FlacData.chunk_lengthMax Kellermann2008-09-294-9/+3
| | | | | | | | | | | | | | | chunk_length can be converted to a local variable, because it is always reset to 0 after it was used.
| * | flac: merged flacSendChunk() into flac_common_write()Max Kellermann2008-09-291-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since flacSendChunk() is a trivial function and is only used in one location, move the code there. The advantage is that calling decoder_data() directly returns the decoder_command value, so we can eliminate one decoder_get_command() call. [ew: using the terser API in the main branch, it always eliminated the dc_intr()/dc_seek() call, but I agree that killing a camel, err.. camelCase function is a good thing]
| * | flac: removed generic sample size supportMax Kellermann2008-09-291-31/+27
| | | | | | | | | | | | | | | | | | | | | | | | Support for bit rates except 16 bits (and 8 bits on little endian) has always been broken. Since we added optimized functions for 8, 16, 24/32 bits, we can remove the generic flac_convert() function. Instead of removing it, convert it to a wrapper function for flac_convert_*().
| * | flac: added special functions for 8 and 32 bitMax Kellermann2008-09-291-0/+37
| | | | | | | | | | | | | | | Same optimization for 8 and 32 bit files, like the previous patch for 16 bit. Along the way, this patch adds 24 bit FLAC support!
| * | flac: added optimized converter for 16 bitMax Kellermann2008-09-291-0/+17
| | | | | | | | | | | | | | | | | | flac_convert_16() runs a lot faster than the generic (and quite buggy) function flac_convert(). flac_convert_16() is only used for non-stereo files, since there is already flac_convert_stereo16().
| * | flac: use signed integers in flac_convert_stereo16()Max Kellermann2008-09-291-6/+4
| | | | | | | | | | | | | | | | | | By mistake, I casted the sample value to uint16_t, which is wrong. This patch simplifies the code by using a int16_t pointer instead of casting to int16_t* every time.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 06:38:04 +0000