return p->user_data;
}
-static void lsd_player_on_eop(void * userdata, unsigned int id, void *arg){
+static void lsd_player_on_eop(void * userdata, MSFilter *f, unsigned int id, void *arg){
LsdPlayer *p=(LsdPlayer *)userdata;
if (p->eop_cb!=NULL)
p->eop_cb(p);
void lsd_player_set_gain(LsdPlayer *p, float gain){
MSAudioMixerCtl gainctl;
gainctl.pin=p->mixer_pin;
- gainctl.gain=gain;
+ gainctl.param.gain=gain;
ms_filter_call_method(p->lsd->mixer,MS_AUDIO_MIXER_SET_INPUT_GAIN,&gainctl);
}
-LinphoneSoundDaemon * linphone_sound_daemon_new(const char *cardname){
+LinphoneSoundDaemon * linphone_sound_daemon_new(const char *cardname, int rate, int nchannels){
int i;
MSConnectionPoint mp;
LinphoneSoundDaemon *lsd;
lsd=ms_new0(LinphoneSoundDaemon,1);
lsd->soundout=ms_snd_card_create_writer(card);
lsd->mixer=ms_filter_new(MS_AUDIO_MIXER_ID);
- lsd->out_rate=44100;
- lsd->out_nchans=2;
+ lsd->out_rate=rate;
+ lsd->out_nchans=nchannels;
ms_filter_call_method(lsd->soundout,MS_FILTER_SET_SAMPLE_RATE,&lsd->out_rate);
ms_filter_call_method(lsd->soundout,MS_FILTER_SET_NCHANNELS,&lsd->out_nchans);
ms_filter_call_method(lsd->mixer,MS_FILTER_SET_SAMPLE_RATE,&lsd->out_rate);
lsd_player_init(&lsd->branches[0],mp,MS_ITC_SOURCE_ID,lsd);
ms_filter_set_notify_callback(lsd->branches[0].player,(MSFilterNotifyFunc)lsd_player_configure,&lsd->branches[0]);
- ms_filter_enable_synchronous_notifcations (lsd->branches[0].player,TRUE);
for(i=1;i<MAX_BRANCHES;++i){
mp.pin=i;
lsd_player_init(&lsd->branches[i],mp,MS_FILE_PLAYER_ID,lsd);
lsd->proxycard=ms_snd_card_new(&proxycard);
lsd->proxycard->data=lsd;
-
+ ms_message("LinphoneSoundDaemon started with rate=%i, nchannels=%i",rate,nchannels);
return lsd;
}
+void linphone_sound_daemon_stop_all_players(LinphoneSoundDaemon *obj){
+ int i;
+ for(i=1;i<MAX_BRANCHES;++i){
+ lsd_player_stop(&obj->branches[i]);
+ }
+}
+
+void linphone_sound_daemon_release_all_players(LinphoneSoundDaemon *obj){
+ int i;
+ for(i=1;i<MAX_BRANCHES;++i){
+ linphone_sound_daemon_release_player(obj,&obj->branches[i]);
+ }
+}
+
void linphone_sound_daemon_destroy(LinphoneSoundDaemon *obj){
int i;
MSConnectionPoint mp;
mp.filter=obj->mixer;
for(i=0;i<MAX_BRANCHES;++i){
mp.pin=i;
+ if (i!=0) linphone_sound_daemon_release_player(obj,&obj->branches[i]);
lsd_player_uninit (&obj->branches[i],mp);
}
ms_filter_unlink(obj->mixer,0,obj->soundout,0);