Skip to content

Commit

Permalink
Change prefix of generated marshal codes
Browse files Browse the repository at this point in the history
Change-Id: I62e37fba2ad5ff8948bdbf9eeb0697780e87999e
  • Loading branch information
jcaden committed Jul 26, 2013
1 parent 9e5a7dd commit f1cb7f1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,7 @@ ltversion.m4
lt~obsolete.m4
gstkurento-marshal.c
gstkurento-marshal.h
kms-marshal.c
kms-marshal.h
.directory
*.tmp
12 changes: 6 additions & 6 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions src/kmsbasesdpendpoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -387,22 +387,22 @@ 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] =
g_signal_new ("process-answer",
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,
Expand Down

0 comments on commit f1cb7f1

Please sign in to comment.