aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update: don't export updateDirectory()Max Kellermann2008-10-094-14/+25
| | | | | | | | If the user requests database update during startup, call directory_update_init(). This should be changed to fully asynchronous update later. For this to work, main_notify has to be initialized before db_init().
* update: pass const pointer to addSubDirectoryToDirectory()Max Kellermann2008-10-091-1/+1
| | | | The stat struct isn't going to be modified, make it const.
* update: never pass root path to updatePath()Max Kellermann2008-10-091-6/+1
| | | | | update_task() already checks if it has got a root path. Extend this check and in turn remove a check in the inner function updatePath().
* database: renamed get_get_song() to db_get_song()Max Kellermann2008-10-095-8/+8
| | | | Search'n'replace typo..
* update: don't sanitize the path againMax Kellermann2008-10-091-13/+3
| | | | | directory_update_init() has to be called with a path that is already sanitized. Don't call sanitizePathDup() again in updatePath().
* update: merged addDirectoryPathToDB() into addParentPathToDB()Max Kellermann2008-10-091-25/+3
| | | | | | | The algorithm in addDirectoryPathToDB() can be simplified further if it is combined with the function addParentPathToDB(). Since there is no other caller of addDirectoryPathToDB(), we can do that. This saves another large stack buffer.
* update: make addDirectoryPathToDB() non-recursiveMax Kellermann2008-10-091-11/+15
| | | | | | This recursive function is very dangerous because it allocates a large buffer on the stack in every iteration. That may be misused to generate a stack overflow.
* update: delete directory after failed updateMax Kellermann2008-10-091-1/+8
| | | | | When a directory cannot be updated, there must be something wrong with it, and the database contains stale data. Remove it.
* update: moved code to directory_make_child_checked()Max Kellermann2008-10-091-22/+25
| | | | | | The branching looks a bit complicated in addDirectoryPathToDB() - improve its readability by moving code to a simplified separate function.
* update: clear root after errorMax Kellermann2008-10-091-0/+1
| | | | | When the root directory fails to update, its contents are invalid. Clear it then.
* update: locked delete after update errorMax Kellermann2008-10-091-1/+40
| | | | | | | When a directory failed to update, it was removed from the database, without freeing all children and songs (memory leak), and without locking (race condition). Introduce the functions clear_directory() and delete_directory(), which do both.
* dirvec: added dirvec_clear()Max Kellermann2008-10-091-0/+6
|
* update: removed addToDirectory()Max Kellermann2008-10-091-39/+12
| | | | | | Use updateInDirectory() instead of addToDirectory(). Eliminate a duplicate stat() in updateInDirectory() by calling song_file_update() directly.
* directory: don't query database during loadMax Kellermann2008-10-091-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..
* directory: check the absolute path of a subdirectory while loadingMax Kellermann2008-10-091-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.
* directory: added inline wrappers for accessing childrenMax Kellermann2008-10-093-7/+20
| | | | | Some tiny utilities... wrappers like these may become helpful when we introduce locking.
* dirvec: constant pointers in dirvec_find()Max Kellermann2008-10-092-2/+2
| | | | | dirvec_find() does not modify the object, thus it should get a const pointer.
* directory: moved dirvec struct declaration to dirvec.hMax Kellermann2008-10-096-10/+7
| | | | | No idea why it was created in directory.h, but it should be in dirvec.h.
* diretory: moved code to directory_save.c, directory_print.cMax Kellermann2008-10-099-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.
* database: removed local variable bufferSizeMax Kellermann2008-10-091-3/+2
| | | | Use sizeof(buffer) instead.
* database: simplify db_load()Max Kellermann2008-10-091-47/+42
| | | | Removed a superfluous closure.
* shout: removed DISABLED_SHOUT_ENCODER_PLUGINMax Kellermann2008-10-094-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.
* pcm: fix const flac in pcm_convertSampleRate()Max Kellermann2008-10-091-1/+1
| | | | In the libsamplerate fallback code, a "const" attribute was missing.
* pcm: fixed software volume, broken by unsigned integerMax Kellermann2008-10-091-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.
* Fix error code for "Playlist already exists"Qball Cow2008-10-091-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.
* directory: fix update in root directoryMax Kellermann2008-10-083-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.
* 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).