aboutsummaryrefslogtreecommitdiffstats
path: root/src (unfollow)
Commit message (Collapse)AuthorFilesLines
2008-10-09directory: don't query database during loadMax Kellermann1-2/+2
Don't use db_get_directory() and traverse the full path with every directory being loaded. Just see if the current parent contains the entry. Everything else would be invalid anyway..
2008-10-09directory: check the absolute path of a subdirectory while loadingMax Kellermann1-0/+4
A manipulated database could trigger an assertion failure, because the parent didn't match. Do a proper check if the new directory is within the parent's. This uses FATAL() to bail out, so MPD still dies, but it doesn't crash.
2008-10-09directory: added inline wrappers for accessing childrenMax Kellermann3-7/+20
Some tiny utilities... wrappers like these may become helpful when we introduce locking.
2008-10-09dirvec: constant pointers in dirvec_find()Max Kellermann2-2/+2
dirvec_find() does not modify the object, thus it should get a const pointer.
2008-10-09directory: moved dirvec struct declaration to dirvec.hMax Kellermann6-10/+7
No idea why it was created in directory.h, but it should be in dirvec.h.
2008-10-09diretory: moved code to directory_save.c, directory_print.cMax Kellermann9-116/+214
Remove clutter from directory.c. Everything which saves or loads to/from the hard disk goes to directory_save.c, and code which sends directory information to the client is moved into directory_print.c.
2008-10-09database: removed local variable bufferSizeMax Kellermann1-3/+2
Use sizeof(buffer) instead.
2008-10-09database: simplify db_load()Max Kellermann1-47/+42
Removed a superfluous closure.
2008-10-09shout: removed DISABLED_SHOUT_ENCODER_PLUGINMax Kellermann4-11/+4
Having an array with disabled entries sucks. Removed that DISABLED_SHOUT_ENCODER_PLUGIN macro, and fill the plugin list only with plugins which are actually enabled. This should be done for all plugin types.
2008-10-09pcm: fix const flac in pcm_convertSampleRate()Max Kellermann1-1/+1
In the libsamplerate fallback code, a "const" attribute was missing.
2008-10-09pcm: fixed software volume, broken by unsigned integerMax Kellermann1-6/+3
"volume" was passed as an unsigned integer, which is correct. It's just that when it was multiplied with the sample value, the whole operation was changed to unsigned, breaking the algorithm (and Qball's ears). Internally change "volume" to signed.
2008-10-09Fix error code for "Playlist already exists"Qball Cow1-1/+1
With commit 6dcd7fea (if I am not mistaken) the error returned when you try to save to an existing playlist is wrong. Instead of MPD_ACK_ERROR_EXIST, MPD_ACK_ERROR_NO_EXIST is returned. This is obviously wrong and breaks gmpc.
2008-10-08directory: fix update in root directoryMax Kellermann3-4/+4
Commit 0bfe7802 broke update for new files in the root directory, because music_root->path was an empty string and not NULL. There were some NULL tests missing. Change them to !isRootDirectory(path) instead of path!=NULL.
2008-10-08update: fix deadlock in delete_song()Max Kellermann1-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.
2008-10-08directory: include sys/types.hMax Kellermann1-1/+1
ino_t and dev_t are declared in sys/types.h, not sys/stat.h.
2008-10-08directory: path must not be NULLMax Kellermann3-11/+9
For the root directory, let's set path to an empty string. This saves a few checks.
2008-10-08directory: directory_get_path(NULL) is not allowedMax Kellermann1-2/+8
Also convert directory_get_path() to an inline function, which returns a constant string.
2008-10-08directory: eliminate CamelCaseMax Kellermann9-58/+58
CamelCase is ugly, rename the functions.
2008-10-08database: renamed functions, "db_" prefix and no CamelCaseMax Kellermann11-68/+79
Yet another CamelCase removal patch.
2008-10-08database: removed printDirectoryInfo()Max Kellermann3-14/+5
The same can be achieved with directory_print(db_get_directory()).
2008-10-08directory: moved code to database.cMax Kellermann13-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.
2008-10-08directory: converted isRootDirectory() to an inline functionMax Kellermann2-6/+10
The function isRootDirectory() is tiny and can be converted to an inline function. Don't allow name==NULL.
2008-10-08song: don't allow calling song_get_url(NULL)Max Kellermann2-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.
2008-10-08song: use song_file_update() in song_file_load()Max Kellermann1-10/+3
Eliminate duplicated code.
2008-10-08song: song_file_update() returns boolMax Kellermann3-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.
2008-10-08song: don't check song_is_file() in song_file_update()Max Kellermann1-17/+16
This function was never used on remote songs. Replace the runtime check with an assertion.
2008-10-08song: removed CamelCaseMax Kellermann13-58/+59
CamelCase is ugly... rename all functions.
2008-10-08song: replaced all song constructorsMax Kellermann5-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.
2008-10-08playlist: simplified setPlaylistRandomStatus()Max Kellermann1-16/+15
Check the old status before assigning. This saves a temporary variable.
2008-10-08use the "bool" data type instead of "int"Max Kellermann20-65/+74
"bool" should be used in C99 programs for boolean values.
2008-10-08don't include os_compat.hMax Kellermann62-38/+143
When there are standardized headers, use these instead of the bloated os_compat.h.
2008-10-08CPP include cleanupMax Kellermann5-8/+4
Include only headers which are really used.
2008-10-08notify: removed the "Notify" typedefMax Kellermann7-19/+29
Typedefs shouldn't be used, use the bare struct names instead.
2008-10-08song: converted typedef Song to struct songMax Kellermann26-118/+196
Again, a data type which can be forward-declared.
2008-10-08directory: converted typedef Directory to struct directoryMax Kellermann11-87/+102
The struct can be forward-declared by other headers, which relaxes the header dependencies.
2008-10-08update: merged exploreDirectory() into updateDirectory()Max Kellermann3-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.
2008-10-08directory: added directory_is_empty()Max Kellermann2-1/+9
directory_is_empty() is a tiny inline function which determine if a directory has any child objects (sub directories or songs).
2008-10-08directory: moved code to update.cMax Kellermann8-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.
2008-10-08dirvec: moved code to dirvec.cMax Kellermann3-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.
2008-10-08notify: loop while no signal is pendingMax Kellermann1-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.
2008-10-07song: really make the song struct non-packedMax Kellermann1-1/+1
Somehow I must have missed this in commit 22e40b61.
2008-10-07directory: fix return value in removeDeletedFromDirectoryEric Wong1-1/+1
oops :x
2008-10-07directory: serialize song deletes from playlist during updateEric Wong3-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.
2008-10-07directory: use songvec_for_each for iteratorsEric Wong1-28/+30
Get rid of songvec_write so we can enforce proper locking
2008-10-07song: use songvec_for_each() in songvec_print() / songvec_save()Max Kellermann2-20/+19
songvec_for_each() has locking, use it instead of manually iterating over the songvec items.
2008-10-07songvec: pass const pointersMax Kellermann2-4/+10
Pass const songvec pointers to songvec_find() and songvec_for_each().
2008-10-07dbUtils/directory: traverseAllIn forEachSong returns -1 on errorEric Wong2-14/+11
Being consistent with most UNIX functions...
2008-10-07songvec: lock traversals for thread-safe updates/readsEric Wong1-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.
2008-10-07songvec: add songvec_for_each iteratorEric Wong2-0/+15
This is so we can more consistently deal with locking needed for thread-safety in iterator functions.
2008-10-07song: replace printSong* with song_print_*Eric Wong4-14/+14
This make argument order more consistent for iterators. Additionally, these now return ssize_t results for error checking.