mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-11 15:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(tinyalsa) Buildfix

Browse Source
This commit is contained in:
twinaphex 2017-06-25 04:11:11 +02:00
parent b74b0ceed5
commit 97063701f8
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
audio/drivers/tinyalsa.c
View File

@ -1060,7 +1060,7 @@ static int pcm_set_config(struct pcm *pcm, const struct pcm_config *config)
memset(&sparams, 0, sizeof(sparams)); memset(&sparams, 0, sizeof(sparams));
sparams.tstamp_mode = SNDRV_PCM_TSTAMP_ENABLE; sparams.tstamp_mode = SNDRV_PCM_TSTAMP_ENABLE;
sparams.period_step = 1; sparams.period_step = 1;
sparams.avail_min = 1; sparams.avail_min = 1;
if (!config->start_threshold) if (!config->start_threshold)
{ {
@ -1126,15 +1126,17 @@ static int pcm_hw_mmap_status(struct pcm *pcm)
page_size = sysconf(_SC_PAGE_SIZE); page_size = sysconf(_SC_PAGE_SIZE);
pcm->mmap_status = (snd_pcm_mmap_status*)mmap(NULL, page_size, PROT_READ, MAP_FILE | MAP_SHARED, pcm->mmap_status = (struct snd_pcm_mmap_status*)
pcm->fd, SNDRV_PCM_MMAP_OFFSET_STATUS); mmap(NULL, page_size, PROT_READ, MAP_FILE | MAP_SHARED,
pcm->fd, SNDRV_PCM_MMAP_OFFSET_STATUS);
if (pcm->mmap_status == MAP_FAILED) if (pcm->mmap_status == MAP_FAILED)
pcm->mmap_status = NULL; pcm->mmap_status = NULL;
if (!pcm->mmap_status) if (!pcm->mmap_status)
goto mmap_error; goto mmap_error;
pcm->mmap_control = (snd_pcm_mmap_control*)mmap(NULL, page_size, PROT_READ | PROT_WRITE, pcm->mmap_control = (struct snd_pcm_mmap_control*)
MAP_FILE | MAP_SHARED, pcm->fd, SNDRV_PCM_MMAP_OFFSET_CONTROL); mmap(NULL, page_size, PROT_READ | PROT_WRITE,
MAP_FILE | MAP_SHARED, pcm->fd, SNDRV_PCM_MMAP_OFFSET_CONTROL);
if (pcm->mmap_control == MAP_FAILED) if (pcm->mmap_control == MAP_FAILED)
pcm->mmap_control = NULL; pcm->mmap_control = NULL;
if (!pcm->mmap_control) if (!pcm->mmap_control)
@ -1149,7 +1151,8 @@ static int pcm_hw_mmap_status(struct pcm *pcm)
mmap_error: mmap_error:
pcm->sync_ptr = (snd_pcm_sync_ptr*)calloc(1, sizeof(*pcm->sync_ptr)); pcm->sync_ptr = (struct snd_pcm_sync_ptr*)
calloc(1, sizeof(*pcm->sync_ptr));
if (!pcm->sync_ptr) if (!pcm->sync_ptr)
return -ENOMEM; return -ENOMEM;
pcm->mmap_status = &pcm->sync_ptr->s.status; pcm->mmap_status = &pcm->sync_ptr->s.status;
@ -1815,7 +1818,8 @@ static struct pcm *pcm_open(unsigned int card, unsigned int device,
goto fail_close; goto fail_close;
rc = pcm_hw_mmap_status(pcm); rc = pcm_hw_mmap_status(pcm);
if (rc < 0) { if (rc < 0)
{
oops(pcm, rc, "mmap status failed"); oops(pcm, rc, "mmap status failed");
goto fail; goto fail;
} }