Merge branch 't/gui_reload_fix'

Was cooking for two weeks.

* t/gui_reload_fix:
  gui: Fix config file reloading.

diff --git a/afs.h b/afs.h
index 2ad28b63871abbc03d7ab8b1227b05ee2585cc1c..88b891c829d835efcef315ff8e5aa8fd1b725353 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -104,24 +104,6 @@ enum play_mode {
        PLAY_MODE_PLAYLIST,
 };
 
-/**
- * Data about one audio file.
- *
- * Needed to produce ls and stat output.
- */
-struct ls_data {
-       /** Usual audio format handler information. */
-       struct afh_info afhi;
-       /** Audio file selector information. */
-       struct afs_info afsi;
-       /** The full path of the audio file. */
-       char *path;
-       /** The score value (if -a was given). */
-       long score;
-       /** The hash value of audio file data. */
-       unsigned char *hash;
-};
-
 /**
  * Codes used for communication between the server and the afs process.
  *

diff --git a/aft.c b/aft.c
index 727292c7001cf5b175eb8ef43b063540fc25d4d7..a73537c74446b3cdb49e405f7918701d837a8e8f 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -72,6 +72,20 @@ enum ls_listing_mode {
        LS_MODE_PARSER,
 };
 
+/* Data about one audio file. Needed for ls and stat output. */
+struct ls_data {
+       /* Usual audio format handler information. */
+       struct afh_info afhi;
+       /* Audio file selector information. */
+       struct afs_info afsi;
+       /* The full path of the audio file. */
+       char *path;
+       /* The score value (if -a was given). */
+       long score;
+       /* The hash value of the audio file data. */
+       unsigned char *hash;
+};
+
 /** The flags accepted by the ls command. */
 enum ls_flags {
        /** -p */

diff --git a/blob.c b/blob.c
index 7aedf59bb9d3da7ead694f9c2d85c2d8e52da9d7..0092bea3fbf47c2c5afb7ca1e1e8b3b138119d60 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -66,7 +66,7 @@ static struct osl_column_description blob_cols[] = {
 
 /** Define an osl table description for a blob table. */
 #define DEFINE_BLOB_TABLE_DESC(table_name) \
-       struct osl_table_description table_name ## _table_desc = { \
+       static struct osl_table_description table_name ## _table_desc = { \
                .name = #table_name, \
                .num_columns = NUM_BLOB_COLUMNS, \
                .flags = OSL_LARGE_TABLE, \

diff --git a/server.c b/server.c
index 68434e94e56820c81bb14de76b6759bc645cce29..9104c5aab356c798719ad55695c33d0f19d1e1f5 100644 (file)
--- a/server.c
+++ b/server.c
@@ -7,16 +7,13 @@
 /** \file server.c Paraslash's main server. */
 
 /**
- * \mainpage Main data structures:
+ * \mainpage Main data structures and selected APIs:
  *
  *     - Server: \ref server_command, \ref sender,
  *     - Audio file selector: \ref afs_info, \ref afs_table,
  *     - Audio format handler: \ref audio_format_handler, \ref afh_info
  *     - Receivers/filters/writers: \ref receiver, \ref receiver_node,
  *       \ref filter, \ref filter_node, \ref writer_node, \ref writer.
- *
- * Selected APIs:
- *
  *     - Scheduling: \ref sched.h,
  *     - Buffer trees: \ref buffer_tree.h,
  *     - Sideband API: \ref sideband.h,
@@ -29,7 +26,7 @@
  *     - Interactive sessions: \ref interactive.h,
  *     - File descriptors: \ref fd.h,
  *     - Signals: \ref signal.h,
- *     - Networking: \ref net.h,
+ *     - Networking: \ref net.h,
  *     - Time: \ref time.c,
  *     - Doubly linked lists: \ref list.h.
  */