diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2002-11-15 19:21:58 +0000 |
|---|---|---|
| committer | Christian Schaller <uraeus@gnome.org> | 2002-11-15 19:21:58 +0000 |
| commit | 230f3f84af0e4711f1526bacc2f9d0320a080c00 (patch) | |
| tree | 81616a2aa5aa9bd32de22fe57fd57f8ec44da6cf /ext/raw1394 | |
| parent | bcf4679ab361fa819d806f93e5c7d4a0aa1974b2 (diff) | |
add media-info to spec commit patch from Jan Schmidt for raw1394 plugin
Original commit message from CVS:
add media-info to spec
commit patch from Jan Schmidt for raw1394 plugin
Diffstat (limited to 'ext/raw1394')
| -rw-r--r-- | ext/raw1394/Makefile.am | 2 | ||||
| -rw-r--r-- | ext/raw1394/gst1394.c | 2 | ||||
| -rw-r--r-- | ext/raw1394/gstdv1394src.c | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ext/raw1394/Makefile.am b/ext/raw1394/Makefile.am index 18c590d5..f0e1285f 100644 --- a/ext/raw1394/Makefile.am +++ b/ext/raw1394/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgst1394.la libgst1394_la_SOURCES = gst1394.c gstdv1394src.c libgst1394_la_CFLAGS = $(GST_CFLAGS) -libgst1394_la_LIBADD = $(raw1394_LIBS) +libgst1394_la_LIBADD = $(RAW1394_LIBS) libgst1394_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstdv1394src.h diff --git a/ext/raw1394/gst1394.c b/ext/raw1394/gst1394.c index d4dd5cdf..9ad4ac79 100644 --- a/ext/raw1394/gst1394.c +++ b/ext/raw1394/gst1394.c @@ -21,7 +21,7 @@ #include <gst/gst.h> -#include "dv1394src.h" +#include "gstdv1394src.h" /* elementfactory information */ static GstElementDetails gst_dv1394src_details = { diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c index b096f348..a14cb707 100644 --- a/ext/raw1394/gstdv1394src.c +++ b/ext/raw1394/gstdv1394src.c @@ -31,6 +31,7 @@ enum { ARG_0 }; +#if 0 static GstPadTemplate* gst_dv1394src_factory (void) { @@ -51,6 +52,7 @@ gst_dv1394src_factory (void) } return template; } +#endif static void gst_dv1394src_class_init (GstDV1394SrcClass *klass); static void gst_dv1394src_init (GstDV1394Src *filter); @@ -171,7 +173,8 @@ fprintf(stderr,"."); } static -int gst_dv1394src_bus_reset(raw1394handle_t handle) { +int gst_dv1394src_bus_reset(raw1394handle_t handle, + unsigned int generation) { GST_INFO_ELEMENT(0,GST_DV1394SRC(raw1394_get_userdata(handle)),"have bus reset"); return 0; } @@ -198,7 +201,7 @@ gst_dv1394src_change_state (GstElement *element) switch (GST_STATE_TRANSITION (element)) { case GST_STATE_NULL_TO_READY: - if ((dv1394src->handle = raw1394_get_handle()) == NULL) { + if ((dv1394src->handle = raw1394_new_handle()) == NULL) { GST_INFO_ELEMENT(0,dv1394src,"can't get raw1394 handle"); return GST_STATE_FAILURE; } |