imperxflexsrc: fix build and rename framelinksrc to imperxflexsrc
This commit is contained in:
@@ -14,6 +14,10 @@ if (NIIMAQDX_FOUND)
|
||||
add_subdirectory (niimaqdx)
|
||||
endif (NIIMAQDX_FOUND)
|
||||
|
||||
if (IMPERX_FLEX_FOUND)
|
||||
add_subdirectory (imperx)
|
||||
endif ()
|
||||
|
||||
if (IOTECHDAQX_FOUND)
|
||||
add_subdirectory (iotechdaqx)
|
||||
endif (IOTECHDAQX_FOUND)
|
||||
|
||||
@@ -7,20 +7,21 @@ set ( HEADERS
|
||||
gstframelinksrc.h )
|
||||
|
||||
include_directories ( AFTER
|
||||
${FRAMELINK_INCLUDE_DIR}
|
||||
${IMPERX_FLEX_INCLUDE_DIR}
|
||||
.)
|
||||
|
||||
add_library ( libgstframelink MODULE
|
||||
add_library ( libgstimperxflex MODULE
|
||||
${SOURCES}
|
||||
${HEADERS} )
|
||||
|
||||
target_link_libraries ( libgstframelink
|
||||
target_link_libraries ( libgstimperxflex
|
||||
${GLIB2_LIBRARIES}
|
||||
${GSTREAMER_LIBRARIES}
|
||||
${GOBJECT_LIBRARIES}
|
||||
${GSTREAMER_LIBRARY}
|
||||
${GSTREAMER_BASE_LIBRARY}
|
||||
${GSTREAMER_INTERFACE_LIBRARY}
|
||||
${GSTREAMER_VIDEO_LIBRARY}
|
||||
${FRAMELINK_LIBRARIES})
|
||||
${IMPERX_FLEX_LIBRARIES})
|
||||
|
||||
install (TARGETS libgstframelink
|
||||
LIBRARY DESTINATION lib/gstreamer-0.10)
|
||||
install (TARGETS libgstimperxflex
|
||||
LIBRARY DESTINATION lib/gstreamer-1.0)
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
* Boston, MA 02110-1335, USA.
|
||||
*/
|
||||
/**
|
||||
* SECTION:element-gstframelinksrc
|
||||
* SECTION:element-gstimperxflexsrc
|
||||
*
|
||||
* The framelinksrc element is a source for IMPERX FrameLink and FrameLink Express framegrabbers.
|
||||
* The imperxflexsrc element is a source for IMPERX and FrameLink Express framegrabbers.
|
||||
*
|
||||
* <refsect2>
|
||||
* <title>Example launch line</title>
|
||||
* |[
|
||||
* gst-launch -v framelinksrc ! ffmpegcolorspace ! autovideosink
|
||||
* gst-launch -v imperxflexsrc ! videoconvert ! autovideosink
|
||||
* ]|
|
||||
* Shows video from the default IMPERX FrameLink framegrabber
|
||||
* Shows video from the default IMPERX FrameLink Express framegrabber
|
||||
* </refsect2>
|
||||
*/
|
||||
|
||||
@@ -654,9 +654,9 @@ gst_framelinksrc_create (GstPushSrc * psrc, GstBuffer ** buf)
|
||||
static gboolean
|
||||
plugin_init (GstPlugin * plugin)
|
||||
{
|
||||
GST_DEBUG_CATEGORY_INIT (gst_framelinksrc_debug, "framelinksrc", 0,
|
||||
GST_DEBUG_CATEGORY_INIT (gst_framelinksrc_debug, "imperxflexsrc", 0,
|
||||
"debug category for framelinksrc element");
|
||||
gst_element_register (plugin, "framelinksrc", GST_RANK_NONE,
|
||||
gst_element_register (plugin, "imperxflexsrc", GST_RANK_NONE,
|
||||
gst_framelinksrc_get_type ());
|
||||
|
||||
return TRUE;
|
||||
|
||||
@@ -22,7 +22,10 @@
|
||||
|
||||
#include <gst/base/gstpushsrc.h>
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <Windows.h>
|
||||
|
||||
#define bool gboolean
|
||||
#include <VCECLB.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
Reference in New Issue
Block a user