mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-21 21:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix volume control for alsa and add GET_SAMPLE_RATE method

Browse source 
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@450 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
aymeric 2009-04-28 22:18:51 +00:00
parent a821c98f2e
commit 54b4dad454
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
linphone/mediastreamer2/src/alsa.c
View file

@ -667,6 +667,16 @@ static MSSndCard * alsa_card_new(int id)
obj->name=pos1;
ad->pcmdev=ms_strdup_printf("default:%i",id);
ad->mixdev=ms_strdup_printf("default:%i",id);
{
snd_mixer_t *mixer;
mixer = alsa_mixer_open(ad->mixdev);
if (mixer==NULL) {
ms_free(ad->mixdev);
ad->mixdev=ms_strdup_printf("hw:%i",id);
} else {
alsa_mixer_close(mixer);
}
}
}
/*check card capabilities: */
obj->capabilities=get_card_capabilities(ad->pcmdev);
@ -880,6 +890,12 @@ void alsa_read_process(MSFilter *obj){
}
#endif
static int alsa_read_get_sample_rate(MSFilter *obj, void *param){
AlsaReadData *ad=(AlsaReadData*)obj->data;
*((int*)param)=ad->rate;
return 0;
}
static int alsa_read_set_sample_rate(MSFilter *obj, void *param){
AlsaReadData *ad=(AlsaReadData*)obj->data;
ad->rate=*((int*)param);
@ -893,8 +909,9 @@ static int alsa_read_set_nchannels(MSFilter *obj, void *param){
}
MSFilterMethod alsa_read_methods[]={
{MS_FILTER_GET_SAMPLE_RATE, alsa_read_get_sample_rate},
{MS_FILTER_SET_SAMPLE_RATE, alsa_read_set_sample_rate},
{MS_FILTER_SET_SAMPLE_RATE, alsa_read_set_nchannels},
{MS_FILTER_SET_NCHANNELS, alsa_read_set_nchannels},
{0,NULL}
};
@ -946,6 +963,12 @@ void alsa_write_uninit(MSFilter *obj){
ms_free(ad);
}
static int alsa_write_get_sample_rate(MSFilter *obj, void *data){
AlsaWriteData *ad=(AlsaWriteData*)obj->data;
*((int*)data)=ad->rate;
return 0;
}
int alsa_write_set_sample_rate(MSFilter *obj, void *data){
int *rate=(int*)data;
AlsaWriteData *ad=(AlsaWriteData*)obj->data;
@ -990,6 +1013,7 @@ void alsa_write_process(MSFilter *obj){
}
MSFilterMethod alsa_write_methods[]={
{MS_FILTER_GET_SAMPLE_RATE, alsa_write_get_sample_rate},
{MS_FILTER_SET_SAMPLE_RATE, alsa_write_set_sample_rate},
{MS_FILTER_SET_NCHANNELS, alsa_write_set_nchannels},
{0,NULL}