Merge commit 'box/directory' into ew/song-locks

* 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

1 files changed, 3 insertions, 4 deletions

diff --git a/src/directory.h b/src/directory.h
index eb1b35aa7..20b784166 100644
--- a/src/directory.h
+++ b/src/directory.h
@@ -43,11 +43,10 @@ int isUpdatingDB(void);
 
 /*
  * returns the non-negative update job ID on success,
- * -1 if busy, -2 if invalid argument
- * @argv itself is safe to free once updateInit returns, but the
- * string values contained by @argv MUST NOT be freed manually
+ * returns -1 if busy
+ * @path will be freed by this function and should not be reused
  */
-int updateInit(int argc, char *argv[]);
+int directory_update_init(char *path);
 
 void directory_init(void);