GNOME.org
 

[gst-debugger/refactor-v1.0] refactor: "common" library review

commit ab25e9f00fff6df5b4b80dd5e966cffdd3c90654
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Sat Oct 3 23:22:19 2015 +0200

    refactor: "common" library review

 src/common/Makefile.am                             |    7 +-
 src/common/buffer-prepare-utils.h                  |   34 ----
 src/common/deserializer.c                          |  148 ------------------
 src/common/deserializer.h                          |   30 ----
 src/common/gst-utils.c                             |   51 ++-----
 src/common/gst-utils.h                             |   21 ++--
 src/common/{protocol_utils.c => protocol-utils.c}  |   58 +++----
 src/common/protocol-utils.h                        |   23 +++
 src/common/protocol_utils.h                        |   29 ----
 src/common/serializer.c                            |  162 +++++++-------------
 src/common/serializer.h                            |   11 +-
 src/debugserver/gstdebugserver.c                   |    2 +-
 src/debugserver/gstdebugserverbuffer.c             |    2 +-
 src/debugserver/gstdebugserverqe.c                 |    3 +-
 src/debugserver/gstdebugservertcp.c                |   34 +----
 src/debugserver/gstdebugservertopology.c           |    2 +-
 src/gst-debugger/controller/controller.cpp         |    2 +-
 src/gst-debugger/controller/tcp_client.cpp         |    8 +-
 src/gst-debugger/gvalue-converter/gvalue_enum.cpp  |    3 +-
 src/gst-debugger/gvalue-converter/gvalue_flags.cpp |    3 +-
 .../gvalue-converter/gvalue_unknown.cpp            |    3 +-
 src/gst-debugger/modules/gst_properties_module.cpp |    1 -
 src/gst-debugger/pipeline-drawer/graph_module.cpp  |    3 +-
 23 files changed, 154 insertions(+), 486 deletions(-)
---
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a84a014..cc3ddf5 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -12,17 +12,14 @@ dist_noinst_DATA = gstdebugger.proto
 MOSTLYCLEANFILES = gstdebugger.pb-c.c gstdebugger.pb-c.h gstdebugger.pb.cc gstdebugger.pb.h
 
 common_sources =               \
-       deserializer.c          \
        gst-utils.c             \
-       protocol_utils.c        \
+       protocol-utils.c        \
        serializer.c
 
 common_headers =               \
-       buffer-prepare-utils.h  \
        common.h                \
-       deserializer.h          \
        gst-utils.h             \
-       protocol_utils.h        \
+       protocol-utils.h        \
        serializer.h
 
 common_include_dir = $(includedir)/gst-debugger- GST_DEBUGGER_API_VERSION@/gst-debugger
diff --git a/src/common/gst-utils.c b/src/common/gst-utils.c
index 034538b..4bb062d 100644
--- a/src/common/gst-utils.c
+++ b/src/common/gst-utils.c
@@ -1,26 +1,26 @@
 #include "gst-utils.h"
 
-#include <glib.h>
-
-#include <limits.h>
 #include <assert.h>
 #include <string.h>
 
-GstObject* gst_utils_get_root (GstObject * start)
+static gpointer gst_unknown_type_copy (gpointer *object)
 {
-  GstObject *tmp;
-
-  if (start == NULL) {
-    return NULL;
-  }
+  return gst_unknown_type_new (((GstUnknownType*)object)->type_name);
+}
 
-  tmp = start;
+static void gst_unknown_type_free (gpointer *object)
+{
+  g_free (((GstUnknownType*)object)->type_name);
+  g_slice_free1 (sizeof (GstUnknownType), object);
+}
 
-  do {
-    start = tmp;
-  } while ((tmp = gst_object_get_parent (start)) != NULL);
+G_DEFINE_BOXED_TYPE (GstUnknownType, gst_unknown_type, (GBoxedCopyFunc)gst_unknown_type_copy, 
(GBoxedFreeFunc)gst_unknown_type_free);
 
-  return start;
+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)
@@ -167,26 +167,3 @@ GType gst_utils_get_virtual_flags_type (void)
 
   return (GType) id;
 }
-
-
-static gpointer gst_unknown_type_copy (gpointer *object)
-{
-  return gst_unknown_type_new (((GstUnknownType*)object)->type_name);
-}
-
-static void gst_unknown_type_free (gpointer *object)
-{
-  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);
-
-GstUnknownType* gst_unknown_type_new (const gchar *type_name)
-{
-  GstUnknownType *self = g_slice_new (GstUnknownType);
-  self->type_name = g_strdup (type_name);
-  return self;
-}
-
-
diff --git a/src/common/gst-utils.h b/src/common/gst-utils.h
index bd6d71b..d054fcd 100644
--- a/src/common/gst-utils.h
+++ b/src/common/gst-utils.h
@@ -1,11 +1,17 @@
-#ifndef __GST_DEBUGGER_GST_UTILS_H__
-#define __GST_DEBUGGER_GST_UTILS_H__
+#ifndef SRC_COMMON_GST_UTILS_H_
+#define SRC_COMMON_GST_UTILS_H_
 
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
 
-GstObject* gst_utils_get_root (GstObject * start);
+typedef struct {
+  gchar *type_name;
+} GstUnknownType;
+
+GType gst_unknown_type_get_type(void);
+
+GstUnknownType *gst_unknown_type_new (const gchar *type_name);
 
 GstElement* gst_utils_get_element_from_path (GstElement * root, const gchar * path);
 
@@ -19,13 +25,6 @@ GType gst_utils_get_virtual_enum_type (void);
 
 GType gst_utils_get_virtual_flags_type (void);
 
-typedef struct {
-  gchar *type_name;
-} GstUnknownType;
-
-GType gst_unknown_type_get_type(void);
-GstUnknownType *gst_unknown_type_new (const gchar *type_name);
-
 G_END_DECLS
 
-#endif /* __GST_DEBUGGER_GST_UTILS_H__ */
+#endif /* SRC_COMMON_GST_UTILS_H_ */
diff --git a/src/common/protocol_utils.c b/src/common/protocol-utils.c
similarity index 55%
rename from src/common/protocol_utils.c
rename to src/common/protocol-utils.c
index a77a80e..3699926 100644
--- a/src/common/protocol_utils.c
+++ b/src/common/protocol-utils.c
@@ -1,42 +1,24 @@
-#include "protocol_utils.h"
-
-#define SESRIALIZER \
-  gint i; \
-  for (i = 0; i < size; i++) { \
-    buffer[i] = value % 256; \
-    value /= 256; \
-  }
-
-#define DESERIALIZER \
-  gint value = 0, i; \
-  for (i = size - 1; i >= 0; i--) { \
-    value *= 256; \
-    value += (unsigned char)buffer[i]; \
-  } \
-  return value;
+#include "protocol-utils.h"
 
 void
 gst_debugger_protocol_utils_serialize_integer64 (gint64 value, gchar * buffer, gint size)
 {
-  SESRIALIZER
-}
-
-void
-gst_debugger_protocol_utils_serialize_uinteger64 (guint64 value, gchar * buffer, gint size)
-{
-  SESRIALIZER
+  gint i;
+  for (i = 0; i < size; i++) {
+    buffer[i] = value % 256;
+    value /= 256;
+  }
 }
 
-gint64
+static gint64
 gst_debugger_protocol_utils_deserialize_integer64 (const gchar * buffer, gint size)
 {
-  DESERIALIZER
-}
-
-guint64
-gst_debugger_protocol_utils_deserialize_uinteger64 (const gchar * buffer, gint size)
-{
-  DESERIALIZER
+  gint value = 0, i;
+  for (i = size - 1; i >= 0; i--) {
+    value *= 256;
+    value += (unsigned char)buffer[i];
+  }
+  return value;
 }
 
 gboolean
@@ -60,9 +42,21 @@ gst_debugger_protocol_utils_read_header (GInputStream * istream, GCancellable *c
 {
   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*
+gst_debugger_protocol_write_header (GOutputStream * ostream, gint64 value)
+{
+  gchar size_buffer[4];
+  GError *err = NULL;
+
+  gst_debugger_protocol_utils_serialize_integer64 (value, size_buffer, 4);
+  g_output_stream_write (ostream, size_buffer, 4, NULL, &err);
+
+  return err;
+}
diff --git a/src/common/protocol-utils.h b/src/common/protocol-utils.h
new file mode 100644
index 0000000..133a22c
--- /dev/null
+++ b/src/common/protocol-utils.h
@@ -0,0 +1,23 @@
+/*
+ * protocol-utils.h
+ *
+ *  Created on: Jun 9, 2015
+ *      Author: mkolny
+ */
+
+#ifndef PROTOCOL_UTILS_H_
+#define PROTOCOL_UTILS_H_
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+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);
+
+GError* gst_debugger_protocol_write_header (GOutputStream * ostream, gint64 value);
+
+G_END_DECLS
+
+#endif /* PROTOCOL_UTILS_H_ */
diff --git a/src/common/serializer.c b/src/common/serializer.c
index e41a4a5..06b2fd5 100644
--- a/src/common/serializer.c
+++ b/src/common/serializer.c
@@ -6,111 +6,8 @@
  */
 
 #include "serializer.h"
-#include "protocol_utils.h"
-
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
-
-gint gst_query_serialize (GstQuery * query, gchar * buffer, gint size)
-{
-  gchar * str;
-  gint str_len;
-  gint type_size;
-  gint total_size;
-  const GstStructure * q_structure = gst_query_get_structure (query);
-
-  str = gst_structure_to_string (q_structure);
-  str_len = strlen (str) + 1;
-  type_size = 4;
-  total_size = type_size + str_len;
-  if (total_size > size) {
-    goto finalize;
-  }
-
-  gst_debugger_protocol_utils_serialize_integer64 (query->type, buffer, type_size);
-  memcpy (buffer + type_size, str, str_len);
-
-finalize:
-  g_free (str);
-  return total_size;
-}
-
-gint gst_event_serialize (GstEvent * event, gchar * buffer, gint size)
-{
-  gint total_size;
-  gchar *evt_str;
-  gint str_len;
-  const GstStructure *e_structure = gst_event_get_structure (event);
-
-  evt_str = gst_structure_to_string (e_structure);
-  str_len = strlen (evt_str)+1;
-  total_size = str_len + 16;
-
-  if (total_size > size) {
-    goto finalize;
-  }
-
-  gst_debugger_protocol_utils_serialize_integer64 (event->type, buffer, 4);
-  gst_debugger_protocol_utils_serialize_uinteger64(event->timestamp, buffer+4, 8);
-  gst_debugger_protocol_utils_serialize_uinteger64(event->seqnum, buffer+12, 4);
-  memcpy (buffer + 16, evt_str, str_len);
-
-finalize:
-  g_free (evt_str);
-  return total_size;
-}
-
-gint gst_message_serialize(GstMessage * message, gchar * buffer, gint size)
-{
-  gint total_size;
-  gchar *msg_str;
-  gint msg_str_len;
-  const GstStructure *m_structure = gst_message_get_structure (message);
-  gchar *src_name = GST_MESSAGE_SRC_NAME (message);
-  gint src_name_len = strlen (src_name) + 1;
-
-  msg_str = gst_structure_to_string (m_structure);
-  msg_str_len = strlen (msg_str)+1;
-  total_size = msg_str_len + 16 + src_name_len;
-
-  if (total_size > size) {
-    goto finalize;
-  }
-
-  gst_debugger_protocol_utils_serialize_integer64 (message->type, buffer, 4);
-  gst_debugger_protocol_utils_serialize_uinteger64(message->timestamp, buffer+4, 8);
-  gst_debugger_protocol_utils_serialize_uinteger64(message->seqnum, buffer+12, 4);
-
-  memcpy (buffer + 16, msg_str, msg_str_len);
-  memcpy (buffer + 16 + msg_str_len, src_name, src_name_len);
-
-finalize:
-  g_free (msg_str);
-  return total_size;
-}
-
-gint gst_buffer_serialize(GstBuffer * gstbuffer, gchar * buffer, gint size)
-{
-  gint buff_size = gst_buffer_get_size(gstbuffer);
-  gint total_size = 44 + buff_size;
-
-  if (total_size > size) {
-    goto finalize;
-  }
-
-  gst_debugger_protocol_utils_serialize_uinteger64 (GST_BUFFER_PTS (gstbuffer), buffer, 8);
-  gst_debugger_protocol_utils_serialize_uinteger64 (GST_BUFFER_DTS (gstbuffer), buffer+8, 8);
-  gst_debugger_protocol_utils_serialize_uinteger64 (GST_BUFFER_DURATION (gstbuffer), buffer+16, 8);
-  gst_debugger_protocol_utils_serialize_uinteger64 (GST_BUFFER_OFFSET (gstbuffer), buffer+24, 8);
-  gst_debugger_protocol_utils_serialize_uinteger64 (GST_BUFFER_OFFSET_END (gstbuffer), buffer+32, 8);
-  gst_debugger_protocol_utils_serialize_uinteger64 (GST_BUFFER_FLAGS (gstbuffer), buffer+40, 4);
-
-  gst_buffer_extract(gstbuffer, 0, buffer + 44, buff_size);
-
-finalize:
-  return total_size;
-}
+#include "gst-utils.h"
 
 gchar * g_value_serialize (GValue * value, GType * type, InternalGType * internal_type)
 {
@@ -162,3 +59,60 @@ gchar * g_value_serialize (GValue * value, GType * type, InternalGType * interna
 
   return gst_value_serialize (&tmp);
 }
+
+
+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));
+    }
+    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);
+
+    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 cefc71f..982c06e 100644
--- a/src/common/serializer.h
+++ b/src/common/serializer.h
@@ -14,16 +14,11 @@
 
 G_BEGIN_DECLS
 
-gint gst_query_serialize(GstQuery * query, gchar * buffer, gint size);
-
-gint gst_event_serialize(GstEvent * event, gchar * buffer, gint size);
-
-gint gst_message_serialize(GstMessage * message, gchar * buffer, gint size);
-
-gint gst_buffer_serialize(GstBuffer * gstbuffer, gchar * buffer, gint size);
-
 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);
+
 G_END_DECLS
 
 #endif /* SRC_GST_SERIALIZATION_SERIALIZER_H_ */
diff --git a/src/debugserver/gstdebugserver.c b/src/debugserver/gstdebugserver.c
index 22451ac..29f90c9 100644
--- a/src/debugserver/gstdebugserver.c
+++ b/src/debugserver/gstdebugserver.c
@@ -34,7 +34,7 @@
 
 #include "gstdebugservertopology.h"
 
-#include "common/gst-utils.h"
+#include "../common/gst-utils.h"
 #include "common/serializer.h"
 
 #include <string.h>
diff --git a/src/debugserver/gstdebugserverbuffer.c b/src/debugserver/gstdebugserverbuffer.c
index 4c79b66..458ef78 100644
--- a/src/debugserver/gstdebugserverbuffer.c
+++ b/src/debugserver/gstdebugserverbuffer.c
@@ -19,7 +19,7 @@
 
 #include "gstdebugserverbuffer.h"
 
-#include "common/gst-utils.h"
+#include "../common/gst-utils.h"
 
 typedef struct {
   gboolean send_data;
diff --git a/src/debugserver/gstdebugserverqe.c b/src/debugserver/gstdebugserverqe.c
index 0a82727..18bf830 100644
--- a/src/debugserver/gstdebugserverqe.c
+++ b/src/debugserver/gstdebugserverqe.c
@@ -21,9 +21,8 @@
 
 #include "common/serializer.h"
 #include "common/gstdebugger.pb-c.h"
-#include "common/gst-utils.h"
-
 #include <string.h>
+#include "../common/gst-utils.h"
 
 typedef struct _QEWatch {
   gint qe_type;
diff --git a/src/debugserver/gstdebugservertcp.c b/src/debugserver/gstdebugservertcp.c
index ed6891b..ef7599c 100644
--- a/src/debugserver/gstdebugservertcp.c
+++ b/src/debugserver/gstdebugservertcp.c
@@ -19,10 +19,11 @@
 
 #include "gstdebugservertcp.h"
 
-#include "common/protocol_utils.h"
 #include "common/gstdebugger.pb-c.h"
 
 #include <gst/gst.h>
+
+#include "../common/protocol-utils.h"
 #define GST_USE_UNSTABLE_API
 #include <gst/gsttracer.h>
 
@@ -207,35 +208,13 @@ gst_debugserver_tcp_find_client (GstDebugserverTcp * tcp, GSocketConnection * co
  return NULL;
 }
 
-#define SAFE_PREPARE_BUFFER_INIT(BUFFER_SIZE) \
-  gchar buff[BUFFER_SIZE]; \
-  gchar *m_buff = buff; \
-  gint max_m_buff_size = BUFFER_SIZE;
-
-#define SAFE_PREPARE_BUFFER(FUNCTION_CALL, SIZE_VAR) \
-  do { \
-    SIZE_VAR = (FUNCTION_CALL); \
-    if (SIZE_VAR > 1024) { \
-      m_buff = (gchar *) g_malloc (SIZE_VAR); \
-      max_m_buff_size = SIZE_VAR; \
-      SIZE_VAR = (FUNCTION_CALL); \
-    } \
-  } while (0)
-
-#define SAFE_PREPARE_BUFFER_CLEAN \
-  do { \
-    if (m_buff != buff) { \
-      g_free (m_buff); \
-    } \
-  } while (0)
-
 gboolean
 gst_debugserver_tcp_send_packet (GstDebugserverTcp * tcp, TcpClient * client,
   GstDebugger__GStreamerData * gst_data)
 {
   GError *err = NULL;
   gchar size_buffer[4];
-  GSocket *socket;
+  GOutputStream *ostream;
   gchar buff[1024];
   gchar *m_buff = buff;
   gint size;
@@ -250,12 +229,11 @@ gst_debugserver_tcp_send_packet (GstDebugserverTcp * tcp, TcpClient * client,
     return FALSE;
   }
 
-  socket = g_socket_connection_get_socket (client->connection);
+  ostream = g_io_stream_get_output_stream (G_IO_STREAM (client->connection));
 
   size = gst_debugger__gstreamer_data__get_packed_size (gst_data);
-  gst_debugger_protocol_utils_serialize_integer64 (size, size_buffer, 4);
 
-  g_socket_send (socket, (gchar*)size_buffer, 4, NULL, &err);
+  err = gst_debugger_protocol_write_header (ostream, size);
 
   if (err) {
     g_mutex_unlock (&client->mutex);
@@ -270,7 +248,7 @@ gst_debugserver_tcp_send_packet (GstDebugserverTcp * tcp, TcpClient * client,
 
   gst_debugger__gstreamer_data__pack (gst_data, m_buff);
 
-  g_socket_send (socket, (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);
diff --git a/src/debugserver/gstdebugservertopology.c b/src/debugserver/gstdebugservertopology.c
index c1fe0f9..0294e10 100644
--- a/src/debugserver/gstdebugservertopology.c
+++ b/src/debugserver/gstdebugservertopology.c
@@ -18,10 +18,10 @@
  */
 
 #include "gstdebugservertopology.h"
-#include "common/gst-utils.h"
 #include "common/gstdebugger.pb-c.h"
 #include <stdio.h>
 #include <string.h>
+#include "../common/gst-utils.h"
 
 GSList *src_pads;
 
diff --git a/src/gst-debugger/controller/controller.cpp b/src/gst-debugger/controller/controller.cpp
index b7a35a5..95670c1 100644
--- a/src/gst-debugger/controller/controller.cpp
+++ b/src/gst-debugger/controller/controller.cpp
@@ -12,8 +12,8 @@
 #include "gvalue-converter/gvalue_enum.h"
 #include "gvalue-converter/gvalue_flags.h"
 
+#include "common/serializer.h"
 #include "common/common.h"
-#include "common/deserializer.h"
 
 #include <gtkmm.h>
 
diff --git a/src/gst-debugger/controller/tcp_client.cpp b/src/gst-debugger/controller/tcp_client.cpp
index f4de69f..9e2d9f6 100644
--- a/src/gst-debugger/controller/tcp_client.cpp
+++ b/src/gst-debugger/controller/tcp_client.cpp
@@ -7,9 +7,8 @@
 
 #include "tcp_client.h"
 
-#include "common/protocol_utils.h"
-
 #include <cassert>
+#include "../../common/protocol-utils.h"
 
 bool TcpClient::connect(const std::string &address, int port)
 {
@@ -90,9 +89,6 @@ void TcpClient::send_command(const GstDebugger::Command &cmd)
        if (!is_connected())
                throw Gio::Error(Gio::Error::FAILED, "No connection!");
 
-       char buffer[4];
-       auto size = cmd.ByteSize();
-       gst_debugger_protocol_utils_serialize_integer64(size, buffer, 4);
-       connection->get_output_stream()->write(buffer, 4);
+       gst_debugger_protocol_write_header(connection->get_output_stream()->gobj(), cmd.ByteSize());
        cmd.SerializeToFileDescriptor(connection->get_socket()->get_fd());
 }
diff --git a/src/gst-debugger/gvalue-converter/gvalue_enum.cpp 
b/src/gst-debugger/gvalue-converter/gvalue_enum.cpp
index b51f630..5fca979 100644
--- a/src/gst-debugger/gvalue-converter/gvalue_enum.cpp
+++ b/src/gst-debugger/gvalue-converter/gvalue_enum.cpp
@@ -7,9 +7,8 @@
 
 #include "gvalue_enum.h"
 
-#include "common/gst-utils.h"
-
 #include <glibmm.h>
+#include "../../common/gst-utils.h"
 
 GValueEnum::GValueEnum(GValue *gobj)
 : GValueBase(gobj)
diff --git a/src/gst-debugger/gvalue-converter/gvalue_flags.cpp 
b/src/gst-debugger/gvalue-converter/gvalue_flags.cpp
index 84bee6a..56e19c9 100644
--- a/src/gst-debugger/gvalue-converter/gvalue_flags.cpp
+++ b/src/gst-debugger/gvalue-converter/gvalue_flags.cpp
@@ -8,9 +8,8 @@
 #include "gvalue_flags.h"
 #include "ui_utils.h"
 
-#include "common/gst-utils.h"
-
 #include <glibmm.h>
+#include "../../common/gst-utils.h"
 
 GValueFlags::GValueFlags(GValue *gobj)
 : GValueBase(gobj)
diff --git a/src/gst-debugger/gvalue-converter/gvalue_unknown.cpp 
b/src/gst-debugger/gvalue-converter/gvalue_unknown.cpp
index 2c91897..3a8a4eb 100644
--- a/src/gst-debugger/gvalue-converter/gvalue_unknown.cpp
+++ b/src/gst-debugger/gvalue-converter/gvalue_unknown.cpp
@@ -6,7 +6,8 @@
  */
 
 #include "gvalue_unknown.h"
-#include "common/gst-utils.h"
+
+#include "../../common/gst-utils.h"
 GValueUnknown::GValueUnknown(GValue *gobj)
 : GValueBase(gobj)
 {}
diff --git a/src/gst-debugger/modules/gst_properties_module.cpp 
b/src/gst-debugger/modules/gst_properties_module.cpp
index 44d81a1..94f34dc 100644
--- a/src/gst-debugger/modules/gst_properties_module.cpp
+++ b/src/gst-debugger/modules/gst_properties_module.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "gst_properties_module.h"
-#include "common/deserializer.h"
 #include "controller/command_factory.h"
 #include "controller/controller.h"
 #include "controller/element_path_processor.h"
diff --git a/src/gst-debugger/pipeline-drawer/graph_module.cpp 
b/src/gst-debugger/pipeline-drawer/graph_module.cpp
index 56a7586..52b61a9 100644
--- a/src/gst-debugger/pipeline-drawer/graph_module.cpp
+++ b/src/gst-debugger/pipeline-drawer/graph_module.cpp
@@ -9,11 +9,10 @@
 
 #include "controller/controller.h"
 
-#include "common/gst-utils.h"
-
 #include "graphviz-plugin/graphviz-gstdebugger.h"
 
 #include <boost/algorithm/string.hpp>
+#include "../../common/gst-utils.h"
 
 static void ptr_free(std::shared_ptr<ElementModel>* ptr)
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]