Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-20 04:16:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

audio:add media session support for sim_alsa audio_ops_s interface

Browse Source 
fix Compiler Warning:initialization of ‘int (*)(struct audio_lowerhalf_s *, void *)’
from incompatible pointer type ‘int (*)(struct audio_lowerhalf_s *)’ [-Wincompatible-pointer-types]

Signed-off-by: shipei <shipei@xiaomi.com>
This commit is contained in:
shipei
2023-08-16 19:51:48 +08:00
committed by Xiang Xiao
parent 42873065a6
commit f150699d7a
1 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/sim/src/sim/posix/sim_alsa.c
+42 -5
View File
@@ -79,11 +79,19 @@ static int sim_audio_getcaps(struct audio_lowerhalf_s *dev, int type,
static int sim_audio_configure(struct audio_lowerhalf_s *dev,
void *session,
const struct audio_caps_s *caps);
static int sim_audio_start(struct audio_lowerhalf_s *dev, void *session);
#ifndef CONFIG_AUDIO_EXCLUDE_STOP
static int sim_audio_stop(struct audio_lowerhalf_s *dev, void *session);
#endif
#ifndef CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME
static int sim_audio_pause(struct audio_lowerhalf_s *dev, void *session);
static int sim_audio_resume(struct audio_lowerhalf_s *dev, void *session);
#endif
static int sim_audio_reserve(struct audio_lowerhalf_s *dev, void **session);
static int sim_audio_release(struct audio_lowerhalf_s *dev, void *session);
#else
static int sim_audio_configure(struct audio_lowerhalf_s *dev,
const struct audio_caps_s *caps);
#endif
static int sim_audio_shutdown(struct audio_lowerhalf_s *dev);
static int sim_audio_start(struct audio_lowerhalf_s *dev);
#ifndef CONFIG_AUDIO_EXCLUDE_STOP
static int sim_audio_stop(struct audio_lowerhalf_s *dev);
@@ -92,13 +100,14 @@ static int sim_audio_stop(struct audio_lowerhalf_s *dev);
static int sim_audio_pause(struct audio_lowerhalf_s *dev);
static int sim_audio_resume(struct audio_lowerhalf_s *dev);
#endif
static int sim_audio_reserve(struct audio_lowerhalf_s *dev);
static int sim_audio_release(struct audio_lowerhalf_s *dev);
#endif
static int sim_audio_shutdown(struct audio_lowerhalf_s *dev);
static int sim_audio_enqueuebuffer(struct audio_lowerhalf_s *dev,
struct ap_buffer_s *apb);
static int sim_audio_ioctl(struct audio_lowerhalf_s *dev, int cmd,
unsigned long arg);
static int sim_audio_reserve(struct audio_lowerhalf_s *dev);
static int sim_audio_release(struct audio_lowerhalf_s *dev);
/****************************************************************************
* Private Data
****************************************************************************/
@@ -467,7 +476,11 @@ static int sim_audio_shutdown(struct audio_lowerhalf_s *dev)
return 0;
}
#ifdef CONFIG_AUDIO_MULTI_SESSION
static int sim_audio_start(struct audio_lowerhalf_s *dev, void *session)
#else
static int sim_audio_start(struct audio_lowerhalf_s *dev)
#endif
{
struct sim_audio_s *priv = (struct sim_audio_s *)dev;
struct audio_buf_desc_s buf_desc;
@@ -488,7 +501,11 @@ static int sim_audio_start(struct audio_lowerhalf_s *dev)
}
#ifndef CONFIG_AUDIO_EXCLUDE_STOP
#ifdef CONFIG_AUDIO_MULTI_SESSION
static int sim_audio_stop(struct audio_lowerhalf_s *dev, void *session)
#else
static int sim_audio_stop(struct audio_lowerhalf_s *dev)
#endif
{
struct sim_audio_s *priv = (struct sim_audio_s *)dev;
int ret;
@@ -532,7 +549,11 @@ static int sim_audio_stop(struct audio_lowerhalf_s *dev)
#endif
#ifndef CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME
#ifdef CONFIG_AUDIO_MULTI_SESSION
static int sim_audio_pause(struct audio_lowerhalf_s *dev, void *session)
#else
static int sim_audio_pause(struct audio_lowerhalf_s *dev)
#endif
{
struct sim_audio_s *priv = (struct sim_audio_s *)dev;
@@ -545,7 +566,11 @@ static int sim_audio_pause(struct audio_lowerhalf_s *dev)
return 0;
}
#ifdef CONFIG_AUDIO_MULTI_SESSION
static int sim_audio_resume(struct audio_lowerhalf_s *dev, void *session)
#else
static int sim_audio_resume(struct audio_lowerhalf_s *dev)
#endif
{
struct sim_audio_s *priv = (struct sim_audio_s *)dev;
@@ -719,12 +744,20 @@ static int sim_audio_ioctl(struct audio_lowerhalf_s *dev, int cmd,
return ret;
}
#ifdef CONFIG_AUDIO_MULTI_SESSION
static int sim_audio_reserve(struct audio_lowerhalf_s *dev, void **session)
#else
static int sim_audio_reserve(struct audio_lowerhalf_s *dev)
#endif
{
return 0;
}
#ifdef CONFIG_AUDIO_MULTI_SESSION
static int sim_audio_release(struct audio_lowerhalf_s *dev, void *session)
#else
static int sim_audio_release(struct audio_lowerhalf_s *dev)
#endif
{
return 0;
}
@@ -941,7 +974,11 @@ static void sim_audio_process(struct sim_audio_s *priv)
if (final)
{
snd_pcm_drain(priv->pcm);
#ifdef CONFIG_AUDIO_MULTI_SESSION
sim_audio_stop(&priv->dev, NULL);
#else
sim_audio_stop(&priv->dev);
#endif
}
}