static const struct sr_input_module *input_module_list[] = {
&input_vcd,
-// &input_chronovu_la8,
+ &input_chronovu_la8,
&input_wav,
-// &input_csv,
+ &input_csv,
/* This one has to be last, because it will take any input. */
// &input_binary,
NULL,
mod_opts = imod->options();
- for (size = 1; mod_opts[size].id; size++)
+ for (size = 0; mod_opts[size].id; size++)
;
- opts = g_malloc(size * sizeof(struct sr_option *));
+ opts = g_malloc((size + 1) * sizeof(struct sr_option *));
for (i = 0; i < size; i++)
opts[i] = &mod_opts[i];
*/
SR_API void sr_input_options_free(const struct sr_option **options)
{
- struct sr_option *opt;
+ int i;
if (!options)
return;
- for (opt = (struct sr_option *)options[0]; opt; opt++) {
- if (opt->def) {
- g_variant_unref(opt->def);
- opt->def = NULL;
+ for (i = 0; options[i]; i++) {
+ if (options[i]->def) {
+ g_variant_unref(options[i]->def);
+ ((struct sr_option *)options[i])->def = NULL;
}
- if (opt->values) {
- g_slist_free_full(opt->values, (GDestroyNotify)g_variant_unref);
- opt->values = NULL;
+ if (options[i]->values) {
+ g_slist_free_full(options[i]->values, (GDestroyNotify)g_variant_unref);
+ ((struct sr_option *)options[i])->values = NULL;
}
}
g_free(options);
}
if (in->module->init && in->module->init(in, new_opts) != SR_OK) {
- g_hash_table_destroy(new_opts);
g_free(in);
in = NULL;
}
if (new_opts)
g_hash_table_destroy(new_opts);
+ in->buf = g_string_sized_new(128);
return in;
}
* If an input module is found, an instance is created and returned.
* Otherwise, NULL is returned.
*
+ * If an instance is created, it has the given buffer used for scanning
+ * already submitted to it, to be processed before more data is sent.
+ * This allows a frontend to submit an initial chunk of a non-seekable
+ * stream, such as stdin, without having to keep it around and submit
+ * it again later.
+ *
*/
SR_API const struct sr_input *sr_input_scan_buffer(GString *buf)
{
/* Found a matching module. */
in = sr_input_new(imod, NULL);
- in->buf = g_string_new_len(buf->str, buf->len);
+ g_string_insert_len(in->buf, 0, buf->str, buf->len);
break;
}
struct sr_input *in;
const struct sr_input_module *imod;
GHashTable *meta;
- GString *buf;
+ GString *header_buf;
struct stat st;
unsigned int midx, m, i;
int fd;
/* TODO: MIME type */
in = NULL;
- buf = NULL;
+ header_buf = g_string_sized_new(128);
for (i = 0; input_module_list[i]; i++) {
+ g_string_truncate(header_buf, 0);
+
imod = input_module_list[i];
if (!imod->metadata[0]) {
/* Module has no metadata for matching so will take
meta = g_hash_table_new(NULL, NULL);
for (m = 0; m < sizeof(imod->metadata); m++) {
mitem = imod->metadata[m] & ~SR_INPUT_META_REQUIRED;
+ if (!mitem)
+ /* Metadata list is 0-terminated. */
+ break;
if (mitem == SR_INPUT_META_FILENAME)
g_hash_table_insert(meta, GINT_TO_POINTER(mitem),
(gpointer)filename);
- else if (mitem == SR_INPUT_META_FILESIZE)
+ else if (mitem == SR_INPUT_META_FILESIZE) {
+ sr_dbg("inserting fs %d", st.st_size);
g_hash_table_insert(meta, GINT_TO_POINTER(mitem),
GINT_TO_POINTER(st.st_size));
- else if (mitem == SR_INPUT_META_HEADER) {
- buf = g_string_sized_new(128);
+ } else if (mitem == SR_INPUT_META_HEADER) {
if ((fd = open(filename, O_RDONLY)) < 0) {
sr_err("%s", strerror(errno));
return NULL;
}
- size = read(fd, buf->str, 128);
- buf->len = size;
+ size = read(fd, header_buf->str, 128);
+ header_buf->len = size;
close(fd);
if (size <= 0) {
- g_string_free(buf, TRUE);
+ g_string_free(header_buf, TRUE);
sr_err("%s", strerror(errno));
return NULL;
}
- g_hash_table_insert(meta, GINT_TO_POINTER(mitem), buf);
- g_string_free(buf, TRUE);
+ g_hash_table_insert(meta, GINT_TO_POINTER(mitem), header_buf);
}
}
if (g_hash_table_size(meta) == 0) {
/* Found a matching module. */
in = sr_input_new(imod, NULL);
- in->buf = g_string_new_len(buf->str, buf->len);
break;
}
- if (!in && buf)
- g_string_free(buf, TRUE);
+ g_string_free(header_buf, TRUE);
return in;
}