Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
Makefile.am emotion_xine.c emotion_xine.h
Added Files:
emotion_xine_vo_out.c
Log Message:
move plugin to be inlined ans loaded from code and make xine emotion support
work again
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 2 Oct 2005 07:34:36 -0000 1.6
+++ Makefile.am 21 Jan 2006 14:13:51 -0000 1.7
@@ -1,7 +1,6 @@
## Process this file with automake to produce Makefile.in
if BUILD_XINE_MODULE
-SUBDIRS = xine
XINE_LIB_NAME=emotion_decoder_xine.la
endif
@@ -25,7 +24,8 @@
if BUILD_XINE_MODULE
emotion_decoder_xine_la_SOURCES = \
emotion_xine.c \
-emotion_xine.h
+emotion_xine.h \
+emotion_xine_vo_out.c
emotion_decoder_xine_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@
emotion_decoder_xine_la_LDFLAGS = -module -avoid-version \
-L$(top_builddir)/src/lib
-L$(top_builddir)/src/lib/.libs
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- emotion_xine.c 30 Aug 2005 23:40:34 -0000 1.25
+++ emotion_xine.c 21 Jan 2006 14:13:51 -0000 1.26
@@ -60,6 +60,8 @@
static void *_em_get_pos_len_th(void *par);
static void _em_get_pos_len (Emotion_Xine_Video *ev);
+extern plugin_info_t emotion_xine_plugin_info[];
+
static unsigned char
em_init(Evas_Object *obj, void **emotion_video)
{
@@ -75,11 +77,12 @@
ev->decoder = xine_new();
if (!ev->decoder)
- {
- free(ev);
- return 0;
- }
+ {
+ free(ev);
+ return 0;
+ }
xine_init(ev->decoder);
+ xine_register_plugins(ev->decoder, emotion_xine_plugin_info);
if (1)
{
xine_cfg_entry_t cf;
@@ -228,7 +231,10 @@
}
ev->fd = ev->fd_write;
- ev->video = xine_open_video_driver(ev->decoder, "emotion",
XINE_VISUAL_TYPE_NONE, ev);
+ printf("OPEN VIDEO PLUGIN...\n");
+ ev->video = xine_open_video_driver(ev->decoder, "emotion",
+ XINE_VISUAL_TYPE_NONE, ev);
+ printf("RESULT: xine_open_video_driver() = %p\n", ev->video);
//Let xine autodetect the best audio output driver
ev->audio = xine_open_audio_driver(ev->decoder, NULL, ev);
// ev->audio = xine_open_audio_driver(ev->decoder, "oss", ev);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- emotion_xine.h 8 Jul 2005 23:08:48 -0000 1.11
+++ emotion_xine.h 21 Jan 2006 14:13:51 -0000 1.12
@@ -2,6 +2,7 @@
#define EMOTION_XINE_H
#include <xine.h>
+#include <xine/xine_plugin.h>
#include <unistd.h>
#include <fcntl.h>
#include <pthread.h>
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
