diff --git a/test/agent/src/bindings/call.h b/test/agent/src/bindings/call.h index 6322a71c8b092adcc426563acc00fff6c6910e5c..d62f4c921b8debb3ec358ece45478ea8ce34dee2 100644 --- a/test/agent/src/bindings/call.h +++ b/test/agent/src/bindings/call.h @@ -57,48 +57,54 @@ place_call_with_media_binding(SCM accountID_str, SCM contact_str, SCM call_media } static SCM -hang_up_binding(SCM callID_str) +hang_up_binding(SCM accountID_str, SCM callID_str) { LOG_BINDING(); - return to_guile(DRing::hangUp(from_guile(callID_str))); + return to_guile(DRing::hangUp(from_guile(accountID_str), + from_guile(callID_str))); } static SCM -accept_binding(SCM callID_str, SCM call_media_vector_alist_optional) +accept_binding(SCM accountID_str, SCM callID_str, SCM call_media_vector_alist_optional) { LOG_BINDING(); if (SCM_UNBNDP(call_media_vector_alist_optional)) { - return to_guile(DRing::accept(from_guile(callID_str))); + return to_guile(DRing::accept(from_guile(accountID_str), + from_guile(callID_str))); } - return to_guile(DRing::acceptWithMedia(from_guile(callID_str), + return to_guile(DRing::acceptWithMedia(from_guile(accountID_str), + from_guile(callID_str), from_guile(call_media_vector_alist_optional))); } static SCM -refuse_binding(SCM callID_str) +refuse_binding(SCM accountID_str, SCM callID_str) { LOG_BINDING(); - return to_guile(DRing::refuse(from_guile(callID_str))); + return to_guile(DRing::refuse(from_guile(accountID_str), + from_guile(callID_str))); } static SCM -hold_binding(SCM callID_str) +hold_binding(SCM accountID_str, SCM callID_str) { LOG_BINDING(); - return to_guile(DRing::hold(from_guile(callID_str))); + return to_guile(DRing::hold(from_guile(accountID_str), + from_guile(callID_str))); } static SCM -unhold_binding(SCM callID_str) +unhold_binding(SCM accountID_str, SCM callID_str) { LOG_BINDING(); - return to_guile(DRing::unhold(from_guile(callID_str))); + return to_guile(DRing::unhold(from_guile(accountID_str), + from_guile(callID_str))); } static void @@ -106,9 +112,9 @@ install_call_primitives(void *) { define_primitive("place-call", 2, 1, 0, (void*) place_call_binding); define_primitive("place-call/media", 2, 1, 0, (void*) place_call_with_media_binding); - define_primitive("hang-up", 1, 0, 0, (void*) hang_up_binding); - define_primitive("accept", 1, 1, 0, (void*) accept_binding); - define_primitive("refuse", 1, 0, 0, (void*) refuse_binding); - define_primitive("hold", 1, 0, 0, (void*) hold_binding); - define_primitive("unhold", 1, 0, 0, (void*) unhold_binding); + define_primitive("hang-up", 2, 0, 0, (void*) hang_up_binding); + define_primitive("accept", 2, 1, 0, (void*) accept_binding); + define_primitive("refuse", 2, 0, 0, (void*) refuse_binding); + define_primitive("hold", 2, 0, 0, (void*) hold_binding); + define_primitive("unhold", 2, 0, 0, (void*) unhold_binding); } diff --git a/test/agent/src/bindings/signal.cpp b/test/agent/src/bindings/signal.cpp index 540c0e4370b4673cc880d328dc148fac8186587d..85e044a87a33bc6daa8aa211581543c6b62a1926 100644 --- a/test/agent/src/bindings/signal.cpp +++ b/test/agent/src/bindings/signal.cpp @@ -206,17 +206,20 @@ install_signal_primitives(void*) add_handler<DRing::CallSignal::RecordPlaybackFilepath, const std::string&, const std::string&>( handlers, "record-playback-filepath"); - add_handler<DRing::CallSignal::ConferenceCreated, const std::string&>(handlers, - "conference-created"); + add_handler<DRing::CallSignal::ConferenceCreated, + const std::string&, const std::string&>(handlers, + "conference-created"); - add_handler<DRing::CallSignal::ConferenceChanged, const std::string&, const std::string&>( - handlers, "conference-changed"); + add_handler<DRing::CallSignal::ConferenceChanged, + const std::string&, const std::string&, const std::string&>( + handlers, "conference-changed"); add_handler<DRing::CallSignal::UpdatePlaybackScale, const std::string&, unsigned, unsigned>( handlers, "update-playback-scale"); - add_handler<DRing::CallSignal::ConferenceRemoved, const std::string&>(handlers, - "conference-removed"); + add_handler<DRing::CallSignal::ConferenceRemoved, + const std::string&, const std::string&>(handlers, + "conference-removed"); add_handler<DRing::CallSignal::RecordingStateChanged, const std::string&, int>( handlers, "recording-state-changed");