com_stat(): Return a proper error message if an invalid option was given.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 767afa8dec4b4e607b82e244b10c71d71d049e1f..29a8aa30abec6be72aee946b92d7767f3fc037e5 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -8,16 +8,17 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <signal.h>

+#include <openssl/rc4.h>

 
 #include "para.h"
 #include "error.h"
 
 #include "para.h"
 #include "error.h"

+#include "crypt.h"

 #include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
 #include "recv.h"
 #include "filter.h"
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
 #include "recv.h"
 #include "filter.h"

-#include "grab_client.cmdline.h"

 #include "grab_client.h"
 #include "client.cmdline.h"
 #include "client.h"
 #include "grab_client.h"
 #include "client.cmdline.h"
 #include "client.h"


@@ -160,7 +161,7 @@ struct command_task {
  * \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
  * \a name is not a supported audio format.
  */
  * \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
  * \a name is not a supported audio format.
  */

-int get_audio_format_num(char *name)
+int get_audio_format_num(const char *name)

 {
        int i;
 
 {
        int i;
 


@@ -443,7 +444,7 @@ static void open_writers(int slot_num)
                stat_task->server_stream_start : *now;
        s->offset_seconds = stat_task->offset_seconds;
        s->seconds_total = stat_task->length_seconds;
                stat_task->server_stream_start : *now;
        s->offset_seconds = stat_task->offset_seconds;
        s->seconds_total = stat_task->length_seconds;

-       activate_inactive_grab_clients(slot_num, s->format, s->fc);
+       activate_inactive_grab_clients(s->format, s->fc);

 }
 
 static int open_receiver(int format)
 }
 
 static int open_receiver(int format)