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, 4 insertions, 0 deletions

diff --git a/src/main_notify.h b/src/main_notify.h
index db36042a7..dc743b833 100644
--- a/src/main_notify.h
+++ b/src/main_notify.h
@@ -21,6 +21,10 @@
 #ifndef MAIN_NOTIFY_H
 #define MAIN_NOTIFY_H
 
+#include <pthread.h>
+
+extern pthread_t main_task;
+
 void init_main_notify(void);
 
 void wakeup_main_task(void);