conf: no CamelCase, part I

Renamed functions, types, variables.
This commit is contained in:
Max Kellermann
2009-01-17 20:23:27 +01:00
parent 2bbf378dd8
commit 4d472c265e
40 changed files with 204 additions and 170 deletions

View File

@@ -88,9 +88,9 @@ static void freeAlsaData(AlsaData * ad)
}
static void
alsa_configure(AlsaData *ad, ConfigParam *param)
alsa_configure(AlsaData *ad, struct config_param *param)
{
BlockParam *bp;
struct block_param *bp;
if ((bp = getBlockParam(param, "device")))
ad->device = g_strdup(bp->value);
@@ -119,9 +119,10 @@ alsa_configure(AlsaData *ad, ConfigParam *param)
#endif
}
static void *alsa_initDriver(G_GNUC_UNUSED struct audio_output *ao,
G_GNUC_UNUSED const struct audio_format *audio_format,
ConfigParam * param)
static void *
alsa_initDriver(G_GNUC_UNUSED struct audio_output *ao,
G_GNUC_UNUSED const struct audio_format *audio_format,
struct config_param *param)
{
/* no need for pthread_once thread-safety when reading config */
static int free_global_registered;

View File

@@ -74,14 +74,15 @@ static void audioOutputAo_error(const char *msg)
g_warning("%s: %s\n", msg, error);
}
static void *audioOutputAo_initDriver(struct audio_output *ao,
G_GNUC_UNUSED const struct audio_format *audio_format,
ConfigParam * param)
static void *
audioOutputAo_initDriver(struct audio_output *ao,
G_GNUC_UNUSED const struct audio_format *audio_format,
struct config_param *param)
{
ao_info *ai;
char *test;
AoData *ad = newAoData();
BlockParam *blockParam;
struct block_param *blockParam;
if ((blockParam = getBlockParam(param, "write_size"))) {
ad->writeSize = strtol(blockParam->value, &test, 10);

View File

@@ -161,10 +161,10 @@ static bool openFifo(FifoData *fd)
static void *fifo_initDriver(G_GNUC_UNUSED struct audio_output *ao,
G_GNUC_UNUSED const struct audio_format *audio_format,
ConfigParam *param)
struct config_param *param)
{
FifoData *fd;
BlockParam *blockParam;
struct block_param *blockParam;
char *path;
blockParam = getBlockParam(param, "path");

View File

@@ -186,10 +186,10 @@ mpd_jack_error(const char *msg)
static void *
mpd_jack_init(struct audio_output *ao,
G_GNUC_UNUSED const struct audio_format *audio_format,
ConfigParam *param)
struct config_param *param)
{
struct jack_data *jd;
BlockParam *bp;
struct block_param *bp;
char *endptr;
int val;
char *cp = NULL;

View File

@@ -112,7 +112,7 @@ static bool mvp_testDefault(void)
static void *mvp_initDriver(G_GNUC_UNUSED struct audio_output *audio_output,
G_GNUC_UNUSED const struct audio_format *audio_format,
G_GNUC_UNUSED ConfigParam *param)
G_GNUC_UNUSED struct config_param *param)
{
MvpData *md = g_new(MvpData, 1);
md->audio_output = audio_output;

View File

@@ -28,7 +28,7 @@ struct null_data {
static void *
null_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput,
G_GNUC_UNUSED const struct audio_format *audio_format,
G_GNUC_UNUSED ConfigParam *param)
G_GNUC_UNUSED struct config_param *param)
{
struct null_data *nd = g_new(struct null_data, 1);
nd->timer = NULL;

View File

@@ -344,7 +344,7 @@ static bool oss_testDefault(void)
return false;
}
static void *oss_open_default(ConfigParam *param)
static void *oss_open_default(struct config_param *param)
{
int i;
int err[G_N_ELEMENTS(default_devices)];
@@ -387,12 +387,13 @@ static void *oss_open_default(ConfigParam *param)
return NULL; /* some compilers can be dumb... */
}
static void *oss_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput,
G_GNUC_UNUSED const struct audio_format *audio_format,
ConfigParam * param)
static void *
oss_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput,
G_GNUC_UNUSED const struct audio_format *audio_format,
struct config_param *param)
{
if (param) {
BlockParam *bp = getBlockParam(param, "device");
struct block_param *bp = getBlockParam(param, "device");
if (bp) {
OssData *od = newOssData();
od->device = bp->value;

View File

@@ -83,7 +83,7 @@ static bool osx_testDefault(void)
static void *
osx_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput,
G_GNUC_UNUSED const struct audio_format *audio_format,
G_GNUC_UNUSED ConfigParam * param)
G_GNUC_UNUSED struct config_param *param)
{
return newOsxData();
}

View File

@@ -55,10 +55,10 @@ static void pulse_free_data(struct pulse_data *pd)
static void *
pulse_init(struct audio_output *ao,
G_GNUC_UNUSED const struct audio_format *audio_format,
ConfigParam *param)
struct config_param *param)
{
BlockParam *server = NULL;
BlockParam *sink = NULL;
struct block_param *server = NULL;
struct block_param *sink = NULL;
struct pulse_data *pd;
if (param) {

View File

@@ -94,7 +94,7 @@ static void free_shout_data(struct shout_data *sd)
static void *my_shout_init_driver(struct audio_output *audio_output,
const struct audio_format *audio_format,
ConfigParam *param)
struct config_param *param)
{
struct shout_data *sd;
char *test;
@@ -106,7 +106,7 @@ static void *my_shout_init_driver(struct audio_output *audio_output,
unsigned protocol;
const char *user;
char *name;
BlockParam *block_param;
struct block_param *block_param;
int public;
sd = new_shout_data();