gemian/pulseaudio-modules-droid
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #28 from jusa/dev

Browse source 
Fix build with Mako.
This commit is contained in:
Juho Hämäläinen 2015-02-24 16:38:25 +02:00
commit 8ea034153a
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -2,7 +2,7 @@ AC_PREREQ(2.60)
m4_define(PA_MAJOR, [5])
m4_define(PA_MINOR, [0])
m4_define(NEMO_MICRO, [32])
m4_define(NEMO_MICRO, [33])
AC_INIT([pulseaudio-modules-droid], [PA_MAJOR.PA_MINOR.NEMO_MICRO], [mer-general@lists.merproject.org])
AC_CONFIG_HEADER([config.h])

2
src/droid/droid-util.h
View file

@ -51,7 +51,7 @@
typedef struct pa_droid_hw_module pa_droid_hw_module;
typedef struct pa_droid_card_data pa_droid_card_data;
typedef void (*common_set_parameters_cb_t)(pa_droid_card_data *card_data, const char *str);
typedef int (*common_set_parameters_cb_t)(pa_droid_card_data *card_data, const char *str);
typedef struct pa_droid_config_audio pa_droid_config_audio;
typedef struct pa_droid_config_hw_module pa_droid_config_hw_module;

14
src/droid/module-droid-card.c
View file

@ -208,19 +208,19 @@ static pa_card_profile* add_virtual_profile(struct userdata *u, const char *name
return cp;
}
static void set_parameters_cb(pa_droid_card_data *card_data, const char *str) {
static int set_parameters_cb(pa_droid_card_data *card_data, const char *str) {
struct userdata *u;
int ret;
pa_assert(card_data);
pa_assert_se((u = card_data->userdata));
pa_assert(str);
u = card_data->userdata;
pa_droid_hw_module_lock(u->hw_module);
ret = u->hw_module->device->set_parameters(u->hw_module->device, str);
pa_droid_hw_module_unlock(u->hw_module);
if (u) {
pa_droid_hw_module_lock(u->hw_module);
u->hw_module->device->set_parameters(u->hw_module->device, str);
pa_droid_hw_module_unlock(u->hw_module);
}
return ret;
}
static void set_card_name(pa_modargs *ma, pa_card_new_data *data, const char *module_id) {