aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Li <dvdli@google.com>2020-12-02 07:46:19 +0000
committerDavid Li <dvdli@google.com>2020-12-02 07:46:19 +0000
commitc0d68b1cfc5e91e5b154b1b69af04b4d6006a122 (patch)
tree7028f39cbd40f356e0be427e8b436e6099f86f6b /src
parent40867609e738919872c88b7716b17c30d96211a4 (diff)
fix build breakage
1. Add a missing field and a function 2. Disable the deprecated attribute in Android temporarily to allow us to use "pcm_read/write" which are deprecated upstream 3. Remove an unused define and an include in mixer.h 4. Add mixer_ctl_event and copy the snd_ctl_event to mixer_ctl_event 5. Add pcm_ioctl function and mark as deprecated function
Diffstat (limited to 'src')
-rw-r--r--src/mixer.c52
-rw-r--r--src/pcm.c18
2 files changed, 55 insertions, 15 deletions
diff --git a/src/mixer.c b/src/mixer.c
index fe590e8..a45502e 100644
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -553,39 +553,61 @@ exit:
* further events can be alerted.
*
* @param mixer A mixer handle.
- * @returns 0 on success. -errno on failure.
+ * @returns 1 on success. 0, if no pending event. -errno on failure.
* @ingroup libtinyalsa-mixer
*/
int mixer_consume_event(struct mixer *mixer)
{
- struct snd_ctl_event ev;
+ struct mixer_ctl_event ev;
return mixer_read_event(mixer, &ev);
}
-int mixer_read_event(struct mixer *mixer, struct snd_ctl_event *ev)
+/** Read a mixer control event.
+ * Try to read an control event from mixer.
+ *
+ * @param mixer A mixer handle.
+ * @param event Output parameter. If there is an event read form the mixer, this function will fill
+ * the event data into it.
+ * @returns 1 on success. 0, if no pending event. -errno on failure.
+ * @ingroup libtinyalsa-mixer
+ */
+int mixer_read_event(struct mixer *mixer, struct mixer_ctl_event *event)
{
- struct mixer_ctl_group *grp;
- ssize_t count = 0;
+ struct mixer_ctl_group *grp = NULL;
+ struct snd_ctl_event ev;
+ ssize_t bytes = 0;
+
+ if (!mixer || !event) {
+ return -EINVAL;
+ }
if (mixer->h_grp) {
- grp = mixer->h_grp;
- if (grp->event_cnt) {
- grp->event_cnt--;
- count = grp->ops->read_event(grp->data, ev, sizeof(*ev));
- return (count >= 0) ? 0 : -errno;
+ if (mixer->h_grp->event_cnt > 0) {
+ grp = mixer->h_grp;
}
}
#ifdef TINYALSA_USES_PLUGINS
if (mixer->v_grp) {
- grp = mixer->v_grp;
- if (grp->event_cnt) {
- grp->event_cnt--;
- count = grp->ops->read_event(grp->data, ev, sizeof(*ev));
- return (count >= 0) ? 0 : -errno;
+ if (mixer->v_grp->event_cnt > 0) {
+ grp = mixer->v_grp;
}
}
#endif
+ if (grp) {
+ grp->event_cnt--;
+ bytes = grp->ops->read_event(grp->data, &ev, sizeof(ev));
+
+ if (bytes < 0) {
+ return -errno;
+ }
+
+ if (bytes == sizeof(*event)) {
+ memcpy(event, &ev, sizeof(*event));
+ return 1;
+ }
+ }
+
return 0;
}
diff --git a/src/pcm.c b/src/pcm.c
index 352ddc6..98ca9eb 100644
--- a/src/pcm.c
+++ b/src/pcm.c
@@ -1750,3 +1750,21 @@ long pcm_get_delay(struct pcm *pcm)
return pcm->pcm_delay;
}
+
+// TODO: Currently in Android, there are some libraries using this function to control the driver.
+// We should remove this function as soon as possible.
+int pcm_ioctl(struct pcm *pcm, int request, ...)
+{
+ va_list ap;
+ void * arg;
+
+ if (!pcm_is_ready(pcm))
+ return -1;
+
+ va_start(ap, request);
+ arg = va_arg(ap, void *);
+ va_end(ap);
+
+ // FIXME Does not handle plugins
+ return ioctl(pcm->fd, request, arg);
+}