From: Enlightenment C. <no...@cv...> - 2007-05-05 15:14:49
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: configure.in Log Message: asparagus - pass distcheck. =================================================================== RCS file: /cvs/e/e17/libs/emotion/configure.in,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- configure.in 15 Apr 2007 17:09:03 -0000 1.46 +++ configure.in 5 May 2007 15:14:16 -0000 1.47 @@ -4,7 +4,7 @@ rm -f config.cache AC_INIT(configure.in) -AM_INIT_AUTOMAKE(emotion, 0.0.1.004) +AM_INIT_AUTOMAKE(emotion, 0.0.1.005) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN |
From: Enlightenment C. <no...@cv...> - 2007-05-06 05:03:23
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/lib Modified Files: emotion_private.h emotion_smart.c Log Message: export api calls to modules =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_private.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- emotion_private.h 13 Mar 2007 02:30:14 -0000 1.13 +++ emotion_private.h 6 May 2007 05:03:18 -0000 1.14 @@ -123,18 +123,18 @@ void *handle; }; -void *_emotion_video_get(Evas_Object *obj); -void _emotion_frame_new(Evas_Object *obj); -void _emotion_video_pos_update(Evas_Object *obj, double pos, double len); -void _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio); -void _emotion_decode_stop(Evas_Object *obj); -void _emotion_playback_finished(Evas_Object *obj); -void _emotion_audio_level_change(Evas_Object *obj); -void _emotion_channels_change(Evas_Object *obj); -void _emotion_title_set(Evas_Object *obj, char *title); -void _emotion_progress_set(Evas_Object *obj, char *info, double stat); -void _emotion_file_ref_set(Evas_Object *obj, char *file, int num); -void _emotion_spu_button_num_set(Evas_Object *obj, int num); -void _emotion_spu_button_set(Evas_Object *obj, int button); +EAPI void *_emotion_video_get(Evas_Object *obj); +EAPI void _emotion_frame_new(Evas_Object *obj); +EAPI void _emotion_video_pos_update(Evas_Object *obj, double pos, double len); +EAPI void _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio); +EAPI void _emotion_decode_stop(Evas_Object *obj); +EAPI void _emotion_playback_finished(Evas_Object *obj); +EAPI void _emotion_audio_level_change(Evas_Object *obj); +EAPI void _emotion_channels_change(Evas_Object *obj); +EAPI void _emotion_title_set(Evas_Object *obj, char *title); +EAPI void _emotion_progress_set(Evas_Object *obj, char *info, double stat); +EAPI void _emotion_file_ref_set(Evas_Object *obj, char *file, int num); +EAPI void _emotion_spu_button_num_set(Evas_Object *obj, int num); +EAPI void _emotion_spu_button_set(Evas_Object *obj, int button); #endif =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- emotion_smart.c 13 Mar 2007 16:17:38 -0000 1.26 +++ emotion_smart.c 6 May 2007 05:03:18 -0000 1.27 @@ -807,7 +807,7 @@ /* Utility calls for modules */ /*****************************/ -void * +EAPI void * _emotion_video_get(Evas_Object *obj) { Smart_Data *sd; @@ -816,7 +816,7 @@ return sd->video; } -void +EAPI void _emotion_frame_new(Evas_Object *obj) { Smart_Data *sd; @@ -825,7 +825,7 @@ evas_object_image_pixels_dirty_set(sd->obj, 1); } -void +EAPI void _emotion_video_pos_update(Evas_Object *obj, double pos, double len) { Smart_Data *sd; @@ -840,7 +840,7 @@ if (nlen) evas_object_smart_callback_call(obj, "length_change", NULL); } -void +EAPI void _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio) { Smart_Data *sd; @@ -864,7 +864,7 @@ if (changed) evas_object_smart_callback_call(obj, "frame_resize", NULL); } -void +EAPI void _emotion_decode_stop(Evas_Object *obj) { Smart_Data *sd; @@ -877,18 +877,19 @@ } } -void +EAPI void _emotion_playback_finished(Evas_Object *obj) { evas_object_smart_callback_call(obj, "playback_finished", NULL); } -void _emotion_audio_level_change(Evas_Object *obj) +EAPI void +_emotion_audio_level_change(Evas_Object *obj) { evas_object_smart_callback_call(obj, "audio_level_change", NULL); } -void +EAPI void _emotion_channels_change(Evas_Object *obj) { Smart_Data *sd; @@ -897,7 +898,7 @@ evas_object_smart_callback_call(obj, "channels_change", NULL); } -void +EAPI void _emotion_title_set(Evas_Object *obj, char *title) { Smart_Data *sd; @@ -908,7 +909,7 @@ evas_object_smart_callback_call(obj, "title_change", NULL); } -void +EAPI void _emotion_progress_set(Evas_Object *obj, char *info, double stat) { Smart_Data *sd; @@ -920,7 +921,7 @@ evas_object_smart_callback_call(obj, "progress_change", NULL); } -void +EAPI void _emotion_file_ref_set(Evas_Object *obj, char *file, int num) { Smart_Data *sd; @@ -932,7 +933,7 @@ evas_object_smart_callback_call(obj, "ref_change", NULL); } -void +EAPI void _emotion_spu_button_num_set(Evas_Object *obj, int num) { Smart_Data *sd; @@ -942,7 +943,7 @@ evas_object_smart_callback_call(obj, "button_num_change", NULL); } -void +EAPI void _emotion_spu_button_set(Evas_Object *obj, int button) { Smart_Data *sd; |
From: Enlightenment C. <no...@cv...> - 2007-05-06 05:05:27
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/lib Modified Files: emotion_smart.c Log Message: change to use lazy eval for dlopen =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- emotion_smart.c 6 May 2007 05:03:18 -0000 1.27 +++ emotion_smart.c 6 May 2007 05:05:26 -0000 1.28 @@ -102,7 +102,7 @@ E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0); snprintf(buf, sizeof(buf), "%s%s", PACKAGE_LIB_DIR"/emotion/", name); - handle = dlopen(buf, RTLD_NOW | RTLD_GLOBAL); + handle = dlopen(buf, RTLD_LAZY); if (handle) { unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module **, void **, Emotion_Module_Options *); |
From: Enlightenment C. <no...@cv...> - 2007-05-06 06:40:04
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/modules Modified Files: emotion_xine.c Log Message: protect if opening still =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- emotion_xine.c 21 Mar 2007 20:20:45 -0000 1.36 +++ emotion_xine.c 6 May 2007 06:40:00 -0000 1.37 @@ -852,6 +852,7 @@ int v; ev = (Emotion_Xine_Video *)ef; + if (ev->opening) return 0; v = xine_get_stream_info(ev->stream, XINE_STREAM_INFO_VIDEO_CHANNELS); if ((v < 1) && xine_get_stream_info(ev->stream, XINE_STREAM_INFO_HAS_VIDEO)) return 1; @@ -875,6 +876,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; + if (ev->opening) return 0; return xine_get_param(ev->stream, XINE_PARAM_VIDEO_CHANNEL); } @@ -911,6 +913,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; + if (ev->opening) return 0; return xine_get_stream_info(ev->stream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL); } @@ -931,6 +934,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; + if (ev->opening) return 0; return xine_get_param(ev->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL); } @@ -941,6 +945,7 @@ static char lang[XINE_LANG_MAX + 1]; ev = (Emotion_Xine_Video *)ef; + if (ev->opening) return NULL; lang[0] = 0; if (xine_get_audio_lang(ev->stream, channel, lang)) return lang; return NULL; |
From: Enlightenment C. <no...@cv...> - 2007-05-07 14:04:44
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/modules Modified Files: Makefile.am Log Message: link modules to emotion =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/modules/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 17 Jul 2006 17:11:04 -0000 1.9 +++ Makefile.am 7 May 2007 14:04:40 -0000 1.10 @@ -26,7 +26,7 @@ emotion_xine.c \ emotion_xine.h \ emotion_xine_vo_out.c -emotion_decoder_xine_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@ -lpthread +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 @@ -38,7 +38,7 @@ emotion_gstreamer.h \ emotion_gstreamer_pipeline.c \ emotion_gstreamer_pipeline.h -emotion_decoder_gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@ +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 |
From: Enlightenment C. <no...@cv...> - 2007-06-17 15:26:23
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: configure.in Log Message: ASPARAGUS! =================================================================== RCS file: /cvs/e/e17/libs/emotion/configure.in,v retrieving revision 1.47 retrieving revision 1.48 diff -u -3 -r1.47 -r1.48 --- configure.in 5 May 2007 15:14:16 -0000 1.47 +++ configure.in 17 Jun 2007 15:25:49 -0000 1.48 @@ -4,7 +4,7 @@ rm -f config.cache AC_INIT(configure.in) -AM_INIT_AUTOMAKE(emotion, 0.0.1.005) +AM_INIT_AUTOMAKE(emotion, 0.0.1.006) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN |
From: Enlightenment C. <no...@cv...> - 2007-07-10 00:14:05
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: Makefile.am configure.in Log Message: 1. fix a lot of things so they pass make distcheck - so many things have broken. guys - need to be more careful! 2. asparagus 3. some extra docs/comments for evas =================================================================== RCS file: /cvs/e/e17/libs/emotion/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 1 Jul 2007 18:22:15 -0000 1.10 +++ Makefile.am 10 Jul 2007 00:13:23 -0000 1.11 @@ -15,8 +15,7 @@ emotion.pc.in debian/changelog debian/control \ debian/copyright debian/rules debian/libemotion0.install \ debian/libemotion0-dev.install debian/emotion0-bin.install \ - debian/libemotion0-gstreamer.install debian/libemotion0-xine.install \ - debian/docs + debian/libemotion0-gstreamer.install debian/libemotion0-xine.install pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = emotion.pc =================================================================== RCS file: /cvs/e/e17/libs/emotion/configure.in,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- configure.in 1 Jul 2007 18:22:15 -0000 1.49 +++ configure.in 10 Jul 2007 00:13:23 -0000 1.50 @@ -4,7 +4,7 @@ rm -f config.cache AC_INIT(configure.in) -AM_INIT_AUTOMAKE(emotion, 0.0.1.006) +AM_INIT_AUTOMAKE(emotion, 0.0.1.007) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN |
From: Enlightenment C. <no...@cv...> - 2007-07-15 08:28:44
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/modules Modified Files: emotion_gstreamer_pipeline.c Log Message: various patches from the devel mailing list in - and fixed where needed. =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer_pipeline.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- emotion_gstreamer_pipeline.c 18 Jul 2006 19:04:38 -0000 1.2 +++ emotion_gstreamer_pipeline.c 15 Jul 2007 08:28:04 -0000 1.3 @@ -77,6 +77,11 @@ buf[1] = buffer; write(ev->fd_ev_write, buf, sizeof(buf)); } + else { + Emotion_Audio_Sink *asink; + asink = (Emotion_Audio_Sink *)ecore_list_goto_index (ev->audio_sinks, ev->audio_sink_nbr); + _emotion_video_pos_update(ev->obj, ev->position, asink->length_time); + } query = gst_query_new_position (GST_FORMAT_TIME); if (gst_pad_query (gst_pad_get_peer (pad), query)) { |
From: Enlightenment C. <no...@cv...> - 2007-07-18 04:42:33
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/modules Modified Files: emotion_xine_vo_out.c Log Message: debugging emotion. =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine_vo_out.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- emotion_xine_vo_out.c 13 Mar 2007 02:30:14 -0000 1.5 +++ emotion_xine_vo_out.c 18 Jul 2007 04:42:31 -0000 1.6 @@ -461,7 +461,7 @@ ret = write(dv->ev->fd_write, &buf, sizeof(void *)); // printf("-- FRAME DEC %p == %i\n", fr->frame.obj, ret); fr->in_use = 1; -// dv->ev->fq++; + dv->ev->fq++; } /* hmm - must find a way to sanely copy data out... FIXME problem */ // fr->vo_frame.free(&fr->vo_frame); |
From: Enlightenment C. <no...@cv...> - 2007-07-18 04:43:04
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/lib Modified Files: emotion_smart.c Log Message: debugging emotion. =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- emotion_smart.c 6 May 2007 05:05:26 -0000 1.28 +++ emotion_smart.c 18 Jul 2007 04:42:31 -0000 1.29 @@ -822,6 +822,7 @@ Smart_Data *sd; E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); +// printf("pix get set 1 %p\n", sd->obj); evas_object_image_pixels_dirty_set(sd->obj, 1); } @@ -1036,6 +1037,7 @@ } if ((iw < 1) || (ih < 1)) { +// printf("pix get set 0 (1)\n"); evas_object_image_pixels_dirty_set(obj, 0); } else @@ -1056,6 +1058,7 @@ evas_object_image_data_update_add(obj, 0, 0, iw, ih); } evas_object_image_data_set(obj, rows); +// printf("pix get set 0 (2)\n"); evas_object_image_pixels_dirty_set(obj, 0); } else if (format == EMOTION_FORMAT_BGRA) @@ -1063,6 +1066,7 @@ if (sd->module->bgra_data_get(sd->video, &bgra_data)); { evas_object_image_data_set(obj, bgra_data); +// printf("pix get set 0 (3)\n"); evas_object_image_pixels_dirty_set(obj, 0); } } |
From: Enlightenment C. <no...@cv...> - 2007-07-18 04:43:04
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/data Modified Files: theme.edc Log Message: debugging emotion. =================================================================== RCS file: /cvs/e/e17/libs/emotion/data/theme.edc,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- theme.edc 27 May 2007 06:47:44 -0000 1.8 +++ theme.edc 18 Jul 2007 04:42:31 -0000 1.9 @@ -138,7 +138,6 @@ relative: 0.0 0.0; offset: 14 14; } - color: 0 0 0 0; } } part { @@ -771,7 +770,6 @@ relative: 0.0 1.0; offset: 7 -25; } - color: 0 0 0 0; } } part { |
From: Enlightenment C. <no...@cv...> - 2007-07-18 05:13:21
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/modules Modified Files: emotion_xine.c emotion_xine.h Log Message: work around xine deadlock =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- emotion_xine.c 6 May 2007 06:40:00 -0000 1.37 +++ emotion_xine.c 18 Jul 2007 05:13:19 -0000 1.38 @@ -128,6 +128,7 @@ ev->queue = xine_event_new_queue(ev->stream); xine_event_create_listener_thread(ev->queue, _em_event, ev); ev->opening = 0; + ev->play_ok = 1; _em_module_event(ev, 1); /* event - open done */ } break; @@ -405,6 +406,7 @@ ev->delete_me = 0; ev->get_pos_thread_deleted = 0; ev->opening = 1; + ev->play_ok = 0; if (opt) { @@ -471,6 +473,7 @@ ev = (Emotion_Xine_Video *)ef; ev->play = 1; + ev->play_ok = 0; ppos = malloc(sizeof(double)); *ppos = pos; _em_slave_event(ev, 4, ppos); @@ -483,6 +486,7 @@ ev = (Emotion_Xine_Video *)ef; ev->play = 0; + ev->play_ok = 0; _em_slave_event(ev, 5, NULL); } @@ -591,7 +595,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return 0; + if (ev->opening || (!ev->play_ok)) return 0; return (xine_get_stream_info(ev->stream, XINE_STREAM_INFO_HAS_VIDEO) && xine_get_stream_info(ev->stream, XINE_STREAM_INFO_VIDEO_HANDLED)); } @@ -602,7 +606,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return 0; + if (ev->opening || (!ev->play_ok)) return 0; return (xine_get_stream_info(ev->stream, XINE_STREAM_INFO_HAS_AUDIO) && xine_get_stream_info(ev->stream, XINE_STREAM_INFO_AUDIO_HANDLED)); } @@ -613,7 +617,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return 0; + if (ev->opening || (!ev->play_ok)) return 0; return xine_get_stream_info(ev->stream, XINE_STREAM_INFO_SEEKABLE); } @@ -707,7 +711,7 @@ xine_event_t xine_event; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return; + if ((ev->opening) || (!ev->play_ok)) return; xine_event.data_length = 0; xine_event.data = NULL; xine_event.stream = ev->stream; @@ -813,7 +817,7 @@ xine_input_data_t xine_input; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return; + if ((ev->opening) || (!ev->play_ok)) return; xine_event.stream = ev->stream; gettimeofday(&xine_event.tv, NULL); xine_event.type = XINE_EVENT_INPUT_MOUSE_BUTTON; @@ -833,7 +837,7 @@ xine_input_data_t xine_input; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return; + if ((ev->opening) || (!ev->play_ok)) return; xine_event.stream = ev->stream; gettimeofday(&xine_event.tv, NULL); xine_event.type = XINE_EVENT_INPUT_MOUSE_MOVE; @@ -852,7 +856,7 @@ int v; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return 0; + if (ev->opening || (!ev->play_ok)) return 0; v = xine_get_stream_info(ev->stream, XINE_STREAM_INFO_VIDEO_CHANNELS); if ((v < 1) && xine_get_stream_info(ev->stream, XINE_STREAM_INFO_HAS_VIDEO)) return 1; @@ -876,7 +880,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return 0; + if (ev->opening || (!ev->play_ok)) return 0; return xine_get_param(ev->stream, XINE_PARAM_VIDEO_CHANNEL); } @@ -913,7 +917,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return 0; + if (ev->opening || (!ev->play_ok)) return 0; return xine_get_stream_info(ev->stream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL); } @@ -934,7 +938,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return 0; + if (ev->opening || (!ev->play_ok)) return 0; return xine_get_param(ev->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL); } @@ -988,7 +992,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return 0; + if (ev->opening || (!ev->play_ok)) return 0; return (double)xine_get_param(ev->stream, XINE_PARAM_AUDIO_VOLUME) / 100.0; } @@ -998,7 +1002,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return 0; + if (ev->opening || (!ev->play_ok)) return 0; return xine_get_stream_info(ev->stream, XINE_STREAM_INFO_MAX_SPU_CHANNEL); } @@ -1019,7 +1023,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return 0; + if (ev->opening || (!ev->play_ok)) return 0; return xine_get_param(ev->stream, XINE_PARAM_SPU_CHANNEL); } @@ -1061,7 +1065,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return 0; + if (ev->opening || (!ev->play_ok)) return 0; if (xine_get_stream_info(ev->stream, XINE_STREAM_INFO_HAS_CHAPTERS)) return 99; return 0; @@ -1126,7 +1130,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - if (ev->opening) return NULL; + if ((ev->opening) || (!ev->play_ok)) return NULL; switch (meta) { case META_TRACK_TITLE: @@ -1254,6 +1258,44 @@ eev = buf[1]; if (eev->mtype != 0) { + switch (eev->mtype) + { + case 1: /* init done */ + ev->play_ok = 1; + break; + case 2: /* open done */ + ev->play_ok = 1; + break; + case 3: /* shutdown done */ + ev->play_ok = 1; + break; + case 4: /* play done */ + ev->play_ok = 1; + break; + case 5: /* stop done */ + ev->play_ok = 1; + break; + case 6: /* seek done */ + ev->play_ok = 1; + break; + case 7: /* eject done */ + ev->play_ok = 1; + break; + case 8: /* spu mute done */ + ev->play_ok = 1; + break; + case 9: /* channel done */ + ev->play_ok = 1; + break; + case 10: /* volume done */ + ev->play_ok = 1; + break; + case 11: /* close done */ + ev->play_ok = 1; + break; + default: + break; + } } else { =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- emotion_xine.h 13 Mar 2007 16:23:59 -0000 1.16 +++ emotion_xine.h 18 Jul 2007 05:13:19 -0000 1.17 @@ -51,6 +51,7 @@ volatile unsigned char opening : 1; volatile unsigned char closing : 1; volatile unsigned char have_vo : 1; + volatile unsigned char play_ok : 1; pthread_t get_pos_len_th; pthread_cond_t get_pos_len_cond; |
From: Enlightenment C. <no...@cv...> - 2007-08-04 13:13:14
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/lib Modified Files: emotion_smart.c Log Message: move a chunk of stuff to use evas_smart_class_new() - evas_smart_new() will probably die as it's already got legacy funcion methods for layer etc. stuff. =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- emotion_smart.c 18 Jul 2007 04:42:31 -0000 1.29 +++ emotion_smart.c 4 Aug 2007 13:12:41 -0000 1.30 @@ -74,11 +74,6 @@ static void _smart_init(void); static void _smart_add(Evas_Object * obj); static void _smart_del(Evas_Object * obj); -static void _smart_layer_set(Evas_Object * obj, int layer); -static void _smart_raise(Evas_Object * obj); -static void _smart_lower(Evas_Object * obj); -static void _smart_stack_above(Evas_Object * obj, Evas_Object * above); -static void _smart_stack_below(Evas_Object * obj, Evas_Object * below); static void _smart_move(Evas_Object * obj, Evas_Coord x, Evas_Coord y); static void _smart_resize(Evas_Object * obj, Evas_Coord w, Evas_Coord h); static void _smart_show(Evas_Object * obj); @@ -239,7 +234,6 @@ { sd->module->file_close(sd->video); sd->video = NULL; - printf("VIDEO -> NULL\n"); evas_object_image_size_set(sd->obj, 0, 0); } } @@ -1130,22 +1124,24 @@ _smart_init(void) { if (smart) return; - smart = evas_smart_new(E_OBJ_NAME, - _smart_add, - _smart_del, - _smart_layer_set, - _smart_raise, - _smart_lower, - _smart_stack_above, - _smart_stack_below, - _smart_move, - _smart_resize, - _smart_show, - _smart_hide, - _smart_color_set, - _smart_clip_set, - _smart_clip_unset, - NULL); + { + static const Evas_Smart_Class sc = + { + E_OBJ_NAME, + EVAS_SMART_CLASS_VERSION, + _smart_add, + _smart_del, + _smart_move, + _smart_resize, + _smart_show, + _smart_hide, + _smart_color_set, + _smart_clip_set, + _smart_clip_unset, + NULL + }; + smart = evas_smart_class_new(&sc); + } } static void @@ -1179,67 +1175,14 @@ Smart_Data *sd; sd = evas_object_smart_data_get(obj); if (!sd) return; - printf("DEL: sd->video = %p\n", sd->video); if (sd->video) sd->module->file_close(sd->video); - printf("MOD CLOSE: sd->video = %p\n", sd->video); _emotion_module_close(sd->module, sd->video); - printf("DEL SD: sd = %p\n", sd); evas_object_del(sd->obj); if (sd->file) free(sd->file); if (sd->job) ecore_job_del(sd->job); if (sd->progress.info) free(sd->progress.info); if (sd->ref.file) free(sd->ref.file); free(sd); -} - -static void -_smart_layer_set(Evas_Object * obj, int layer) -{ - Smart_Data *sd; - - sd = evas_object_smart_data_get(obj); - if (!sd) return; - evas_object_layer_set(sd->obj, layer); -} - -static void -_smart_raise(Evas_Object * obj) -{ - Smart_Data *sd; - - sd = evas_object_smart_data_get(obj); - if (!sd) return; - evas_object_raise(sd->obj); -} - -static void -_smart_lower(Evas_Object * obj) -{ - Smart_Data *sd; - - sd = evas_object_smart_data_get(obj); - if (!sd) return; - evas_object_lower(sd->obj); -} - -static void -_smart_stack_above(Evas_Object * obj, Evas_Object * above) -{ - Smart_Data *sd; - - sd = evas_object_smart_data_get(obj); - if (!sd) return; - evas_object_stack_above(sd->obj, above); -} - -static void -_smart_stack_below(Evas_Object * obj, Evas_Object * below) -{ - Smart_Data *sd; - - sd = evas_object_smart_data_get(obj); - if (!sd) return; - evas_object_stack_below(sd->obj, below); } static void |
From: Enlightenment C. <no...@cv...> - 2007-08-26 14:34:13
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: configure.in Log Message: asparagus! =================================================================== RCS file: /cvs/e/e17/libs/emotion/configure.in,v retrieving revision 1.50 retrieving revision 1.51 diff -u -3 -r1.50 -r1.51 --- configure.in 10 Jul 2007 00:13:23 -0000 1.50 +++ configure.in 26 Aug 2007 14:33:40 -0000 1.51 @@ -4,7 +4,7 @@ rm -f config.cache AC_INIT(configure.in) -AM_INIT_AUTOMAKE(emotion, 0.0.1.007) +AM_INIT_AUTOMAKE(emotion, 0.0.1.008) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN |
From: Enlightenment C. <no...@cv...> - 2007-10-05 05:13:09
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/lib Modified Files: emotion_smart.c Log Message: cedric's ecore_job_init/shtudown patches. =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- emotion_smart.c 4 Aug 2007 13:12:41 -0000 1.30 +++ emotion_smart.c 5 Oct 2007 05:12:38 -0000 1.31 @@ -193,12 +193,15 @@ sd->seek_pos = 0; sd->len = 0; + ecore_job_init(); + if ((!sd->module) || (!sd->video)) { if (!_emotion_module_open(module_filename, obj, &sd->module, &sd->video)) return 0; } + return 1; } @@ -1183,6 +1186,8 @@ if (sd->progress.info) free(sd->progress.info); if (sd->ref.file) free(sd->ref.file); free(sd); + + ecore_job_shutdown(); } static void |
From: Enlightenment C. <no...@cv...> - 2007-10-26 10:49:18
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/lib Modified Files: emotion_smart.c Log Message: check if *mod is null =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- emotion_smart.c 25 Oct 2007 04:52:39 -0000 1.32 +++ emotion_smart.c 26 Oct 2007 10:49:16 -0000 1.33 @@ -107,8 +107,11 @@ { if (func_module_open(obj, mod, video, &(sd->module_options))) { - (*mod)->handle = handle; - return 1; + if (*mod) + { + (*mod)->handle = handle; + return 1; + } } } dlclose(handle); |
From: Enlightenment C. <no...@cv...> - 2007-10-28 03:59:25
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/modules Modified Files: emotion_gstreamer.c emotion_xine.c Log Message: handle exists too - and it gets written! =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- emotion_gstreamer.c 1 Sep 2007 17:51:40 -0000 1.25 +++ emotion_gstreamer.c 28 Oct 2007 03:59:23 -0000 1.26 @@ -220,7 +220,9 @@ em_speed_set, /* speed_set */ em_speed_get, /* speed_get */ em_eject, /* eject */ - em_meta_get /* meta_get */ + em_meta_get, /* meta_get */ + + NULL /* handle */ }; static unsigned char =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- emotion_xine.c 18 Jul 2007 05:13:19 -0000 1.38 +++ emotion_xine.c 28 Oct 2007 03:59:23 -0000 1.39 @@ -1463,7 +1463,7 @@ pthread_mutex_unlock(&(ev->get_pos_len_mutex)); } -const static Emotion_Video_Module em_module = +static Emotion_Video_Module em_module = { em_init, /* init */ em_shutdown, /* shutdown */ @@ -1519,7 +1519,9 @@ em_speed_set, /* speed_set */ em_speed_get, /* speed_get */ em_eject, /* eject */ - em_meta_get /* meta_get */ + em_meta_get, /* meta_get */ + + NULL /* handle */ }; unsigned char |
From: Enlightenment C. <no...@cv...> - 2007-10-28 10:19:14
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/lib Modified Files: emotion_smart.c Log Message: fix odd sized videos =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- emotion_smart.c 26 Oct 2007 10:49:16 -0000 1.33 +++ emotion_smart.c 28 Oct 2007 10:19:09 -0000 1.34 @@ -1027,6 +1027,8 @@ sd = data; evas_object_image_size_get(obj, &iw, &ih); sd->module->video_data_size_get(sd->video, &w, &h); + w = (w >> 1) << 1; + h = (h >> 1) << 1; if ((w != iw) || (h != ih)) { evas_object_image_colorspace_set(obj, EVAS_COLORSPACE_YCBCR422P601_PL); |
From: Enlightenment C. <no...@cv...> - 2008-01-25 03:36:21
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: configure.in Log Message: asparagus! also pass distcheck and have common autofoo init that is consistent for package, version etc. =================================================================== RCS file: /cvs/e/e17/libs/emotion/configure.in,v retrieving revision 1.54 retrieving revision 1.55 diff -u -3 -r1.54 -r1.55 --- configure.in 13 Nov 2007 07:13:51 -0000 1.54 +++ configure.in 25 Jan 2008 03:35:48 -0000 1.55 @@ -3,7 +3,7 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT(emotion, 0.0.1.008, enl...@li...) +AC_INIT(emotion, 0.1.0.042, enl...@li...) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(configure.in) |
From: Enlightenment C. <no...@cv...> - 2008-03-20 21:13:58
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/bin Modified Files: emotion_test_main.c Log Message: fix #ifdef =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/bin/emotion_test_main.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- emotion_test_main.c 28 Feb 2008 20:35:16 -0000 1.17 +++ emotion_test_main.c 20 Mar 2008 21:13:55 -0000 1.18 @@ -98,7 +98,7 @@ if (mode == 0) ecore_evas = ecore_evas_software_x11_new(NULL, 0, 0, 0, startw, starth); #endif -#if HAVE_ECORE_EVAS_GL +#if HAVE_ECORE_EVAS_X11_GL if (mode == 1) ecore_evas = ecore_evas_gl_x11_new(NULL, 0, 0, 0, startw, starth); #endif |