/* Calculate the desired timestamp scaling factor. */
inc->samplerate = 1000000 *
- g_variant_get_uint32(g_hash_table_lookup(options, "samplerate"));
+ g_variant_get_uint64(g_hash_table_lookup(options, "samplerate"));
inc->timestamp_scale = ((1 / TIMESTAMP_RESOLUTION) / (double)inc->samplerate);
static void send_metadata(struct sr_input *in)
{
- struct sr_datafeed_packet packet;
- struct sr_datafeed_meta meta;
- struct sr_config *src;
struct context *inc;
inc = in->priv;
-
- packet.type = SR_DF_META;
- packet.payload = &meta;
- src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->samplerate));
- meta.config = g_slist_append(NULL, src);
- sr_session_send(in->sdi, &packet);
- g_slist_free(meta.config);
- sr_config_free(src);
-
+ (void)sr_session_send_meta(in->sdi, SR_CONF_SAMPLERATE,
+ g_variant_new_uint64(inc->samplerate));
inc->meta_sent = TRUE;
}
static void process_record_pi(struct sr_input *in, gsize start)
{
- struct sr_datafeed_packet packet;
struct context *inc;
uint64_t timestamp, next_timestamp;
uint32_t pod_data;
if (timestamp == inc->trigger_timestamp && !inc->trigger_sent) {
sr_dbg("Trigger @%lf s, record #%d.",
timestamp * TIMESTAMP_RESOLUTION, inc->cur_record);
-
- packet.type = SR_DF_TRIGGER;
- packet.payload = NULL;
- sr_session_send(in->sdi, &packet);
+ std_session_send_df_trigger(in->sdi);
inc->trigger_sent = TRUE;
}
static void process_record_iprobe(struct sr_input *in, gsize start)
{
- struct sr_datafeed_packet packet;
struct context *inc;
uint64_t timestamp, next_timestamp;
char single_payload[3];
if (timestamp == inc->trigger_timestamp && !inc->trigger_sent) {
sr_dbg("Trigger @%lf s, record #%d.",
timestamp * TIMESTAMP_RESOLUTION, inc->cur_record);
-
- packet.type = SR_DF_TRIGGER;
- packet.payload = NULL;
- sr_session_send(in->sdi, &packet);
+ std_session_send_df_trigger(in->sdi);
inc->trigger_sent = TRUE;
}
options[9].def = g_variant_ref_sink(g_variant_new_boolean(FALSE));
options[10].def = g_variant_ref_sink(g_variant_new_boolean(FALSE));
options[11].def = g_variant_ref_sink(g_variant_new_boolean(FALSE));
- options[12].def = g_variant_ref_sink(g_variant_new_uint32(DEFAULT_SAMPLERATE));
+ options[12].def = g_variant_ref_sink(g_variant_new_uint64(DEFAULT_SAMPLERATE));
}
return options;