projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a0e3a9e
)
video: Remove custom marshallers
author
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Tue, 24 Apr 2012 16:16:27 +0000
(18:16 +0200)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Tue, 24 Apr 2012 16:16:27 +0000
(18:16 +0200)
gst-libs/gst/video/Makefile.am
patch
|
blob
|
history
gst-libs/gst/video/colorbalance.c
patch
|
blob
|
history
gst-libs/gst/video/colorbalancechannel.c
patch
|
blob
|
history
gst-libs/gst/video/video-marshal.list
[deleted file]
patch
|
blob
|
history
gst-libs/gst/video/videoorientation.c
patch
|
blob
|
history
diff --git
a/gst-libs/gst/video/Makefile.am
b/gst-libs/gst/video/Makefile.am
index
4cc5bf2
..
f5af250
100644
(file)
--- a/
gst-libs/gst/video/Makefile.am
+++ b/
gst-libs/gst/video/Makefile.am
@@
-1,19
+1,17
@@
-# variables used for enum
/marshal
generation
+# variables used for enum generation
glib_enum_headers = video.h colorbalance.h navigation.h
glib_enum_define = GST_VIDEO
glib_gen_prefix = gst_video
glib_gen_basename = video
glib_enum_headers = video.h colorbalance.h navigation.h
glib_enum_define = GST_VIDEO
glib_gen_prefix = gst_video
glib_gen_basename = video
-built_sources = video-enumtypes.c
video-marshal.c
-built_headers = video-enumtypes.h
video-marshal.h
+built_sources = video-enumtypes.c
+built_headers = video-enumtypes.h
BUILT_SOURCES = $(built_sources) $(built_headers)
lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la
CLEANFILES = $(BUILT_SOURCES)
BUILT_SOURCES = $(built_sources) $(built_headers)
lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la
CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = video-marshal.list
-
libgstvideo_@GST_API_VERSION@_la_SOURCES = \
colorbalance.c \
colorbalancechannel.c \
libgstvideo_@GST_API_VERSION@_la_SOURCES = \
colorbalance.c \
colorbalancechannel.c \
diff --git
a/gst-libs/gst/video/colorbalance.c
b/gst-libs/gst/video/colorbalance.c
index
57a4de4
..
53aeca3
100644
(file)
--- a/
gst-libs/gst/video/colorbalance.c
+++ b/
gst-libs/gst/video/colorbalance.c
@@
-25,7
+25,6
@@
#endif
#include "colorbalance.h"
#endif
#include "colorbalance.h"
-#include "video-marshal.h"
/**
* SECTION:gstcolorbalance
/**
* SECTION:gstcolorbalance
@@
-99,8
+98,7
@@
gst_color_balance_class_init (GstColorBalanceInterface * iface)
g_signal_new ("value-changed",
GST_TYPE_COLOR_BALANCE, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstColorBalanceInterface, value_changed),
g_signal_new ("value-changed",
GST_TYPE_COLOR_BALANCE, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstColorBalanceInterface, value_changed),
- NULL, NULL,
- gst_video_marshal_VOID__OBJECT_INT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 2, GST_TYPE_COLOR_BALANCE_CHANNEL, G_TYPE_INT);
initialized = TRUE;
G_TYPE_NONE, 2, GST_TYPE_COLOR_BALANCE_CHANNEL, G_TYPE_INT);
initialized = TRUE;
diff --git
a/gst-libs/gst/video/colorbalancechannel.c
b/gst-libs/gst/video/colorbalancechannel.c
index
ae22fba
..
bcd6b78
100644
(file)
--- a/
gst-libs/gst/video/colorbalancechannel.c
+++ b/
gst-libs/gst/video/colorbalancechannel.c
@@
-96,8
+96,7
@@
gst_color_balance_channel_class_init (GstColorBalanceChannelClass * klass)
g_signal_new ("value-changed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstColorBalanceChannelClass,
g_signal_new ("value-changed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstColorBalanceChannelClass,
- value_changed),
- NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+ value_changed), NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT);
object_klass->dispose = gst_color_balance_channel_dispose;
}
object_klass->dispose = gst_color_balance_channel_dispose;
}
diff --git
a/gst-libs/gst/video/video-marshal.list
b/gst-libs/gst/video/video-marshal.list
deleted file mode 100644
(file)
index
b9d0c49
..0000000
--- a/
gst-libs/gst/video/video-marshal.list
+++ /dev/null
@@
-1
+0,0 @@
-VOID:OBJECT,INT
diff --git
a/gst-libs/gst/video/videoorientation.c
b/gst-libs/gst/video/videoorientation.c
index
0f8ede4
..
bb96286
100644
(file)
--- a/
gst-libs/gst/video/videoorientation.c
+++ b/
gst-libs/gst/video/videoorientation.c
@@
-24,7
+24,6
@@
#endif
#include "videoorientation.h"
#endif
#include "videoorientation.h"
-#include "video-marshal.h"
#include <string.h>
#include <string.h>