Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
Makefile.am emotion_gstreamer.c
Log Message:
* Use ecore_plugin instead of dlfcn
* the modules names are now "xine" and "gstreamer" (it's useless to add
the extension, as ecore_plugin do not need it). I'll fix eclair,
etk_extra and ewl.
* look for the modules in path that is pointed by the env variable
EMOTION_MODULES_DIR first.
* fix a leak in the gstreamer module
* remove some trailing spaces
===================================================================
RCS file: /cvs/e/e17/libs/emotion/src/modules/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am 7 May 2007 14:04:40 -0000 1.10
+++ Makefile.am 31 Oct 2007 19:34:39 -0000 1.11
@@ -1,11 +1,11 @@
## Process this file with automake to produce Makefile.in
if BUILD_XINE_MODULE
-XINE_LIB_NAME=emotion_decoder_xine.la
+XINE_LIB_NAME = xine.la
endif
if BUILD_GSTREAMER_MODULE
-GSTREAMER_LIB_NAME = emotion_decoder_gstreamer.la
+GSTREAMER_LIB_NAME = gstreamer.la
endif
#AUTOMAKE_OPTIONS = 1.4 foreign
@@ -22,24 +22,24 @@
pkg_LTLIBRARIES = $(XINE_LIB_NAME) $(GSTREAMER_LIB_NAME)
if BUILD_XINE_MODULE
-emotion_decoder_xine_la_SOURCES = \
+xine_la_SOURCES = \
emotion_xine.c \
emotion_xine.h \
emotion_xine_vo_out.c
-emotion_decoder_xine_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@
$(top_builddir)/src/lib/libemotion.la -lpthread
-emotion_decoder_xine_la_LDFLAGS = -module -avoid-version \
- -L$(top_builddir)/src/lib
-L$(top_builddir)/src/lib/.libs
-emotion_decoder_xine_la_DEPENDENCIES = $(top_builddir)/config.h
+xine_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@
$(top_builddir)/src/lib/libemotion.la -lpthread
+xine_la_LDFLAGS = -module -avoid-version \
+ -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+xine_la_DEPENDENCIES = $(top_builddir)/config.h
endif
if BUILD_GSTREAMER_MODULE
-emotion_decoder_gstreamer_la_SOURCES = \
+gstreamer_la_SOURCES = \
emotion_gstreamer.c \
emotion_gstreamer.h \
emotion_gstreamer_pipeline.c \
emotion_gstreamer_pipeline.h
-emotion_decoder_gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@
$(top_builddir)/src/lib/libemotion.la
-emotion_decoder_gstreamer_la_LDFLAGS = -module -avoid-version \
- -L$(top_builddir)/src/lib
-L$(top_builddir)/src/lib/.libs
-emotion_decoder_gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h
+gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@
$(top_builddir)/src/lib/libemotion.la
+gstreamer_la_LDFLAGS = -module -avoid-version \
+ -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h
endif
===================================================================
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- emotion_gstreamer.c 28 Oct 2007 03:59:23 -0000 1.26
+++ emotion_gstreamer.c 31 Oct 2007 19:34:39 -0000 1.27
@@ -328,6 +328,7 @@
ecore_list_destroy (ev->audio_sinks);
/* FIXME: and the evas object ? */
+ if (ev->obj_data) free(ev->obj_data);
ecore_main_fd_handler_del(ev->fd_ev_handler);
close(ev->fd_ev_write);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
