From 4d472c265ed0b3f7f61ee624c01c8ef319db7c99 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 17 Jan 2009 20:23:27 +0100 Subject: conf: no CamelCase, part I Renamed functions, types, variables. --- src/volume.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/volume.c') diff --git a/src/volume.c b/src/volume.c index 5eb0bd64c..3f9a9f1d3 100644 --- a/src/volume.c +++ b/src/volume.c @@ -50,22 +50,22 @@ void volume_finish(void) static void mixer_reconfigure(char *driver) { - ConfigParam *newparam, *param; + struct config_param *newparam, *param; //create parameter list newparam = newConfigParam(NULL, -1); - param = getConfigParam(CONF_MIXER_DEVICE); + param = config_get_param(CONF_MIXER_DEVICE); if (param) { g_warning("deprecated option mixer_device found, translating to %s config section\n", driver); addBlockParam(newparam, "mixer_device", param->value, -1); } - param = getConfigParam(CONF_MIXER_CONTROL); + param = config_get_param(CONF_MIXER_CONTROL); if (param) { g_warning("deprecated option mixer_control found, translating to %s config section\n", driver); addBlockParam(newparam, "mixer_control", param->value, -1); } - if (newparam->numberOfBlockParams > 0) { + if (newparam->num_block_params > 0) { //call configure method of corrensponding mixer if (!mixer_configure_legacy(driver, newparam)) { g_error("Using mixer_type '%s' with not enabled %s output", driver, driver); @@ -77,7 +77,7 @@ mixer_reconfigure(char *driver) void volume_init(void) { - ConfigParam *param = getConfigParam(CONF_MIXER_TYPE); + struct config_param *param = config_get_param(CONF_MIXER_TYPE); //hw mixing is by default if (param) { if (strcmp(param->value, VOLUME_MIXER_SOFTWARE) == 0) { -- cgit v1.2.3