camerabin2: Move basecamerasrc to gst-libs

Move the base camera src class to gst-libs/gst/basecamerabinsrc to
allow it to be included from the tests.
This commit is contained in:
Thiago Santos 2010-12-13 19:36:41 -03:00
parent 4a28d5f478
commit 4938c2e9ea
13 changed files with 52 additions and 11 deletions

View file

@ -1781,6 +1781,7 @@ gst/vmnc/Makefile
gst/y4m/Makefile gst/y4m/Makefile
gst-libs/Makefile gst-libs/Makefile
gst-libs/gst/Makefile gst-libs/gst/Makefile
gst-libs/gst/basecamerabinsrc/Makefile
gst-libs/gst/interfaces/Makefile gst-libs/gst/interfaces/Makefile
gst-libs/gst/signalprocessor/Makefile gst-libs/gst/signalprocessor/Makefile
gst-libs/gst/video/Makefile gst-libs/gst/video/Makefile

View file

@ -1,5 +1,9 @@
SUBDIRS = interfaces signalprocessor video if BUILD_EXPERIMENTAL
EXPERIMENTAL_LIBS=basecamerabinsrc
endif
SUBDIRS = $(EXPERIMENTAL_LIBS) interfaces signalprocessor video
noinst_HEADERS = gst-i18n-plugin.h gettext.h noinst_HEADERS = gst-i18n-plugin.h gettext.h
DIST_SUBDIRS = interfaces signalprocessor video DIST_SUBDIRS = $(EXPERIMENTAL_LIBS) interfaces signalprocessor video

View file

@ -0,0 +1,26 @@
lib_LTLIBRARIES = libgstbasecamerabinsrc-@GST_MAJORMINOR@.la
CLEANFILES = $(BUILT_SOURCES)
libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_SOURCES = \
gstcamerabin-enum.c \
gstbasecamerasrc.c
libgstbasecamerabinsrc_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/basecamerabinsrc
libgstbasecamerabinsrc_@GST_MAJORMINOR@include_HEADERS = \
gstcamerabin-enum.h \
gstbasecamerasrc.h
libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
-DGST_USE_UNSTABLE_API \
$(GST_CFLAGS)
libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LIBADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
-lgstinterfaces-$(GST_MAJORMINOR)
libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)

View file

@ -4,8 +4,6 @@ libgstcamerabin2_la_SOURCES = gstviewfinderbin.c \
gstimagecapturebin.c \ gstimagecapturebin.c \
gstvideorecordingbin.c \ gstvideorecordingbin.c \
camerabingeneral.c \ camerabingeneral.c \
gstbasecamerasrc.c \
gstcamerabin-enum.c \
gstv4l2camerasrc.c \ gstv4l2camerasrc.c \
gstcamerabin2.c \ gstcamerabin2.c \
gstplugin.c gstplugin.c
@ -17,6 +15,7 @@ libgstcamerabin2_la_CFLAGS = \
libgstcamerabin2_la_LIBADD = \ libgstcamerabin2_la_LIBADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la \
$(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-$(GST_MAJORMINOR).la \
$(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-lgstinterfaces-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR)
@ -27,7 +26,5 @@ noinst_HEADERS = gstviewfinderbin.h \
gstimagecapturebin.h \ gstimagecapturebin.h \
gstvideorecordingbin.h \ gstvideorecordingbin.h \
camerabingeneral.h \ camerabingeneral.h \
gstbasecamerasrc.h \
gstv4l2camerasrc.h \ gstv4l2camerasrc.h \
gstcamerabin2.h \ gstcamerabin2.h
gstcamerabin-enum.h

View file

@ -49,9 +49,8 @@
#include "config.h" #include "config.h"
#endif #endif
#include "gstbasecamerasrc.h" #include <gst/basecamerabinsrc/gstbasecamerasrc.h>
#include "gstcamerabin2.h" #include "gstcamerabin2.h"
#include "gstcamerabin-enum.h"
GST_DEBUG_CATEGORY_STATIC (gst_camera_bin_debug); GST_DEBUG_CATEGORY_STATIC (gst_camera_bin_debug);
#define GST_CAT_DEFAULT gst_camera_bin_debug #define GST_CAT_DEFAULT gst_camera_bin_debug

View file

@ -33,7 +33,6 @@
#include "gstv4l2camerasrc.h" #include "gstv4l2camerasrc.h"
#include "camerabingeneral.h" #include "camerabingeneral.h"
#include "gstcamerabin-enum.h"
enum enum
{ {

View file

@ -23,7 +23,7 @@
#define __GST_V4L2_CAMERA_SRC_H__ #define __GST_V4L2_CAMERA_SRC_H__
#include <gst/gst.h> #include <gst/gst.h>
#include "gstbasecamerasrc.h" #include <gst/basecamerabinsrc/gstbasecamerasrc.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_V4L2_CAMERA_SRC \ #define GST_TYPE_V4L2_CAMERA_SRC \

View file

@ -197,6 +197,20 @@ elements_camerabin_LDADD = \
-lgstinterfaces-@GST_MAJORMINOR@ -lgstinterfaces-@GST_MAJORMINOR@
elements_camerabin_SOURCES = elements/camerabin.c elements_camerabin_SOURCES = elements/camerabin.c
if BUILD_EXPERIMENTAL
elements_camerabin2_CFLAGS = \
-I$(top_builddir)/gst-libs \
$(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_PLUGINS_BAD_CFLAGS) $(GST_CHECK_CFLAGS) \
-DGST_USE_UNSTABLE_API
elements_camerabin2_LDADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_MAJORMINOR@.la \
$(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
$(GST_CHECK_LIBS)
elements_camerabin2_SOURCES = elements/camerabin2.c
endif
elements_jifmux_CFLAGS = $(GST_CHECK_CFLAGS) $(GST_OPTION_CFLAGS) $(AM_CFLAGS) $(EXIF_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) elements_jifmux_CFLAGS = $(GST_CHECK_CFLAGS) $(GST_OPTION_CFLAGS) $(AM_CFLAGS) $(EXIF_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
elements_jifmux_LDADD = $(GST_CHECK_LIBS) $(EXIF_LIBS) $(LDADD) $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) elements_jifmux_LDADD = $(GST_CHECK_LIBS) $(EXIF_LIBS) $(LDADD) $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR)
elements_jifmux_SOURCES = elements/jifmux.c elements_jifmux_SOURCES = elements/jifmux.c

View file

@ -29,6 +29,7 @@
#include <glib.h> #include <glib.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/check/gstcheck.h> #include <gst/check/gstcheck.h>
#include <gst/basecamerabinsrc/gstbasecamerasrc.h>
#define IMAGE_FILENAME "image" #define IMAGE_FILENAME "image"
#define VIDEO_FILENAME "video" #define VIDEO_FILENAME "video"