From 6e5c73c6ad58492ef8f551729ae778f1db005ae5 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Thu, 10 Mar 2016 19:30:01 +0100 Subject: [PATCH] Add message handler for m.audio --- .gitignore | 1 + src/Makefile.am | 1 + src/matrix-event-types.c | 3 ++ src/matrix-message-audio.vala | 75 +++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+) create mode 100644 src/matrix-message-audio.vala diff --git a/.gitignore b/.gitignore index 494d8af..614a9c6 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ Makefile.in /src/matrix-message-notice.c /src/matrix-message-file.c /src/matrix-message-image.c +/src/matrix-message-audio.c diff --git a/src/Makefile.am b/src/Makefile.am index fe010a5..85e7069 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,6 +56,7 @@ libmatrix_glib_0_0_la_VALA_SOURCES = \ matrix-message-notice.vala \ matrix-message-file.vala \ matrix-message-image.vala \ + matrix-message-audio.vala \ $(NULL) AM_CPPFLAGS += \ diff --git a/src/matrix-event-types.c b/src/matrix-event-types.c index eb8cb82..f7cd5b9 100644 --- a/src/matrix-event-types.c +++ b/src/matrix-event-types.c @@ -237,6 +237,9 @@ matrix_event_types_ctor(void) matrix_message_register_type("m.image", MATRIX_MESSAGE_TYPE_IMAGE, NULL); + matrix_message_register_type("m.audio", + MATRIX_MESSAGE_TYPE_AUDIO, + NULL); } void diff --git a/src/matrix-message-audio.vala b/src/matrix-message-audio.vala new file mode 100644 index 0000000..b5c119c --- /dev/null +++ b/src/matrix-message-audio.vala @@ -0,0 +1,75 @@ +/* + * This file is part of matrix-glib-sdk + * + * matrix-glib-sdk is free software: you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation, either + * version 3 of the License, or (at your option) any later version. + * + * matrix-glib-sdk is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with matrix-glib-sdk. If not, see + * . + */ + +/** + * Class to hold a m.audio message + * + * This message represents a single audio clip. + */ +public class Matrix.Message.Audio : Matrix.Message.Base { + /** + * The URL to the audio clip. + */ + public string? url { get; set; default = null; } + + /** + * Metadata for the audio clip referred to in `url`. + */ + public AudioInfo? info { get; set; default = null; } + + protected override void + from_json(Json.Node json_data) + throws Matrix.Error + { + var root = json_data.get_object(); + Json.Node? node; + + if ((node = root.get_member("url")) != null) { + _url = node.get_string(); + } else if (Config.DEBUG) { + warning("url is missing from a m.audio message"); + } + + if ((node = root.get_member("info")) != null) { + _info = AudioInfo(); + _info.set_from_json(node); + } + + base.from_json(json_data); + } + + protected override void + to_json(Json.Node json_data) + throws Matrix.Error + { + if (_url == null) { + throw new Matrix.Error.INCOMPLETE( + "Won't generate a m.audio message without url"); + } + + var root = json_data.get_object(); + + root.set_string_member("url", _url); + + if (_info != null) { + root.set_member("info", _info.get_json_node()); + } + + base.to_json(json_data); + } +}