gergely/matrix-glib-sdk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Create a base call for m.call.* events

Browse Source
This commit is contained in:
Gergely Polonkai
2016-03-09 11:43:53 +01:00
committed by Gergely Polonkai
parent b9ded01e98
commit ff6400a94a
7 changed files with 86 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/matrix-event-call-candidates.vala
View File

@@ -21,7 +21,7 @@
* callee after answering. Its purpose is to give the other party
* additional ICE candidates to try using to communicate.
*/
public class Matrix.Event.CallCandidates : Matrix.Event.Room {
public class Matrix.Event.CallCandidates : Matrix.Event.Call {
public struct Candidate {
string? sdp_mid; /// The SDP media type this candidate is
/// intended for.
@@ -30,11 +30,6 @@ public class Matrix.Event.CallCandidates : Matrix.Event.Room {
string? candidate; /// The SDP 'a' line of the candidate.
}
/**
* The ID of the call this event relates to.
*/
public string? call_id { get; set; default = null; }
/**
* The list of candidates.
*/
@@ -50,11 +45,6 @@ public class Matrix.Event.CallCandidates : Matrix.Event.Room {
default = null;
}
/**
* The version of the VoIP specification this messages adheres to.
*/
public int? version { get; set; default = null; }
private List<Candidate?>? _candidates;
protected override void
@@ -65,12 +55,6 @@ public class Matrix.Event.CallCandidates : Matrix.Event.Room {
.get_member("content").get_object();
Json.Node? node;
if ((node = content_root.get_member("call_id")) != null) {
_call_id = node.get_string();
} else {
warning("content.call_id is missing from a m.call.candidates event");
}
if ((node = content_root.get_member("candidates")) != null) {
node.get_array().foreach_element((ary, idx, cand_node) => {
var cand_root = cand_node.get_object();
@@ -100,12 +84,6 @@ public class Matrix.Event.CallCandidates : Matrix.Event.Room {
warning("content.candidates is missing from a m.call.candidates event");
}
if ((node = content_root.get_member("version")) != null) {
_version = (int)node.get_int();
} else {
warning("content.version is missing from a m.call.candidates event");
}
base.from_json(json_data);
}
@@ -113,16 +91,6 @@ public class Matrix.Event.CallCandidates : Matrix.Event.Room {
to_json(Json.Node json_data)
throws Matrix.Error
{
if (_call_id == null) {
throw new Matrix.Error.INCOMPLETE(
"Won't generate a m.call.candidates event without call_id");
}
if (_version == null) {
throw new Matrix.Error.INCOMPLETE(
"Won't generate a m.call.candidates event without version");
}
if ((_candidates == null) || (_candidates.length() < 1)) {
throw new Matrix.Error.INCOMPLETE(
"Won't generate a m.call.candidates event without candidates");
@@ -131,9 +99,6 @@ public class Matrix.Event.CallCandidates : Matrix.Event.Room {
var content_root = json_data.get_object()
.get_member("content").get_object();
content_root.set_string_member("call_id", _call_id);
content_root.set_int_member("version", _version);
var cands = new Json.Array();
foreach (var entry in _candidates) {