aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update: fix deadlock in delete_song()Max Kellermann2008-10-081-1/+1
| | | | | | Due to a merge error, reap_update_task() called cond_signal_async() with a locked mutex. That always fails. Use cond_signal_sync() instead.
* directory: include sys/types.hMax Kellermann2008-10-081-1/+1
| | | | ino_t and dev_t are declared in sys/types.h, not sys/stat.h.
* directory: path must not be NULLMax Kellermann2008-10-083-11/+9
| | | | | For the root directory, let's set path to an empty string. This saves a few checks.
* directory: directory_get_path(NULL) is not allowedMax Kellermann2008-10-081-2/+8
| | | | | Also convert directory_get_path() to an inline function, which returns a constant string.
* directory: eliminate CamelCaseMax Kellermann2008-10-089-58/+58
| | | | CamelCase is ugly, rename the functions.
* database: renamed functions, "db_" prefix and no CamelCaseMax Kellermann2008-10-0811-68/+79
| | | | Yet another CamelCase removal patch.
* database: removed printDirectoryInfo()Max Kellermann2008-10-083-14/+5
| | | | The same can be achieved with directory_print(db_get_directory()).
* directory: moved code to database.cMax Kellermann2008-10-0813-336/+425
| | | | | | Taming the directory.c monster, part II: move the database management stuff to database. directory.c should only contain code which works on directory objects.
* directory: converted isRootDirectory() to an inline functionMax Kellermann2008-10-082-6/+10
| | | | | The function isRootDirectory() is tiny and can be converted to an inline function. Don't allow name==NULL.
* song: don't allow calling song_get_url(NULL)Max Kellermann2008-10-082-7/+2
| | | | | | 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.
* song: use song_file_update() in song_file_load()Max Kellermann2008-10-081-10/+3
| | | | Eliminate duplicated code.
* song: song_file_update() returns boolMax Kellermann2008-10-083-6/+6
| | | | | | Instead of returning 0 or -1, return true on success and false on failure. This seems more natural, and when the C library was designed, there was no "bool" data type.
* song: don't check song_is_file() in song_file_update()Max Kellermann2008-10-081-17/+16
| | | | | This function was never used on remote songs. Replace the runtime check with an assertion.
* song: removed CamelCaseMax Kellermann2008-10-0813-58/+59
| | | | CamelCase is ugly... rename all functions.
* song: replaced all song constructorsMax Kellermann2008-10-085-28/+49
| | | | | | Provide separate constructors for creating a remote song, a local song, and one for loading data from a song file. This way, we can add more assertions.
* playlist: simplified setPlaylistRandomStatus()Max Kellermann2008-10-081-16/+15
| | | | | Check the old status before assigning. This saves a temporary variable.
* use the "bool" data type instead of "int"Max Kellermann2008-10-0820-65/+74
| | | | "bool" should be used in C99 programs for boolean values.
* don't include os_compat.hMax Kellermann2008-10-0862-38/+143
| | | | | When there are standardized headers, use these instead of the bloated os_compat.h.
* CPP include cleanupMax Kellermann2008-10-085-8/+4
| | | | Include only headers which are really used.
* notify: removed the "Notify" typedefMax Kellermann2008-10-087-19/+29
| | | | Typedefs shouldn't be used, use the bare struct names instead.
* song: converted typedef Song to struct songMax Kellermann2008-10-0826-118/+196
| | | | Again, a data type which can be forward-declared.
* directory: converted typedef Directory to struct directoryMax Kellermann2008-10-0811-87/+102
| | | | | The struct can be forward-declared by other headers, which relaxes the header dependencies.
* update: merged exploreDirectory() into updateDirectory()Max Kellermann2008-10-083-49/+15
| | | | | | exploreDirectory() duplicates some code in updateDirectory(). Merge both functions, and use directory_is_empty() to determine whether update or explore mode should be used.
* directory: added directory_is_empty()Max Kellermann2008-10-082-1/+9
| | | | | directory_is_empty() is a tiny inline function which determine if a directory has any child objects (sub directories or songs).
* directory: moved code to update.cMax Kellermann2008-10-088-586/+653
| | | | | | The source directory.c mixes several libraries: directory object management, database management and database update, resulting in a 1000+ line monster. Move the whole database update code to update.c.
* dirvec: moved code to dirvec.cMax Kellermann2008-10-083-62/+75
| | | | | | | | Having all functions as static (non-inline) functions generates GCC warnings, and duplicates binary code across several object files. Most of dirvec's methods are too complex for becoming inline functions. Move them all to dirvec.c and publish the prototypes in dirvec.h.
* notify: loop while no signal is pendingMax Kellermann2008-10-081-2/+1
| | | | | | pthread_cond_wait() may wake up spuriously. To prevent superfluous state checks, loop until the "pending" flag becomes true. Removed the dangerous assertion.
* song: really make the song struct non-packedMax Kellermann2008-10-071-1/+1
| | | | Somehow I must have missed this in commit 22e40b61.
* directory: fix return value in removeDeletedFromDirectoryEric Wong2008-10-071-1/+1
| | | | oops :x
* directory: serialize song deletes from playlist during updateEric Wong2008-10-073-11/+28
| | | | | | | | | | | | | | | | This makes the update code thread-safe and doesn't penalize the playlist code by complicating it with complicated and error-prone locks (and the associated overhead, not everybody has a thread-implementation as good as NPTL). The update task blocks during the delete; but the update task is a slow task anyways so we can block w/o people caring too much. This was also our only freeSong call site, so remove that function. Note that deleting entire directories is not fully thread-safe, yet; as their traversals are not yet locked.
* directory: use songvec_for_each for iteratorsEric Wong2008-10-071-28/+30
| | | | Get rid of songvec_write so we can enforce proper locking
* song: use songvec_for_each() in songvec_print() / songvec_save()Max Kellermann2008-10-072-20/+19
| | | | | songvec_for_each() has locking, use it instead of manually iterating over the songvec items.
* songvec: pass const pointersMax Kellermann2008-10-072-4/+10
| | | | Pass const songvec pointers to songvec_find() and songvec_for_each().
* dbUtils/directory: traverseAllIn forEachSong returns -1 on errorEric Wong2008-10-072-14/+11
| | | | Being consistent with most UNIX functions...
* songvec: lock traversals for thread-safe updates/readsEric Wong2008-10-071-10/+34
| | | | | | | | | | Only one lock is used for all songvec traversals since they're rarely changed. Also, minimize lock time and release it before calling iterator functions since they may block (updateSongInfo => stat/open/seek/read). This lock only protects songvecs (and all of them) during traversals; not the individual song structures themselves.
* songvec: add songvec_for_each iteratorEric Wong2008-10-072-0/+15
| | | | | This is so we can more consistently deal with locking needed for thread-safety in iterator functions.
* song: replace printSong* with song_print_*Eric Wong2008-10-074-14/+14
| | | | | | This make argument order more consistent for iterators. Additionally, these now return ssize_t results for error checking.
* Assert if we don't have song or song->url setEric Wong2008-10-072-4/+10
| | | | song objects cannot exist without a path or URL
* autotools: tidy up make distEric Wong2008-10-063-145/+2
| | | | | | | | * Add missing headers in Makefile.am * remove mp4ff.dsp (Win32 crap) * Add scripts, m4, bs, autogen.sh to allow for hotfixes by the SCM-challenged. (downloading the source via git is NOT a lightweight operation for everybody).
* autotools: add pthreads linker supportEric Wong2008-10-062-0/+279
| | | | | This is needed for people that don't use any of the following: JACK, ALSA, libmikmod, Shout.
* Add .gitignoreEric Wong2008-10-061-0/+35
| | | | | These patterns have been sitting in my private .git/info/exclude files since 2005 because we used to use SVN.
* song: stop storing song_typeEric Wong2008-10-066-27/+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: don't make the struct packedMax Kellermann2008-10-062-2/+2
| | | | | | The "packed" attribute may have negative side effects on performance. Remove the "packed" attribute, and increase the size of "song.url" to a multiple of the machine word size.
* song: use flex arrays to store song->urlEric Wong2008-10-064-17/+25
| | | | | | 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: get rid of newNullSong()Eric Wong2008-10-063-16/+3
| | | | | 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-061-1/+1
| | | | | There's no reason to scan the playlist for a song we just allocated.
* command: fix return statusEric Wong2008-10-061-17/+8
| | | | | | This got broken when listHandlerFunc was removed. Since we no longer need it and it's confusing, remove processCommandInternal and just use process_command.
* directory: reuse existing directory if found on updateEric Wong2008-10-061-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"
* tag: merge clearMpdTag into tag_freeEric Wong2008-10-061-12/+2
| | | | | avoid some redundant clearing logic as well, since the tag is getting freed.
* command: get rid of specialized list handlersEric Wong2008-10-061-88/+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.