Remove mood.h.

It's too small to be useful. Simply move the three function
declarations to afs.h, next to the playlist related functions.

diff --git a/afs.c b/afs.c
index 4d473dc1aa6d61f0d6786e97991ab0490c39f43d..36c679fc85d6a1c3b29c216d187b3c7a56dc501f 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -30,7 +30,6 @@
 #include "sched.h"
 #include "fd.h"
 #include "signal.h"
-#include "mood.h"
 #include "sideband.h"
 #include "command.h"
 

diff --git a/afs.h b/afs.h
index 14d943f8154035edff69c04fd37b2397d79eca3d..1c54a1bdc9a820fd2801a740432b4098deccd2f2 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -263,6 +263,11 @@ int audio_file_loop(void *private_data, osl_rbtree_loop_func *func);
 int aft_check_callback(struct afs_callback_arg *aca);
 void free_status_items(void);
 
+/* mood */
+int mood_switch(const char *mood_name, char **errmsg);
+void close_current_mood(void);
+int mood_check_callback(struct afs_callback_arg *aca);
+
 /* playlist */
 int playlist_open(const char *name, char **errmsg);
 void playlist_close(void);

diff --git a/mood.c b/mood.c
index db0dfaeec53602eb31fa3e58991fa078d451f73b..597ca650b7e01b621c567f8c7f6bf45af0d0c780 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -12,7 +12,6 @@
 #include "afh.h"
 #include "afs.h"
 #include "list.h"
-#include "mood.h"
 
 /*
  * Mood parser API. It's overkill to have an own header file for

diff --git a/mood.h b/mood.h
deleted file mode 100644 (file)
index a4b262b..0000000
--- a/mood.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
-
-/** \file mood.h Public functions of mood.c. */
-
-int mood_switch(const char *mood_name, char **errmsg);
-void close_current_mood(void);
-int mood_check_callback(struct afs_callback_arg *aca);