Merge branch 'maint'

[paraslash.git] / afs.h

diff --git a/afs.h b/afs.h
index bfafd949e7b26fb434e07e43434f276680c07fce..aeaf8fb8189535ec44dbcd14d19f472b710f81d7 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -117,8 +117,6 @@ struct ls_data {
        HASH_TYPE *hash;
 };
 
-int send_afs_status(struct rc4_context *rc4c, int parser_friendly);
-
 /** Data about the current audio file, passed from afs to server. */
 struct audio_file_data {
        /** The open file descriptor to the current audio file. */
@@ -236,13 +234,6 @@ int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj);
 int audio_file_loop(void *private_data, osl_rbtree_loop_func *func);
 void aft_check_callback(int fd, __a_unused const struct osl_object *query);
 
-/* mood */
-int change_current_mood(char *mood_name);
-void close_current_mood(void);
-int reload_current_mood(void);
-void mood_check_callback(int fd, __a_unused const struct osl_object *query);
-
-
 /* playlist */
 int playlist_open(char *name);
 void playlist_close(void);
@@ -280,21 +271,3 @@ enum blob_table_columns {
        /** A blob table has that many columns. */
        NUM_BLOB_COLUMNS
 };
-
-/** Define an osl table description for a blob table. */
-#define DEFINE_BLOB_TABLE_DESC(table_name) \
-       struct osl_table_description table_name ## _table_desc = { \
-               .name = #table_name, \
-               .num_columns = NUM_BLOB_COLUMNS, \
-               .flags = OSL_LARGE_TABLE, \
-               .column_descriptions = blob_cols \
-       };
-
-/** Define a pointer to an osl blob table with a canonical name. */
-#define DEFINE_BLOB_TABLE_PTR(table_name) struct osl_table *table_name ## _table;
-
-/** Define a blob table. */
-#define INIT_BLOB_TABLE(table_name) \
-       DEFINE_BLOB_TABLE_DESC(table_name); \
-       DEFINE_BLOB_TABLE_PTR(table_name);
-