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

mvp: no CamelCase

Browse Source 
Renamed types, functions and variables.
This commit is contained in:
Max Kellermann 2009-02-25 21:49:59 +01:00
parent 6aa6def776
commit fff52ac5b9
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/output/mvp_plugin.c
View File

@ -69,12 +69,12 @@ typedef struct {
#define MVP_SET_AUD_DAC_CLK _IOW('a',27,int) #define MVP_SET_AUD_DAC_CLK _IOW('a',27,int)
#define MVP_GET_AUD_REGS _IOW('a',28,aud_ctl_regs_t*) #define MVP_GET_AUD_REGS _IOW('a',28,aud_ctl_regs_t*)
typedef struct _MvpData { struct mvp_data {
struct audio_format audio_format; struct audio_format audio_format;
int fd; int fd;
} MvpData; };
static unsigned pcmfrequencies[][3] = { static unsigned mvp_sample_rates[][3] = {
{9, 8000, 32000}, {9, 8000, 32000},
{10, 11025, 44100}, {10, 11025, 44100},
{11, 12000, 48000}, {11, 12000, 48000},
@ -90,9 +90,10 @@ static unsigned pcmfrequencies[][3] = {
}; };
static const unsigned numfrequencies = static const unsigned numfrequencies =
sizeof(pcmfrequencies) / sizeof(pcmfrequencies[0]); sizeof(mvp_sample_rates) / sizeof(mvp_sample_rates[0]);
static bool mvp_testDefault(void) static bool
mvp_output_test_default_device(void)
{ {
int fd; int fd;
@ -110,23 +111,25 @@ static bool mvp_testDefault(void)
} }
static void * static void *
mvp_initDriver(G_GNUC_UNUSED const struct audio_format *audio_format, mvp_output_init(G_GNUC_UNUSED const struct audio_format *audio_format,
G_GNUC_UNUSED const struct config_param *param) G_GNUC_UNUSED const struct config_param *param)
{ {
MvpData *md = g_new(MvpData, 1); struct mvp_data *md = g_new(struct mvp_data, 1);
md->fd = -1; md->fd = -1;
return md; return md;
} }
static void mvp_finishDriver(void *data) static void
mvp_output_finish(void *data)
{ {
MvpData *md = data; struct mvp_data *md = data;
g_free(md); g_free(md);
} }
static int mvp_setPcmParams(MvpData * md, unsigned long rate, int channels, static int
int big_endian, unsigned bits) mvp_set_pcm_params(struct mvp_data *md, unsigned long rate, int channels,
int big_endian, unsigned bits)
{ {
unsigned iloop; unsigned iloop;
unsigned mix[5]; unsigned mix[5];
@ -159,8 +162,8 @@ static int mvp_setPcmParams(MvpData * md, unsigned long rate, int channels,
* if there is an exact match for the frequency, use it. * if there is an exact match for the frequency, use it.
*/ */
for (iloop = 0; iloop < numfrequencies; iloop++) { for (iloop = 0; iloop < numfrequencies; iloop++) {
if (rate == pcmfrequencies[iloop][1]) { if (rate == mvp_sample_rates[iloop][1]) {
mix[2] = pcmfrequencies[iloop][0]; mix[2] = mvp_sample_rates[iloop][0];
break; break;
} }
} }
@ -190,9 +193,9 @@ static int mvp_setPcmParams(MvpData * md, unsigned long rate, int channels,
} }
static bool static bool
mvp_openDevice(void *data, struct audio_format *audioFormat) mvp_output_open(void *data, struct audio_format *audio_format)
{ {
MvpData *md = data; struct mvp_data *md = data;
long long int stc = 0; long long int stc = 0;
int mix[5] = { 0, 2, 7, 1, 0 }; int mix[5] = { 0, 2, 7, 1, 0 };
@ -222,23 +225,24 @@ mvp_openDevice(void *data, struct audio_format *audioFormat)
strerror(errno)); strerror(errno));
return false; return false;
} }
mvp_setPcmParams(md, audioFormat->sample_rate, audioFormat->channels, mvp_set_pcm_params(md, audio_format->sample_rate,
MVP_USE_LITTLE_ENDIAN, audioFormat->bits); audio_format->channels,
md->audio_format = *audioFormat; MVP_USE_LITTLE_ENDIAN, audio_format->bits);
md->audio_format = *audio_format;
return true; return true;
} }
static void mvp_closeDevice(void *data) static void mvp_output_close(void *data)
{ {
MvpData *md = data; struct mvp_data *md = data;
if (md->fd >= 0) if (md->fd >= 0)
close(md->fd); close(md->fd);
md->fd = -1; md->fd = -1;
} }
static void mvp_dropBufferedAudio(void *data) static void mvp_output_cancel(void *data)
{ {
MvpData *md = data; struct mvp_data *md = data;
if (md->fd >= 0) { if (md->fd >= 0) {
ioctl(md->fd, MVP_SET_AUD_RESET, 0x11); ioctl(md->fd, MVP_SET_AUD_RESET, 0x11);
close(md->fd); close(md->fd);
@ -247,14 +251,14 @@ static void mvp_dropBufferedAudio(void *data)
} }
static size_t static size_t
mvp_playAudio(void *data, const void *chunk, size_t size) mvp_output_play(void *data, const void *chunk, size_t size)
{ {
MvpData *md = data; struct mvp_data *md = data;
ssize_t ret; ssize_t ret;
/* reopen the device since it was closed by dropBufferedAudio */ /* reopen the device since it was closed by dropBufferedAudio */
if (md->fd < 0) if (md->fd < 0)
mvp_openDevice(md, &md->audio_format); mvp_output_open(md, &md->audio_format);
while (true) { while (true) {
ret = write(md->fd, chunk, size); ret = write(md->fd, chunk, size);
@ -271,13 +275,13 @@ mvp_playAudio(void *data, const void *chunk, size_t size)
} }
} }
const struct audio_output_plugin mvpPlugin = { const struct audio_output_plugin mvp_output_plugin = {
.name = "mvp", .name = "mvp",
.test_default_device = mvp_testDefault, .test_default_device = mvp_output_test_default_device,
.init = mvp_initDriver, .init = mvp_output_init,
.finish = mvp_finishDriver, .finish = mvp_output_finish,
.open = mvp_openDevice, .open = mvp_output_open,
.play = mvp_playAudio, .close = mvp_output_close,
.cancel = mvp_dropBufferedAudio, .play = mvp_output_play,
.close = mvp_closeDevice, .cancel = mvp_output_cancel,
}; };

4
src/output_list.c
View File

@ -28,7 +28,7 @@ extern const struct audio_output_plugin ao_output_plugin;
extern const struct audio_output_plugin ossPlugin; extern const struct audio_output_plugin ossPlugin;
extern const struct audio_output_plugin osxPlugin; extern const struct audio_output_plugin osxPlugin;
extern const struct audio_output_plugin pulse_plugin; extern const struct audio_output_plugin pulse_plugin;
extern const struct audio_output_plugin mvpPlugin; extern const struct audio_output_plugin mvp_output_plugin;
extern const struct audio_output_plugin jackPlugin; extern const struct audio_output_plugin jackPlugin;
const struct audio_output_plugin *audio_output_plugins[] = { const struct audio_output_plugin *audio_output_plugins[] = {
@ -55,7 +55,7 @@ const struct audio_output_plugin *audio_output_plugins[] = {
&pulse_plugin, &pulse_plugin,
#endif #endif
#ifdef HAVE_MVP #ifdef HAVE_MVP
&mvpPlugin, &mvp_output_plugin,
#endif #endif
#ifdef HAVE_JACK #ifdef HAVE_JACK
&jackPlugin, &jackPlugin,