* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "protocol.h"
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-
-#define DEFAULT_PROBES 2
-#define SAMPLE_WIDTH 16
-#define DEFAULT_SAMPLERATE 44100
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "protocol.h"
static const int hwcaps[] = {
SR_HWCAP_SAMPLERATE,
case SR_DI_CUR_SAMPLERATE:
*data = &devc->cur_samplerate;
break;
+ case SR_DI_SAMPLERATES:
+ if (!devc->supp_rates.list) {
+ sr_err("Instance did not contain a samplerate list.");
+ return SR_ERR_ARG;
+ }
+ *data = &devc->supp_rates;
+ break;
default:
sr_err("Invalid info_id: %d.", info_id);
return SR_ERR_ARG;
switch (hwcap) {
case SR_HWCAP_SAMPLERATE:
- devc->cur_samplerate = *(const uint64_t *)value;
+ alsa_set_samplerate(sdi, *(const uint64_t *)value);
break;
case SR_HWCAP_LIMIT_SAMPLES:
devc->limit_samples = *(const uint64_t *)value;
struct sr_datafeed_meta_analog meta;
struct dev_context *devc;
int count, ret;
+ char *endianness;
devc = sdi->priv;
devc->cb_data = cb_data;
+ devc->num_samples = 0;
sr_dbg("Setting audio access type to RW/interleaved.");
ret = snd_pcm_hw_params_set_access(devc->capture_handle,
}
/* FIXME: Hardcoded for 16bits. */
- sr_dbg("Setting audio sample format to signed 16bit (little endian).");
+ if (SND_PCM_FORMAT_S16 == SND_PCM_FORMAT_S16_LE)
+ endianness = "little endian";
+ else
+ endianness = "big endian";
+ sr_dbg("Setting audio sample format to signed 16bit (%s).", endianness);
ret = snd_pcm_hw_params_set_format(devc->capture_handle,
- devc->hw_params, SND_PCM_FORMAT_S16_LE);
+ devc->hw_params,
+ SND_PCM_FORMAT_S16);
if (ret < 0) {
sr_err("Can't set audio sample format: %s.", snd_strerror(ret));
return SR_ERR;
sr_err("Unable to obtain poll descriptors count.");
return SR_ERR;
}
- sr_spew("Obtained poll descriptor count: %d.", count);
if (!(devc->ufds = g_try_malloc(count * sizeof(struct pollfd)))) {
sr_err("Failed to malloc ufds.");