SR_PRIV struct sr_dev_driver alsa_driver_info;
static struct sr_dev_driver *di = &alsa_driver_info;
-static int clear_instances(void)
+static void clear_helper(void *priv)
{
- struct drv_context *drvc;
+ struct dev_context *devc;
- if (!(drvc = di->priv))
- return SR_OK;
+ devc = priv;
- g_slist_free_full(drvc->instances, (GDestroyNotify)alsa_dev_inst_clear);
- drvc->instances = NULL;
+ snd_pcm_hw_params_free(devc->hw_params);
+ devc->hw_params = NULL;
- return SR_OK;
+ g_free((void *)devc->samplerates);
+ devc->samplerates = NULL;
+}
+
+static int dev_clear(void)
+{
+ return std_dev_clear(di, clear_helper);
}
static int init(struct sr_context *sr_ctx)
{
- return std_hw_init(sr_ctx, di, LOG_PREFIX);
+ return std_init(sr_ctx, di, LOG_PREFIX);
}
static GSList *scan(GSList *options)
if (devc->capture_handle) {
sr_dbg("Closing PCM device.");
- if ((ret = snd_pcm_close(devc->capture_handle)) < 0) {
+ if ((ret = snd_pcm_close(devc->capture_handle)) < 0)
sr_err("Failed to close device: %s.",
snd_strerror(ret));
- devc->capture_handle = NULL;
- sdi->status = SR_ST_INACTIVE;
- }
+ devc->capture_handle = NULL;
+ sdi->status = SR_ST_INACTIVE;
} else {
sr_dbg("No capture handle, no need to close audio device.");
}
static int cleanup(void)
{
- clear_instances();
-
- return SR_OK;
+ return dev_clear();
}
static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
.cleanup = cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = clear_instances,
+ .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,