generic module can now be built-in as static module.
also removed sole left-overs of previous disable of vlc engine. SVN revision: 63141
This commit is contained in:
parent
999e3bf306
commit
e83e1ea1fc
|
@ -296,7 +296,7 @@ echo " Xine...............: ${enable_xine}"
|
||||||
echo " Gstreamer..........: ${enable_gstreamer}"
|
echo " Gstreamer..........: ${enable_gstreamer}"
|
||||||
echo " Generic............: ${enable_generic}"
|
echo " Generic............: ${enable_generic}"
|
||||||
|
|
||||||
if test "x${enable_generic}" = "xyes"; then
|
if test "x${enable_generic}" = "xyes" || test "x${enable_generic}" = "xstatic"; then
|
||||||
echo
|
echo
|
||||||
echo " Generic Players:"
|
echo " Generic Players:"
|
||||||
echo " VLC................: ${enable_generic_vlc}"
|
echo " VLC................: ${enable_generic_vlc}"
|
||||||
|
|
|
@ -172,7 +172,7 @@ AC_ARG_ENABLE(generic-[]DOWN,
|
||||||
],
|
],
|
||||||
[enable_module="auto"])
|
[enable_module="auto"])
|
||||||
|
|
||||||
if test "x${enable_generic}" != "xyes"; then
|
if test "x${enable_generic}" != "xyes" && test "x${enable_generic}" != "xstatic"; then
|
||||||
if test "x${enable_module}" = "xyes"; then
|
if test "x${enable_module}" = "xyes"; then
|
||||||
AC_MSG_WARN([Generic module is disabled, force disable of Generic Player $1])
|
AC_MSG_WARN([Generic module is disabled, force disable of Generic Player $1])
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -21,10 +21,6 @@ if EMOTION_STATIC_BUILD_GSTREAMER
|
||||||
AM_CPPFLAGS += @GSTREAMER_CFLAGS@
|
AM_CPPFLAGS += @GSTREAMER_CFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#if EMOTION_STATIC_BUILD_VLC
|
|
||||||
#AM_CPPFLAGS += @VLC_CFLAGS@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
lib_LTLIBRARIES = libemotion.la
|
lib_LTLIBRARIES = libemotion.la
|
||||||
includes_HEADERS = Emotion.h
|
includes_HEADERS = Emotion.h
|
||||||
includesdir = $(includedir)/emotion-@VMAJ@
|
includesdir = $(includedir)/emotion-@VMAJ@
|
||||||
|
@ -43,10 +39,10 @@ $(top_srcdir)/src/modules/gstreamer/emotion_gstreamer.c \
|
||||||
$(top_srcdir)/src/modules/gstreamer/emotion_sink.c
|
$(top_srcdir)/src/modules/gstreamer/emotion_sink.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#if EMOTION_STATIC_BUILD_VLC
|
if EMOTION_STATIC_BUILD_GENERIC
|
||||||
#libemotion_la_SOURCES += \
|
libemotion_la_SOURCES += \
|
||||||
#$(top_srcdir)/src/modules/vlc/emotion_vlc.c
|
$(top_srcdir)/src/modules/generic/emotion_generic.c
|
||||||
#endif
|
endif
|
||||||
|
|
||||||
libemotion_la_LIBADD = @EMOTION_LIBS@ @EIO_LIBS@ @EEZE_LIBS@
|
libemotion_la_LIBADD = @EMOTION_LIBS@ @EIO_LIBS@ @EEZE_LIBS@
|
||||||
|
|
||||||
|
@ -58,10 +54,6 @@ if EMOTION_STATIC_BUILD_GSTREAMER
|
||||||
libemotion_la_LIBADD += @GSTREAMER_LIBS@
|
libemotion_la_LIBADD += @GSTREAMER_LIBS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#if EMOTION_STATIC_BUILD_VLC
|
|
||||||
#libemotion_la_LIBADD += @VLC_LIBS@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
libemotion_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
|
libemotion_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
|
||||||
|
|
||||||
EXTRA_DIST = emotion_private.h
|
EXTRA_DIST = emotion_private.h
|
||||||
|
|
|
@ -121,7 +121,6 @@ static int _log_domain = -1;
|
||||||
static const char *_backend_priority[] = {
|
static const char *_backend_priority[] = {
|
||||||
"gstreamer",
|
"gstreamer",
|
||||||
"xine",
|
"xine",
|
||||||
"vlc",
|
|
||||||
"generic"
|
"generic"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1508,6 +1507,9 @@ Eina_Bool xine_module_init(void);
|
||||||
#ifdef EMOTION_STATIC_BUILD_GSTREAMER
|
#ifdef EMOTION_STATIC_BUILD_GSTREAMER
|
||||||
Eina_Bool gstreamer_module_init(void);
|
Eina_Bool gstreamer_module_init(void);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef EMOTION_STATIC_BUILD_GENERIC
|
||||||
|
Eina_Bool generic_module_init(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_smart_init(void)
|
_smart_init(void)
|
||||||
|
@ -1557,6 +1559,9 @@ _smart_init(void)
|
||||||
#ifdef EMOTION_STATIC_BUILD_GSTREAMER
|
#ifdef EMOTION_STATIC_BUILD_GSTREAMER
|
||||||
gstreamer_module_init();
|
gstreamer_module_init();
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef EMOTION_STATIC_BUILD_GENERIC
|
||||||
|
generic_module_init();
|
||||||
|
#endif
|
||||||
|
|
||||||
static Evas_Smart_Class sc =
|
static Evas_Smart_Class sc =
|
||||||
EVAS_SMART_CLASS_INIT_NAME_VERSION(E_OBJ_NAME);
|
EVAS_SMART_CLASS_INIT_NAME_VERSION(E_OBJ_NAME);
|
||||||
|
|
|
@ -1148,7 +1148,7 @@ static void module_close(Emotion_Video_Module *module __UNUSED__, void *video)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static Eina_Bool
|
Eina_Bool
|
||||||
generic_module_init(void)
|
generic_module_init(void)
|
||||||
{
|
{
|
||||||
if (!pfx)
|
if (!pfx)
|
||||||
|
|
Loading…
Reference in New Issue