oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

[CLEANUP] Fix indentation to be like the rest of

Browse Source 
the repository

git-svn-id: https://svn.musicpd.org/mpd/trunk@4348 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Avuton Olrich
2006-07-15 05:16:53 +00:00
parent 3ad41fdda6
commit 32fd264ffc
1 changed files with 129 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/audioOutputs/audioOutput_mvp.c
View File

@@ -69,7 +69,6 @@ typedef struct {
#define MVP_SET_AUD_DAC_CLK _IOW('a',27,int)
#define MVP_GET_AUD_REGS _IOW('a',28,aud_ctl_regs_t*)
typedef struct _MvpData {
int fd;
} MvpData;
@@ -86,11 +85,13 @@ static int pcmfrequencies[][3] = {
{7, 48000, 48000},
{13, 64000, 32000},
{14, 88200, 44100},
{15,96000,48000}};
{15, 96000, 48000}
};
static int numfrequencies = sizeof(pcmfrequencies) / 12;
static int mvp_testDefault() {
static int mvp_testDefault()
{
int fd;
fd = open("/dev/adec_pcm", O_WRONLY);
@@ -106,7 +107,8 @@ static int mvp_testDefault() {
return -1;
}
static int mvp_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
static int mvp_initDriver(AudioOutput * audioOutput, ConfigParam * param)
{
MvpData *md = malloc(sizeof(MvpData));
md->fd = -1;
audioOutput->data = md;
@@ -114,12 +116,15 @@ static int mvp_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
return 0;
}
static void mvp_finishDriver(AudioOutput * audioOutput) {
static void mvp_finishDriver(AudioOutput * audioOutput)
{
MvpData *md = audioOutput->data;
free(md);
}
static int mvp_setPcmParams(MvpData *md, unsigned long rate, int channels, int big_endian, int bits){
static int mvp_setPcmParams(MvpData * md, unsigned long rate, int channels,
int big_endian, int bits)
{
int iloop;
int mix[5];
@@ -150,18 +155,15 @@ static int mvp_setPcmParams(MvpData *md, unsigned long rate, int channels, int b
/*
* if there is an exact match for the frequency, use it.
*/
for(iloop = 0;iloop<numfrequencies;iloop++)
{
if(rate == pcmfrequencies[iloop][1])
{
for (iloop = 0; iloop < numfrequencies; iloop++) {
if (rate == pcmfrequencies[iloop][1]) {
mix[2] = pcmfrequencies[iloop][0];
break;
}
}
if (iloop >= numfrequencies) {
ERROR("Can not find suitable output frequency for %ld\n",
rate);
ERROR("Can not find suitable output frequency for %ld\n", rate);
return -1;
}
@@ -183,7 +185,6 @@ static int mvp_setPcmParams(MvpData *md, unsigned long rate, int channels, int b
return 0;
}
static int mvp_openDevice(AudioOutput * audioOutput)
{
int ret = -1;
@@ -192,8 +193,7 @@ static int mvp_openDevice(AudioOutput * audioOutput)
AudioFormat *audioFormat = &audioOutput->outAudioFormat;
int mix[5] = { 0, 2, 7, 1, 0 };
if ((md->fd=open("/dev/adec_pcm",
O_RDWR|O_NONBLOCK)) < 0){
if ((md->fd = open("/dev/adec_pcm", O_RDWR | O_NONBLOCK)) < 0) {
ERROR("Error opening /dev/adec_pcm: %s\n", strerror(errno));
return -1;
}
@@ -215,22 +215,27 @@ static int mvp_openDevice(AudioOutput * audioOutput)
return -1;
}
#ifdef WORDS_BIGENDIAN
mvp_setPcmParams(md, audioFormat->sampleRate, audioFormat->channels, 0, audioFormat->bits);
mvp_setPcmParams(md, audioFormat->sampleRate, audioFormat->channels, 0,
audioFormat->bits);
#else
mvp_setPcmParams(md, audioFormat->sampleRate, audioFormat->channels, 1, audioFormat->bits);
mvp_setPcmParams(md, audioFormat->sampleRate, audioFormat->channels, 1,
audioFormat->bits);
#endif
audioOutput->open = 1;
return 0;
}
static void mvp_closeDevice(AudioOutput * audioOutput) {
static void mvp_closeDevice(AudioOutput * audioOutput)
{
MvpData *md = audioOutput->data;
if(md->fd >= 0) close(md->fd);
if (md->fd >= 0)
close(md->fd);
md->fd = -1;
audioOutput->open = 0;
}
static void mvp_dropBufferedAudio(AudioOutput * audioOutput) {
static void mvp_dropBufferedAudio(AudioOutput * audioOutput)
{
MvpData *md = audioOutput->data;
if (md->fd >= 0) {
ioctl(md->fd, MVP_SET_AUD_RESET, 0x11);
@@ -240,19 +245,20 @@ static void mvp_dropBufferedAudio(AudioOutput * audioOutput) {
}
}
static int mvp_playAudio(AudioOutput * audioOutput, char * playChunk,
int size)
static int mvp_playAudio(AudioOutput * audioOutput, char *playChunk, int size)
{
MvpData *md = audioOutput->data;
int ret;
/* reopen the device since it was closed by dropBufferedAudio */
if(md->fd < 0) mvp_openDevice(audioOutput);
if (md->fd < 0)
mvp_openDevice(audioOutput);
while (size > 0) {
ret = write(md->fd, playChunk, size);
if (ret < 0) {
if(errno == EINTR) continue;
if (errno == EINTR)
continue;
ERROR("closing mvp PCM device due to write error: "
"%s\n", strerror(errno));
mvp_closeDevice(audioOutput);
@@ -264,8 +270,7 @@ static int mvp_playAudio(AudioOutput * audioOutput, char * playChunk,
return 0;
}
AudioOutputPlugin mvpPlugin =
{
AudioOutputPlugin mvpPlugin = {
"mvp",
mvp_testDefault,
mvp_initDriver,
@@ -280,5 +285,4 @@ AudioOutputPlugin mvpPlugin =
#else /* HAVE_MVP */
DISABLED_AUDIO_OUTPUT_PLUGIN(mvpPlugin)
#endif /* HAVE_MVP */