diff --git a/coreapi/lsd.c b/coreapi/lsd.c index 66abf89db..f3a324637 100644 --- a/coreapi/lsd.c +++ b/coreapi/lsd.c @@ -249,11 +249,11 @@ LinphoneSoundDaemon * linphone_sound_daemon_new(MSFactory* factory, const char * mp.filter=lsd->mixer; mp.pin=0; - lsd_player_init(&lsd->branches[0],mp,MS_ITC_SOURCE_ID,lsd); + lsd_player_init(factory, &lsd->branches[0],mp,MS_ITC_SOURCE_ID,lsd); ms_filter_add_notify_callback(lsd->branches[0].player,(MSFilterNotifyFunc)lsd_player_configure,&lsd->branches[0],FALSE); for(i=1;ibranches[i],mp,MS_FILE_PLAYER_ID,lsd); + lsd_player_init(factory,&lsd->branches[i],mp,MS_FILE_PLAYER_ID,lsd); } ms_filter_link(lsd->mixer,0,lsd->soundout,0); lsd->ticker=ms_ticker_new(); diff --git a/mediastreamer2 b/mediastreamer2 index c8a2aec22..00125cf3f 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit c8a2aec22f201d37b0e83d6d4a0cb0f57ef38cdf +Subproject commit 00125cf3f29528da5c542733fcc006797c14d839