diff --git a/daemon/commands/audio-stream-start.cc b/daemon/commands/audio-stream-start.cc index f82d5e517..e6b8bf8ba 100644 --- a/daemon/commands/audio-stream-start.cc +++ b/daemon/commands/audio-stream-start.cc @@ -24,13 +24,16 @@ void AudioStreamStartCommand::exec(Daemon *app, const char *args) { char addr[256]; int port; int payload_type; + MSFactory* factory ; + factory = (app->getCore())->factory; + if (sscanf(args, "%255s %d %d", addr, &port, &payload_type) == 3) { int local_port = linphone_core_get_audio_port(app->getCore()); int jitt = linphone_core_get_audio_jittcomp(app->getCore()); bool_t echo_canceller = linphone_core_echo_cancellation_enabled(app->getCore()); int ptime=linphone_core_get_upload_ptime(app->getCore()); - MSSndCardManager *manager = ms_snd_card_manager_get(); + MSSndCardManager *manager = ms_factory_get_snd_card_manager(factory); MSSndCard *capture_card = ms_snd_card_manager_get_card(manager, linphone_core_get_capture_device(app->getCore())); MSSndCard *play_card = ms_snd_card_manager_get_card(manager, linphone_core_get_playback_device(app->getCore())); RtpProfile *prof=rtp_profile_new("stream"); @@ -40,7 +43,7 @@ void AudioStreamStartCommand::exec(Daemon *app, const char *args) { app->sendResponse(Response("No payload type were assigned to this number.")); return; } - AudioStream *stream = audio_stream_new(local_port, local_port + 1, linphone_core_ipv6_enabled(app->getCore())); + AudioStream *stream = audio_stream_new(factory, local_port, local_port + 1, linphone_core_ipv6_enabled(app->getCore())); audio_stream_set_features(stream,linphone_core_get_audio_features(app->getCore())); pt=payload_type_clone(pt); diff --git a/daemon/daemon-pipetest.c b/daemon/daemon-pipetest.c index 1b6c192ce..dde0bb3b0 100644 --- a/daemon/daemon-pipetest.c +++ b/daemon/daemon-pipetest.c @@ -21,7 +21,7 @@ int main(int argc, char *argv[]){ char buf[4096]; ortp_init(); - ortp_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); + ortp_set_log_level_mask(NULL,ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); if (fd==-1){ ortp_error("Could not connect to control pipe: %s",strerror(errno)); return -1; diff --git a/daemon/daemon.cc b/daemon/daemon.cc index cfb98939e..47f820ab0 100644 --- a/daemon/daemon.cc +++ b/daemon/daemon.cc @@ -327,7 +327,8 @@ Daemon::Daemon(const char *config_path, const char *factory_config_path, const c vtable.dtmf_received = dtmfReceived; mLc = linphone_core_new(&vtable, config_path, factory_config_path, this); linphone_core_set_user_data(mLc, this); - linphone_core_enable_video(mLc, capture_video, display_video); + linphone_core_enable_video_capture(mLc,capture_video); + linphone_core_enable_video_display(mLc,display_video); initCommands(); mUseStatsEvents=true; } @@ -813,7 +814,7 @@ void Daemon::enableLSD(bool enabled) { if (mLSD) linphone_sound_daemon_destroy(mLSD); linphone_core_use_sound_daemon(mLc, NULL); if (enabled) { - mLSD = linphone_sound_daemon_new(NULL, 44100, 1); + mLSD = linphone_sound_daemon_new(mLc->factory,NULL, 44100, 1); linphone_core_use_sound_daemon(mLc, mLSD); } }