sys/v4l/: Fix pad template stuff.
Original commit message from CVS: 2004-01-02 Ronald Bultje <rbultje@ronald.bitfreak.net> * sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_init): * sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_init): * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_base_init), (gst_v4lsrc_init): Fix pad template stuff.
This commit is contained in:
parent
8fb19a51ed
commit
88198262f5
@ -1,3 +1,10 @@
|
|||||||
|
2004-01-02 Ronald Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
|
* sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_init):
|
||||||
|
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_init):
|
||||||
|
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_base_init), (gst_v4lsrc_init):
|
||||||
|
Fix pad template stuff.
|
||||||
|
|
||||||
2004-01-02 Ronald Bultje <rbultje@ronald.bitfreak.net>
|
2004-01-02 Ronald Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
* gst/matroska/ebml-read.c: (gst_ebml_read_sint):
|
* gst/matroska/ebml-read.c: (gst_ebml_read_sint):
|
||||||
|
@ -73,8 +73,6 @@ static GstElementStateReturn gst_v4lmjpegsink_change_state (GstElement
|
|||||||
static void gst_v4lmjpegsink_set_clock (GstElement *element, GstClock *clock);
|
static void gst_v4lmjpegsink_set_clock (GstElement *element, GstClock *clock);
|
||||||
|
|
||||||
|
|
||||||
static GstPadTemplate *sink_template;
|
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
static guint gst_v4lmjpegsink_signals[LAST_SIGNAL] = { 0 };
|
static guint gst_v4lmjpegsink_signals[LAST_SIGNAL] = { 0 };
|
||||||
|
|
||||||
@ -168,7 +166,10 @@ gst_v4lmjpegsink_class_init (GstV4lMjpegSinkClass *klass)
|
|||||||
static void
|
static void
|
||||||
gst_v4lmjpegsink_init (GstV4lMjpegSink *v4lmjpegsink)
|
gst_v4lmjpegsink_init (GstV4lMjpegSink *v4lmjpegsink)
|
||||||
{
|
{
|
||||||
v4lmjpegsink->sinkpad = gst_pad_new_from_template (sink_template, "sink");
|
GstElementClass *klass = GST_ELEMENT_GET_CLASS (v4lmjpegsink);
|
||||||
|
|
||||||
|
v4lmjpegsink->sinkpad = gst_pad_new_from_template (
|
||||||
|
gst_element_class_get_pad_template (klass, "sink"), "sink");
|
||||||
gst_element_add_pad (GST_ELEMENT (v4lmjpegsink), v4lmjpegsink->sinkpad);
|
gst_element_add_pad (GST_ELEMENT (v4lmjpegsink), v4lmjpegsink->sinkpad);
|
||||||
|
|
||||||
gst_pad_set_chain_function (v4lmjpegsink->sinkpad, gst_v4lmjpegsink_chain);
|
gst_pad_set_chain_function (v4lmjpegsink->sinkpad, gst_v4lmjpegsink_chain);
|
||||||
|
@ -103,8 +103,6 @@ static void gst_v4lmjpegsrc_set_clock (GstElement *eleme
|
|||||||
static GstElementStateReturn gst_v4lmjpegsrc_change_state (GstElement *element);
|
static GstElementStateReturn gst_v4lmjpegsrc_change_state (GstElement *element);
|
||||||
|
|
||||||
|
|
||||||
static GstPadTemplate *src_template;
|
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
static guint gst_v4lmjpegsrc_signals[LAST_SIGNAL] = { 0 };
|
static guint gst_v4lmjpegsrc_signals[LAST_SIGNAL] = { 0 };
|
||||||
|
|
||||||
@ -230,9 +228,12 @@ gst_v4lmjpegsrc_class_init (GstV4lMjpegSrcClass *klass)
|
|||||||
static void
|
static void
|
||||||
gst_v4lmjpegsrc_init (GstV4lMjpegSrc *v4lmjpegsrc)
|
gst_v4lmjpegsrc_init (GstV4lMjpegSrc *v4lmjpegsrc)
|
||||||
{
|
{
|
||||||
|
GstElementClass *klass = GST_ELEMENT_GET_CLASS (v4lmjpegsrc);
|
||||||
|
|
||||||
GST_FLAG_SET(GST_ELEMENT(v4lmjpegsrc), GST_ELEMENT_THREAD_SUGGESTED);
|
GST_FLAG_SET(GST_ELEMENT(v4lmjpegsrc), GST_ELEMENT_THREAD_SUGGESTED);
|
||||||
|
|
||||||
v4lmjpegsrc->srcpad = gst_pad_new_from_template (src_template, "src");
|
v4lmjpegsrc->srcpad = gst_pad_new_from_template (
|
||||||
|
gst_element_class_get_pad_template (klass, "src"), "src");
|
||||||
gst_element_add_pad(GST_ELEMENT(v4lmjpegsrc), v4lmjpegsrc->srcpad);
|
gst_element_add_pad(GST_ELEMENT(v4lmjpegsrc), v4lmjpegsrc->srcpad);
|
||||||
|
|
||||||
gst_pad_set_get_function (v4lmjpegsrc->srcpad, gst_v4lmjpegsrc_get);
|
gst_pad_set_get_function (v4lmjpegsrc->srcpad, gst_v4lmjpegsrc_get);
|
||||||
|
@ -95,8 +95,6 @@ static GstElementStateReturn gst_v4lsrc_change_state (GstElement *element);
|
|||||||
static void gst_v4lsrc_set_clock (GstElement *element,
|
static void gst_v4lsrc_set_clock (GstElement *element,
|
||||||
GstClock *clock);
|
GstClock *clock);
|
||||||
|
|
||||||
static GstPadTemplate *src_template = NULL;
|
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
static guint gst_v4lsrc_signals[LAST_SIGNAL] = { 0 };
|
static guint gst_v4lsrc_signals[LAST_SIGNAL] = { 0 };
|
||||||
|
|
||||||
@ -127,6 +125,7 @@ gst_v4lsrc_get_type (void)
|
|||||||
static void
|
static void
|
||||||
gst_v4lsrc_base_init (gpointer g_class)
|
gst_v4lsrc_base_init (gpointer g_class)
|
||||||
{
|
{
|
||||||
|
GstPadTemplate *src_template;
|
||||||
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
|
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
|
||||||
|
|
||||||
gst_element_class_set_details (gstelement_class, &gst_v4lsrc_details);
|
gst_element_class_set_details (gstelement_class, &gst_v4lsrc_details);
|
||||||
@ -191,9 +190,12 @@ gst_v4lsrc_class_init (GstV4lSrcClass *klass)
|
|||||||
static void
|
static void
|
||||||
gst_v4lsrc_init (GstV4lSrc *v4lsrc)
|
gst_v4lsrc_init (GstV4lSrc *v4lsrc)
|
||||||
{
|
{
|
||||||
|
GstElementClass *klass = GST_ELEMENT_GET_CLASS (v4lsrc);
|
||||||
|
|
||||||
GST_FLAG_SET(GST_ELEMENT(v4lsrc), GST_ELEMENT_THREAD_SUGGESTED);
|
GST_FLAG_SET(GST_ELEMENT(v4lsrc), GST_ELEMENT_THREAD_SUGGESTED);
|
||||||
|
|
||||||
v4lsrc->srcpad = gst_pad_new_from_template (src_template, "src");
|
v4lsrc->srcpad = gst_pad_new_from_template (
|
||||||
|
gst_element_class_get_pad_template (klass, "src"), "src");
|
||||||
gst_element_add_pad(GST_ELEMENT(v4lsrc), v4lsrc->srcpad);
|
gst_element_add_pad(GST_ELEMENT(v4lsrc), v4lsrc->srcpad);
|
||||||
|
|
||||||
gst_pad_set_get_function (v4lsrc->srcpad, gst_v4lsrc_get);
|
gst_pad_set_get_function (v4lsrc->srcpad, gst_v4lsrc_get);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user