mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update mediastreamer and player.

Browse source
This commit is contained in:
Sandrine Avakian 2016-01-19 10:54:09 +01:00
parent 1afed9cd17
commit 56a452a8f3
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
coreapi/localplayer.c
View file

@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <mediastreamer2/msmediaplayer.h>
#include <mediastreamer2/mssndcard.h>
static int _local_player_open(LinphonePlayer *obj, const char *filename);
static int _local_player_open(LinphonePlayer *obj, const char *filename, MSFactory *factory);
static int _local_player_start(LinphonePlayer *obj);
static int _local_player_pause(LinphonePlayer *obj);
static int _local_player_seek(LinphonePlayer *obj, int time_ms);
@ -54,8 +54,8 @@ bool_t linphone_local_player_matroska_supported(void) {
return ms_media_player_matroska_supported();
}
static int _local_player_open(LinphonePlayer *obj, const char *filename) {
return ms_media_player_open((MSMediaPlayer *)obj->impl, filename) ? 0 : -1;
static int _local_player_open(LinphonePlayer *obj, const char *filename,MSFactory* factory) {
return ms_media_player_open((MSMediaPlayer *)obj->impl, filename, factory) ? 0 : -1;
}
static int _local_player_start(LinphonePlayer *obj) {

2
coreapi/private.h
View file

@ -1227,7 +1227,7 @@ LINPHONE_PUBLIC int linphone_remote_provisioning_load_file( LinphoneCore* lc, co
****************************************************************************/
struct _LinphonePlayer{
int (*open)(struct _LinphonePlayer* player, const char *filename);
int (*open)(struct _LinphonePlayer* player, const char *filename, MSFactory *factory);
int (*start)(struct _LinphonePlayer* player);
int (*pause)(struct _LinphonePlayer* player);
int (*seek)(struct _LinphonePlayer* player, int time_ms);

6
gtk/audio_assistant.c
View file

@ -218,7 +218,7 @@ void linphone_gtk_start_record_sound(GtkWidget *w, gpointer data){
if(active){
gchar *path = get_record_file();
stream=audio_stream_new(8888, 8889, FALSE);
stream=audio_stream_new(8888, 8889, FALSE, lc->factory);
if(stream != NULL){
audio_stream_start_full(stream,&av_profile,"127.0.0.1",8888,"127.0.0.1",8889,0,0,NULL,
path,NULL,ms_snd_card_manager_get_card(manager,linphone_core_get_capture_device(lc)),FALSE);
@ -261,7 +261,7 @@ void linphone_gtk_start_play_record_sound(GtkWidget *w,gpointer data){
if(active){
gchar *path = g_object_get_data(G_OBJECT(audio_assistant),"path");
stream=audio_stream_new(8888, 8889, FALSE);
stream=audio_stream_new(8888, 8889, FALSE, lc->factory);
if(path != NULL){
audio_stream_start_full(stream,&av_profile,"127.0.0.1",8888,"127.0.0.1",8889,0,0,path,
NULL,ms_snd_card_manager_get_card(manager,linphone_core_get_playback_device(lc)),NULL,FALSE);
@ -453,7 +453,7 @@ static void prepare(GtkAssistant *w){
//Speaker page
if(page == 1){
MSSndCardManager *manager = ms_snd_card_manager_get();
audio_stream = audio_stream_start_with_sndcards(&av_profile,9898,"127.0.0.1",19898,0,0,ms_snd_card_manager_get_card(manager,linphone_core_get_playback_device(lc)),ms_snd_card_manager_get_card(manager,linphone_core_get_capture_device(lc)),FALSE);
audio_stream = audio_stream_start_with_sndcards(&av_profile,9898,"127.0.0.1",19898,0,0,ms_snd_card_manager_get_card(manager,linphone_core_get_playback_device(lc)),ms_snd_card_manager_get_card(manager,linphone_core_get_capture_device(lc)),FALSE, lc->factory);
if (mic_audiolevel != NULL && audio_stream != NULL){
g_object_set_data(G_OBJECT(audio_assistant),"stream",audio_stream);
linphone_gtk_init_audio_meter(mic_audiolevel,(get_volume_t)audio_stream_get_record_volume,audio_stream);

2
mediastreamer2

@ -1 +1 @@
Subproject commit 081c581afc080352651dfbd6c4aefd24b7e2e400
Subproject commit 8fc4323f8166b7432bdbf409fdeb426e08cdff32