From 4e675e7d45af2fab1ab8d8a6e8d0c86bc4a2a960 Mon Sep 17 00:00:00 2001 From: Mark Farrugia Date: Wed, 5 Sep 2018 14:53:53 +1000 Subject: Move ALSA info into coreinfo, for export to Audio Paths Remove the avirt_alsa_driver Signed-off-by: Mark Farrugia --- alsa-pcm.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'alsa-pcm.c') diff --git a/alsa-pcm.c b/alsa-pcm.c index faa7a83..17255df 100644 --- a/alsa-pcm.c +++ b/alsa-pcm.c @@ -7,7 +7,6 @@ * Copyright (C) 2010-2018 Fiberdyne Systems Pty Ltd */ -#include "core.h" #include "alsa.h" #define AP_LOGNAME "CORE" @@ -30,9 +29,9 @@ */ static int configure_pcm(struct snd_pcm_substream *substream) { - struct avirt_alsa_dev_config *config; + struct avirt_alsa_devconfig *config; struct avirt_audiopath *audiopath; - struct avirt_alsa_dev_group *group; + struct avirt_alsa_group *group; struct snd_pcm_hardware *hw; unsigned bytes_per_sample = 0, blocksize = 0; @@ -55,7 +54,7 @@ static int configure_pcm(struct snd_pcm_substream *substream) } // Get device group (playback/capture) - group = avirt_alsa_get_dev_group(substream->stream); + group = avirt_alsa_get_group(substream->stream); CHK_NULL(group); // Check if substream id is valid @@ -135,11 +134,9 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, int channels, err; size_t bufsz; struct avirt_audiopath *audiopath; - struct avirt_alsa_dev_group *group; + struct avirt_alsa_group *group; - DINFO(AP_LOGNAME, ""); - - group = avirt_alsa_get_dev_group(substream->stream); + group = avirt_alsa_get_group(substream->stream); CHK_NULL(group); channels = group->config[substream->pcm->device].channels; @@ -270,11 +267,9 @@ static int pcm_get_time_info( struct snd_pcm_audio_tstamp_config *audio_tstamp_config, struct snd_pcm_audio_tstamp_report *audio_tstamp_report) { - struct avirt_alsa_dev_group *group; - - DINFO(AP_LOGNAME, ""); + struct avirt_alsa_group *group; - group = avirt_alsa_get_dev_group(substream->stream); + group = avirt_alsa_get_group(substream->stream); CHK_NULL(group); DO_AUDIOPATH_CB(get_time_info, substream, system_ts, audio_ts, -- cgit 1.2.3-korg