Revert "fix compress filter for big endian machines"

[paraslash.git] / grab_client.c

diff --git a/grab_client.c b/grab_client.c
index f505fa8739070d4a9a01563c2e60a8395fdea70a..50594f238aeb5d579c6cb0c627fb3c4b5fe51f4a 100644 (file)
--- a/grab_client.c
+++ b/grab_client.c
@@ -24,7 +24,6 @@
  */
 
 #include "para.h"
-#include "close_on_fork.h"
 #include "grab_client.cmdline.h"
 #include "list.h"
 #include "sched.h"
@@ -34,6 +33,7 @@
 #include "error.h"
 #include "string.h"
 #include "fd.h"
+#include "crypt.h"
 
 /** grab clients that are not yet attached to a filter node */
 struct list_head inactive_grab_client_list;
@@ -90,31 +90,31 @@ rewrite:
 static int check_gc_args(struct grab_client *gc)
 {
        int i;
-       struct grab_client_args_info *conf = gc->conf;
+       struct grab_client_args_info *c = gc->conf;
        char **mv = grab_client_cmdline_parser_mode_values;
 
-       PARA_INFO_LOG("filter_num: %d\n", gc->conf->filter_num_arg);
+       PARA_INFO_LOG("filter_num: %d\n", c->filter_num_arg);
        for (i = 0; mv[i]; i++)
-               if (!strcmp(conf->mode_arg, mv[i]))
+               if (!strcmp(c->mode_arg, mv[i]))
                        break;
        if (!mv[i])
                return -E_GC_SYNTAX;
        gc->mode = i;
        gc->audio_format_num = -1;
-       if (conf->audio_format_given) {
-               gc->audio_format_num = get_audio_format_num(conf->audio_format_arg);
+       if (c->audio_format_given) {
+               gc->audio_format_num = get_audio_format_num(c->audio_format_arg);
                if (gc->audio_format_num < 0)
                        return gc->audio_format_num;
        }
-       if (conf->slot_arg > MAX_STREAM_SLOTS)
+       if (c->slot_arg > MAX_STREAM_SLOTS)
                return -E_BAD_GC_SLOT;
-       if (conf->filter_num_arg <= 0)
+       if (c->filter_num_arg <= 0)
                return -E_BAD_GC_FILTER_NUM;
-       if (conf->audio_format_given) {
-               if (num_filters(gc->audio_format_num) < conf->filter_num_arg)
+       if (c->audio_format_given) {
+               if (num_filters(gc->audio_format_num) < c->filter_num_arg)
                        return -E_BAD_GC_FILTER_NUM;
        } else
-               if (conf->filter_num_arg > max_num_filters())
+               if (c->filter_num_arg > max_num_filters())
                        return -E_BAD_GC_FILTER_NUM;
 
        return 1;
@@ -124,7 +124,7 @@ static void add_inactive_gc(struct grab_client *gc)
 {
        PARA_INFO_LOG("adding grab client %p (fd %d) to inactive list\n",
                gc, gc->fd);
-       list_add(&gc->node, &inactive_grab_client_list);
+       para_list_add(&gc->node, &inactive_grab_client_list);
 }
 
 static void gc_free(struct grab_client *gc)
@@ -145,7 +145,6 @@ static void gc_close(struct filter_callback *fcb)
 
        if (gc->conf->one_shot_given || gc->error) {
                PARA_INFO_LOG("closing fd %d (grab client %p)\n", gc->fd, gc);
-               del_close_on_fork_list(gc->fd);
                close(gc->fd);
                gc_free(gc);
                /* close on fork ?*/
@@ -166,13 +165,13 @@ void activate_grab_client(struct grab_client *gc, struct filter_node *fn)
 {
        PARA_INFO_LOG("activating %p (fd %d, filter node: %p)\n", gc, gc->fd, fn);
        list_del(&gc->node);
-       list_add(&gc->fcb.node, &fn->callbacks);
+       para_list_add(&gc->fcb.node, &fn->callbacks);
 }
 
 /**
  * activate inactive grab clients if possible
  *
- * \param slot audiod's slot for the new audio file
+ * \param slot_num audiod's slot for the new audio file
  * \param audio_format_num the number of the audio format of the new audio file
  * \param filter_list the list of activated filters for that new audio file
  *
@@ -185,7 +184,7 @@ void activate_grab_client(struct grab_client *gc, struct filter_node *fn)
  * \sa filter_chain_info::filters, inactive_grab_client_list,
  * activate_grab_client
  */
-void activate_inactive_grab_clients(int slot, int audio_format_num,
+void activate_inactive_grab_clients(int slot_num, int audio_format_num,
                struct list_head *filter_list)
 {
        struct grab_client *gc, *tmp;
@@ -194,7 +193,7 @@ void activate_inactive_grab_clients(int slot, int audio_format_num,
 
        list_for_each_entry_safe(gc, tmp, &inactive_grab_client_list, node) {
 //             PARA_INFO_LOG("checking inactive grab client %p\n", gc);
-               if (gc->conf->slot_arg >= 0 && gc->conf->slot_arg != slot)
+               if (gc->conf->slot_arg >= 0 && gc->conf->slot_arg != slot_num)
                        continue;
                if (gc->audio_format_num >= 0 && gc->audio_format_num !=
                                audio_format_num)