audiod: Make audio_formats[] dynamic

[paraslash.git] / audiod.h

diff --git a/audiod.h b/audiod.h
index c8d5fc2..856bc05 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -1,15 +1,16 @@
 /** \file audiod.h symbols exported from audiod.c */
 int num_filters(int audio_format_num);
 int get_audio_format_num(char *name);
 /** \file audiod.h symbols exported from audiod.c */
 int num_filters(int audio_format_num);
 int get_audio_format_num(char *name);

-enum {
-       AUDIO_FORMAT_MP3,
-       AUDIO_FORMAT_OGG,
-       AUDIO_FORMAT_AAC,
-       NUM_AUDIO_FORMATS
-};
+
+/** enum of audio formats supported by para_audiod */
+enum {AUDIOD_AUDIO_FORMATS_ENUM};
+
+/** array of audio format names supported by para_audiod */

 extern const char *audio_formats[];
 extern const char *audio_formats[];

-#define DEFINE_AUDIO_FORMAT_ARRAY const char *audio_formats[] = {"mp3", "ogg", "aac", NULL}
+
+/** maximal number of simultaneous instances */

 #define MAX_STREAM_SLOTS 5
 #define MAX_STREAM_SLOTS 5

+

 /**
  * the possible modes of operation
  *
 /**
  * the possible modes of operation
  *


@@ -61,6 +62,8 @@ struct status_task {
        char *stat_item_values[NUM_STAT_ITEMS];
        /** do not restart client command until this time */
        struct timeval restart_barrier;
        char *stat_item_values[NUM_STAT_ITEMS];
        /** do not restart client command until this time */
        struct timeval restart_barrier;

+       /** last time we received status data from para_server */
+       struct timeval last_status_read;

        /** the offset value announced by para_server */
        int offset_seconds;
        /** the length of the current audio file as announced by para_server */
        /** the offset value announced by para_server */
        int offset_seconds;
        /** the length of the current audio file as announced by para_server */


@@ -71,8 +74,6 @@ struct status_task {
        struct timeval sa_time_diff;
        /** whether client time is ahead of server time */
        int sa_time_diff_sign;
        struct timeval sa_time_diff;
        /** whether client time is ahead of server time */
        int sa_time_diff_sign;

-       /** the audio format announced in server status */
-       char *af_status;

        /** non-zero if \a af_status is "playing" */
        int playing;
 };
        /** non-zero if \a af_status is "playing" */
        int playing;
 };


@@ -86,6 +87,7 @@ extern const char *status_item_list[NUM_STAT_ITEMS];
 void __noreturn clean_exit(int status, const char *msg);
 int handle_connect(int accept_fd);
 void audiod_status_dump(void);
 void __noreturn clean_exit(int status, const char *msg);
 int handle_connect(int accept_fd);
 void audiod_status_dump(void);

+void dump_empty_status(void);

 
 /** iterate over all slots */
 #define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)
 
 /** iterate over all slots */
 #define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)