From f1cb7f12c3b78d8973c532c31d2d4cade60b1a2c Mon Sep 17 00:00:00 2001 From: Jose Antonio Santos Cadenas Date: Fri, 26 Jul 2013 10:26:19 +0200 Subject: [PATCH] Change prefix of generated marshal codes Change-Id: I62e37fba2ad5ff8948bdbf9eeb0697780e87999e --- .gitignore | 2 ++ src/Makefile.am | 12 ++++++------ src/{gstkurento-marshal.list => kms-marshal.list} | 0 src/kmsbasesdpendpoint.c | 8 ++++---- 4 files changed, 12 insertions(+), 10 deletions(-) rename src/{gstkurento-marshal.list => kms-marshal.list} (100%) diff --git a/.gitignore b/.gitignore index ba201a327..b8574c8be 100644 --- a/.gitignore +++ b/.gitignore @@ -39,5 +39,7 @@ ltversion.m4 lt~obsolete.m4 gstkurento-marshal.c gstkurento-marshal.h +kms-marshal.c +kms-marshal.h .directory *.tmp diff --git a/src/Makefile.am b/src/Makefile.am index 07969dc6d..65545bb27 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,19 +1,19 @@ plugin_LTLIBRARIES = libgstkurento.la -glib_enum_define = GST_KURENTO -glib_gen_prefix = __gst_kurento -glib_gen_basename = gstkurento +glib_enum_define = KMS_PLUGINS +glib_gen_prefix = __kms +glib_gen_basename = kms include $(top_srcdir)/gst-glib-gen.mak -built_sources = gstkurento-marshal.c -built_headers = gstkurento-marshal.h +built_sources = kms-marshal.c +built_headers = kms-marshal.h BUILT_SOURCES = $(built_sources) $(built_headers) CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = gstkurento-marshal.list +EXTRA_DIST = kms-marshal.list # sources used to compile this plug-in libgstkurento_la_SOURCES = gstkurento.c \ diff --git a/src/gstkurento-marshal.list b/src/kms-marshal.list similarity index 100% rename from src/gstkurento-marshal.list rename to src/kms-marshal.list diff --git a/src/kmsbasesdpendpoint.c b/src/kmsbasesdpendpoint.c index 6d4df42e6..b3c979de1 100644 --- a/src/kmsbasesdpendpoint.c +++ b/src/kmsbasesdpendpoint.c @@ -6,7 +6,7 @@ #include "kmsbasesdpenpoint.h" #include "kmsagnosticbin.h" -#include "gstkurento-marshal.h" +#include "kms-marshal.h" #include "sdp_utils.h" #define PLUGIN_NAME "base_sdp_end_point" @@ -387,14 +387,14 @@ kms_base_sdp_end_point_class_init (KmsBaseSdpEndPointClass * klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_ACTION | G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (KmsBaseSdpEndPointClass, generate_offer), NULL, NULL, - __gst_kurento_marshal_BOXED__VOID, GST_TYPE_SDP_MESSAGE, 0); + __kms_marshal_BOXED__VOID, GST_TYPE_SDP_MESSAGE, 0); kms_base_sdp_end_point_signals[SIGNAL_PROCESS_OFFER] = g_signal_new ("process-offer", G_TYPE_FROM_CLASS (klass), G_SIGNAL_ACTION | G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (KmsBaseSdpEndPointClass, process_offer), NULL, NULL, - __gst_kurento_marshal_BOXED__BOXED, GST_TYPE_SDP_MESSAGE, 1, + __kms_marshal_BOXED__BOXED, GST_TYPE_SDP_MESSAGE, 1, GST_TYPE_SDP_MESSAGE); kms_base_sdp_end_point_signals[SIGNAL_PROCESS_ANSWER] = @@ -402,7 +402,7 @@ kms_base_sdp_end_point_class_init (KmsBaseSdpEndPointClass * klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_ACTION | G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (KmsBaseSdpEndPointClass, process_answer), NULL, NULL, - __gst_kurento_marshal_VOID__BOXED, G_TYPE_NONE, 1, GST_TYPE_SDP_MESSAGE); + __kms_marshal_VOID__BOXED, G_TYPE_NONE, 1, GST_TYPE_SDP_MESSAGE); /* Properties initialization */ g_object_class_install_property (gobject_class, PROP_USE_IPV6,