[gst-debugger] Re-format source so it follows GStreamer standards
- From: Marcin Kolny <mkolny src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gst-debugger] Re-format source so it follows GStreamer standards
- Date: Wed, 25 Oct 2017 21:51:49 +0000 (UTC)
commit 44b6ba80e5cd0c4eb5f675a9dba62e6b0077772f
Author: Marcin Kolny <marcin kolny gmail com>
Date: Wed Oct 25 22:08:46 2017 +0100
Re-format source so it follows GStreamer standards
src/common/gst-utils.c | 62 ++++---
src/common/gst-utils.h | 14 +-
src/common/protocol-utils.c | 23 ++-
src/common/protocol-utils.h | 9 +-
src/common/serializer.c | 107 +++++-----
src/common/serializer.h | 7 +-
src/debugserver/gstdebugserver.c | 333 ++++++++++++++++++------------
src/debugserver/gstdebugserver.h | 11 +-
src/debugserver/gstdebugserverbuffer.c | 77 +++++---
src/debugserver/gstdebugserverbuffer.h | 19 +-
src/debugserver/gstdebugserverhooks.c | 31 ++-
src/debugserver/gstdebugserverhooks.h | 18 +-
src/debugserver/gstdebugserverlog.c | 95 +++++----
src/debugserver/gstdebugserverlog.h | 21 +-
src/debugserver/gstdebugservermessage.c | 54 +++--
src/debugserver/gstdebugservermessage.h | 11 +-
src/debugserver/gstdebugserverqe.c | 86 +++++---
src/debugserver/gstdebugserverqe.h | 13 +-
src/debugserver/gstdebugservertcp.c | 77 ++++---
src/debugserver/gstdebugservertcp.h | 31 ++--
src/debugserver/gstdebugservertopology.c | 90 ++++++---
src/debugserver/gstdebugservertopology.h | 13 +-
src/debugserver/gstdebugservertypes.c | 89 +++++---
src/debugserver/gstdebugservertypes.h | 4 +-
24 files changed, 778 insertions(+), 517 deletions(-)
---
diff --git a/src/common/gst-utils.c b/src/common/gst-utils.c
index 4bb062d..178fc1b 100644
--- a/src/common/gst-utils.c
+++ b/src/common/gst-utils.c
@@ -3,27 +3,33 @@
#include <assert.h>
#include <string.h>
-static gpointer gst_unknown_type_copy (gpointer *object)
+static gpointer
+gst_unknown_type_copy (gpointer * object)
{
- return gst_unknown_type_new (((GstUnknownType*)object)->type_name);
+ return gst_unknown_type_new (((GstUnknownType *) object)->type_name);
}
-static void gst_unknown_type_free (gpointer *object)
+static void
+gst_unknown_type_free (gpointer * object)
{
- g_free (((GstUnknownType*)object)->type_name);
+ g_free (((GstUnknownType *) object)->type_name);
g_slice_free1 (sizeof (GstUnknownType), object);
}
-G_DEFINE_BOXED_TYPE (GstUnknownType, gst_unknown_type, (GBoxedCopyFunc)gst_unknown_type_copy,
(GBoxedFreeFunc)gst_unknown_type_free);
+G_DEFINE_BOXED_TYPE (GstUnknownType, gst_unknown_type,
+ (GBoxedCopyFunc) gst_unknown_type_copy,
+ (GBoxedFreeFunc) gst_unknown_type_free);
-GstUnknownType* gst_unknown_type_new (const gchar *type_name)
+GstUnknownType *
+gst_unknown_type_new (const gchar * type_name)
{
GstUnknownType *self = g_slice_new (GstUnknownType);
self->type_name = g_strdup (type_name);
return self;
}
-GstElement* gst_utils_get_element_from_path (GstElement * root, const gchar * path)
+GstElement *
+gst_utils_get_element_from_path (GstElement * root, const gchar * path)
{
if (root == NULL || path == NULL) {
return NULL;
@@ -35,10 +41,10 @@ GstElement* gst_utils_get_element_from_path (GstElement * root, const gchar * pa
return root;
}
- gchar ** element_names = g_strsplit (path, "/", -1);
+ gchar **element_names = g_strsplit (path, "/", -1);
gint i, size;
- GstElement * sp = root;
+ GstElement *sp = root;
for (size = 0; element_names && element_names[size]; size++);
@@ -54,13 +60,14 @@ GstElement* gst_utils_get_element_from_path (GstElement * root, const gchar * pa
}
}
- sp = gst_bin_get_by_name (GST_BIN (sp), element_names[size-1]);
+ sp = gst_bin_get_by_name (GST_BIN (sp), element_names[size - 1]);
g_strfreev (element_names);
return sp;
}
-GstPad* gst_utils_get_pad_from_path (GstElement * root, const gchar * pad_path)
+GstPad *
+gst_utils_get_pad_from_path (GstElement * root, const gchar * pad_path)
{
if (pad_path == NULL || strlen (pad_path) == 0) {
return NULL;
@@ -68,7 +75,7 @@ GstPad* gst_utils_get_pad_from_path (GstElement * root, const gchar * pad_path)
GstPad *pad = NULL;
gchar *tmp_path = g_strdup (pad_path);
- gchar *pad_name = strrchr(tmp_path, ':');
+ gchar *pad_name = strrchr (tmp_path, ':');
GstElement *parent_element = NULL;
if (pad_name == NULL) {
@@ -91,13 +98,15 @@ finalize:
return pad;
}
-gchar* gst_utils_get_object_path (GstObject *obj)
+gchar *
+gst_utils_get_object_path (GstObject * obj)
{
GString *path;
assert (obj != NULL);
- const gchar *init = gst_object_get_parent (obj) == NULL ? NULL : GST_OBJECT_NAME (obj);
+ const gchar *init =
+ gst_object_get_parent (obj) == NULL ? NULL : GST_OBJECT_NAME (obj);
path = g_string_new (init);
@@ -106,7 +115,7 @@ gchar* gst_utils_get_object_path (GstObject *obj)
} else if (GST_IS_ELEMENT (obj)) {
g_string_prepend_c (path, '/');
} else {
- assert (FALSE); // only GstElement and GstPad allowed
+ assert (FALSE); // only GstElement and GstPad allowed
}
obj = gst_object_get_parent (obj);
@@ -120,27 +129,29 @@ gchar* gst_utils_get_object_path (GstObject *obj)
return g_string_free (path, FALSE);
}
-gboolean gst_utils_check_pad_has_element_parent (GstPad * pad)
+gboolean
+gst_utils_check_pad_has_element_parent (GstPad * pad)
{
GstObject *obj = GST_OBJECT_PARENT (pad);
if (obj == NULL) {
return FALSE;
} else if (GST_IS_ELEMENT (obj)) {
return TRUE;
- } else if (GST_IS_PAD (obj)) { // internal pad
+ } else if (GST_IS_PAD (obj)) { // internal pad
obj = GST_OBJECT_PARENT (obj);
return obj != NULL && GST_IS_ELEMENT (obj);
}
return FALSE;
}
-GType gst_utils_get_virtual_enum_type (void)
+GType
+gst_utils_get_virtual_enum_type (void)
{
static gsize id = 0;
static const GEnumValue values[] = {
- { 0, "DUMMY_VALUE_NAME_BEGIN", "dummy nick name begin"},
- { INT_MAX, "DUMMY_VALUE_NAME_END", "dummy nick name end"},
- { 0, NULL, NULL }
+ {0, "DUMMY_VALUE_NAME_BEGIN", "dummy nick name begin"},
+ {INT_MAX, "DUMMY_VALUE_NAME_END", "dummy nick name end"},
+ {0, NULL, NULL}
};
if (g_once_init_enter (&id)) {
@@ -151,13 +162,14 @@ GType gst_utils_get_virtual_enum_type (void)
return (GType) id;
}
-GType gst_utils_get_virtual_flags_type (void)
+GType
+gst_utils_get_virtual_flags_type (void)
{
static gsize id = 0;
static const GFlagsValue values[] = {
- { 0, "DUMMY_VALUE_NAME_BEGIN", "dummy nick name begin"},
- { INT_MAX, "DUMMY_VALUE_NAME_END", "dummy nick name end"},
- { 0, NULL, NULL }
+ {0, "DUMMY_VALUE_NAME_BEGIN", "dummy nick name begin"},
+ {INT_MAX, "DUMMY_VALUE_NAME_END", "dummy nick name end"},
+ {0, NULL, NULL}
};
if (g_once_init_enter (&id)) {
diff --git a/src/common/gst-utils.h b/src/common/gst-utils.h
index d054fcd..7f35849 100644
--- a/src/common/gst-utils.h
+++ b/src/common/gst-utils.h
@@ -5,19 +5,21 @@
G_BEGIN_DECLS
-typedef struct {
+typedef struct
+{
gchar *type_name;
} GstUnknownType;
-GType gst_unknown_type_get_type(void);
+GType gst_unknown_type_get_type (void);
-GstUnknownType *gst_unknown_type_new (const gchar *type_name);
+GstUnknownType *gst_unknown_type_new (const gchar * type_name);
-GstElement* gst_utils_get_element_from_path (GstElement * root, const gchar * path);
+GstElement *gst_utils_get_element_from_path (GstElement * root,
+ const gchar * path);
-GstPad* gst_utils_get_pad_from_path (GstElement * root, const gchar * pad_path);
+GstPad *gst_utils_get_pad_from_path (GstElement * root, const gchar * pad_path);
-gchar* gst_utils_get_object_path (GstObject *obj);
+gchar *gst_utils_get_object_path (GstObject * obj);
gboolean gst_utils_check_pad_has_element_parent (GstPad * pad);
diff --git a/src/common/protocol-utils.c b/src/common/protocol-utils.c
index 3699926..c310aef 100644
--- a/src/common/protocol-utils.c
+++ b/src/common/protocol-utils.c
@@ -1,7 +1,8 @@
#include "protocol-utils.h"
void
-gst_debugger_protocol_utils_serialize_integer64 (gint64 value, gchar * buffer, gint size)
+gst_debugger_protocol_utils_serialize_integer64 (gint64 value, gchar * buffer,
+ gint size)
{
gint i;
for (i = 0; i < size; i++) {
@@ -11,24 +12,28 @@ gst_debugger_protocol_utils_serialize_integer64 (gint64 value, gchar * buffer, g
}
static gint64
-gst_debugger_protocol_utils_deserialize_integer64 (const gchar * buffer, gint size)
+gst_debugger_protocol_utils_deserialize_integer64 (const gchar * buffer,
+ gint size)
{
gint value = 0, i;
for (i = size - 1; i >= 0; i--) {
value *= 256;
- value += (unsigned char)buffer[i];
+ value += (unsigned char) buffer[i];
}
return value;
}
gboolean
-gst_debugger_protocol_utils_read_requested_size (GInputStream * istream, gint requested_size, gchar *
buffer, GCancellable *cancel)
+gst_debugger_protocol_utils_read_requested_size (GInputStream * istream,
+ gint requested_size, gchar * buffer, GCancellable * cancel)
{
gint size = 0;
gint cnt = 0;
while (size < requested_size) {
- if ((cnt = g_input_stream_read (istream, buffer + size, requested_size - size, cancel, NULL)) < 1) {
+ if ((cnt =
+ g_input_stream_read (istream, buffer + size, requested_size - size,
+ cancel, NULL)) < 1) {
return FALSE;
}
size += cnt;
@@ -38,18 +43,20 @@ gst_debugger_protocol_utils_read_requested_size (GInputStream * istream, gint re
}
gint
-gst_debugger_protocol_utils_read_header (GInputStream * istream, GCancellable *cancel)
+gst_debugger_protocol_utils_read_header (GInputStream * istream,
+ GCancellable * cancel)
{
gchar buffer[4];
- if (gst_debugger_protocol_utils_read_requested_size (istream, 4, buffer, cancel) == FALSE) {
+ if (gst_debugger_protocol_utils_read_requested_size (istream, 4, buffer,
+ cancel) == FALSE) {
return -1;
}
return gst_debugger_protocol_utils_deserialize_integer64 (buffer, 4);
}
-GError*
+GError *
gst_debugger_protocol_write_header (GOutputStream * ostream, gint64 value)
{
gchar size_buffer[4];
diff --git a/src/common/protocol-utils.h b/src/common/protocol-utils.h
index 133a22c..09cb255 100644
--- a/src/common/protocol-utils.h
+++ b/src/common/protocol-utils.h
@@ -12,11 +12,14 @@
G_BEGIN_DECLS
-gboolean gst_debugger_protocol_utils_read_requested_size (GInputStream * istream, gint requested_size, gchar
* buffer, GCancellable *cancel);
+gboolean gst_debugger_protocol_utils_read_requested_size (GInputStream *
+ istream, gint requested_size, gchar * buffer, GCancellable * cancel);
-gint gst_debugger_protocol_utils_read_header (GInputStream * istream, GCancellable *cancel);
+gint gst_debugger_protocol_utils_read_header (GInputStream * istream,
+ GCancellable * cancel);
-GError* gst_debugger_protocol_write_header (GOutputStream * ostream, gint64 value);
+GError *gst_debugger_protocol_write_header (GOutputStream * ostream,
+ gint64 value);
G_END_DECLS
diff --git a/src/common/serializer.c b/src/common/serializer.c
index 3793f26..a2dda78 100644
--- a/src/common/serializer.c
+++ b/src/common/serializer.c
@@ -9,17 +9,19 @@
#include <stdio.h>
#include "gst-utils.h"
-gchar * g_value_serialize (GValue * value, GType * type, InternalGType * internal_type)
+gchar *
+g_value_serialize (GValue * value, GType * type, InternalGType * internal_type)
{
GValue tmp = G_VALUE_INIT;
- if (G_TYPE_IS_FUNDAMENTAL (value->g_type) && value->g_type < G_TYPE_RESERVED_USER_FIRST) {
+ if (G_TYPE_IS_FUNDAMENTAL (value->g_type)
+ && value->g_type < G_TYPE_RESERVED_USER_FIRST) {
*type = value->g_type;
*internal_type = INTERNAL_GTYPE_FUNDAMENTAL;
return gst_value_serialize (value);
- } else if (G_TYPE_IS_ENUM(value->g_type) || G_TYPE_IS_FLAGS (value->g_type)) {
+ } else if (G_TYPE_IS_ENUM (value->g_type) || G_TYPE_IS_FLAGS (value->g_type)) {
gint val;
- g_value_init(&tmp, G_TYPE_INT);
+ g_value_init (&tmp, G_TYPE_INT);
*type = G_TYPE_INT;
if (G_TYPE_IS_FLAGS (value->g_type)) {
val = g_value_get_flags (value);
@@ -28,14 +30,14 @@ gchar * g_value_serialize (GValue * value, GType * type, InternalGType * interna
val = g_value_get_enum (value);
*internal_type = INTERNAL_GTYPE_ENUM;
}
- g_value_set_int(&tmp, val);
+ g_value_set_int (&tmp, val);
} else if (value->g_type == GST_TYPE_CAPS) {
- g_value_init(&tmp, G_TYPE_STRING);
+ g_value_init (&tmp, G_TYPE_STRING);
*type = G_TYPE_STRING;
g_value_set_string (&tmp, gst_caps_to_string (gst_value_get_caps (value)));
*internal_type = INTERNAL_GTYPE_CAPS;
} else if (value->g_type == GST_TYPE_OBJECT) {
- g_value_init(&tmp, G_TYPE_STRING);
+ g_value_init (&tmp, G_TYPE_STRING);
gchar buffer[128];
GstObject *obj = g_value_get_object (value);
gchar *name;
@@ -49,7 +51,7 @@ gchar * g_value_serialize (GValue * value, GType * type, InternalGType * interna
g_value_set_string (&tmp, g_strdup (buffer));
*internal_type = INTERNAL_GTYPE_GST_OBJECT;
} else {
- g_value_init(&tmp, G_TYPE_STRING);
+ g_value_init (&tmp, G_TYPE_STRING);
gchar buffer[128];
snprintf (buffer, 128, "%s", g_type_name (value->g_type));
*type = G_TYPE_STRING;
@@ -61,58 +63,59 @@ gchar * g_value_serialize (GValue * value, GType * type, InternalGType * interna
}
-void g_value_deserialize (GValue * value, GType type, InternalGType internal_type,
- const gchar * data, gint len)
+void
+g_value_deserialize (GValue * value, GType type, InternalGType internal_type,
+ const gchar * data, gint len)
{
// I don't use string for Value::data field, because serializer implementation
// might change in the future (I don't break the API then).
gchar *t_data = g_strndup (data, len);
switch (internal_type) {
- case INTERNAL_GTYPE_ENUM:
- case INTERNAL_GTYPE_FLAGS:
- {
- GValue tmp = G_VALUE_INIT;
- g_value_init (&tmp, type);
- gst_value_deserialize (&tmp, t_data);
- if (internal_type == INTERNAL_GTYPE_ENUM) {
- g_value_init(value, gst_utils_get_virtual_enum_type ());
- g_value_set_enum (value, g_value_get_int (&tmp));
- } else {
- g_value_init(value, gst_utils_get_virtual_flags_type ());
- g_value_set_flags (value, g_value_get_int (&tmp));
+ case INTERNAL_GTYPE_ENUM:
+ case INTERNAL_GTYPE_FLAGS:
+ {
+ GValue tmp = G_VALUE_INIT;
+ g_value_init (&tmp, type);
+ gst_value_deserialize (&tmp, t_data);
+ if (internal_type == INTERNAL_GTYPE_ENUM) {
+ g_value_init (value, gst_utils_get_virtual_enum_type ());
+ g_value_set_enum (value, g_value_get_int (&tmp));
+ } else {
+ g_value_init (value, gst_utils_get_virtual_flags_type ());
+ g_value_set_flags (value, g_value_get_int (&tmp));
+ }
+ g_value_unset (&tmp);
+ break;
}
- g_value_unset (&tmp);
- break;
- }
- case INTERNAL_GTYPE_GST_OBJECT: // and with pointers
- case INTERNAL_GTYPE_FUNDAMENTAL:
- g_value_init (value, type);
- gst_value_deserialize (value, t_data);
- break;
- case INTERNAL_GTYPE_UNKNOWN:
- {
- GValue tmp = G_VALUE_INIT;
- g_value_init (&tmp, G_TYPE_STRING);
- gst_value_deserialize (&tmp, t_data);
- g_value_init (value, gst_unknown_type_get_type ());
- g_value_take_boxed (value, gst_unknown_type_new (g_value_get_string (&tmp)));
- g_value_unset (&tmp);
+ case INTERNAL_GTYPE_GST_OBJECT: // and with pointers
+ case INTERNAL_GTYPE_FUNDAMENTAL:
+ g_value_init (value, type);
+ gst_value_deserialize (value, t_data);
+ break;
+ case INTERNAL_GTYPE_UNKNOWN:
+ {
+ GValue tmp = G_VALUE_INIT;
+ g_value_init (&tmp, G_TYPE_STRING);
+ gst_value_deserialize (&tmp, t_data);
+ g_value_init (value, gst_unknown_type_get_type ());
+ g_value_take_boxed (value,
+ gst_unknown_type_new (g_value_get_string (&tmp)));
+ g_value_unset (&tmp);
- break;
- }
- case INTERNAL_GTYPE_CAPS:
- {
- GstCaps *caps;
- g_value_init (value, G_TYPE_STRING);
- gst_value_deserialize (value, t_data);
- caps = gst_caps_from_string (g_value_get_string (value));
- g_value_unset (value);
- g_value_init (value, GST_TYPE_CAPS);
- gst_value_set_caps (value, caps);
- break;
- }
+ break;
+ }
+ case INTERNAL_GTYPE_CAPS:
+ {
+ GstCaps *caps;
+ g_value_init (value, G_TYPE_STRING);
+ gst_value_deserialize (value, t_data);
+ caps = gst_caps_from_string (g_value_get_string (value));
+ g_value_unset (value);
+ g_value_init (value, GST_TYPE_CAPS);
+ gst_value_set_caps (value, caps);
+ break;
+ }
}
g_free (t_data);
}
-
diff --git a/src/common/serializer.h b/src/common/serializer.h
index 982c06e..0873279 100644
--- a/src/common/serializer.h
+++ b/src/common/serializer.h
@@ -14,10 +14,11 @@
G_BEGIN_DECLS
-gchar * g_value_serialize (GValue * value, GType * type, InternalGType * internal_type);
+gchar * g_value_serialize (GValue * value, GType * type,
+ InternalGType * internal_type);
-void g_value_deserialize (GValue * value, GType type, InternalGType internal_type,
- const gchar * data, gint len);
+void g_value_deserialize (GValue * value, GType type,
+ InternalGType internal_type, const gchar * data, gint len);
G_END_DECLS
diff --git a/src/debugserver/gstdebugserver.c b/src/debugserver/gstdebugserver.c
index 199fd36..1ba9db9 100644
--- a/src/debugserver/gstdebugserver.c
+++ b/src/debugserver/gstdebugserver.c
@@ -42,38 +42,42 @@
GST_DEBUG_CATEGORY_STATIC (gst_debugserver_debug);
#define GST_CAT_DEFAULT gst_debugserver_debug
+
#define _do_init \
GST_DEBUG_CATEGORY_INIT (gst_debugserver_debug, "debugserver", 0, "debugserver tracer");
+
#define gst_debugserver_tracer_parent_class parent_class
+
G_DEFINE_TYPE_WITH_CODE (GstDebugserverTracer, gst_debugserver_tracer,
GST_TYPE_TRACER, _do_init)
#define DEFAULT_PORT 8080
#define DEFAULT_MAX_CONNECTIONS 10
-static void gst_debugserver_command_handler (GstDebugger__Command * command,
- gpointer debugtracer, TcpClient * client);
+static void gst_debugserver_command_handler (GstDebugger__Command *
+ command, gpointer debugtracer, TcpClient * client);
static void gst_debugserver_tracer_finalize (GObject * obj);
static void
-gst_debugserver_log_handler (GstDebugCategory *category, GstDebugLevel level,
- const gchar *file, const gchar *function, gint line, GObject *object,
- GstDebugMessage *message, gpointer user_data) G_GNUC_NO_INSTRUMENT;
+gst_debugserver_log_handler (GstDebugCategory * category,
+ GstDebugLevel level, const gchar * file, const gchar * function, gint line,
+ GObject * object, GstDebugMessage * message,
+ gpointer user_data) G_GNUC_NO_INSTRUMENT;
static void
-gst_debugserver_log_handler (GstDebugCategory *category, GstDebugLevel level,
- const gchar *file, const gchar *function, gint line, GObject *object,
- GstDebugMessage *message, gpointer user_data)
+gst_debugserver_log_handler (GstDebugCategory * category,
+ GstDebugLevel level, const gchar * file, const gchar * function, gint line,
+ GObject * object, GstDebugMessage * message, gpointer user_data)
{
GstDebugserverTracer *tracer = GST_DEBUGSERVER_TRACER (user_data);
- gst_debugserver_log_send_log (tracer->log, tracer->tcp_server, category, level,
- file, function, line, object, message);
+ gst_debugserver_log_send_log (tracer->log, tracer->tcp_server, category,
+ level, file, function, line, object, message);
}
static void
-set_params (GstDebugserverTracer *self)
+set_params (GstDebugserverTracer * self)
{
gchar *params = NULL, *tmp;
GstStructure *params_struct;
@@ -92,7 +96,8 @@ set_params (GstDebugserverTracer *self)
if (!gst_structure_get_int (params_struct, "port", &self->port)) {
self->port = DEFAULT_PORT;
}
- if (!gst_structure_get_int (params_struct, "max_connections", &self->max_connections)) {
+ if (!gst_structure_get_int (params_struct, "max_connections",
+ &self->max_connections)) {
self->max_connections = DEFAULT_MAX_CONNECTIONS;
}
gst_structure_free (params_struct);
@@ -108,7 +113,8 @@ gst_debugserver_tracer_constructed (GObject * object)
set_params (self);
- gst_debugserver_tcp_start_server (self->tcp_server, self->port, self->max_connections);
+ gst_debugserver_tcp_start_server (self->tcp_server, self->port,
+ self->max_connections);
}
static void
@@ -116,7 +122,8 @@ message_broadcaster (GstBus * bus, GstMessage * message, gpointer user_data)
{
GstDebugserverTracer *self = GST_DEBUGSERVER_TRACER (user_data);
- gst_debugserver_message_send_message (self->message, self->tcp_server, message);
+ gst_debugserver_message_send_message (self->message, self->tcp_server,
+ message);
}
static void
@@ -128,50 +135,63 @@ do_element_new (GstTracer * self, guint64 ts, GstElement * element)
debugserver->pipeline = GST_PIPELINE (element);
bus = gst_pipeline_get_bus (debugserver->pipeline);
gst_bus_add_signal_watch (bus);
- g_signal_connect (bus, "message", G_CALLBACK (message_broadcaster), debugserver);
+ g_signal_connect (bus, "message", G_CALLBACK (message_broadcaster),
+ debugserver);
}
}
static void
-do_pad_unlink_post (GstTracer * self, guint64 ts, GstPad * src, GstPad * sink, gboolean result)
+do_pad_unlink_post (GstTracer * self, guint64 ts, GstPad * src, GstPad * sink,
+ gboolean result)
{
if (result == TRUE) {
- gst_debugserver_topology_send_pad_link (src, sink, FALSE, GST_DEBUGSERVER_TRACER (self)->tcp_server,
NULL);
+ gst_debugserver_topology_send_pad_link (src, sink, FALSE,
+ GST_DEBUGSERVER_TRACER (self)->tcp_server, NULL);
}
}
static void
-do_pad_link_post (GstTracer * self, guint64 ts, GstPad * src, GstPad * sink, GstPadLinkReturn result)
+do_pad_link_post (GstTracer * self, guint64 ts, GstPad * src, GstPad * sink,
+ GstPadLinkReturn result)
{
if (result == TRUE) {
- gst_debugserver_topology_send_pad_link (src, sink, TRUE, GST_DEBUGSERVER_TRACER (self)->tcp_server,
NULL);
+ gst_debugserver_topology_send_pad_link (src, sink, TRUE,
+ GST_DEBUGSERVER_TRACER (self)->tcp_server, NULL);
}
}
static void
-do_bin_add_post (GstTracer * self, gint64 ts, GstBin * bin, GstElement * element, gboolean result)
+do_bin_add_post (GstTracer * self, gint64 ts, GstBin * bin,
+ GstElement * element, gboolean result)
{
if (result == TRUE) {
- gst_debugserver_topology_send_element_in_bin (bin, element, TRUE, GST_DEBUGSERVER_TRACER
(self)->tcp_server, NULL);
+ gst_debugserver_topology_send_element_in_bin (bin, element, TRUE,
+ GST_DEBUGSERVER_TRACER (self)->tcp_server, NULL);
}
}
static void
-do_bin_remove_pre (GstTracer * self, gint64 ts, GstBin * bin, GstElement * element)
+do_bin_remove_pre (GstTracer * self, gint64 ts, GstBin * bin,
+ GstElement * element)
{
- gst_debugserver_topology_send_element_in_bin (bin, element, FALSE, GST_DEBUGSERVER_TRACER
(self)->tcp_server, NULL);
+ gst_debugserver_topology_send_element_in_bin (bin, element, FALSE,
+ GST_DEBUGSERVER_TRACER (self)->tcp_server, NULL);
}
static void
-do_element_add_pad (GstTracer * self, gint64 ts, GstElement * element, GstPad * pad)
+do_element_add_pad (GstTracer * self, gint64 ts, GstElement * element,
+ GstPad * pad)
{
- gst_debugserver_topology_send_pad_in_element (element, pad, TRUE, GST_DEBUGSERVER_TRACER
(self)->tcp_server, NULL);
+ gst_debugserver_topology_send_pad_in_element (element, pad, TRUE,
+ GST_DEBUGSERVER_TRACER (self)->tcp_server, NULL);
}
static void
-do_element_remove_pad (GstTracer * self, gint64 ts, GstElement * element, GstPad * pad)
+do_element_remove_pad (GstTracer * self, gint64 ts, GstElement * element,
+ GstPad * pad)
{
- gst_debugserver_topology_send_pad_in_element (element, pad, FALSE, GST_DEBUGSERVER_TRACER
(self)->tcp_server, NULL);
+ gst_debugserver_topology_send_pad_in_element (element, pad, FALSE,
+ GST_DEBUGSERVER_TRACER (self)->tcp_server, NULL);
}
static void
@@ -179,15 +199,18 @@ do_push_event_pre (GstTracer * self, guint64 ts, GstPad * pad, GstEvent * event)
{
GstDebugserverTracer *tracer = GST_DEBUGSERVER_TRACER (self);
- gst_debugserver_qe_send_qe (tracer->event, tracer->tcp_server, pad, GST_MINI_OBJECT_CAST (event));
+ gst_debugserver_qe_send_qe (tracer->event, tracer->tcp_server, pad,
+ GST_MINI_OBJECT_CAST (event));
}
static void
-do_pad_query_post (GstTracer * self, guint64 ts, GstPad * pad, GstQuery * query, gboolean result)
+do_pad_query_post (GstTracer * self, guint64 ts, GstPad * pad, GstQuery * query,
+ gboolean result)
{
GstDebugserverTracer *tracer = GST_DEBUGSERVER_TRACER (self);
- gst_debugserver_qe_send_qe (tracer->query, tracer->tcp_server, pad, GST_MINI_OBJECT_CAST (query));
+ gst_debugserver_qe_send_qe (tracer->query, tracer->tcp_server, pad,
+ GST_MINI_OBJECT_CAST (query));
}
static void
@@ -195,12 +218,14 @@ do_pad_push_pre (GstTracer * self, guint64 ts, GstPad * pad, GstBuffer * buffer)
{
GstDebugserverTracer *tracer = GST_DEBUGSERVER_TRACER (self);
- gst_debugserver_buffer_send_buffer (tracer->buffer, tracer->tcp_server, pad, buffer);
+ gst_debugserver_buffer_send_buffer (tracer->buffer, tracer->tcp_server, pad,
+ buffer);
}
static void
-gst_debugserver_tracer_client_disconnected (TcpClient * client, gpointer user_data)
+gst_debugserver_tracer_client_disconnected (TcpClient * client,
+ gpointer user_data)
{
GstDebugserverTracer *self = GST_DEBUGSERVER_TRACER (user_data);
@@ -222,7 +247,8 @@ gst_debugserver_tracer_class_init (GstDebugserverTracerClass * klass)
}
static void
-gst_debugserver_tracer_send_property (GstDebugserverTcp * tcp_server, TcpClient * client, GParamSpec * spec,
GstElement * element)
+gst_debugserver_tracer_send_property (GstDebugserverTcp * tcp_server,
+ TcpClient * client, GParamSpec * spec, GstElement * element)
{
GstDebugger__GStreamerData gst_data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
GstDebugger__PropertyValue property = GST_DEBUGGER__PROPERTY_VALUE__INIT;
@@ -237,18 +263,19 @@ gst_debugserver_tracer_send_property (GstDebugserverTcp * tcp_server, TcpClient
return;
}
- property.name = (gchar*) g_param_spec_get_name (spec);
- property.object = (gchar*) object;
+ property.name = (gchar *) g_param_spec_get_name (spec);
+ property.object = (gchar *) object;
g_value_init (&gvalue, spec->value_type);
- g_object_get_property (G_OBJECT (element), g_param_spec_get_name (spec), &gvalue);
+ g_object_get_property (G_OBJECT (element), g_param_spec_get_name (spec),
+ &gvalue);
serialized_data = g_value_serialize (&gvalue, &out_gtype, &out_internal_type);
- value.data.data = (guchar*) serialized_data;
+ value.data.data = (guchar *) serialized_data;
value.data.len = serialized_data == NULL ? 0 : strlen (serialized_data);
value.gtype = out_gtype;
- value.type_name = (gchar*) g_type_name (spec->value_type);
+ value.type_name = (gchar *) g_type_name (spec->value_type);
if (out_gtype != spec->value_type) {
value.internal_type = out_internal_type;
@@ -259,7 +286,8 @@ gst_debugserver_tracer_send_property (GstDebugserverTcp * tcp_server, TcpClient
property.value = &value;
gst_data.property_value = &property;
- gst_data.info_type_case = GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_PROPERTY_VALUE;
+ gst_data.info_type_case =
+ GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_PROPERTY_VALUE;
gst_debugserver_tcp_send_packet (tcp_server, client, &gst_data);
@@ -281,7 +309,8 @@ gst_debugserver_tracer_init (GstDebugserverTracer * self)
self->tcp_server = gst_debugserver_tcp_new ();
self->tcp_server->command_handler = gst_debugserver_command_handler;
- self->tcp_server->client_disconnected_handler = gst_debugserver_tracer_client_disconnected;
+ self->tcp_server->client_disconnected_handler =
+ gst_debugserver_tracer_client_disconnected;
self->tcp_server->owner = self;
self->message = gst_debugserver_message_new ();
@@ -329,52 +358,67 @@ gst_debugserver_tracer_finalize (GObject * obj)
gst_debugserver_buffer_free (self->buffer);
}
-static gboolean gst_debugserver_process_hook_request (GstDebugserverTracer * self, GstDebugger__HookRequest
* request, TcpClient * client)
+static gboolean
+gst_debugserver_process_hook_request (GstDebugserverTracer * self,
+ GstDebugger__HookRequest * request, TcpClient * client)
{
gboolean add_hook = request->action == GST_DEBUGGER__ACTION__ADD;
switch (request->hook_type_case) {
- case GST_DEBUGGER__HOOK_REQUEST__HOOK_TYPE_PAD_HOOK:
- {
- GstDebugger__PadHookRequest *pad_request = request->pad_hook;
- GstPad *pad = gst_utils_get_pad_from_path (GST_ELEMENT_CAST (self->pipeline), pad_request->pad);
-
- switch (pad_request->pad_hook_type_case)
+ case GST_DEBUGGER__HOOK_REQUEST__HOOK_TYPE_PAD_HOOK:
{
- case GST_DEBUGGER__PAD_HOOK_REQUEST__PAD_HOOK_TYPE_EVENT:
- return gst_debugserver_qe_set_hook (self->event, add_hook, pad_request->event->type, pad,
pad_request->pad, client);
- case GST_DEBUGGER__PAD_HOOK_REQUEST__PAD_HOOK_TYPE_QUERY:
- return gst_debugserver_qe_set_hook (self->query, add_hook, pad_request->query->type, pad,
pad_request->pad, client);
- case GST_DEBUGGER__PAD_HOOK_REQUEST__PAD_HOOK_TYPE_BUFFER:
- return gst_debugserver_buffer_set_hook (self->buffer, add_hook, pad_request->buffer->send_data, pad,
- pad_request->pad, client);
- default:
- break;
+ GstDebugger__PadHookRequest *pad_request = request->pad_hook;
+ GstPad *pad =
+ gst_utils_get_pad_from_path (GST_ELEMENT_CAST (self->pipeline),
+ pad_request->pad);
+
+ switch (pad_request->pad_hook_type_case) {
+ case GST_DEBUGGER__PAD_HOOK_REQUEST__PAD_HOOK_TYPE_EVENT:
+ return gst_debugserver_qe_set_hook (self->event, add_hook,
+ pad_request->event->type, pad, pad_request->pad, client);
+ case GST_DEBUGGER__PAD_HOOK_REQUEST__PAD_HOOK_TYPE_QUERY:
+ return gst_debugserver_qe_set_hook (self->query, add_hook,
+ pad_request->query->type, pad, pad_request->pad, client);
+ case GST_DEBUGGER__PAD_HOOK_REQUEST__PAD_HOOK_TYPE_BUFFER:
+ return gst_debugserver_buffer_set_hook (self->buffer, add_hook,
+ pad_request->buffer->send_data, pad, pad_request->pad, client);
+ default:
+ break;
+ }
+ return FALSE;
}
- return FALSE;
- }
- case GST_DEBUGGER__HOOK_REQUEST__HOOK_TYPE_MESSAGE:
- return gst_debugserver_message_set_hook (self->message, client, add_hook, request->message);
+ case GST_DEBUGGER__HOOK_REQUEST__HOOK_TYPE_MESSAGE:
+ return gst_debugserver_message_set_hook (self->message, client, add_hook,
+ request->message);
- case GST_DEBUGGER__HOOK_REQUEST__HOOK_TYPE_LOG:
- return gst_debugserver_log_set_hook (self->log, add_hook, request->log->level, request->log->category,
client);
+ case GST_DEBUGGER__HOOK_REQUEST__HOOK_TYPE_LOG:
+ return gst_debugserver_log_set_hook (self->log, add_hook,
+ request->log->level, request->log->category, client);
- default:
- return FALSE;
+ default:
+ return FALSE;
}
}
-static void gst_debugserver_send_single_property (GstDebugserverTracer * self, TcpClient * client,
GstElement * element, const gchar * name)
+static void
+gst_debugserver_send_single_property (GstDebugserverTracer * self,
+ TcpClient * client, GstElement * element, const gchar * name)
{
- GParamSpec *spec = g_object_class_find_property (G_OBJECT_CLASS (GST_ELEMENT_GET_CLASS (element)), name);
+ GParamSpec *spec =
+ g_object_class_find_property (G_OBJECT_CLASS (GST_ELEMENT_GET_CLASS
+ (element)), name);
- gst_debugserver_tracer_send_property (self->tcp_server, client, spec, element);
+ gst_debugserver_tracer_send_property (self->tcp_server, client, spec,
+ element);
}
-static void gst_debugserver_process_property_request (GstDebugserverTracer * self, TcpClient * client,
- GstDebugger__PropertyRequest * request)
+static void
+gst_debugserver_process_property_request (GstDebugserverTracer * self,
+ TcpClient * client, GstDebugger__PropertyRequest * request)
{
- GstElement * element = gst_utils_get_element_from_path (GST_ELEMENT_CAST (self->pipeline),
request->object);
+ GstElement *element =
+ gst_utils_get_element_from_path (GST_ELEMENT_CAST (self->pipeline),
+ request->object);
guint n_properties, i;
GParamSpec **spec;
@@ -383,89 +427,106 @@ static void gst_debugserver_process_property_request (GstDebugserverTracer * sel
}
if (request->name == NULL || request->name[0] == '\0') {
- spec = g_object_class_list_properties (G_OBJECT_CLASS (GST_ELEMENT_GET_CLASS (element)), &n_properties);
+ spec =
+ g_object_class_list_properties (G_OBJECT_CLASS (GST_ELEMENT_GET_CLASS
+ (element)), &n_properties);
for (i = 0; i < n_properties; i++) {
- gst_debugserver_send_single_property (self, client, element, spec[i]->name);
+ gst_debugserver_send_single_property (self, client, element,
+ spec[i]->name);
}
} else {
gst_debugserver_send_single_property (self, client, element, request->name);
}
}
-static void gst_debugserver_command_handler (GstDebugger__Command * command,
+static void
+gst_debugserver_command_handler (GstDebugger__Command * command,
gpointer debugtracer, TcpClient * client)
{
GstDebugserverTracer *self = GST_DEBUGSERVER_TRACER (debugtracer);
- GstDebugserverTcp * tcp = self->tcp_server;
+ GstDebugserverTcp *tcp = self->tcp_server;
switch (command->command_type_case) {
- case GST_DEBUGGER__COMMAND__COMMAND_TYPE_TYPE_DESCRIPTION:
- gst_debugserver_types_send_type (tcp, client, command->type_description);
- break;
- case GST_DEBUGGER__COMMAND__COMMAND_TYPE_DEBUG_CATEGORIES_LIST:
- gst_debugserver_log_send_debug_categories (tcp, client);
- break;
- case GST_DEBUGGER__COMMAND__COMMAND_TYPE_LOG_THRESHOLD:
- gst_debugserver_log_set_threshold (command->log_threshold);
- break;
- case GST_DEBUGGER__COMMAND__COMMAND_TYPE_HOOK_REQUEST:
- {
- if (gst_debugserver_process_hook_request (self, command->hook_request, client)) {
- GstDebugger__GStreamerData data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
- data.confirmation = command;
- data.info_type_case = GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_CONFIRMATION;
- gst_debugserver_tcp_send_packet (self->tcp_server, client, &data);
- }
- break;
- }
- case GST_DEBUGGER__COMMAND__COMMAND_TYPE_ENTIRE_TOPOLOGY:
- gst_debugserver_topology_send_entire_topology (GST_BIN_CAST (self->pipeline), self->tcp_server, client);
- break;
- case GST_DEBUGGER__COMMAND__COMMAND_TYPE_PROPERTY:
- gst_debugserver_process_property_request (self, client, command->property);
- break;
- case GST_DEBUGGER__COMMAND__COMMAND_TYPE_PROPERTY_SET:
- {
- GValue val = G_VALUE_INIT;
- GstElement *element = gst_utils_get_element_from_path (GST_ELEMENT_CAST (self->pipeline),
command->property_set->object);
- g_value_deserialize (&val, command->property_set->value->gtype,
command->property_set->value->internal_type,
- (gchar*) command->property_set->value->data.data, command->property_set->value->data.len);
- g_object_set_property (G_OBJECT (element), command->property_set->name, &val);
- g_value_unset (&val);
- break;
- }
- case GST_DEBUGGER__COMMAND__COMMAND_TYPE_PAD_DYNAMIC_INFO:
- {
- GstDebugger__GStreamerData data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
- GstDebugger__PadDynamicInfo pad_info = GST_DEBUGGER__PAD_DYNAMIC_INFO__INIT;
- GstPad *pad = gst_utils_get_pad_from_path (GST_ELEMENT_CAST (self->pipeline), command->pad_dynamic_info);
- if (pad == NULL) {
+ case GST_DEBUGGER__COMMAND__COMMAND_TYPE_TYPE_DESCRIPTION:
+ gst_debugserver_types_send_type (tcp, client, command->type_description);
+ break;
+ case GST_DEBUGGER__COMMAND__COMMAND_TYPE_DEBUG_CATEGORIES_LIST:
+ gst_debugserver_log_send_debug_categories (tcp, client);
+ break;
+ case GST_DEBUGGER__COMMAND__COMMAND_TYPE_LOG_THRESHOLD:
+ gst_debugserver_log_set_threshold (command->log_threshold);
+ break;
+ case GST_DEBUGGER__COMMAND__COMMAND_TYPE_HOOK_REQUEST:
+ {
+ if (gst_debugserver_process_hook_request (self, command->hook_request,
+ client)) {
+ GstDebugger__GStreamerData data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
+ data.confirmation = command;
+ data.info_type_case =
+ GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_CONFIRMATION;
+ gst_debugserver_tcp_send_packet (self->tcp_server, client, &data);
+ }
break;
}
- GstCaps *allowed_caps = gst_pad_get_allowed_caps (pad);
- GstCaps *current_caps = gst_pad_get_current_caps (pad);
- gchar *allowed_caps_str = gst_caps_to_string (allowed_caps);
- gchar *current_caps_str = gst_caps_to_string (current_caps);
- pad_info.pad = command->pad_dynamic_info;
- pad_info.allowed_caps = allowed_caps_str;
- pad_info.current_caps = current_caps_str;
- data.info_type_case = GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_PAD_DYNAMIC_INFO;
- data.pad_dynamic_info = &pad_info;
-
- gst_debugserver_tcp_send_packet (self->tcp_server, client, &data);
-
- g_free (allowed_caps_str);
- g_free (current_caps_str);
-
- if (current_caps) {
- gst_caps_unref (current_caps);
+ case GST_DEBUGGER__COMMAND__COMMAND_TYPE_ENTIRE_TOPOLOGY:
+ gst_debugserver_topology_send_entire_topology (GST_BIN_CAST
+ (self->pipeline), self->tcp_server, client);
+ break;
+ case GST_DEBUGGER__COMMAND__COMMAND_TYPE_PROPERTY:
+ gst_debugserver_process_property_request (self, client,
+ command->property);
+ break;
+ case GST_DEBUGGER__COMMAND__COMMAND_TYPE_PROPERTY_SET:
+ {
+ GValue val = G_VALUE_INIT;
+ GstElement *element =
+ gst_utils_get_element_from_path (GST_ELEMENT_CAST (self->pipeline),
+ command->property_set->object);
+ g_value_deserialize (&val, command->property_set->value->gtype,
+ command->property_set->value->internal_type,
+ (gchar *) command->property_set->value->data.data,
+ command->property_set->value->data.len);
+ g_object_set_property (G_OBJECT (element), command->property_set->name,
+ &val);
+ g_value_unset (&val);
+ break;
}
- if (allowed_caps) {
- gst_caps_unref (allowed_caps);
+ case GST_DEBUGGER__COMMAND__COMMAND_TYPE_PAD_DYNAMIC_INFO:
+ {
+ GstDebugger__GStreamerData data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
+ GstDebugger__PadDynamicInfo pad_info =
+ GST_DEBUGGER__PAD_DYNAMIC_INFO__INIT;
+ GstPad *pad =
+ gst_utils_get_pad_from_path (GST_ELEMENT_CAST (self->pipeline),
+ command->pad_dynamic_info);
+ if (pad == NULL) {
+ break;
+ }
+ GstCaps *allowed_caps = gst_pad_get_allowed_caps (pad);
+ GstCaps *current_caps = gst_pad_get_current_caps (pad);
+ gchar *allowed_caps_str = gst_caps_to_string (allowed_caps);
+ gchar *current_caps_str = gst_caps_to_string (current_caps);
+ pad_info.pad = command->pad_dynamic_info;
+ pad_info.allowed_caps = allowed_caps_str;
+ pad_info.current_caps = current_caps_str;
+ data.info_type_case =
+ GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_PAD_DYNAMIC_INFO;
+ data.pad_dynamic_info = &pad_info;
+
+ gst_debugserver_tcp_send_packet (self->tcp_server, client, &data);
+
+ g_free (allowed_caps_str);
+ g_free (current_caps_str);
+
+ if (current_caps) {
+ gst_caps_unref (current_caps);
+ }
+ if (allowed_caps) {
+ gst_caps_unref (allowed_caps);
+ }
}
- }
- case GST_DEBUGGER__COMMAND__COMMAND_TYPE__NOT_SET:
+ case GST_DEBUGGER__COMMAND__COMMAND_TYPE__NOT_SET:
// TODO: error
break;
}
diff --git a/src/debugserver/gstdebugserver.h b/src/debugserver/gstdebugserver.h
index 31e3169..615c2fe 100644
--- a/src/debugserver/gstdebugserver.h
+++ b/src/debugserver/gstdebugserver.h
@@ -41,12 +41,14 @@ G_BEGIN_DECLS
*
* Opaque #GstDebugserverTracer data structure
*/
-G_DECLARE_FINAL_TYPE(GstDebugserverTracer, gst_debugserver_tracer, GST, DEBUGSERVER_TRACER, GstTracer)
+G_DECLARE_FINAL_TYPE (GstDebugserverTracer, gst_debugserver_tracer, GST,
+ DEBUGSERVER_TRACER, GstTracer)
-struct _GstDebugserverTracer {
- GstTracer parent;
+struct _GstDebugserverTracer
+{
+ GstTracer parent;
- /*< private >*/
+ /*< private > */
GstPipeline *pipeline;
gint port;
gint max_connections;
@@ -58,7 +60,6 @@ struct _GstDebugserverTracer {
GstDebugserverBuffer *buffer;
};
-
G_END_DECLS
#endif /* __GST_DEBUGSERVER_TRACER_H__ */
diff --git a/src/debugserver/gstdebugserverbuffer.c b/src/debugserver/gstdebugserverbuffer.c
index bb214b2..426bf5e 100644
--- a/src/debugserver/gstdebugserverbuffer.c
+++ b/src/debugserver/gstdebugserverbuffer.c
@@ -21,15 +21,17 @@
#include "../common/gst-utils.h"
-typedef struct {
+typedef struct
+{
gboolean send_data;
- GstPad * pad;
- gchar * pad_path;
+ GstPad *pad;
+ gchar *pad_path;
} BufferHook;
-static BufferHook * buffer_hook_new (gboolean send_data, GstPad * pad, gchar * pad_path)
+static BufferHook *
+buffer_hook_new (gboolean send_data, GstPad * pad, gchar * pad_path)
{
- BufferHook * hook = (BufferHook *) g_malloc (sizeof (BufferHook));
+ BufferHook *hook = (BufferHook *) g_malloc (sizeof (BufferHook));
hook->send_data = send_data;
hook->pad = pad;
@@ -38,21 +40,24 @@ static BufferHook * buffer_hook_new (gboolean send_data, GstPad * pad, gchar * p
return hook;
}
-static void buffer_hook_free (BufferHook * hook)
+static void
+buffer_hook_free (BufferHook * hook)
{
g_free (hook->pad_path);
g_free (hook);
}
-static void buffer_hook_list_free (gpointer ptr)
+static void
+buffer_hook_list_free (gpointer ptr)
{
g_slist_free_full (ptr, (GDestroyNotify) buffer_hook_free);
}
-static gint buffer_hook_compare (gconstpointer a, gconstpointer b)
+static gint
+buffer_hook_compare (gconstpointer a, gconstpointer b)
{
- BufferHook *a1 = (BufferHook*) a;
- BufferHook *b1 = (BufferHook*) b;
+ BufferHook *a1 = (BufferHook *) a;
+ BufferHook *b1 = (BufferHook *) b;
if (g_strcmp0 (a1->pad_path, b1->pad_path) == 0 || a1->pad == NULL) {
return 0;
@@ -61,23 +66,28 @@ static gint buffer_hook_compare (gconstpointer a, gconstpointer b)
}
}
-GstDebugserverBuffer * gst_debugserver_buffer_new (void)
+GstDebugserverBuffer *
+gst_debugserver_buffer_new (void)
{
- GstDebugserverBuffer *buf = (GstDebugserverBuffer*)g_malloc (sizeof(GstDebugserverBuffer));
+ GstDebugserverBuffer *buf =
+ (GstDebugserverBuffer *) g_malloc (sizeof (GstDebugserverBuffer));
- gst_debugserver_hooks_init (&buf->hooks, NULL, (GDestroyNotify) buffer_hook_list_free,
buffer_hook_compare);
+ gst_debugserver_hooks_init (&buf->hooks, NULL,
+ (GDestroyNotify) buffer_hook_list_free, buffer_hook_compare);
return buf;
}
-void gst_debugserver_buffer_free (GstDebugserverBuffer * buf)
+void
+gst_debugserver_buffer_free (GstDebugserverBuffer * buf)
{
gst_debugserver_hooks_deinit (&buf->hooks);
g_free (buf);
}
-gboolean gst_debugserver_buffer_add_hook (GstDebugserverBuffer * buf,
- gboolean send_data, GstPad * pad, gchar * pad_path, TcpClient * client)
+gboolean
+gst_debugserver_buffer_add_hook (GstDebugserverBuffer * buf,
+ gboolean send_data, GstPad * pad, gchar * pad_path, TcpClient * client)
{
BufferHook *w = buffer_hook_new (send_data, pad, pad_path);
if (gst_debugserver_hooks_add_hook (&buf->hooks, w, client) == TRUE) {
@@ -88,26 +98,31 @@ gboolean gst_debugserver_buffer_add_hook (GstDebugserverBuffer * buf,
}
}
-gboolean gst_debugserver_buffer_remove_hook (GstDebugserverBuffer * buf,
- gboolean send_data, GstPad * pad, gchar * pad_path, TcpClient * client)
+gboolean
+gst_debugserver_buffer_remove_hook (GstDebugserverBuffer * buf,
+ gboolean send_data, GstPad * pad, gchar * pad_path, TcpClient * client)
{
BufferHook w = { send_data, pad, pad_path };
return gst_debugserver_hooks_remove_hook (&buf->hooks, &w, client);
}
-gboolean gst_debugserver_buffer_set_hook (GstDebugserverBuffer * buf, gboolean enable,
- gboolean send_data, GstPad * pad, gchar * pad_path, TcpClient * client)
+gboolean
+gst_debugserver_buffer_set_hook (GstDebugserverBuffer * buf, gboolean enable,
+ gboolean send_data, GstPad * pad, gchar * pad_path, TcpClient * client)
{
if (enable) {
- return gst_debugserver_buffer_add_hook (buf, send_data, pad, pad_path, client);
+ return gst_debugserver_buffer_add_hook (buf, send_data, pad, pad_path,
+ client);
} else {
- return gst_debugserver_buffer_remove_hook (buf, send_data, pad, pad_path, client);
+ return gst_debugserver_buffer_remove_hook (buf, send_data, pad, pad_path,
+ client);
}
}
-void gst_debugserver_buffer_send_buffer (GstDebugserverBuffer * buffer,
- GstDebugserverTcp * tcp_server, GstPad * pad, GstBuffer * gst_buffer)
+void
+gst_debugserver_buffer_send_buffer (GstDebugserverBuffer * buffer,
+ GstDebugserverTcp * tcp_server, GstPad * pad, GstBuffer * gst_buffer)
{
GHashTableIter iter;
gpointer client, value;
@@ -126,7 +141,7 @@ void gst_debugserver_buffer_send_buffer (GstDebugserverBuffer * buffer,
buffer_info.pad = pad_path;
buffer_info.size = gst_buffer_get_size (gst_buffer);
- buff_data = (guchar*) g_malloc (sizeof (guchar) * buffer_info.size);
+ buff_data = (guchar *) g_malloc (sizeof (guchar) * buffer_info.size);
gst_buffer_extract (gst_buffer, 0, buff_data, buffer_info.size);
buffer_info.data.data = buff_data;
@@ -138,10 +153,11 @@ void gst_debugserver_buffer_send_buffer (GstDebugserverBuffer * buffer,
g_mutex_lock (&buffer->hooks.mutex);
g_hash_table_iter_init (&iter, buffer->hooks.clients);
while (g_hash_table_iter_next (&iter, &client, &value)) {
- list = g_slist_find_custom ((GSList*) value, &hook, buffer_hook_compare);
+ list = g_slist_find_custom ((GSList *) value, &hook, buffer_hook_compare);
if (list != NULL) {
- buffer_info.has_data = ((BufferHook*)list->data)->send_data;
- gst_debugserver_tcp_send_packet (tcp_server, (TcpClient*) client, &gst_data);
+ buffer_info.has_data = ((BufferHook *) list->data)->send_data;
+ gst_debugserver_tcp_send_packet (tcp_server, (TcpClient *) client,
+ &gst_data);
}
}
g_mutex_unlock (&buffer->hooks.mutex);
@@ -150,8 +166,9 @@ void gst_debugserver_buffer_send_buffer (GstDebugserverBuffer * buffer,
g_free (pad_path);
}
-void gst_debugserver_buffer_remove_client (GstDebugserverBuffer * buf, TcpClient * client)
+void
+gst_debugserver_buffer_remove_client (GstDebugserverBuffer * buf,
+ TcpClient * client)
{
gst_debugserver_hooks_remove_client (&buf->hooks, client);
}
-
diff --git a/src/debugserver/gstdebugserverbuffer.h b/src/debugserver/gstdebugserverbuffer.h
index 4852b0f..b5f4db7 100644
--- a/src/debugserver/gstdebugserverbuffer.h
+++ b/src/debugserver/gstdebugserverbuffer.h
@@ -23,27 +23,26 @@
#include <gst/gst.h>
#include "gstdebugserverhooks.h"
-G_BEGIN_DECLS
+G_BEGIN_DECLS typedef struct _GstDebugserverBuffer GstDebugserverBuffer;
-typedef struct _GstDebugserverBuffer GstDebugserverBuffer;
-
-struct _GstDebugserverBuffer {
+struct _GstDebugserverBuffer
+{
GstDebugserverHooks hooks;
};
-GstDebugserverBuffer * gst_debugserver_buffer_new (void);
+GstDebugserverBuffer *gst_debugserver_buffer_new (void);
void gst_debugserver_buffer_free (GstDebugserverBuffer * buf);
-gboolean gst_debugserver_buffer_set_hook (GstDebugserverBuffer * buf, gboolean enable,
- gboolean send_data, GstPad * pad, gchar * pad_path, TcpClient * client);
+gboolean gst_debugserver_buffer_set_hook (GstDebugserverBuffer * buf,
+ gboolean enable, gboolean send_data, GstPad * pad, gchar * pad_path,
+ TcpClient * client);
void gst_debugserver_buffer_send_buffer (GstDebugserverBuffer * buffer,
- GstDebugserverTcp * tcp_server, GstPad * pad, GstBuffer * gst_buffer);
+ GstDebugserverTcp * tcp_server, GstPad * pad, GstBuffer * gst_buffer);
void gst_debugserver_buffer_remove_client (GstDebugserverBuffer * buf,
- TcpClient * client);
+ TcpClient * client);
G_END_DECLS
-
#endif /* __GST_DEBUGSERVER_BUFFER_H__ */
diff --git a/src/debugserver/gstdebugserverhooks.c b/src/debugserver/gstdebugserverhooks.c
index b857f59..72bc0e5 100644
--- a/src/debugserver/gstdebugserverhooks.c
+++ b/src/debugserver/gstdebugserverhooks.c
@@ -19,16 +19,19 @@
#include "gstdebugserverhooks.h"
-void gst_debugserver_hooks_init (GstDebugserverHooks * hooks, OkFunction ok_function,
- GDestroyNotify hash_destroy, GCompareFunc cmp_func)
+void
+gst_debugserver_hooks_init (GstDebugserverHooks * hooks, OkFunction ok_function,
+ GDestroyNotify hash_destroy, GCompareFunc cmp_func)
{
- hooks->clients = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, hash_destroy);
+ hooks->clients =
+ g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, hash_destroy);
g_mutex_init (&hooks->mutex);
hooks->ok_function = ok_function;
hooks->cmp_function = cmp_func;
}
-void gst_debugserver_hooks_deinit (GstDebugserverHooks * hooks)
+void
+gst_debugserver_hooks_deinit (GstDebugserverHooks * hooks)
{
g_mutex_lock (&hooks->mutex);
g_hash_table_destroy (hooks->clients);
@@ -36,7 +39,9 @@ void gst_debugserver_hooks_deinit (GstDebugserverHooks * hooks)
g_mutex_clear (&hooks->mutex);
}
-void gst_debugserver_hooks_send_data (GstDebugserverHooks * hooks, GstDebugserverTcp * tcp_server,
GstDebugger__GStreamerData * gst_data)
+void
+gst_debugserver_hooks_send_data (GstDebugserverHooks * hooks,
+ GstDebugserverTcp * tcp_server, GstDebugger__GStreamerData * gst_data)
{
GHashTableIter iter;
gpointer client, value;
@@ -45,12 +50,15 @@ void gst_debugserver_hooks_send_data (GstDebugserverHooks * hooks, GstDebugserve
g_hash_table_iter_init (&iter, hooks->clients);
while (g_hash_table_iter_next (&iter, &client, &value)) {
if (hooks->ok_function (gst_data, value))
- gst_debugserver_tcp_send_packet (tcp_server, (TcpClient*) client, gst_data);
+ gst_debugserver_tcp_send_packet (tcp_server, (TcpClient *) client,
+ gst_data);
}
g_mutex_unlock (&hooks->mutex);
}
-gboolean gst_debugserver_hooks_add_hook (GstDebugserverHooks * hooks, gpointer data, TcpClient * client)
+gboolean
+gst_debugserver_hooks_add_hook (GstDebugserverHooks * hooks, gpointer data,
+ TcpClient * client)
{
GSList *listeners;
gboolean ret = FALSE;
@@ -78,8 +86,9 @@ finalize:
return ret;
}
-gboolean gst_debugserver_hooks_remove_hook (GstDebugserverHooks * hooks,
- gpointer data, TcpClient * client)
+gboolean
+gst_debugserver_hooks_remove_hook (GstDebugserverHooks * hooks,
+ gpointer data, TcpClient * client)
{
GSList *listeners;
@@ -99,7 +108,9 @@ gboolean gst_debugserver_hooks_remove_hook (GstDebugserverHooks * hooks,
}
}
-void gst_debugserver_hooks_remove_client (GstDebugserverHooks * hooks, TcpClient * client)
+void
+gst_debugserver_hooks_remove_client (GstDebugserverHooks * hooks,
+ TcpClient * client)
{
g_mutex_lock (&hooks->mutex);
g_hash_table_remove (hooks->clients, client);
diff --git a/src/debugserver/gstdebugserverhooks.h b/src/debugserver/gstdebugserverhooks.h
index 24d62d8..42dadeb 100644
--- a/src/debugserver/gstdebugserverhooks.h
+++ b/src/debugserver/gstdebugserverhooks.h
@@ -26,28 +26,32 @@
G_BEGIN_DECLS
-typedef gboolean (*OkFunction)(GstDebugger__GStreamerData*, gpointer);
+typedef gboolean (*OkFunction) (GstDebugger__GStreamerData *, gpointer);
-typedef struct {
+typedef struct
+{
GHashTable *clients;
GMutex mutex;
OkFunction ok_function;
GCompareFunc cmp_function;
} GstDebugserverHooks;
-void gst_debugserver_hooks_init (GstDebugserverHooks * hooks, OkFunction ok_function, GDestroyNotify
hash_destroy, GCompareFunc cmp_func);
+void gst_debugserver_hooks_init (GstDebugserverHooks * hooks,
+ OkFunction ok_function, GDestroyNotify hash_destroy, GCompareFunc cmp_func);
void gst_debugserver_hooks_deinit (GstDebugserverHooks * hooks);
gboolean gst_debugserver_hooks_add_hook (GstDebugserverHooks * hooks,
- gpointer data, TcpClient * client);
+ gpointer data, TcpClient * client);
gboolean gst_debugserver_hooks_remove_hook (GstDebugserverHooks * hooks,
- gpointer data, TcpClient * client);
+ gpointer data, TcpClient * client);
-void gst_debugserver_hooks_remove_client (GstDebugserverHooks * hooks, TcpClient * client);
+void gst_debugserver_hooks_remove_client (GstDebugserverHooks * hooks,
+ TcpClient * client);
-void gst_debugserver_hooks_send_data (GstDebugserverHooks * hooks, GstDebugserverTcp * tcp_server,
GstDebugger__GStreamerData * gst_data);
+void gst_debugserver_hooks_send_data (GstDebugserverHooks * hooks,
+ GstDebugserverTcp * tcp_server, GstDebugger__GStreamerData * gst_data);
G_END_DECLS
diff --git a/src/debugserver/gstdebugserverlog.c b/src/debugserver/gstdebugserverlog.c
index 289e670..473b791 100644
--- a/src/debugserver/gstdebugserverlog.c
+++ b/src/debugserver/gstdebugserverlog.c
@@ -22,14 +22,16 @@
#include <string.h>
-typedef struct {
+typedef struct
+{
GstDebugLevel level;
- gchar * category;
+ gchar *category;
} DebugHook;
-static DebugHook * debug_hook_new (GstDebugLevel level, const gchar * category)
+static DebugHook *
+debug_hook_new (GstDebugLevel level, const gchar * category)
{
- DebugHook * hook = (DebugHook *) g_malloc (sizeof (DebugHook));
+ DebugHook *hook = (DebugHook *) g_malloc (sizeof (DebugHook));
hook->level = level;
hook->category = g_strdup (category);
@@ -37,54 +39,63 @@ static DebugHook * debug_hook_new (GstDebugLevel level, const gchar * category)
return hook;
}
-static void debug_hook_free (DebugHook * hook)
+static void
+debug_hook_free (DebugHook * hook)
{
g_free (hook->category);
g_free (hook);
}
-static void debug_hook_list_free (gpointer ptr)
+static void
+debug_hook_list_free (gpointer ptr)
{
g_slist_free_full (ptr, (GDestroyNotify) debug_hook_free);
}
-static gint debug_hook_compare (gconstpointer p1, gconstpointer p2)
+static gint
+debug_hook_compare (gconstpointer p1, gconstpointer p2)
{
const DebugHook *w1 = p1, *w2 = p2;
if (w1->level >= w2->level && (w1->category == NULL ||
- g_strcmp0 (w1->category, w2->category) == 0)) {
+ g_strcmp0 (w1->category, w2->category) == 0)) {
return 0;
} else {
return 1;
}
}
-static gboolean gst_debugserver_log_ok (GstDebugger__GStreamerData* original, gpointer new_ptr)
+static gboolean
+gst_debugserver_log_ok (GstDebugger__GStreamerData * original, gpointer new_ptr)
{
- GstDebugger__LogInfo* info = original->log_info;
+ GstDebugger__LogInfo *info = original->log_info;
GSList *list = new_ptr;
DebugHook hook = { info->level, info->category };
return g_slist_find_custom (list, &hook, debug_hook_compare) != NULL;
}
-GstDebugserverLog * gst_debugserver_log_new (void)
+GstDebugserverLog *
+gst_debugserver_log_new (void)
{
- GstDebugserverLog *log = (GstDebugserverLog*)g_malloc (sizeof(GstDebugserverLog));
- gst_debugserver_hooks_init (&log->hooks, gst_debugserver_log_ok, (GDestroyNotify) debug_hook_list_free,
debug_hook_compare);
+ GstDebugserverLog *log =
+ (GstDebugserverLog *) g_malloc (sizeof (GstDebugserverLog));
+ gst_debugserver_hooks_init (&log->hooks, gst_debugserver_log_ok,
+ (GDestroyNotify) debug_hook_list_free, debug_hook_compare);
return log;
}
-void gst_debugserver_log_free (GstDebugserverLog * log)
+void
+gst_debugserver_log_free (GstDebugserverLog * log)
{
gst_debugserver_hooks_deinit (&log->hooks);
g_free (log);
}
-static gboolean gst_debugserver_log_add_hook (GstDebugserverLog * log, gint level,
- const gchar * category, TcpClient * client)
+static gboolean
+gst_debugserver_log_add_hook (GstDebugserverLog * log, gint level,
+ const gchar * category, TcpClient * client)
{
DebugHook *w = debug_hook_new (level, category);
if (gst_debugserver_hooks_add_hook (&log->hooks, w, client) == TRUE) {
@@ -95,16 +106,18 @@ static gboolean gst_debugserver_log_add_hook (GstDebugserverLog * log, gint leve
}
}
-static gboolean gst_debugserver_log_remove_hook (GstDebugserverLog * log,
- gint level, const gchar * category, TcpClient * client)
+static gboolean
+gst_debugserver_log_remove_hook (GstDebugserverLog * log,
+ gint level, const gchar * category, TcpClient * client)
{
- DebugHook w = { level, (gchar*)category };
+ DebugHook w = { level, (gchar *) category };
return gst_debugserver_hooks_remove_hook (&log->hooks, &w, client);
}
-gboolean gst_debugserver_log_set_hook (GstDebugserverLog * log, gboolean enable,
- gint level, const gchar * category, TcpClient * client)
+gboolean
+gst_debugserver_log_set_hook (GstDebugserverLog * log, gboolean enable,
+ gint level, const gchar * category, TcpClient * client)
{
if (enable) {
return gst_debugserver_log_add_hook (log, level, category, client);
@@ -113,26 +126,28 @@ gboolean gst_debugserver_log_set_hook (GstDebugserverLog * log, gboolean enable,
}
}
-void gst_debugserver_log_send_log (GstDebugserverLog * log, GstDebugserverTcp * tcp_server,
- GstDebugCategory * category, GstDebugLevel level, const gchar * file, const gchar * function,
- gint line, GObject * object, GstDebugMessage * message)
+void
+gst_debugserver_log_send_log (GstDebugserverLog * log,
+ GstDebugserverTcp * tcp_server, GstDebugCategory * category,
+ GstDebugLevel level, const gchar * file, const gchar * function, gint line,
+ GObject * object, GstDebugMessage * message)
{
GstDebugger__GStreamerData gst_data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
GstDebugger__LogInfo log_info = GST_DEBUGGER__LOG_INFO__INIT;
- log_info.level = (gint)level;
- log_info.category = (gchar*) gst_debug_category_get_name (category);
- log_info.file = (gchar*) file;
- log_info.function = (gchar*) function;
+ log_info.level = (gint) level;
+ log_info.category = (gchar *) gst_debug_category_get_name (category);
+ log_info.file = (gchar *) file;
+ log_info.function = (gchar *) function;
log_info.line = line;
if (GST_IS_OBJECT (object)) {
log_info.object = GST_OBJECT_NAME (object);
} else {
- log_info.object = (gchar*) G_OBJECT_TYPE_NAME (object);
+ log_info.object = (gchar *) G_OBJECT_TYPE_NAME (object);
}
- log_info.message = (gchar*) gst_debug_message_get (message);
+ log_info.message = (gchar *) gst_debug_message_get (message);
gst_data.info_type_case = GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_LOG_INFO;
gst_data.log_info = &log_info;
@@ -147,13 +162,17 @@ sort_by_category_name (gconstpointer a, gconstpointer b)
gst_debug_category_get_name ((GstDebugCategory *) b));
}
-void gst_debugserver_log_send_debug_categories (GstDebugserverTcp *tcp_server, TcpClient *client)
+void
+gst_debugserver_log_send_debug_categories (GstDebugserverTcp * tcp_server,
+ TcpClient * client)
{
GstDebugger__GStreamerData gst_data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
- GstDebugger__DebugCategories debug_categories = GST_DEBUGGER__DEBUG_CATEGORIES__INIT;
+ GstDebugger__DebugCategories debug_categories =
+ GST_DEBUGGER__DEBUG_CATEGORIES__INIT;
gint categories_count, i = 0;
- gst_data.info_type_case = GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_DEBUG_CATEGORIES;
+ gst_data.info_type_case =
+ GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_DEBUG_CATEGORIES;
GSList *tmp, *all_categories = gst_debug_get_all_categories ();
@@ -161,7 +180,8 @@ void gst_debugserver_log_send_debug_categories (GstDebugserverTcp *tcp_server, T
categories_count = g_slist_length (all_categories);
debug_categories.n_category = categories_count;
- debug_categories.category = (char **) g_malloc (sizeof (char*) * categories_count);
+ debug_categories.category =
+ (char **) g_malloc (sizeof (char *) * categories_count);
while (tmp) {
GstDebugCategory *cat = (GstDebugCategory *) tmp->data;
@@ -177,13 +197,14 @@ void gst_debugserver_log_send_debug_categories (GstDebugserverTcp *tcp_server, T
g_free (debug_categories.category);
}
-void gst_debugserver_log_set_threshold (const gchar * threshold)
+void
+gst_debugserver_log_set_threshold (const gchar * threshold)
{
gst_debug_set_threshold_from_string (threshold, TRUE);
}
-void gst_debugserver_log_remove_client (GstDebugserverLog * log,
- TcpClient * client)
+void
+gst_debugserver_log_remove_client (GstDebugserverLog * log, TcpClient * client)
{
gst_debugserver_hooks_remove_client (&log->hooks, client);
}
diff --git a/src/debugserver/gstdebugserverlog.h b/src/debugserver/gstdebugserverlog.h
index 7793546..b85c06b 100644
--- a/src/debugserver/gstdebugserverlog.h
+++ b/src/debugserver/gstdebugserverlog.h
@@ -27,27 +27,30 @@ G_BEGIN_DECLS
typedef struct _GstDebugserverLog GstDebugserverLog;
-struct _GstDebugserverLog {
+struct _GstDebugserverLog
+{
GstDebugserverHooks hooks;
};
-GstDebugserverLog * gst_debugserver_log_new (void);
+GstDebugserverLog *gst_debugserver_log_new (void);
void gst_debugserver_log_free (GstDebugserverLog * log);
-void gst_debugserver_log_send_log (GstDebugserverLog * log, GstDebugserverTcp * tcp_server,
- GstDebugCategory * category, GstDebugLevel level, const gchar * file, const gchar * function,
- gint line, GObject * object, GstDebugMessage * message);
+void gst_debugserver_log_send_log (GstDebugserverLog * log,
+ GstDebugserverTcp * tcp_server, GstDebugCategory * category,
+ GstDebugLevel level, const gchar * file, const gchar * function, gint line,
+ GObject * object, GstDebugMessage * message);
-gboolean gst_debugserver_log_set_hook (GstDebugserverLog * log, gboolean enable, gint level,
- const gchar * category, TcpClient * client);
+gboolean gst_debugserver_log_set_hook (GstDebugserverLog * log, gboolean enable,
+ gint level, const gchar * category, TcpClient * client);
-void gst_debugserver_log_send_debug_categories (GstDebugserverTcp *tcp_server, TcpClient *client);
+void gst_debugserver_log_send_debug_categories (GstDebugserverTcp * tcp_server,
+ TcpClient * client);
void gst_debugserver_log_set_threshold (const gchar * threshold);
void gst_debugserver_log_remove_client (GstDebugserverLog * log,
- TcpClient * client);
+ TcpClient * client);
G_END_DECLS
diff --git a/src/debugserver/gstdebugservermessage.c b/src/debugserver/gstdebugservermessage.c
index 076e9a8..ce41594 100644
--- a/src/debugserver/gstdebugservermessage.c
+++ b/src/debugserver/gstdebugservermessage.c
@@ -22,18 +22,22 @@
#include <string.h>
#include <assert.h>
-static gint g_int_cmp (gconstpointer v1, gconstpointer v2)
+static gint
+g_int_cmp (gconstpointer v1, gconstpointer v2)
{
return GPOINTER_TO_INT (v1) != GPOINTER_TO_INT (v2);
}
-static gboolean gst_debugserver_message_ok (GstDebugger__GStreamerData* original, gpointer new_ptr)
+static gboolean
+gst_debugserver_message_ok (GstDebugger__GStreamerData * original,
+ gpointer new_ptr)
{
GSList *list = new_ptr;
GstDebugger__MessageInfo *msg = original->message_info;
while (list) {
- if (msg->type == GPOINTER_TO_INT (list->data) || GPOINTER_TO_INT (list->data) == GST_MESSAGE_ANY) {
+ if (msg->type == GPOINTER_TO_INT (list->data)
+ || GPOINTER_TO_INT (list->data) == GST_MESSAGE_ANY) {
return TRUE;
}
list = g_slist_next (list);
@@ -42,53 +46,65 @@ static gboolean gst_debugserver_message_ok (GstDebugger__GStreamerData* original
return FALSE;
}
-GstDebugserverMessage * gst_debugserver_message_new (void)
+GstDebugserverMessage *
+gst_debugserver_message_new (void)
{
- GstDebugserverMessage *msg = (GstDebugserverMessage*)g_malloc (sizeof(GstDebugserverMessage));
+ GstDebugserverMessage *msg =
+ (GstDebugserverMessage *) g_malloc (sizeof (GstDebugserverMessage));
- gst_debugserver_hooks_init (&msg->hooks, gst_debugserver_message_ok, (GDestroyNotify) g_slist_free,
g_int_cmp);
+ gst_debugserver_hooks_init (&msg->hooks, gst_debugserver_message_ok,
+ (GDestroyNotify) g_slist_free, g_int_cmp);
return msg;
}
-void gst_debugserver_message_free (GstDebugserverMessage * msg)
+void
+gst_debugserver_message_free (GstDebugserverMessage * msg)
{
gst_debugserver_hooks_deinit (&msg->hooks);
g_free (msg);
}
-gboolean gst_debugserver_message_set_hook (GstDebugserverMessage * msg,
- TcpClient * client, gboolean enable, GstDebugger__MessageRequest * request)
+gboolean
+gst_debugserver_message_set_hook (GstDebugserverMessage * msg,
+ TcpClient * client, gboolean enable, GstDebugger__MessageRequest * request)
{
if (enable) {
- return gst_debugserver_hooks_add_hook (&msg->hooks, GINT_TO_POINTER (request->type), client);
+ return gst_debugserver_hooks_add_hook (&msg->hooks,
+ GINT_TO_POINTER (request->type), client);
} else {
- return gst_debugserver_hooks_remove_hook (&msg->hooks, GINT_TO_POINTER (request->type), client);
+ return gst_debugserver_hooks_remove_hook (&msg->hooks,
+ GINT_TO_POINTER (request->type), client);
}
}
-void gst_debugserver_message_remove_client (GstDebugserverMessage * msg,
- TcpClient * client)
+void
+gst_debugserver_message_remove_client (GstDebugserverMessage * msg,
+ TcpClient * client)
{
gst_debugserver_hooks_remove_client (&msg->hooks, client);
}
-void gst_debugserver_message_send_message (GstDebugserverMessage * msg, GstDebugserverTcp * tcp_server,
- GstMessage * gst_msg)
+void
+gst_debugserver_message_send_message (GstDebugserverMessage * msg,
+ GstDebugserverTcp * tcp_server, GstMessage * gst_msg)
{
GstDebugger__GStreamerData gst_data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
GstDebugger__MessageInfo msg_info = GST_DEBUGGER__MESSAGE_INFO__INIT;
const GstStructure *msg_structure = gst_message_get_structure (gst_msg);
- gchar *structure_data = msg_structure != NULL ? gst_structure_to_string (msg_structure) : NULL;
+ gchar *structure_data =
+ msg_structure != NULL ? gst_structure_to_string (msg_structure) : NULL;
msg_info.seqnum = gst_msg->seqnum;
msg_info.timestamp = gst_msg->timestamp;
msg_info.type = gst_msg->type;
- msg_info.structure_data.data = (guchar*) structure_data;
- msg_info.structure_data.len = structure_data == NULL ? 0 : strlen (structure_data);
+ msg_info.structure_data.data = (guchar *) structure_data;
+ msg_info.structure_data.len =
+ structure_data == NULL ? 0 : strlen (structure_data);
- gst_data.info_type_case = GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_MESSAGE_INFO;
+ gst_data.info_type_case =
+ GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_MESSAGE_INFO;
gst_data.message_info = &msg_info;
gst_debugserver_hooks_send_data (&msg->hooks, tcp_server, &gst_data);
diff --git a/src/debugserver/gstdebugservermessage.h b/src/debugserver/gstdebugservermessage.h
index a5eff6c..10eee4f 100644
--- a/src/debugserver/gstdebugservermessage.h
+++ b/src/debugserver/gstdebugservermessage.h
@@ -29,22 +29,23 @@ G_BEGIN_DECLS
typedef struct _GstDebugserverMessage GstDebugserverMessage;
-struct _GstDebugserverMessage {
+struct _GstDebugserverMessage
+{
GstDebugserverHooks hooks;
};
-GstDebugserverMessage * gst_debugserver_message_new (void);
+GstDebugserverMessage *gst_debugserver_message_new (void);
void gst_debugserver_message_free (GstDebugserverMessage * msg);
gboolean gst_debugserver_message_set_hook (GstDebugserverMessage * msg,
- TcpClient * client, gboolean enable, GstDebugger__MessageRequest * request);
+ TcpClient * client, gboolean enable, GstDebugger__MessageRequest * request);
void gst_debugserver_message_remove_client (GstDebugserverMessage * msg,
- TcpClient * client);
+ TcpClient * client);
void gst_debugserver_message_send_message (GstDebugserverMessage * msg,
- GstDebugserverTcp * tcp_server, GstMessage * gst_msg);
+ GstDebugserverTcp * tcp_server, GstMessage * gst_msg);
G_END_DECLS
diff --git a/src/debugserver/gstdebugserverqe.c b/src/debugserver/gstdebugserverqe.c
index 76bbfcd..2e90373 100644
--- a/src/debugserver/gstdebugserverqe.c
+++ b/src/debugserver/gstdebugserverqe.c
@@ -24,15 +24,17 @@
#include <string.h>
#include "../common/gst-utils.h"
-typedef struct _QEHook {
+typedef struct _QEHook
+{
gint qe_type;
- GstPad * pad;
- gchar * pad_path;
+ GstPad *pad;
+ gchar *pad_path;
} QEHook;
-static QEHook * qe_hook_new (gint type, GstPad * pad, gchar * pad_path)
+static QEHook *
+qe_hook_new (gint type, GstPad * pad, gchar * pad_path)
{
- QEHook * hook = (QEHook *) g_malloc (sizeof (QEHook));
+ QEHook *hook = (QEHook *) g_malloc (sizeof (QEHook));
hook->qe_type = type;
hook->pad = pad;
@@ -41,37 +43,43 @@ static QEHook * qe_hook_new (gint type, GstPad * pad, gchar * pad_path)
return hook;
}
-static void qe_hook_free (QEHook * hook)
+static void
+qe_hook_free (QEHook * hook)
{
g_free (hook->pad_path);
g_free (hook);
}
-static void qe_hook_list_free (gpointer ptr)
+static void
+qe_hook_list_free (gpointer ptr)
{
g_slist_free_full (ptr, (GDestroyNotify) qe_hook_free);
}
-static gint qe_hook_compare (gconstpointer a, gconstpointer b)
+static gint
+qe_hook_compare (gconstpointer a, gconstpointer b)
{
- QEHook *a1 = (QEHook*) a;
- QEHook *b1 = (QEHook*) b;
+ QEHook *a1 = (QEHook *) a;
+ QEHook *b1 = (QEHook *) b;
- if (a1->qe_type == b1->qe_type && (g_strcmp0 (a1->pad_path, b1->pad_path) == 0 || a1->pad == NULL)) {
+ if (a1->qe_type == b1->qe_type && (g_strcmp0 (a1->pad_path, b1->pad_path) == 0
+ || a1->pad == NULL)) {
return 0;
} else {
return 1;
}
}
-static gboolean gst_debugserver_qe_ok (GstDebugger__GStreamerData* original, gpointer new_ptr)
+static gboolean
+gst_debugserver_qe_ok (GstDebugger__GStreamerData * original, gpointer new_ptr)
{
GSList *list = new_ptr;
QEHook hook;
hook.pad = NULL;
- if (original->info_type_case == GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_EVENT_INFO) {
+ if (original->info_type_case ==
+ GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_EVENT_INFO) {
hook.qe_type = original->event_info->type;
hook.pad_path = original->event_info->pad;
} else {
@@ -82,22 +90,27 @@ static gboolean gst_debugserver_qe_ok (GstDebugger__GStreamerData* original, gpo
return g_slist_find_custom (list, &hook, qe_hook_compare) != NULL;
}
-GstDebugserverQE * gst_debugserver_qe_new (void)
+GstDebugserverQE *
+gst_debugserver_qe_new (void)
{
- GstDebugserverQE *qe = (GstDebugserverQE*)g_malloc (sizeof(GstDebugserverQE));
- gst_debugserver_hooks_init (&qe->hooks, gst_debugserver_qe_ok, (GDestroyNotify) qe_hook_list_free,
qe_hook_compare);
+ GstDebugserverQE *qe =
+ (GstDebugserverQE *) g_malloc (sizeof (GstDebugserverQE));
+ gst_debugserver_hooks_init (&qe->hooks, gst_debugserver_qe_ok,
+ (GDestroyNotify) qe_hook_list_free, qe_hook_compare);
return qe;
}
-void gst_debugserver_qe_free (GstDebugserverQE * qe)
+void
+gst_debugserver_qe_free (GstDebugserverQE * qe)
{
gst_debugserver_hooks_deinit (&qe->hooks);
g_free (qe);
}
-static gboolean gst_debugserver_qe_add_hook (GstDebugserverQE * qe, gint type,
- GstPad * pad, gchar * pad_path, TcpClient * client)
+static gboolean
+gst_debugserver_qe_add_hook (GstDebugserverQE * qe, gint type,
+ GstPad * pad, gchar * pad_path, TcpClient * client)
{
QEHook *w = qe_hook_new (type, pad, pad_path);
if (gst_debugserver_hooks_add_hook (&qe->hooks, w, client) == TRUE) {
@@ -108,16 +121,18 @@ static gboolean gst_debugserver_qe_add_hook (GstDebugserverQE * qe, gint type,
}
}
-static gboolean gst_debugserver_qe_remove_hook (GstDebugserverQE * qe,
- gint type, GstPad * pad, gchar * pad_path, TcpClient * client)
+static gboolean
+gst_debugserver_qe_remove_hook (GstDebugserverQE * qe,
+ gint type, GstPad * pad, gchar * pad_path, TcpClient * client)
{
QEHook w = { type, pad, pad_path };
return gst_debugserver_hooks_remove_hook (&qe->hooks, &w, client);
}
-gboolean gst_debugserver_qe_set_hook (GstDebugserverQE * qe, gboolean enable,
- gint type, GstPad * pad, gchar * pad_path, TcpClient * client)
+gboolean
+gst_debugserver_qe_set_hook (GstDebugserverQE * qe, gboolean enable,
+ gint type, GstPad * pad, gchar * pad_path, TcpClient * client)
{
if (enable) {
return gst_debugserver_qe_add_hook (qe, type, pad, pad_path, client);
@@ -126,7 +141,9 @@ gboolean gst_debugserver_qe_set_hook (GstDebugserverQE * qe, gboolean enable,
}
}
-void gst_debugserver_qe_send_qe (GstDebugserverQE * qe, GstDebugserverTcp * tcp_server, GstPad * pad,
GstMiniObject * obj)
+void
+gst_debugserver_qe_send_qe (GstDebugserverQE * qe,
+ GstDebugserverTcp * tcp_server, GstPad * pad, GstMiniObject * obj)
{
GstDebugger__GStreamerData gst_data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
GstDebugger__EventInfo event_info = GST_DEBUGGER__EVENT_INFO__INIT;
@@ -144,12 +161,15 @@ void gst_debugserver_qe_send_qe (GstDebugserverQE * qe, GstDebugserverTcp * tcp_
event_info.structure_data.data = NULL;
event_info.structure_data.len = 0;
} else {
- event_info.structure_data.data = (guchar*) gst_structure_to_string (structure);
- event_info.structure_data.len = strlen ((gchar*) event_info.structure_data.data);
+ event_info.structure_data.data =
+ (guchar *) gst_structure_to_string (structure);
+ event_info.structure_data.len =
+ strlen ((gchar *) event_info.structure_data.data);
}
event_info.pad = pad_path;
gst_data.event_info = &event_info;
- gst_data.info_type_case = GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_EVENT_INFO;
+ gst_data.info_type_case =
+ GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_EVENT_INFO;
} else if (GST_IS_QUERY (obj)) {
GstQuery *query = GST_QUERY_CAST (obj);
query_info.type = query->type;
@@ -159,11 +179,14 @@ void gst_debugserver_qe_send_qe (GstDebugserverQE * qe, GstDebugserverTcp * tcp_
query_info.structure_data.data = NULL;
query_info.structure_data.len = 0;
} else {
- query_info.structure_data.data = (guchar*) gst_structure_to_string (structure);
- query_info.structure_data.len = strlen ((gchar*) query_info.structure_data.data);
+ query_info.structure_data.data =
+ (guchar *) gst_structure_to_string (structure);
+ query_info.structure_data.len =
+ strlen ((gchar *) query_info.structure_data.data);
}
gst_data.query_info = &query_info;
- gst_data.info_type_case = GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_QUERY_INFO;
+ gst_data.info_type_case =
+ GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_QUERY_INFO;
}
gst_debugserver_hooks_send_data (&qe->hooks, tcp_server, &gst_data);
@@ -177,7 +200,8 @@ void gst_debugserver_qe_send_qe (GstDebugserverQE * qe, GstDebugserverTcp * tcp_
g_free (pad_path);
}
-void gst_debugserver_qe_remove_client (GstDebugserverQE * qe, TcpClient * client)
+void
+gst_debugserver_qe_remove_client (GstDebugserverQE * qe, TcpClient * client)
{
gst_debugserver_hooks_remove_client (&qe->hooks, client);
}
diff --git a/src/debugserver/gstdebugserverqe.h b/src/debugserver/gstdebugserverqe.h
index 1e0fdfc..562977f 100644
--- a/src/debugserver/gstdebugserverqe.h
+++ b/src/debugserver/gstdebugserverqe.h
@@ -27,20 +27,23 @@ G_BEGIN_DECLS
typedef struct _GstDebugserverQE GstDebugserverQE;
-struct _GstDebugserverQE {
+struct _GstDebugserverQE
+{
GstDebugserverHooks hooks;
};
-GstDebugserverQE * gst_debugserver_qe_new (void);
+GstDebugserverQE *gst_debugserver_qe_new (void);
void gst_debugserver_qe_free (GstDebugserverQE * qe);
gboolean gst_debugserver_qe_set_hook (GstDebugserverQE * qe, gboolean enable,
- gint qe_type, GstPad * pad, gchar * pad_path, TcpClient * client);
+ gint qe_type, GstPad * pad, gchar * pad_path, TcpClient * client);
-void gst_debugserver_qe_send_qe (GstDebugserverQE * qe, GstDebugserverTcp * tcp_server, GstPad * pad,
GstMiniObject * obj);
+void gst_debugserver_qe_send_qe (GstDebugserverQE * qe,
+ GstDebugserverTcp * tcp_server, GstPad * pad, GstMiniObject * obj);
-void gst_debugserver_qe_remove_client (GstDebugserverQE * evt, TcpClient * client);
+void gst_debugserver_qe_remove_client (GstDebugserverQE * evt,
+ TcpClient * client);
G_END_DECLS
diff --git a/src/debugserver/gstdebugservertcp.c b/src/debugserver/gstdebugservertcp.c
index 340843a..ab80cf9 100644
--- a/src/debugserver/gstdebugservertcp.c
+++ b/src/debugserver/gstdebugservertcp.c
@@ -37,19 +37,20 @@ G_DEFINE_TYPE_WITH_CODE (GstDebugserverTcp, gst_debugserver_tcp,
static gboolean
gst_debugserver_tcp_run (GThreadedSocketService * service,
- GSocketConnection * connection, GObject * source_object, gpointer user_data);
+ GSocketConnection * connection, GObject * source_object,
+ gpointer user_data);
-static TcpClient*
-gst_debugserver_tcp_add_client (GstDebugserverTcp * tcp, GSocketConnection * connection);
+static TcpClient *gst_debugserver_tcp_add_client (GstDebugserverTcp * tcp,
+ GSocketConnection * connection);
static gboolean
-gst_debugserver_tcp_send_packet_to_all_clients (GstDebugserverTcp * tcp, GstDebugger__GStreamerData *
gst_data);
-
+gst_debugserver_tcp_send_packet_to_all_clients (GstDebugserverTcp *
+ tcp, GstDebugger__GStreamerData * gst_data);
static void
gst_debugserver_tcp_finalize (GObject * obj)
{
- GstDebugserverTcp * tcp = GST_DEBUGSERVER_TCP (obj);
+ GstDebugserverTcp *tcp = GST_DEBUGSERVER_TCP (obj);
if (tcp->service == NULL) {
return;
@@ -59,10 +60,11 @@ gst_debugserver_tcp_finalize (GObject * obj)
g_mutex_lock (&tcp->clients_mutex);
while (tcp->clients) {
- TcpClient* client = tcp->clients->data;
+ TcpClient *client = tcp->clients->data;
g_cancellable_cancel (client->cancel);
gint64 end_time = g_get_monotonic_time () + 5 * G_TIME_SPAN_MILLISECOND;
- g_cond_wait_until (&tcp->client_removed_cond, &tcp->clients_mutex, end_time);
+ g_cond_wait_until (&tcp->client_removed_cond, &tcp->clients_mutex,
+ end_time);
}
g_mutex_unlock (&tcp->clients_mutex);
@@ -94,15 +96,17 @@ gst_debugserver_tcp_init (GstDebugserverTcp * self)
g_cond_init (&self->client_removed_cond);
}
-GstDebugserverTcp * gst_debugserver_tcp_new (void)
+GstDebugserverTcp *
+gst_debugserver_tcp_new (void)
{
- GstDebugserverTcp * tcp = g_object_new (GST_TYPE_DEBUGSERVER_TCP, NULL);
+ GstDebugserverTcp *tcp = g_object_new (GST_TYPE_DEBUGSERVER_TCP, NULL);
return tcp;
}
gboolean
-gst_debugserver_tcp_start_server (GstDebugserverTcp * tcp, guint port, gint max_connections)
+gst_debugserver_tcp_start_server (GstDebugserverTcp * tcp, guint port,
+ gint max_connections)
{
GError *error = NULL;
@@ -136,15 +140,19 @@ gst_debugserver_tcp_run (GThreadedSocketService * service,
gint size;
GstDebugger__Command *command;
- GInputStream *istream = g_io_stream_get_input_stream (G_IO_STREAM (client->connection));
+ GInputStream *istream =
+ g_io_stream_get_input_stream (G_IO_STREAM (client->connection));
GST_DEBUG_OBJECT (self, "Received connection from client!\n");
- while ((size = gst_debugger_protocol_utils_read_header (istream, client->cancel)) > 0) {
- assert (size <= 1024); // todo max message size in global file
+ while ((size =
+ gst_debugger_protocol_utils_read_header (istream,
+ client->cancel)) > 0) {
+ assert (size <= 1024); // todo max message size in global file
GST_DEBUG_OBJECT (self, "Received message of size: %d\n", size);
- gst_debugger_protocol_utils_read_requested_size (istream, size, buffer, NULL);
- command = gst_debugger__command__unpack (NULL, size, (uint8_t*) buffer);
+ gst_debugger_protocol_utils_read_requested_size (istream, size, buffer,
+ NULL);
+ command = gst_debugger__command__unpack (NULL, size, (uint8_t *) buffer);
if (command == NULL) {
g_print ("error unpacking incoming message\n");
continue;
@@ -176,44 +184,46 @@ gst_debugserver_tcp_run (GThreadedSocketService * service,
return FALSE;
}
-static TcpClient*
-gst_debugserver_tcp_add_client (GstDebugserverTcp * tcp, GSocketConnection * connection)
+static TcpClient *
+gst_debugserver_tcp_add_client (GstDebugserverTcp * tcp,
+ GSocketConnection * connection)
{
- TcpClient *client = (TcpClient*) g_malloc (sizeof (TcpClient));
+ TcpClient *client = (TcpClient *) g_malloc (sizeof (TcpClient));
g_mutex_init (&client->mutex);
client->connection = connection;
client->cancel = g_cancellable_new ();
- g_mutex_lock(&tcp->clients_mutex);
+ g_mutex_lock (&tcp->clients_mutex);
tcp->clients = g_slist_append (tcp->clients, client);
- g_mutex_unlock(&tcp->clients_mutex);
+ g_mutex_unlock (&tcp->clients_mutex);
return client;
}
-TcpClient*
-gst_debugserver_tcp_find_client (GstDebugserverTcp * tcp, GSocketConnection * connection)
+TcpClient *
+gst_debugserver_tcp_find_client (GstDebugserverTcp * tcp,
+ GSocketConnection * connection)
{
- g_mutex_lock(&tcp->clients_mutex);
+ g_mutex_lock (&tcp->clients_mutex);
GSList *client_list = tcp->clients;
TcpClient *client;
while (client_list != NULL) {
- client = (TcpClient*) client_list->data;
+ client = (TcpClient *) client_list->data;
if (client->connection == connection) {
- g_mutex_unlock(&tcp->clients_mutex);
+ g_mutex_unlock (&tcp->clients_mutex);
return client;
}
client_list = g_slist_next (client_list);
}
- g_mutex_unlock(&tcp->clients_mutex);
- return NULL;
+ g_mutex_unlock (&tcp->clients_mutex);
+ return NULL;
}
gboolean
gst_debugserver_tcp_send_packet (GstDebugserverTcp * tcp, TcpClient * client,
- GstDebugger__GStreamerData * gst_data)
+ GstDebugger__GStreamerData * gst_data)
{
GError *err = NULL;
GOutputStream *ostream;
@@ -245,12 +255,12 @@ gst_debugserver_tcp_send_packet (GstDebugserverTcp * tcp, TcpClient * client,
}
if (size > 1024) {
- m_buff = (guchar*) g_malloc (size * sizeof (guchar));
+ m_buff = (guchar *) g_malloc (size * sizeof (guchar));
}
gst_debugger__gstreamer_data__pack (gst_data, m_buff);
- g_output_stream_write (ostream, (gchar*)m_buff, size, NULL, &err);
+ g_output_stream_write (ostream, (gchar *) m_buff, size, NULL, &err);
if (m_buff != buff) {
g_free (m_buff);
@@ -268,7 +278,8 @@ gst_debugserver_tcp_send_packet (GstDebugserverTcp * tcp, TcpClient * client,
}
static gboolean
-gst_debugserver_tcp_send_packet_to_all_clients (GstDebugserverTcp * tcp, GstDebugger__GStreamerData *
gst_data)
+gst_debugserver_tcp_send_packet_to_all_clients (GstDebugserverTcp * tcp,
+ GstDebugger__GStreamerData * gst_data)
{
TcpClient *client;
gboolean ret = TRUE;
@@ -276,7 +287,7 @@ gst_debugserver_tcp_send_packet_to_all_clients (GstDebugserverTcp * tcp, GstDebu
g_mutex_lock (&tcp->clients_mutex);
GSList *clients = tcp->clients;
while (clients != NULL) {
- client = (TcpClient*)clients->data;
+ client = (TcpClient *) clients->data;
ret = ret && gst_debugserver_tcp_send_packet (tcp, client, gst_data);
clients = clients->next;
}
diff --git a/src/debugserver/gstdebugservertcp.h b/src/debugserver/gstdebugservertcp.h
index ebd7e8b..9131a78 100644
--- a/src/debugserver/gstdebugservertcp.h
+++ b/src/debugserver/gstdebugservertcp.h
@@ -38,31 +38,33 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DEBUGSERVER_TCP))
#define GST_DEBUGSERVER_TCP_CAST(obj) ((GstDebugserverTcp *)(obj))
-typedef struct _TcpClient {
- GSocketConnection * connection;
+typedef struct _TcpClient
+{
+ GSocketConnection *connection;
GMutex mutex;
- GCancellable * cancel;
+ GCancellable *cancel;
} TcpClient;
typedef void (*GstDebugserverTcpHandleCommandFunction)
- (GstDebugger__Command * command, gpointer user_data, TcpClient * client);
+ (GstDebugger__Command * command, gpointer user_data, TcpClient * client);
typedef void (*GstDebugserverTcpClientDisconnectedFunction)
- (TcpClient * client, gpointer user_data);
+ (TcpClient * client, gpointer user_data);
typedef struct _GstDebugserverTcp GstDebugserverTcp;
typedef struct _GstDebugserverTcpClass GstDebugserverTcpClass;
-struct _GstDebugserverTcp {
+struct _GstDebugserverTcp
+{
GObject parent_instance;
gpointer owner;
GstDebugserverTcpHandleCommandFunction command_handler;
GstDebugserverTcpClientDisconnectedFunction client_disconnected_handler;
- /*< private >*/
- GSocketService * service;
- GSList * clients;
+ /*< private > */
+ GSocketService *service;
+ GSList *clients;
GMutex clients_mutex;
GCond client_removed_cond;
};
@@ -71,15 +73,16 @@ struct _GstDebugserverTcpClass
{
GObjectClass parent_class;
- void (*command_received) (gpointer *tracer, GstDebugger__Command *command);
+ void (*command_received) (gpointer * tracer, GstDebugger__Command * command);
};
-GstDebugserverTcp * gst_debugserver_tcp_new (void);
+GstDebugserverTcp *gst_debugserver_tcp_new (void);
-gboolean gst_debugserver_tcp_start_server (GstDebugserverTcp * tcp, guint port, gint max_connections);
+gboolean gst_debugserver_tcp_start_server (GstDebugserverTcp * tcp, guint port,
+ gint max_connections);
-gboolean gst_debugserver_tcp_send_packet (GstDebugserverTcp * tcp, TcpClient * client,
- GstDebugger__GStreamerData * gst_data);
+gboolean gst_debugserver_tcp_send_packet (GstDebugserverTcp * tcp,
+ TcpClient * client, GstDebugger__GStreamerData * gst_data);
G_GNUC_INTERNAL GType gst_debugserver_tcp_get_type (void);
diff --git a/src/debugserver/gstdebugservertopology.c b/src/debugserver/gstdebugservertopology.c
index 186a7be..0771a13 100644
--- a/src/debugserver/gstdebugservertopology.c
+++ b/src/debugserver/gstdebugservertopology.c
@@ -26,7 +26,7 @@
GSList *src_pads;
static GstDebugger__PadTemplate
-get_topology_template_object (GstPadTemplate *template)
+get_topology_template_object (GstPadTemplate * template)
{
GstDebugger__PadTemplate tpl = GST_DEBUGGER__PAD_TEMPLATE__INIT;
@@ -39,11 +39,13 @@ get_topology_template_object (GstPadTemplate *template)
}
static void
-send_object (GstObject *object, GstDebugger__Action action, GstDebugserverTcp * server, TcpClient * client)
+send_object (GstObject * object, GstDebugger__Action action,
+ GstDebugserverTcp * server, TcpClient * client)
{
GstDebugger__GStreamerData info = GST_DEBUGGER__GSTREAMER_DATA__INIT;
GstDebugger__TopologyInfo topology = GST_DEBUGGER__TOPOLOGY_INFO__INIT;
- GstDebugger__TopologyElement element_tp = GST_DEBUGGER__TOPOLOGY_ELEMENT__INIT;
+ GstDebugger__TopologyElement element_tp =
+ GST_DEBUGGER__TOPOLOGY_ELEMENT__INIT;
GstDebugger__TopologyPad pad_tp = GST_DEBUGGER__TOPOLOGY_PAD__INIT;
GstDebugger__PadTemplate template = GST_DEBUGGER__PAD_TEMPLATE__INIT;
@@ -51,27 +53,34 @@ send_object (GstObject *object, GstDebugger__Action action, GstDebugserverTcp *
topology.action = action;
if (GST_IS_ELEMENT (object)) {
- GstElementFactory *factory = gst_element_get_factory (GST_ELEMENT_CAST (object));
- element_tp.type_name = (gchar*) g_type_name (G_OBJECT_TYPE (object));
+ GstElementFactory *factory =
+ gst_element_get_factory (GST_ELEMENT_CAST (object));
+ element_tp.type_name = (gchar *) g_type_name (G_OBJECT_TYPE (object));
element_tp.path = gst_utils_get_object_path (object);
element_tp.is_bin = GST_IS_BIN (object);
if (factory != NULL) {
- element_tp.factory_name = gst_plugin_feature_get_name (gst_element_get_factory (GST_ELEMENT_CAST
(object)));
+ element_tp.factory_name =
+ gst_plugin_feature_get_name (gst_element_get_factory (GST_ELEMENT_CAST
+ (object)));
}
topology.element = &element_tp;
- topology.topology_type_case = GST_DEBUGGER__TOPOLOGY_INFO__TOPOLOGY_TYPE_ELEMENT;
+ topology.topology_type_case =
+ GST_DEBUGGER__TOPOLOGY_INFO__TOPOLOGY_TYPE_ELEMENT;
} else if (GST_IS_PAD (object)) {
GstPad *pad = GST_PAD (object);
pad_tp.path = gst_utils_get_object_path (object);
pad_tp.is_ghostpad = GST_IS_GHOST_PAD (pad);
- pad_tp.presence = gst_pad_get_pad_template (pad) ? GST_PAD_TEMPLATE_PRESENCE (gst_pad_get_pad_template
(pad)) : 0;
+ pad_tp.presence =
+ gst_pad_get_pad_template (pad) ?
+ GST_PAD_TEMPLATE_PRESENCE (gst_pad_get_pad_template (pad)) : 0;
pad_tp.direction = GST_PAD_DIRECTION (pad);
if (GST_PAD_PAD_TEMPLATE (pad)) {
template = get_topology_template_object (GST_PAD_PAD_TEMPLATE (pad));
pad_tp.template_ = &template;
}
topology.pad = &pad_tp;
- topology.topology_type_case = GST_DEBUGGER__TOPOLOGY_INFO__TOPOLOGY_TYPE_PAD;
+ topology.topology_type_case =
+ GST_DEBUGGER__TOPOLOGY_INFO__TOPOLOGY_TYPE_PAD;
} else {
assert (FALSE);
}
@@ -84,13 +93,15 @@ send_object (GstObject *object, GstDebugger__Action action, GstDebugserverTcp *
}
static void
-send_link (GstPad *src_pad, GstPad *sink_pad, GstDebugger__Action action, GstDebugserverTcp *server,
TcpClient * client)
+send_link (GstPad * src_pad, GstPad * sink_pad, GstDebugger__Action action,
+ GstDebugserverTcp * server, TcpClient * client)
{
GstDebugger__GStreamerData info = GST_DEBUGGER__GSTREAMER_DATA__INIT;
GstDebugger__TopologyInfo topology = GST_DEBUGGER__TOPOLOGY_INFO__INIT;
GstDebugger__TopologyLink link_tp = GST_DEBUGGER__TOPOLOGY_LINK__INIT;
- if (!gst_utils_check_pad_has_element_parent (src_pad) || !gst_utils_check_pad_has_element_parent
(sink_pad)) {
+ if (!gst_utils_check_pad_has_element_parent (src_pad)
+ || !gst_utils_check_pad_has_element_parent (sink_pad)) {
return;
}
@@ -105,12 +116,15 @@ send_link (GstPad *src_pad, GstPad *sink_pad, GstDebugger__Action action, GstDeb
link_tp.src_pad = gst_utils_get_object_path (GST_OBJECT_CAST (src_pad));
if (GST_IS_PROXY_PAD (sink_pad)) {
if (GST_IS_GHOST_PAD (sink_pad)) {
- GstPad *internal = gst_pad_get_peer (GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD
(sink_pad))));
+ GstPad *internal =
+ gst_pad_get_peer (GST_PAD_CAST (gst_proxy_pad_get_internal
+ (GST_PROXY_PAD (sink_pad))));
if (internal != NULL) {
send_link (sink_pad, internal, action, server, client);
}
} else {
- sink_pad = GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD (sink_pad)));
+ sink_pad =
+ GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD (sink_pad)));
}
}
@@ -126,7 +140,8 @@ send_link (GstPad *src_pad, GstPad *sink_pad, GstDebugger__Action action, GstDeb
}
static void
-send_element_pads (GstElement * element, GstDebugserverTcp *server, TcpClient * client)
+send_element_pads (GstElement * element, GstDebugserverTcp * server,
+ TcpClient * client)
{
gboolean done;
GstPad *pad;
@@ -138,10 +153,12 @@ send_element_pads (GstElement * element, GstDebugserverTcp *server, TcpClient *
switch (gst_iterator_next (pad_it, &item)) {
case GST_ITERATOR_OK:
pad = g_value_get_object (&item);
- if (gst_pad_get_direction (pad) == GST_PAD_SRC && gst_pad_get_peer (pad)) {
+ if (gst_pad_get_direction (pad) == GST_PAD_SRC
+ && gst_pad_get_peer (pad)) {
src_pads = g_slist_append (src_pads, pad);
}
- send_object (GST_OBJECT (pad), GST_DEBUGGER__ACTION__ADD, server, client);
+ send_object (GST_OBJECT (pad), GST_DEBUGGER__ACTION__ADD, server,
+ client);
g_value_reset (&item);
break;
case GST_ITERATOR_RESYNC:
@@ -158,13 +175,15 @@ send_element_pads (GstElement * element, GstDebugserverTcp *server, TcpClient *
}
static void
-gst_debugserver_topology_send_element (GstElement * element, GstDebugserverTcp *server, TcpClient * client)
+gst_debugserver_topology_send_element (GstElement * element,
+ GstDebugserverTcp * server, TcpClient * client)
{
GstIterator *element_it;
gboolean done;
if (GST_ELEMENT_PARENT (element) != NULL) {
- send_object (GST_OBJECT (element), GST_DEBUGGER__ACTION__ADD, server, client);
+ send_object (GST_OBJECT (element), GST_DEBUGGER__ACTION__ADD, server,
+ client);
}
send_element_pads (element, server, client);
@@ -196,36 +215,51 @@ gst_debugserver_topology_send_element (GstElement * element, GstDebugserverTcp *
gst_iterator_free (element_it);
}
-void gst_debugserver_topology_send_entire_topology (GstBin *bin, GstDebugserverTcp * server, TcpClient *
client)
+void
+gst_debugserver_topology_send_entire_topology (GstBin * bin,
+ GstDebugserverTcp * server, TcpClient * client)
{
src_pads = NULL;
gst_debugserver_topology_send_element (GST_ELEMENT (bin), server, client);
GSList *tmp_list = src_pads;
while (tmp_list != NULL) {
- GstPad *pad = (GstPad*)tmp_list->data;
- send_link (pad, gst_pad_get_peer (pad), GST_DEBUGGER__ACTION__ADD, server, client);
+ GstPad *pad = (GstPad *) tmp_list->data;
+ send_link (pad, gst_pad_get_peer (pad), GST_DEBUGGER__ACTION__ADD, server,
+ client);
tmp_list = tmp_list->next;
}
g_slist_free (src_pads);
}
-void gst_debugserver_topology_send_pad_link (GstPad * src, GstPad * sink, gboolean link, GstDebugserverTcp *
server, TcpClient * client)
+void
+gst_debugserver_topology_send_pad_link (GstPad * src, GstPad * sink,
+ gboolean link, GstDebugserverTcp * server, TcpClient * client)
{
- send_link (src, sink, link ? GST_DEBUGGER__ACTION__ADD : GST_DEBUGGER__ACTION__REMOVE, server, client);
+ send_link (src, sink,
+ link ? GST_DEBUGGER__ACTION__ADD : GST_DEBUGGER__ACTION__REMOVE, server,
+ client);
}
-void gst_debugserver_topology_send_element_in_bin (GstBin * bin, GstElement * element, gboolean add,
GstDebugserverTcp * server, TcpClient * client)
+void
+gst_debugserver_topology_send_element_in_bin (GstBin * bin,
+ GstElement * element, gboolean add, GstDebugserverTcp * server,
+ TcpClient * client)
{
- send_object (GST_OBJECT_CAST (element), add ? GST_DEBUGGER__ACTION__ADD : GST_DEBUGGER__ACTION__REMOVE,
server, client);
+ send_object (GST_OBJECT_CAST (element),
+ add ? GST_DEBUGGER__ACTION__ADD : GST_DEBUGGER__ACTION__REMOVE, server,
+ client);
}
-void gst_debugserver_topology_send_pad_in_element (GstElement * element, GstPad * pad, gboolean add,
GstDebugserverTcp * server, TcpClient * client)
+void
+gst_debugserver_topology_send_pad_in_element (GstElement * element,
+ GstPad * pad, gboolean add, GstDebugserverTcp * server, TcpClient * client)
{
if (GST_OBJECT_PARENT (element) == NULL) {
return;
}
- send_object (GST_OBJECT_CAST (pad), add ? GST_DEBUGGER__ACTION__ADD : GST_DEBUGGER__ACTION__REMOVE,
server, client);
+ send_object (GST_OBJECT_CAST (pad),
+ add ? GST_DEBUGGER__ACTION__ADD : GST_DEBUGGER__ACTION__REMOVE, server,
+ client);
}
-
diff --git a/src/debugserver/gstdebugservertopology.h b/src/debugserver/gstdebugservertopology.h
index 8f69218..02b9e25 100644
--- a/src/debugserver/gstdebugservertopology.h
+++ b/src/debugserver/gstdebugservertopology.h
@@ -24,12 +24,17 @@
#include <gst/gst.h>
-void gst_debugserver_topology_send_entire_topology (GstBin *root, GstDebugserverTcp * server, TcpClient *
client);
+void gst_debugserver_topology_send_entire_topology (GstBin * root,
+ GstDebugserverTcp * server, TcpClient * client);
-void gst_debugserver_topology_send_pad_link (GstPad * src, GstPad * sink, gboolean link, GstDebugserverTcp *
server, TcpClient * client);
+void gst_debugserver_topology_send_pad_link (GstPad * src, GstPad * sink,
+ gboolean link, GstDebugserverTcp * server, TcpClient * client);
-void gst_debugserver_topology_send_element_in_bin (GstBin * bin, GstElement * element, gboolean add,
GstDebugserverTcp * server, TcpClient * client);
+void gst_debugserver_topology_send_element_in_bin (GstBin * bin,
+ GstElement * element, gboolean add, GstDebugserverTcp * server,
+ TcpClient * client);
-void gst_debugserver_topology_send_pad_in_element (GstElement * element, GstPad * pad, gboolean add,
GstDebugserverTcp * server, TcpClient * client);
+void gst_debugserver_topology_send_pad_in_element (GstElement * element,
+ GstPad * pad, gboolean add, GstDebugserverTcp * server, TcpClient * client);
#endif /* SRC_DEBUGSERVER_GSTDEBUGSERVERTOPOLOGY_H_ */
diff --git a/src/debugserver/gstdebugservertypes.c b/src/debugserver/gstdebugservertypes.c
index a8e7c7a..c97f885 100644
--- a/src/debugserver/gstdebugservertypes.c
+++ b/src/debugserver/gstdebugservertypes.c
@@ -30,7 +30,8 @@
#include <string.h>
static void
-send_type_doesnt_exist_error (const gchar * type_name, GstDebugserverTcp * tcp_server, TcpClient * client)
+send_type_doesnt_exist_error (const gchar * type_name,
+ GstDebugserverTcp * tcp_server, TcpClient * client)
{
GstDebugger__GStreamerData gst_data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
GstDebugger__ServerError server_error = GST_DEBUGGER__SERVER_ERROR__INIT;
@@ -63,7 +64,9 @@ send_type_doesnt_exist_error (const gchar * type_name, GstDebugserverTcp * tcp_s
gst_data.enum_flags_type = &data_type; \
} while (FALSE)
-static void gst_debugserver_types_send_enum_flags (GstDebugserverTcp *tcp_server, TcpClient *client, const
gchar * name)
+static void
+gst_debugserver_types_send_enum_flags (GstDebugserverTcp * tcp_server,
+ TcpClient * client, const gchar * name)
{
GType type = g_type_from_name (name);
GstDebugger__GStreamerData gst_data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
@@ -82,7 +85,8 @@ static void gst_debugserver_types_send_enum_flags (GstDebugserverTcp *tcp_server
}
gst_data.enum_flags_type = &data_type;
- gst_data.info_type_case = GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_ENUM_FLAGS_TYPE;
+ gst_data.info_type_case =
+ GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_ENUM_FLAGS_TYPE;
gst_debugserver_tcp_send_packet (tcp_server, client, &gst_data);
@@ -92,7 +96,9 @@ static void gst_debugserver_types_send_enum_flags (GstDebugserverTcp *tcp_server
g_free (values);
}
-static void gst_debugserver_types_send_factory (GstDebugserverTcp *tcp_server, TcpClient *client, const
gchar * name)
+static void
+gst_debugserver_types_send_factory (GstDebugserverTcp * tcp_server,
+ TcpClient * client, const gchar * name)
{
GstDebugger__GStreamerData gst_data = GST_DEBUGGER__GSTREAMER_DATA__INIT;
GstDebugger__FactoryType factory_type = GST_DEBUGGER__FACTORY_TYPE__INIT;
@@ -108,20 +114,23 @@ static void gst_debugserver_types_send_factory (GstDebugserverTcp *tcp_server, T
}
factory_type.name = gst_plugin_feature_get_name (factory);
- factory_type.n_templates = gst_element_factory_get_num_pad_templates (factory);
+ factory_type.n_templates =
+ gst_element_factory_get_num_pad_templates (factory);
if (factory_type.n_templates != 0) {
- templates = g_malloc (factory_type.n_templates * sizeof (GstDebugger__PadTemplate*));
- tpls = (GList*)gst_element_factory_get_static_pad_templates (factory);
+ templates =
+ g_malloc (factory_type.n_templates *
+ sizeof (GstDebugger__PadTemplate *));
+ tpls = (GList *) gst_element_factory_get_static_pad_templates (factory);
while (tpls) {
- static_template = (GstStaticPadTemplate*) tpls->data;
+ static_template = (GstStaticPadTemplate *) tpls->data;
tpls = g_list_next (tpls);
templates[i] = g_malloc (sizeof (GstDebugger__PadTemplate));
gst_debugger__pad_template__init (templates[i]);
- templates[i]->caps = (gchar*) static_template->static_caps.string;
+ templates[i]->caps = (gchar *) static_template->static_caps.string;
templates[i]->direction = static_template->direction;
templates[i]->presence = static_template->presence;
- templates[i]->name_template = (gchar*) static_template->name_template;
+ templates[i]->name_template = (gchar *) static_template->name_template;
i++;
}
}
@@ -133,13 +142,16 @@ static void gst_debugserver_types_send_factory (GstDebugserverTcp *tcp_server, T
GstDebugger__FactoryMeta **entries = NULL;
keys = gst_element_factory_get_metadata_keys (factory);
if (keys != NULL) {
- for (k = keys; *k != NULL; ++k) { meta_cnt++; }
- entries = g_malloc (sizeof (GstDebugger__FactoryMeta*) * meta_cnt);
+ for (k = keys; *k != NULL; ++k) {
+ meta_cnt++;
+ }
+ entries = g_malloc (sizeof (GstDebugger__FactoryMeta *) * meta_cnt);
for (k = keys; *k != NULL; ++k) {
entries[i] = g_malloc (sizeof (GstDebugger__FactoryMeta));
gst_debugger__factory_meta__init (entries[i]);
entries[i]->key = *k;
- entries[i]->value = (gchar*) gst_element_factory_get_metadata (factory, *k);
+ entries[i]->value =
+ (gchar *) gst_element_factory_get_metadata (factory, *k);
i++;
}
}
@@ -163,7 +175,9 @@ static void gst_debugserver_types_send_factory (GstDebugserverTcp *tcp_server, T
g_strfreev (keys);
}
-static void gst_debugserver_types_send_klass (GstDebugserverTcp *tcp_server, TcpClient *client, const gchar
* name)
+static void
+gst_debugserver_types_send_klass (GstDebugserverTcp * tcp_server,
+ TcpClient * client, const gchar * name)
{
GType type = g_type_from_name (name);
GObjectClass *obj_klass = G_OBJECT_CLASS (g_type_class_peek (type));
@@ -183,27 +197,29 @@ static void gst_debugserver_types_send_klass (GstDebugserverTcp *tcp_server, Tcp
return;
}
- klass.name = (gchar*) name;
+ klass.name = (gchar *) name;
specs = g_object_class_list_properties (obj_klass, &n_specs);
klass.n_property_info = n_specs;
- properties_info = g_malloc (sizeof (GstDebugger__PropertyInfo*) * n_specs);
+ properties_info = g_malloc (sizeof (GstDebugger__PropertyInfo *) * n_specs);
for (i = 0; i < n_specs; i++) {
properties_info[i] = g_malloc (sizeof (GstDebugger__PropertyInfo));
gst_debugger__property_info__init (properties_info[i]);
- properties_info[i]->blurb = (gchar*) g_param_spec_get_blurb (specs[i]);
+ properties_info[i]->blurb = (gchar *) g_param_spec_get_blurb (specs[i]);
properties_info[i]->flags = specs[i]->flags;
- properties_info[i]->name = (gchar*) g_param_spec_get_name (specs[i]);
- properties_info[i]->nick = (gchar*) g_param_spec_get_nick (specs[i]);
+ properties_info[i]->name = (gchar *) g_param_spec_get_name (specs[i]);
+ properties_info[i]->nick = (gchar *) g_param_spec_get_nick (specs[i]);
g_value_init (&gvalue, specs[i]->value_type);
g_param_value_set_default (specs[i], &gvalue);
- value = (GstDebugger__Value*) g_malloc (sizeof (GstDebugger__Value));
+ value = (GstDebugger__Value *) g_malloc (sizeof (GstDebugger__Value));
gst_debugger__value__init (value);
- value->type_name = (gchar*) g_type_name (specs[i]->value_type);
- value->data.data = (uint8_t*) g_value_serialize (&gvalue, &out_gtype, &out_internal_type);
- value->data.len = value->data.data == NULL ? 0 : strlen ((gchar*) value->data.data);
+ value->type_name = (gchar *) g_type_name (specs[i]->value_type);
+ value->data.data =
+ (uint8_t *) g_value_serialize (&gvalue, &out_gtype, &out_internal_type);
+ value->data.len =
+ value->data.data == NULL ? 0 : strlen ((gchar *) value->data.data);
value->gtype = out_gtype;
if (out_gtype == specs[i]->value_type) {
@@ -219,7 +235,8 @@ static void gst_debugserver_types_send_klass (GstDebugserverTcp *tcp_server, Tcp
klass.property_info = properties_info;
gst_data.element_klass = &klass;
- gst_data.info_type_case = GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_ELEMENT_KLASS;
+ gst_data.info_type_case =
+ GST_DEBUGGER__GSTREAMER_DATA__INFO_TYPE_ELEMENT_KLASS;
gst_debugserver_tcp_send_packet (tcp_server, client, &gst_data);
@@ -233,19 +250,21 @@ static void gst_debugserver_types_send_klass (GstDebugserverTcp *tcp_server, Tcp
g_free (specs);
}
-void gst_debugserver_types_send_type (GstDebugserverTcp *tcp_server, TcpClient *client, const
GstDebugger__TypeDescriptionRequest *request)
+void
+gst_debugserver_types_send_type (GstDebugserverTcp * tcp_server,
+ TcpClient * client, const GstDebugger__TypeDescriptionRequest * request)
{
switch (request->type) {
- case GST_DEBUGGER__TYPE_DESCRIPTION_REQUEST__TYPE__FACTORY:
- gst_debugserver_types_send_factory (tcp_server, client, request->name);
- break;
- case GST_DEBUGGER__TYPE_DESCRIPTION_REQUEST__TYPE__ENUM_FLAGS:
- gst_debugserver_types_send_enum_flags (tcp_server, client, request->name);
- break;
- case GST_DEBUGGER__TYPE_DESCRIPTION_REQUEST__TYPE__KLASS:
- gst_debugserver_types_send_klass (tcp_server, client, request->name);
- break;
- default:
+ case GST_DEBUGGER__TYPE_DESCRIPTION_REQUEST__TYPE__FACTORY:
+ gst_debugserver_types_send_factory (tcp_server, client, request->name);
+ break;
+ case GST_DEBUGGER__TYPE_DESCRIPTION_REQUEST__TYPE__ENUM_FLAGS:
+ gst_debugserver_types_send_enum_flags (tcp_server, client, request->name);
+ break;
+ case GST_DEBUGGER__TYPE_DESCRIPTION_REQUEST__TYPE__KLASS:
+ gst_debugserver_types_send_klass (tcp_server, client, request->name);
+ break;
+ default:
break;
}
}
diff --git a/src/debugserver/gstdebugservertypes.h b/src/debugserver/gstdebugservertypes.h
index 2f6e35d..d9ed977 100644
--- a/src/debugserver/gstdebugservertypes.h
+++ b/src/debugserver/gstdebugservertypes.h
@@ -25,8 +25,8 @@
#include "gstdebugservertcp.h"
-void gst_debugserver_types_send_type (GstDebugserverTcp *tcp_server, TcpClient *client,
- const GstDebugger__TypeDescriptionRequest *request);
+void gst_debugserver_types_send_type (GstDebugserverTcp * tcp_server,
+ TcpClient * client, const GstDebugger__TypeDescriptionRequest * request);
#endif /* __GST_DEBUGSERVER_ENUM_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
