[gnome-network-displays/cc-tmp: 53/80] uncrustify
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-network-displays/cc-tmp: 53/80] uncrustify
- Date: Fri, 9 Sep 2022 12:03:51 +0000 (UTC)
commit 8bad4ba9716e4b1400d524defdc1c010c32d0758
Author: Anupam Kumar <kyteinsky gmail com>
Date: Sun Sep 4 16:29:13 2022 +0530
uncrustify
src/cc/cc-comm.c | 15 +++++---
src/cc/cc-comm.h | 17 ++++----
src/cc/cc-common.h | 32 +++++++++-------
src/cc/cc-ctrl.c | 100 ++++++++++++++++++++++++++----------------------
src/cc/cc-ctrl.h | 9 +++--
src/cc/cc-json-helper.c | 89 +++++++++++++++++++++++++-----------------
src/cc/cc-json-helper.h | 14 ++++---
src/nd-cc-sink.c | 15 ++++----
8 files changed, 166 insertions(+), 125 deletions(-)
---
diff --git a/src/cc/cc-comm.c b/src/cc/cc-comm.c
index 891ee22..a9e2a3b 100644
--- a/src/cc/cc-comm.c
+++ b/src/cc/cc-comm.c
@@ -160,7 +160,7 @@ cc_comm_header_read_cb (GObject *source_object,
if (g_cancellable_is_cancelled (comm->cancellable))
return;
- g_autoptr (GError) error = NULL;
+ g_autoptr(GError) error = NULL;
gboolean success;
gsize io_bytes;
guint32 message_size;
@@ -178,6 +178,7 @@ cc_comm_header_read_cb (GObject *source_object,
}
GInputStream *istream = istream = g_io_stream_get_input_stream (G_IO_STREAM (comm->con));
+
if (G_INPUT_STREAM (source_object) != istream)
{
g_warning ("CcComm: Old stream encountered while reading header, ignoring");
@@ -218,6 +219,7 @@ static void
cc_comm_read_header (CcComm *comm)
{
GInputStream *istream = g_io_stream_get_input_stream (G_IO_STREAM (comm->con));
+
comm->header_buffer = g_malloc0 (4);
g_input_stream_read_all_async (istream,
comm->header_buffer,
@@ -304,7 +306,7 @@ cc_comm_make_connection (CcComm *comm, gchar *remote_address, GError **error)
void
cc_comm_close_connection (CcComm *comm)
{
- g_autoptr (GError) error = NULL;
+ g_autoptr(GError) error = NULL;
if (comm->con != NULL)
{
@@ -328,7 +330,8 @@ cc_comm_tls_send (CcComm * comm,
{
GOutputStream *ostream;
gssize io_bytes;
- g_autoptr (GError) err = NULL;
+
+ g_autoptr(GError) err = NULL;
if (g_cancellable_is_cancelled (comm->cancellable))
return FALSE;
@@ -482,9 +485,9 @@ cc_comm_send_request (CcComm *comm,
memcpy (sock_buffer, &packed_size_be, 4);
cast__channel__cast_message__pack (&message, 4 + sock_buffer);
- if (message_type != CC_MESSAGE_TYPE_PING
- && message_type != CC_MESSAGE_TYPE_PONG
- && message_type != CC_MESSAGE_TYPE_AUTH)
+ if (message_type != CC_MESSAGE_TYPE_PING &&
+ message_type != CC_MESSAGE_TYPE_PONG &&
+ message_type != CC_MESSAGE_TYPE_AUTH)
{
g_debug ("CcComm: Sending message:");
cc_json_helper_dump_message (&message, FALSE);
diff --git a/src/cc/cc-comm.h b/src/cc/cc-comm.h
index 17f96d5..5f57ab1 100644
--- a/src/cc/cc-comm.h
+++ b/src/cc/cc-comm.h
@@ -29,9 +29,10 @@ G_BEGIN_DECLS
struct _CcCommClosure
{
gpointer userdata;
- void (*message_received_cb) (struct _CcCommClosure *closure,
- Cast__Channel__CastMessage *message);
- void (*fatal_error_cb) (struct _CcCommClosure *closure, GError *error);
+ void (*message_received_cb) (struct _CcCommClosure *closure,
+ Cast__Channel__CastMessage *message);
+ void (*fatal_error_cb) (struct _CcCommClosure *closure,
+ GError *error);
};
typedef struct _CcCommClosure CcCommClosure;
@@ -39,14 +40,14 @@ typedef struct _CcCommClosure CcCommClosure;
struct _CcComm
{
/*< public >*/
- GIOStream *con;
+ GIOStream *con;
- guint8 *header_buffer;
- guint8 *message_buffer;
+ guint8 *header_buffer;
+ guint8 *message_buffer;
- GCancellable *cancellable;
+ GCancellable *cancellable;
- CcCommClosure *closure;
+ CcCommClosure *closure;
};
typedef struct _CcComm CcComm;
diff --git a/src/cc/cc-common.h b/src/cc/cc-common.h
index 598b4d4..562a05e 100644
--- a/src/cc/cc-common.h
+++ b/src/cc/cc-common.h
@@ -61,7 +61,8 @@ typedef enum {
typedef CcReceivedMessageType CcWaitingFor;
-typedef struct _Stream {
+typedef struct _Stream
+{
gint index;
/* Default channel count is 1, e.g. for video. */
@@ -76,12 +77,12 @@ typedef struct _Stream {
* uint8_t aes_key[16];
* uint8_t aes_iv_mask[16];
*/
- gchar *aes_iv_mask;
- gchar *aes_key;
+ gchar *aes_iv_mask;
+ gchar *aes_key;
gboolean receiver_rtcp_event_log;
- gchar *receiver_rtcp_dscp;
+ gchar *receiver_rtcp_dscp;
/* gint rtp_timebase; */
- gchar *rtp_timebase;
+ gchar *rtp_timebase;
/* The codec parameter field honors the format laid out in RFC 6381:
* https://datatracker.ietf.org/doc/html/rfc6381.
@@ -89,19 +90,21 @@ typedef struct _Stream {
gchar *codec_parameter;
} Stream;
-typedef struct _AudioStream {
+typedef struct _AudioStream
+{
Stream stream;
gchar *codec;
- gint bit_rate;
- gint sample_rate;
+ gint bit_rate;
+ gint sample_rate;
gchar *profile;
} AudioStream;
-typedef struct _VideoStream {
+typedef struct _VideoStream
+{
Stream stream;
gchar *codec;
gchar *max_frame_rate;
- gint max_bit_rate;
+ gint max_bit_rate;
gchar *protection;
gchar *profile;
gchar *level;
@@ -109,10 +112,11 @@ typedef struct _VideoStream {
gchar *error_recovery_mode;
} VideoStream;
-typedef struct _Offer {
- gchar *cast_mode;
- guint seq_num;
- gboolean receiver_get_status;
+typedef struct _Offer
+{
+ gchar *cast_mode;
+ guint seq_num;
+ gboolean receiver_get_status;
AudioStream audio_stream;
VideoStream video_stream;
} Offer;
diff --git a/src/cc/cc-ctrl.c b/src/cc/cc-ctrl.c
index 67ab16f..34fbb6c 100644
--- a/src/cc/cc-ctrl.c
+++ b/src/cc/cc-ctrl.c
@@ -48,16 +48,16 @@ static gboolean
cc_ctrl_send_auth (CcCtrl *ctrl)
{
gboolean send_ok = cc_comm_send_request (&ctrl->comm,
- CC_DEFAULT_RECEIVER_ID,
- CC_MESSAGE_TYPE_AUTH,
- NULL);
+ CC_DEFAULT_RECEIVER_ID,
+ CC_MESSAGE_TYPE_AUTH,
+ NULL);
if (!send_ok)
{
g_error ("CcCtrl: Failed to send auth message");
cc_ctrl_fatal_error (ctrl);
}
-
+
return send_ok;
}
@@ -82,9 +82,9 @@ cc_ctrl_send_connect (CcCtrl *ctrl, gchar *destination_id)
NULL);
gboolean send_ok = cc_comm_send_request (&ctrl->comm,
- destination_id,
- CC_MESSAGE_TYPE_CONNECT,
- json);
+ destination_id,
+ CC_MESSAGE_TYPE_CONNECT,
+ json);
if (!send_ok)
{
@@ -103,9 +103,9 @@ cc_ctrl_send_disconnect (CcCtrl *ctrl, gchar *destination_id)
NULL);
gboolean send_ok = cc_comm_send_request (&ctrl->comm,
- destination_id,
- CC_MESSAGE_TYPE_DISCONNECT,
- json);
+ destination_id,
+ CC_MESSAGE_TYPE_DISCONNECT,
+ json);
if (!send_ok)
{
@@ -125,9 +125,9 @@ cc_ctrl_send_get_status (CcCtrl *ctrl, gchar *destination_id)
NULL);
gboolean send_ok = cc_comm_send_request (&ctrl->comm,
- destination_id,
- CC_MESSAGE_TYPE_RECEIVER,
- json);
+ destination_id,
+ CC_MESSAGE_TYPE_RECEIVER,
+ json);
if (send_ok)
cc_ctrl_set_waiting_for (ctrl, CC_RWAIT_TYPE_RECEIVER_STATUS);
@@ -143,7 +143,7 @@ cc_ctrl_send_get_status (CcCtrl *ctrl, gchar *destination_id)
static gboolean
cc_ctrl_send_get_app_availability (CcCtrl *ctrl, gchar *destination_id, gchar *appId)
{
- g_autoptr (GArray) appIds = g_array_new (FALSE, FALSE, sizeof (gchar *));
+ g_autoptr(GArray) appIds = g_array_new (FALSE, FALSE, sizeof (gchar *));
g_array_append_val (appIds, CC_MIRRORING_APP_ID);
gchar *json = cc_json_helper_build_string (
@@ -153,9 +153,9 @@ cc_ctrl_send_get_app_availability (CcCtrl *ctrl, gchar *destination_id, gchar *a
NULL);
gboolean send_ok = cc_comm_send_request (&ctrl->comm,
- destination_id,
- CC_MESSAGE_TYPE_RECEIVER,
- json);
+ destination_id,
+ CC_MESSAGE_TYPE_RECEIVER,
+ json);
if (send_ok)
cc_ctrl_set_waiting_for (ctrl, CC_RWAIT_TYPE_GET_APP_AVAILABILITY);
@@ -179,9 +179,9 @@ cc_ctrl_send_launch_app (CcCtrl *ctrl, gchar *destination_id, gchar *appId)
NULL);
gboolean send_ok = cc_comm_send_request (&ctrl->comm,
- destination_id,
- CC_MESSAGE_TYPE_RECEIVER,
- json);
+ destination_id,
+ CC_MESSAGE_TYPE_RECEIVER,
+ json);
if (send_ok)
cc_ctrl_set_waiting_for (ctrl, CC_RWAIT_TYPE_RECEIVER_STATUS);
@@ -204,9 +204,9 @@ cc_ctrl_send_close_app (CcCtrl *ctrl, gchar *sessionId)
NULL);
gboolean send_ok = cc_comm_send_request (&ctrl->comm,
- sessionId,
- CC_MESSAGE_TYPE_RECEIVER,
- json);
+ sessionId,
+ CC_MESSAGE_TYPE_RECEIVER,
+ json);
if (send_ok)
cc_ctrl_set_waiting_for (ctrl, CC_RWAIT_TYPE_RECEIVER_STATUS);
@@ -247,7 +247,7 @@ build_audio_source (AudioStream *audio_stream)
JsonNode *
build_video_source (VideoStream *video_stream)
{
- g_autoptr (GArray) resolutions = g_array_new (FALSE, FALSE, sizeof (JsonNode *));
+ g_autoptr(GArray) resolutions = g_array_new (FALSE, FALSE, sizeof (JsonNode *));
JsonNode *resolution = cc_json_helper_build_node (
"height", CC_JSON_TYPE_INT, 1080,
@@ -288,7 +288,7 @@ cc_ctrl_send_offer (CcCtrl *ctrl, gchar *destination_id, GError **error)
JsonNode *audio_source_node = build_audio_source (&offer->audio_stream);
JsonNode *video_source_node = build_video_source (&offer->video_stream);
- g_autoptr (GArray) streams = g_array_new (FALSE, FALSE, sizeof (JsonNode *));
+ g_autoptr(GArray) streams = g_array_new (FALSE, FALSE, sizeof (JsonNode *));
g_array_append_val (streams, audio_source_node);
g_array_append_val (streams, video_source_node);
@@ -305,9 +305,9 @@ cc_ctrl_send_offer (CcCtrl *ctrl, gchar *destination_id, GError **error)
NULL);
gboolean send_ok = cc_comm_send_request (&ctrl->comm,
- destination_id,
- CC_MESSAGE_TYPE_WEBRTC,
- cc_json_helper_node_to_string (root));
+ destination_id,
+ CC_MESSAGE_TYPE_WEBRTC,
+ cc_json_helper_node_to_string (root));
if (send_ok)
cc_ctrl_set_waiting_for (ctrl, CC_RWAIT_TYPE_ANSWER);
@@ -359,7 +359,7 @@ cc_ctrl_send_ping (CcCtrl *ctrl)
static gboolean
cc_ctrl_send_offer_cb (CcCtrl *ctrl)
{
- g_autoptr (GError) error = NULL;
+ g_autoptr(GError) error = NULL;
if (!cc_ctrl_send_offer (ctrl, ctrl->session_id, &error))
{
if (error)
@@ -373,7 +373,7 @@ cc_ctrl_send_offer_cb (CcCtrl *ctrl)
static void
cc_ctrl_mirroring_app_init (CcCtrl *ctrl)
{
- g_autoptr (GError) err = NULL;
+ g_autoptr(GError) err = NULL;
if (!cc_ctrl_send_connect (ctrl, ctrl->session_id))
{
g_error ("CcCtrl: Failed to send CONNECT to the mirroring app");
@@ -389,7 +389,7 @@ cc_ctrl_mirroring_app_init (CcCtrl *ctrl)
static void
cc_ctrl_handle_get_app_availability (CcCtrl *ctrl, JsonReader *reader)
{
- g_autoptr (GError) error = NULL;
+ g_autoptr(GError) error = NULL;
if (json_reader_read_member (reader, "availability"))
{
@@ -405,7 +405,7 @@ cc_ctrl_handle_get_app_availability (CcCtrl *ctrl, JsonReader *reader)
return;
}
}
-
+
/* since the app is not available, stop attempts */
g_warning ("CcCtrl: %s app is not available, quiting", CC_MIRRORING_APP_ID);
cc_ctrl_fatal_error (ctrl);
@@ -422,16 +422,16 @@ cc_ctrl_handle_receiver_status (CcCtrl *ctrl, JsonParser *parser)
* connect to it, and then propose an offer
*/
- g_autoptr (GError) error = NULL;
- g_autoptr (JsonNode) app_status = NULL;
- g_autoptr (JsonPath) path = json_path_new();
- json_path_compile(path, "$.status.applications[0]", NULL);
- app_status = json_path_match(path, json_parser_get_root(parser));
+ g_autoptr(GError) error = NULL;
+ g_autoptr(JsonNode) app_status = NULL;
+ g_autoptr(JsonPath) path = json_path_new ();
+ json_path_compile (path, "$.status.applications[0]", NULL);
+ app_status = json_path_match (path, json_parser_get_root (parser));
- g_autoptr (JsonGenerator) generator = json_generator_new();
- json_generator_set_root(generator, app_status);
+ g_autoptr(JsonGenerator) generator = json_generator_new ();
+ json_generator_set_root (generator, app_status);
gsize size;
- json_generator_to_data(generator, &size);
+ json_generator_to_data (generator, &size);
if (size == 2) /* empty array [] */
{
@@ -453,7 +453,7 @@ cc_ctrl_handle_receiver_status (CcCtrl *ctrl, JsonParser *parser)
}
/* one or more apps is/are open */
- g_autoptr (JsonReader) reader = json_reader_new(app_status);
+ g_autoptr(JsonReader) reader = json_reader_new (app_status);
if (json_reader_read_element (reader, 0))
{
@@ -505,7 +505,7 @@ cc_ctrl_handle_media_status (CcCtrl *ctrl, Cast__Channel__CastMessage *message,
static void
cc_ctrl_handle_close (CcCtrl *ctrl, Cast__Channel__CastMessage *message)
{
- g_autoptr (GError) error = NULL;
+ g_autoptr(GError) error = NULL;
if (g_strcmp0 (message->source_id, CC_DEFAULT_RECEIVER_ID) == 0)
{
@@ -521,10 +521,11 @@ cc_ctrl_handle_close (CcCtrl *ctrl, Cast__Channel__CastMessage *message)
}
void
-cc_ctrl_handle_received_msg (CcCommClosure *closure,
+cc_ctrl_handle_received_msg (CcCommClosure *closure,
Cast__Channel__CastMessage *message)
{
CcCtrl *ctrl = (CcCtrl *) closure->userdata;
+
g_autoptr(GError) error = NULL;
g_autoptr(JsonParser) parser = NULL;
g_autoptr(JsonReader) reader = NULL;
@@ -553,31 +554,39 @@ cc_ctrl_handle_received_msg (CcCommClosure *closure,
cc_ctrl_unset_waiting_for (ctrl, CC_RWAIT_TYPE_RECEIVER_STATUS);
cc_ctrl_handle_receiver_status (ctrl, parser);
break;
+
case CC_RWAIT_TYPE_GET_APP_AVAILABILITY:
cc_ctrl_unset_waiting_for (ctrl, CC_RWAIT_TYPE_GET_APP_AVAILABILITY);
cc_ctrl_handle_get_app_availability (ctrl, reader);
break;
+
case CC_RWAIT_TYPE_LAUNCH_ERROR:
g_warning ("CcCtrl: Failed to launch app");
cc_ctrl_fatal_error (ctrl);
break;
+
case CC_RWAIT_TYPE_ANSWER:
cc_ctrl_unset_waiting_for (ctrl, CC_RWAIT_TYPE_ANSWER);
/* cc_ctrl_handle_answer (ctrl, reader); */
break;
+
case CC_RWAIT_TYPE_MEDIA_STATUS:
cc_ctrl_unset_waiting_for (ctrl, CC_RWAIT_TYPE_MEDIA_STATUS);
cc_ctrl_handle_media_status (ctrl, message, reader);
break;
+
case CC_RWAIT_TYPE_PING:
cc_ctrl_unset_waiting_for (ctrl, CC_RWAIT_TYPE_PING);
break;
+
case CC_RWAIT_TYPE_PONG:
cc_ctrl_unset_waiting_for (ctrl, CC_RWAIT_TYPE_PONG);
break;
+
case CC_RWAIT_TYPE_CLOSE:
cc_ctrl_handle_close (ctrl, message);
break;
+
case CC_RWAIT_TYPE_UNKNOWN:
default:
g_warning ("CcCtrl: Unknown message type");
@@ -613,6 +622,7 @@ CcCommClosure *
cc_ctrl_get_callback_closure (CcCtrl *ctrl)
{
CcCommClosure *closure = (CcCommClosure *) g_malloc (sizeof (CcCommClosure));
+
closure->userdata = ctrl;
closure->message_received_cb = cc_ctrl_handle_received_msg;
closure->fatal_error_cb = cc_ctrl_fatal_error_closure;
@@ -622,7 +632,7 @@ cc_ctrl_get_callback_closure (CcCtrl *ctrl)
gboolean
cc_ctrl_connection_init (CcCtrl *ctrl, gchar *remote_address)
{
- g_autoptr (GError) error = NULL;
+ g_autoptr(GError) error = NULL;
ctrl->state = CC_CTRL_STATE_DISCONNECTED;
ctrl->comm.cancellable = ctrl->cancellable;
@@ -650,7 +660,7 @@ cc_ctrl_connection_init (CcCtrl *ctrl, gchar *remote_address)
/* since tls_send is a synchronous call */
ctrl->state = CC_CTRL_STATE_CONNECTED;
-
+
/* send pings to device every 5 seconds */
ctrl->ping_timeout_handle = g_timeout_add_seconds (5, G_SOURCE_FUNC (cc_ctrl_send_ping), ctrl);
diff --git a/src/cc/cc-ctrl.h b/src/cc/cc-ctrl.h
index 50a6f10..1c10dd3 100644
--- a/src/cc/cc-ctrl.h
+++ b/src/cc/cc-ctrl.h
@@ -39,9 +39,9 @@ typedef enum {
struct _CcCtrlClosure
{
gpointer userdata;
- Offer * (*get_offer_message) (struct _CcCtrlClosure *closure);
- void (*start_stream) (struct _CcCtrlClosure *closure);
- void (*end_stream) (struct _CcCtrlClosure *closure);
+ Offer * (*get_offer_message) (struct _CcCtrlClosure *closure);
+ void (*start_stream) (struct _CcCtrlClosure *closure);
+ void (*end_stream) (struct _CcCtrlClosure *closure);
};
typedef struct _CcCtrlClosure CcCtrlClosure;
@@ -65,7 +65,8 @@ struct _CcCtrl
typedef struct _CcCtrl CcCtrl;
/* public functions */
-gboolean cc_ctrl_connection_init (CcCtrl *ctrl, gchar *remote_address);
+gboolean cc_ctrl_connection_init (CcCtrl *ctrl,
+ gchar *remote_address);
void cc_ctrl_finish (CcCtrl *ctrl);
// XXX: is this required?
diff --git a/src/cc/cc-json-helper.c b/src/cc/cc-json-helper.c
index 9b3117a..0eb1746 100644
--- a/src/cc/cc-json-helper.c
+++ b/src/cc/cc-json-helper.c
@@ -21,7 +21,7 @@
static void
cc_json_helper_build_internal (JsonBuilder *builder,
gchar *first_key,
- va_list var_args)
+ va_list var_args)
{
for (gchar *key = first_key; key != NULL; key = va_arg (var_args, gchar *))
{
@@ -35,21 +35,27 @@ cc_json_helper_build_internal (JsonBuilder *builder,
case CC_JSON_TYPE_STRING:
json_builder_add_string_value (builder, va_arg (var_args, gchar *));
continue;
+
case CC_JSON_TYPE_INT:
json_builder_add_int_value (builder, va_arg (var_args, gint));
continue;
+
case CC_JSON_TYPE_DOUBLE:
json_builder_add_double_value (builder, va_arg (var_args, gdouble));
continue;
+
case CC_JSON_TYPE_BOOLEAN:
json_builder_add_boolean_value (builder, va_arg (var_args, gboolean));
continue;
+
case CC_JSON_TYPE_NULL: /* no additional arg is required here */
json_builder_add_null_value (builder);
continue;
+
case CC_JSON_TYPE_OBJECT:
json_builder_add_value (builder, va_arg (var_args, JsonNode *));
continue;
+
default:
return;
}
@@ -58,31 +64,37 @@ cc_json_helper_build_internal (JsonBuilder *builder,
GArray *arr = va_arg (var_args, GArray *);
guint i;
- for (i=0; i<arr->len; i++)
+ for (i = 0; i < arr->len; i++)
{
switch (type)
- {
+ {
case CC_JSON_TYPE_ARRAY_STRING:
json_builder_add_string_value (builder, g_array_index (arr, gchar *, i));
break;
+
case CC_JSON_TYPE_ARRAY_INT:
json_builder_add_int_value (builder, g_array_index (arr, gint, i));
break;
+
case CC_JSON_TYPE_ARRAY_DOUBLE:
json_builder_add_double_value (builder, g_array_index (arr, gdouble, i));
break;
+
case CC_JSON_TYPE_ARRAY_BOOLEAN:
json_builder_add_boolean_value (builder, g_array_index (arr, gboolean, i));
break;
+
case CC_JSON_TYPE_ARRAY_NULL:
json_builder_add_null_value (builder);
break;
+
case CC_JSON_TYPE_ARRAY_OBJECT:
json_builder_add_value (builder, g_array_index (arr, JsonNode *, i));
break;
+
default:
return;
- }
+ }
}
json_builder_end_array (builder);
@@ -90,10 +102,11 @@ cc_json_helper_build_internal (JsonBuilder *builder,
}
JsonNode *
-cc_json_helper_build_node (gchar *first_key,
+cc_json_helper_build_node (gchar *first_key,
...)
{
va_list var_args;
+
va_start (var_args, first_key);
JsonBuilder *builder = json_builder_new ();
@@ -112,10 +125,11 @@ cc_json_helper_build_node (gchar *first_key,
gchar *
cc_json_helper_build_string (/* gboolean pretty_print, */
- gchar *first_key,
- ...)
+ gchar *first_key,
+ ...)
{
va_list var_args;
+
va_start (var_args, first_key);
JsonBuilder *builder = json_builder_new ();
@@ -143,8 +157,10 @@ gchar *
cc_json_helper_node_to_string (JsonNode *node)
{
JsonGenerator *gen = json_generator_new ();
+
json_generator_set_root (gen, node);
gchar *output = json_generator_to_data (gen, NULL);
+
g_object_unref (gen);
return g_steal_pointer (&output);
@@ -152,12 +168,14 @@ cc_json_helper_node_to_string (JsonNode *node)
CcReceivedMessageType
cc_json_helper_get_message_type (Cast__Channel__CastMessage *message,
- JsonReader *reader)
+ JsonReader *reader)
{
const gchar *message_type;
- g_autoptr (GError) error = NULL;
+
+ g_autoptr(GError) error = NULL;
gboolean typeExists = json_reader_read_member (reader, "type");
+
if (typeExists)
message_type = json_reader_get_string_value (reader);
else
@@ -175,26 +193,26 @@ cc_json_helper_get_message_type (Cast__Channel__CastMessage *message,
json_reader_end_member (reader);
cc_switch (message_type)
- {
- cc_case ("RECEIVER_STATUS")
- return CC_RWAIT_TYPE_RECEIVER_STATUS;
- cc_case ("GET_APP_AVAILABILITY")
- return CC_RWAIT_TYPE_GET_APP_AVAILABILITY;
- cc_case ("LAUNCH_ERROR")
- return CC_RWAIT_TYPE_LAUNCH_ERROR;
- cc_case ("ANSWER")
- return CC_RWAIT_TYPE_ANSWER;
- cc_case ("MEDIA_STATUS")
- return CC_RWAIT_TYPE_MEDIA_STATUS;
- cc_case ("PING")
- return CC_RWAIT_TYPE_PING;
- cc_case ("PONG")
- return CC_RWAIT_TYPE_PONG;
- cc_case ("CLOSE")
- return CC_RWAIT_TYPE_CLOSE;
- /* default */
- return CC_RWAIT_TYPE_UNKNOWN;
- } cc_end
+ {
+ cc_case ("RECEIVER_STATUS")
+ return CC_RWAIT_TYPE_RECEIVER_STATUS;
+ cc_case ("GET_APP_AVAILABILITY")
+ return CC_RWAIT_TYPE_GET_APP_AVAILABILITY;
+ cc_case ("LAUNCH_ERROR")
+ return CC_RWAIT_TYPE_LAUNCH_ERROR;
+ cc_case ("ANSWER")
+ return CC_RWAIT_TYPE_ANSWER;
+ cc_case ("MEDIA_STATUS")
+ return CC_RWAIT_TYPE_MEDIA_STATUS;
+ cc_case ("PING")
+ return CC_RWAIT_TYPE_PING;
+ cc_case ("PONG")
+ return CC_RWAIT_TYPE_PONG;
+ cc_case ("CLOSE")
+ return CC_RWAIT_TYPE_CLOSE;
+ /* default */
+ return CC_RWAIT_TYPE_UNKNOWN;
+ } cc_end
}
/* borked var reduces extra computation */
@@ -203,16 +221,17 @@ cc_json_helper_dump_message (Cast__Channel__CastMessage *message, gboolean borke
{
JsonNode *payload_utf8_node;
JsonParser *parser = json_parser_new ();
- g_autoptr (GError) error = NULL;
+
+ g_autoptr(GError) error = NULL;
if (borked || !json_parser_load_from_data (parser, message->payload_utf8, -1, &error))
{
g_warning ("CcJsonHelper: Error parsing received JSON payload: %s", error->message);
g_debug ("{ source_id: %s, destination_id: %s, namespace_: %s, payload_utf8: %s }",
- message->source_id,
- message->destination_id,
- message->namespace_,
- message->payload_utf8);
+ message->source_id,
+ message->destination_id,
+ message->namespace_,
+ message->payload_utf8);
return;
}
@@ -224,6 +243,6 @@ cc_json_helper_dump_message (Cast__Channel__CastMessage *message, gboolean borke
"namespace", CC_JSON_TYPE_STRING, message->namespace_,
"payload_utf8", CC_JSON_TYPE_OBJECT, payload_utf8_node,
NULL);
-
+
g_debug ("%s", output);
}
diff --git a/src/cc/cc-json-helper.h b/src/cc/cc-json-helper.h
index 354e318..f5fa351 100644
--- a/src/cc/cc-json-helper.h
+++ b/src/cc/cc-json-helper.h
@@ -25,8 +25,7 @@
G_BEGIN_DECLS
-typedef enum
-{
+typedef enum {
CC_JSON_TYPE_STRING,
CC_JSON_TYPE_INT,
CC_JSON_TYPE_DOUBLE,
@@ -45,11 +44,14 @@ typedef enum
/* G_GNUC_NULL_TERMINATED */
-JsonNode * cc_json_helper_build_node (gchar *first_key, ...);
-gchar * cc_json_helper_build_string (/* gboolean pretty_print, */ gchar *first_key, ...);
+JsonNode * cc_json_helper_build_node (gchar *first_key,
+ ...);
+gchar * cc_json_helper_build_string (/* gboolean pretty_print, */ gchar *first_key,
+ ...);
gchar * cc_json_helper_node_to_string (JsonNode *node);
CcReceivedMessageType cc_json_helper_get_message_type (Cast__Channel__CastMessage *message,
- JsonReader *json_reader);
-void cc_json_helper_dump_message (Cast__Channel__CastMessage *message, gboolean borked);
+ JsonReader *json_reader);
+void cc_json_helper_dump_message (Cast__Channel__CastMessage *message,
+ gboolean borked);
G_END_DECLS
diff --git a/src/nd-cc-sink.c b/src/nd-cc-sink.c
index 9c360c0..60a4429 100644
--- a/src/nd-cc-sink.c
+++ b/src/nd-cc-sink.c
@@ -323,6 +323,7 @@ CcCtrlClosure *
nd_cc_sink_get_callback_closure (NdCCSink *sink)
{
CcCtrlClosure *closure = (CcCtrlClosure *) g_malloc (sizeof (CcCtrlClosure));
+
closure->userdata = sink;
closure->start_stream = nd_cc_sink_start_webrtc_stream;
closure->end_stream = nd_cc_sink_error_in_ctrl;
@@ -342,7 +343,7 @@ nd_cc_sink_sink_start_stream (NdSink *sink)
g_assert (self->server == NULL);
/* self->state = ND_SINK_STATE_ENSURE_FIREWALL;
- g_object_notify (G_OBJECT (self), "state"); */
+ g_object_notify (G_OBJECT (self), "state"); */
self->state = ND_SINK_STATE_WAIT_SOCKET;
g_object_notify (G_OBJECT (self), "state");
@@ -399,13 +400,13 @@ nd_cc_sink_sink_start_stream (NdSink *sink)
G_CONNECT_SWAPPED);
/*
- self->state = ND_SINK_STATE_WAIT_SOCKET;
- g_object_notify (G_OBJECT (self), "state");
+ self->state = ND_SINK_STATE_WAIT_SOCKET;
+ g_object_notify (G_OBJECT (self), "state");
- these were originally here
- 1. send connect request
- 2. send ping
- */
+ these were originally here
+ 1. send connect request
+ 2. send ping
+ */
return g_object_ref (sink);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
