unsigned sample_format;
/** Number of channels of the current audio stream. */
unsigned channels;
- /** Serializes access to buffer tree nodes. */
+ /**
+ * Serializes access to buffer tree nodes between the writer and
+ * the callback which runs in a different thread.
+ */
int mutex;
- /** The btr node of the callback. */
+ /**
+ * The btr node of the callback.
+ *
+ * Although access to the btr node is serialized between the writer and
+ * the callback via the above mutex, this does not stop other buffer
+ * tree nodes, for example the decoder, to race against the osx
+ * callback.
+ *
+ * However, since all operations on buffer tree nodes are local in the
+ * sense that they only affect one level in the buffer tree (i.e.
+ * parent or child nodes, but not the grandparent or the
+ * grandchildren), we may work around this problem by using another
+ * buffer tree node for the callback.
+ *
+ * The writer grabs the mutex in its post_select method and pushes down
+ * the buffers to the callback node.
+ */
struct btr_node *callback_btrn;
};
struct osx_write_args_info *conf = para_calloc(sizeof(*conf));
/* exits on errors */
- osx_cmdline_parser(argc, argv, conf);
+ osx_write_cmdline_parser(argc, argv, conf);
return conf;
}
static void osx_free_config(void *conf)
{
- osx_cmdline_parser_free(conf);
+ osx_write_cmdline_parser_free(conf);
}
static void osx_write_close(struct writer_node *wn)
{
struct osx_write_args_info dummy;
- osx_cmdline_parser_init(&dummy);
+ osx_write_cmdline_parser_init(&dummy);
w->close = osx_write_close;
w->pre_select = osx_write_pre_select;
w->post_select = osx_write_post_select;
.short_help = osx_write_args_info_help,
.detailed_help = osx_write_args_info_detailed_help
};
- osx_cmdline_parser_free(&dummy);
+ osx_write_cmdline_parser_free(&dummy);
}