* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <string.h>
return SR_ERR;
}
- if (config_key_has_cap(driver, sdi, NULL, SR_CONF_LIMIT_MSEC, SR_CONF_SET)) {
+ if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_LIMIT_MSEC)
+ & SR_CONF_SET) {
gvar = g_variant_new_uint64(time_msec);
if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) {
g_critical("Failed to configure time limit.");
return SR_ERR;
}
- } else if (config_key_has_cap(driver, sdi, NULL, SR_CONF_SAMPLERATE,
- SR_CONF_GET | SR_CONF_SET)) {
+ } else if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_SAMPLERATE)
+ & (SR_CONF_GET | SR_CONF_SET)) {
/* Convert to samples based on the samplerate. */
sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
samplerate = g_variant_get_uint64(gvar);
struct sr_trigger *trigger;
struct sr_dev_inst *sdi;
uint64_t min_samples, max_samples;
- gsize n_elements, i;
- const uint32_t *dev_opts;
+ GArray *dev_opts;
+ guint i;
int is_demo_dev;
struct sr_dev_driver *driver;
const struct sr_transform *t;
+ GMainLoop *main_loop;
devices = device_scan();
if (!devices) {
driver = sr_dev_inst_driver_get(sdi);
- if (sr_config_list(driver, sdi, NULL, SR_CONF_DEVICE_OPTIONS, &gvar) != SR_OK) {
+ if (!(dev_opts = sr_dev_options(driver, sdi, NULL))) {
g_critical("Failed to query list device options.");
return;
}
- dev_opts = g_variant_get_fixed_array(gvar, &n_elements, sizeof(uint32_t));
-
is_demo_dev = 0;
- for (i = 0; i < n_elements; i++) {
- if (dev_opts[i] == SR_CONF_DEMO_DEV)
+ for (i = 0; i < dev_opts->len; i++) {
+ if (g_array_index(dev_opts, uint32_t, i) == SR_CONF_DEMO_DEV)
is_demo_dev = 1;
}
- g_variant_unref(gvar);
+ g_array_free(dev_opts, TRUE);
if (!is_demo_dev)
real_devices = g_slist_append(real_devices, sdi);
return;
}
+ trigger = NULL;
if (opt_triggers) {
if (!parse_triggerstring(sdi, opt_triggers, &trigger)) {
sr_session_destroy(session);
if (!(t = setup_transform_module(sdi)))
g_critical("Failed to initialize transform module.");
+ main_loop = g_main_loop_new(NULL, FALSE);
+
+ sr_session_stopped_callback_set(session,
+ (sr_session_stopped_callback)g_main_loop_quit, main_loop);
+
if (sr_session_start(session) != SR_OK) {
g_critical("Failed to start session.");
+ g_main_loop_unref(main_loop);
sr_session_destroy(session);
return;
}
if (opt_continuous)
add_anykey(session);
- sr_session_run(session);
+ g_main_loop_run(main_loop);
if (opt_continuous)
clear_anykey();
+ if (trigger)
+ sr_trigger_free(trigger);
+
sr_session_datafeed_callback_remove_all(session);
+ g_main_loop_unref(main_loop);
sr_session_destroy(session);
-
}