subject:"E CVS\: libs\/emotion raster"

E CVS: libs/emotion raster

2008-03-20 Thread Enlightenment CVS

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 -  1.17
+++ emotion_test_main.c 20 Mar 2008 21:13:55 -  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



-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2008-01-24 Thread Enlightenment CVS

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.in13 Nov 2007 07:13:51 -  1.54
+++ configure.in25 Jan 2008 03:35:48 -  1.55
@@ -3,7 +3,7 @@
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT(emotion, 0.0.1.008, [EMAIL PROTECTED])
+AC_INIT(emotion, 0.1.0.042, [EMAIL PROTECTED])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(configure.in)
 



-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-10-28 Thread Enlightenment CVS

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 -  1.33
+++ emotion_smart.c 28 Oct 2007 10:19:09 -  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);



-
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

E CVS: libs/emotion raster

2007-10-27 Thread Enlightenment CVS

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 -   1.25
+++ emotion_gstreamer.c 28 Oct 2007 03:59:23 -  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 -  1.38
+++ emotion_xine.c  28 Oct 2007 03:59:23 -  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



-
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

E CVS: libs/emotion raster

2007-10-26 Thread Enlightenment CVS

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 -  1.32
+++ emotion_smart.c 26 Oct 2007 10:49:16 -  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);



-
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

E CVS: libs/emotion raster

2007-10-04 Thread Enlightenment CVS

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 -   1.30
+++ emotion_smart.c 5 Oct 2007 05:12:38 -   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



-
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

E CVS: libs/emotion raster

2007-08-26 Thread Enlightenment CVS

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.in10 Jul 2007 00:13:23 -  1.50
+++ configure.in26 Aug 2007 14:33:40 -  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



-
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

E CVS: libs/emotion raster

2007-08-04 Thread Enlightenment CVS

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 -  1.29
+++ emotion_smart.c 4 Aug 2007 13:12:41 -   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



-
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

E CVS: libs/emotion raster

2007-07-17 Thread Enlightenment CVS

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 -  1.5
+++ emotion_xine_vo_out.c   18 Jul 2007 04:42:31 -  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);



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-07-17 Thread Enlightenment CVS

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 -   1.28
+++ emotion_smart.c 18 Jul 2007 04:42:31 -  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);
   }
  }



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-07-17 Thread Enlightenment CVS

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 -  1.8
+++ theme.edc   18 Jul 2007 04:42:31 -  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 {



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-07-17 Thread Enlightenment CVS

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 -   1.37
+++ emotion_xine.c  18 Jul 2007 05:13:19 -  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)

E CVS: libs/emotion raster

2007-07-15 Thread Enlightenment CVS

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.c18 Jul 2006 19:04:38 -  1.2
+++ emotion_gstreamer_pipeline.c15 Jul 2007 08:28:04 -  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)) {



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-07-09 Thread Enlightenment CVS

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 -   1.10
+++ Makefile.am 10 Jul 2007 00:13:23 -  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.in1 Jul 2007 18:22:15 -   1.49
+++ configure.in10 Jul 2007 00:13:23 -  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



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-06-17 Thread Enlightenment CVS

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.in5 May 2007 15:14:16 -   1.47
+++ configure.in17 Jun 2007 15:25:49 -  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



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-05-07 Thread Enlightenment CVS

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 -  1.9
+++ Makefile.am 7 May 2007 14:04:40 -   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



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-05-06 Thread Enlightenment CVS

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 -  1.36
+++ emotion_xine.c  6 May 2007 06:40:00 -   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;



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-05-05 Thread Enlightenment CVS

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.in15 Apr 2007 17:09:03 -  1.46
+++ configure.in5 May 2007 15:14:16 -   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



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-05-05 Thread Enlightenment CVS

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 -  1.13
+++ emotion_private.h   6 May 2007 05:03:18 -   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 -  1.26
+++ emotion_smart.c 6 May 2007 05:03:18 -   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;



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of

E CVS: libs/emotion raster

2007-05-05 Thread Enlightenment CVS

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 -   1.27
+++ emotion_smart.c 6 May 2007 05:05:26 -   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 *);



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-03-21 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c 


Log Message:


use mutex's right with cond's

===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- emotion_xine.c  19 Mar 2007 18:10:21 -  1.35
+++ emotion_xine.c  21 Mar 2007 20:20:45 -  1.36
@@ -140,7 +140,9 @@
   if (!ev-get_pos_thread_deleted)
 {
printf(closing get_pos thread, %p\n, ev);
+   pthread_mutex_lock((ev-get_pos_len_mutex));
pthread_cond_broadcast((ev-get_pos_len_cond));
+   pthread_mutex_unlock((ev-get_pos_len_mutex));
while (ev-get_poslen);
 }
   printf(EX dispose %p\n, ev);
@@ -1366,10 +1368,11 @@

ev = (Emotion_Xine_Video *)par;

-   pthread_mutex_lock((ev-get_pos_len_mutex));
for (;;)
  {
+   pthread_mutex_lock((ev-get_pos_len_mutex));
pthread_cond_wait((ev-get_pos_len_cond), (ev-get_pos_len_mutex));
+   pthread_mutex_unlock((ev-get_pos_len_mutex));
if (ev-get_poslen)
  {
 int pos_stream = 0;
@@ -1408,7 +1411,9 @@
 {
if (ev-get_poslen) return;
ev-get_poslen = 1;
+   pthread_mutex_lock((ev-get_pos_len_mutex));
pthread_cond_broadcast((ev-get_pos_len_cond));
+   pthread_mutex_unlock((ev-get_pos_len_mutex));
 }
 
 const static Emotion_Video_Module em_module =



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-03-19 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c 


Log Message:


move some more stuff to the threads

===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- emotion_xine.c  13 Mar 2007 16:23:59 -  1.34
+++ emotion_xine.c  19 Mar 2007 18:10:21 -  1.35
@@ -99,6 +99,7 @@
  break;
case 1: /* init */
{
+  ev-decoder = xine_new();
   xine_init(ev-decoder);
   xine_register_plugins(ev-decoder, 
emotion_xine_plugin_info);
   if (1)
@@ -373,13 +374,6 @@
ev = calloc(1, sizeof(Emotion_Xine_Video));
if (!ev) return 0;
ev-obj = obj;
-   
-   ev-decoder = xine_new();
-   if (!ev-decoder)
- {
-   free(ev);
-   return 0;
- }

if (pipe(fds) == 0)
  {



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_gstreamer.c emotion_xine.c emotion_xine.h 
emotion_xine_vo_out.c 


Log Message:


move emotion to fix latency on video load, deadlocks on stop/shutdown etc.

===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- emotion_gstreamer.c 18 Jul 2006 19:04:38 -  1.19
+++ emotion_gstreamer.c 13 Mar 2007 02:30:14 -  1.20
@@ -16,7 +16,8 @@
 /* Interface */
 
 static unsigned char  em_init (Evas_Object *obj,
-   void   
**emotion_video);
+   void   
**emotion_video,
+  Emotion_Module_Options *opt);
 
 static intem_shutdown (void   *video);
 
@@ -224,7 +225,8 @@
 
 static unsigned char
 em_init(Evas_Object  *obj,
-   void**emotion_video)
+   void**emotion_video,
+   Emotion_Module_Options *opt)
 {
Emotion_Gstreamer_Video *ev;
GError  *error;
@@ -1249,7 +1251,8 @@
 unsigned char
 module_open(Evas_Object   *obj,
Emotion_Video_Module **module,
-   void **video)
+   void **video,
+   Emotion_Module_Options *opt)
 {
if (!module)
   return 0;
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- emotion_xine.c  3 Jan 2007 06:24:25 -   1.31
+++ emotion_xine.c  13 Mar 2007 02:30:14 -  1.32
@@ -2,228 +2,395 @@
 #include emotion_private.h
 #include emotion_xine.h
 
-static unsigned char em_init(Evas_Object *obj, void **emotion_video);
-static int em_shutdown(void *video);
-static unsigned char em_file_open(const char *file, Evas_Object *obj, void 
*video);
-static void em_file_close(void *ef);
-static void em_play(void *ef, double pos);
-static void em_stop(void *ef);
-static void em_size_get(void *ef, int *w, int *h);
-static void em_pos_set(void *ef, double pos);
-static void em_vis_set(void  *video, Emotion_Vis vis);
-static double em_len_get(void *ef);
-static int em_fps_num_get(void *ef);
-static int em_fps_den_get(void *ef);
-static double em_fps_get(void *ef);
-static double em_pos_get(void *ef);
-static Emotion_Vis em_vis_get(void *video);
-static double em_ratio_get(void *ef);
-static int em_seekable(void *ef);
-static void em_frame_done(void *ef);
-static Emotion_Format em_format_get(void *ef);
-static void em_video_data_size_get(void *ef, int *w, int *h);
-static int em_yuv_rows_get(void *ef, int w, int h, unsigned char **yrows, 
unsigned char **urows, unsigned char **vrows);
-static int em_bgra_data_get(void *ef, unsigned char **bgra_data);
-static void em_event_feed(void *ef, int event);
-static void em_event_mouse_button_feed(void *ef, int button, int x, int y);
-static void em_event_mouse_move_feed(void *ef, int x, int y);
-static int em_video_channel_count(void *ef);
-static void em_video_channel_set(void *ef, int channel);
-static int em_video_channel_get(void *ef);
-static const char *em_video_channel_name_get(void *ef, int channel);
-static void em_video_channel_mute_set(void *ef, int mute);
-static int em_video_channel_mute_get(void *ef);
-static int em_audio_channel_count(void *ef);
-static void em_audio_channel_set(void *ef, int channel);
-static int em_audio_channel_get(void *ef);
-static const char *em_audio_channel_name_get(void *ef, int channel);
-static void em_audio_channel_mute_set(void *ef, int mute);
-static int em_audio_channel_mute_get(void *ef);
-static void em_audio_channel_volume_set(void *ef, double vol);
-static double em_audio_channel_volume_get(void *ef);
-static int em_spu_channel_count(void *ef);
-static void em_spu_channel_set(void *ef, int channel);
-static int em_spu_channel_get(void *ef);
-static const char *em_spu_channel_name_get(void *ef, int channel);
-static void em_spu_channel_mute_set(void *ef, int mute);
-static int em_spu_channel_mute_get(void *ef);
-static int em_chapter_count(void *ef);
-static void em_chapter_set(void *ef, int chapter);
-static int em_chapter_get(void *ef);
-static const char *em_chapter_name_get(void *ef, int chapter);
-static void em_speed_set(void *ef, double speed);
-static double em_speed_get(void *ef);
-static int em_eject(void *ef);
-static const char *em_meta_get(Emotion_Xine_Video *ev, int meta);
-
-static void *_em_seek(void *par);
-static int   _em_fd_active   (void *data, Ecore_Fd_Handler *fdh);
-static void  _em_event   (void *data, const xine_event_t *event);

E CVS: libs/emotion raster

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
Emotion.h emotion_private.h emotion_smart.c 


Log Message:


move emotion to fix latency on video load, deadlocks on stop/shutdown etc.

===
RCS file: /cvs/e/e17/libs/emotion/src/lib/Emotion.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Emotion.h   6 Sep 2006 07:12:24 -   1.11
+++ Emotion.h   13 Mar 2007 02:30:14 -  1.12
@@ -87,6 +87,7 @@

 /* api calls available */
 EAPI Evas_Object *emotion_object_add   (Evas *evas);
+EAPI void emotion_object_module_option_set (Evas_Object *obj, 
const char *opt, const char *val);
 EAPI Evas_Boolemotion_object_init  (Evas_Object *obj, 
const char *module_filename);
 EAPI void emotion_object_file_set  (Evas_Object *obj, 
const char *filename);
 EAPI const char  *emotion_object_file_get  (Evas_Object *obj);
===
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_private.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- emotion_private.h   14 May 2006 14:32:02 -  1.12
+++ emotion_private.h   13 Mar 2007 02:30:14 -  1.13
@@ -23,6 +23,7 @@
 typedef enum _Emotion_Format Emotion_Format;
 typedef enum _Emotion_Vis Emotion_Vis;
 typedef struct _Emotion_Video_Module Emotion_Video_Module;
+typedef struct _Emotion_Module_Options Emotion_Module_Options;
 
 enum _Emotion_Format
 {
@@ -55,9 +56,15 @@
   EMOTION_VIS_LIBVISUAL_PLASMA
 };
 
+struct _Emotion_Module_Options
+{
+   unsigned char no_video : 1;
+   unsigned char no_audio : 1;
+};
+
 struct _Emotion_Video_Module
 {
-   unsigned char (*init) (Evas_Object *obj, void **video);
+   unsigned char (*init) (Evas_Object *obj, void **video, 
Emotion_Module_Options *opt);
int(*shutdown) (void *video);
unsigned char  (*file_open) (const char *file, Evas_Object *obj, void 
*video);
void   (*file_close) (void *ef);
===
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- emotion_smart.c 3 Jan 2007 06:24:25 -   1.24
+++ emotion_smart.c 13 Mar 2007 02:30:14 -  1.25
@@ -62,6 +62,8 @@
   int button_num;
   int button;
} spu;
+
+   Emotion_Module_Options module_options;
 };
 
 static void _mouse_move(void *data, Evas *ev, Evas_Object *obj, void 
*event_info);
@@ -95,18 +97,20 @@
 {
void *handle;
char buf[4096];
+   Smart_Data *sd;

+   E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
snprintf(buf, sizeof(buf), %s%s, PACKAGE_LIB_DIR/emotion/,
name);
handle = dlopen(buf, RTLD_NOW | RTLD_GLOBAL);
if (handle)
  {
-   unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module 
**, void **);
+   unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module 
**, void **, Emotion_Module_Options *);

func_module_open = dlsym(handle, module_open);
if (func_module_open)
  {
-if (func_module_open(obj, mod, video))
+if (func_module_open(obj, mod, video, (sd-module_options)))
   {
  (*mod)-handle = handle;
  return 1;
@@ -132,7 +136,12 @@
handle = mod-handle;
module_close = dlsym(handle, module_close);
if ((module_close)  (video)) module_close(mod, video);
-   dlclose(handle);
+   /* FIXME: we can't go dlclosing here as a thread still may be running from
+* the module - this in theory will leak- but it shouldnt be too bad and
+* mean that once a module is dlopened() it cant be closed - its refcount
+* will just keep going up
+*/
+//   dlclose(handle);
 }
 
 /***/
@@ -148,6 +157,23 @@
return evas_object_smart_add(evas, smart);   
 }
 
+EAPI void
+emotion_object_module_option_set(Evas_Object *obj, const char *opt, const char 
*val)
+{
+   Smart_Data *sd;
+   
+   E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
+   if ((!opt) || (!val)) return;
+   if (!strcmp(opt, video))
+ {
+   if (!strcmp(val, off)) sd-module_options.no_video = 1;
+ }
+   else if (!strcmp(opt, audio))
+ {
+   if (!strcmp(val, off)) sd-module_options.no_audio = 1;
+ }
+}
+
 EAPI Evas_Bool
 emotion_object_init(Evas_Object *obj, const char *module_filename)
 {
@@ -172,10 +198,12 @@
sd-seek_pos = 0;
sd-len = 0;
 
-   if (!sd-module || !sd-video)
- if (!_emotion_module_open(module_filename, obj, sd-module, sd-video))
-   return 0;
-
+   if ((!sd-module) || (!sd-video))
+ {
+   if (!_emotion_module_open(module_filename, obj,
+ sd-module, sd-video))
+

E CVS: libs/emotion raster

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/bin


Modified Files:
emotion_test_main.c 


Log Message:


move emotion to fix latency on video load, deadlocks on stop/shutdown etc.

===
RCS file: /cvs/e/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- emotion_test_main.c 30 Sep 2006 10:18:31 -  1.14
+++ emotion_test_main.c 13 Mar 2007 02:30:14 -  1.15
@@ -477,7 +477,7 @@
emotion_object_size_get(obj, iw, ih);
ratio = emotion_object_ratio_get(obj);
printf(HANDLE %ix%i @ %3.3f\n, iw, ih, ratio);
-   if (ratio  0.0) iw = ih * ratio;
+   if (ratio  0.0) iw = (ih * ratio) + 0.5;
edje_extern_object_min_size_set(obj, iw, ih);
edje_object_part_swallow(oe, video_swallow, obj);
edje_object_size_min_calc(oe, w, h);



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-01-02 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c emotion_xine.h emotion_xine_vo_out.c 


Log Message:


there is a deadlock between the video out deocder thread and the main process
(emotion) thread as it continues while the main thread is stopped tyring to
stop the video playback - this ends up in a deadlock. this tries to eliminate
that by havng a much more limited framequeue.

===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- emotion_xine.c  19 Dec 2006 14:15:17 -  1.30
+++ emotion_xine.c  3 Jan 2007 06:24:25 -   1.31
@@ -276,7 +276,7 @@
 //   pthread_mutex_lock((ev-seek_mutex));
if (!ev-seek_thread_deleted)
  {
-   printf(closing seek thread\n);
+   printf(closing seek thread %p\n, ev);
pthread_cond_broadcast((ev-seek_cond));
while (ev-seek_to);
  }
@@ -284,20 +284,20 @@
 //   pthread_mutex_lock((ev-get_pos_len_mutex));
if (!ev-get_pos_thread_deleted)
  {
-   printf(closing get_pos thread\n);
+   printf(closing get_pos thread, %p\n, ev);
pthread_cond_broadcast((ev-get_pos_len_cond));
while (ev-get_poslen);
  }
 
-   printf(EX dispose\n);
+   printf(EX dispose %p\n, ev);
xine_dispose(ev-stream);
-   printf(EX dispose evq\n);
+   printf(EX dispose evq %p\n, ev);
xine_event_dispose_queue(ev-queue);
-   printf(EX close video drv\n);
+   printf(EX close video drv %p\n, ev);
if (ev-video) xine_close_video_driver(ev-decoder, ev-video);
-   printf(EX close audio drv\n);
+   printf(EX close audio drv %p\n, ev);
if (ev-audio) xine_close_audio_driver(ev-decoder, ev-audio);
-   printf(EX del fds\n);
+   printf(EX del fds %p\n, ev);
ecore_main_fd_handler_del(ev-fd_handler);
close(ev-fd_write);
close(ev-fd_read);
@@ -365,18 +365,24 @@

ev = (Emotion_Xine_Video *)ef;
if (!ev) return;
-   printf(EX pause end...\n);
+   printf(EX pause end... %p\n, ev);
if (!emotion_object_play_get(ev-obj))
 //   if (xine_get_param(ev-stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE)
  {
-   printf(  ... unpause\n);
+   printf(  ... unpause %p\n, ev);
xine_set_param(ev-stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
  }
-   printf(EX stop\n);
+//   xine_set_param(ev-stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+   printf(EX done %p\n, ev);
+   em_frame_done(ev); 
+//   printf(EX seek 0 %p\n, ev);
+//   xine_play(ev-stream, 0, 0);
+   printf(EX: fq %i %p\n, ev-fq, ev);
+   printf(EX stop %p\n, ev);
xine_stop(ev-stream);
-   printf(EX close\n);
+   printf(EX close %p\n, ev);
xine_close(ev-stream);
-   printf(EX del timer\n);
+   printf(EX del timer %p\n, ev);
if (ev-timer)
  {
ecore_timer_del(ev-timer);
@@ -591,13 +597,15 @@
ev = (Emotion_Xine_Video *)ef;
if (ev-cur_frame)
  {
+   ev-fq--;
if (ev-cur_frame-done_func)
  ev-cur_frame-done_func(ev-cur_frame-done_data);
ev-cur_frame = NULL;
  }
 }
 
-static Emotion_Format em_format_get(void *ef)
+static Emotion_Format
+em_format_get(void *ef)
 {
Emotion_Xine_Video *ev;
Emotion_Xine_Video_Frame *fr;
@@ -605,8 +613,7 @@
ev = (Emotion_Xine_Video *)ef;
fr = ev-cur_frame;
 
-   if (fr)
- return fr-format;
+   if (fr) return fr-format;
return EMOTION_FORMAT_YV12;
 }
 
@@ -660,7 +667,7 @@
if (!fr) return 0;
if (fr-bgra_data)
  {
-   *bgra_data = fr-bgra_data;
+   *bgra_data = fr-bgra_data;
return 1;
  }
return 0;
@@ -1154,25 +1161,14 @@
 ev = _emotion_video_get(fr-obj);
 if (ev)
   {
- if (ev-cur_frame)
-   {
-  if (ev-cur_frame-done_func)
-ev-cur_frame-done_func(ev-cur_frame-done_data);
-   }
+ em_frame_done(ev);
  ev-cur_frame = fr;
  _em_get_pos_len(ev);
  if ((xine_get_stream_info(ev-stream, 
XINE_STREAM_INFO_HAS_VIDEO)) 
  (xine_get_stream_info(ev-stream, 
XINE_STREAM_INFO_VIDEO_HANDLED)))
{
- 
-  if (ev-video_mute)
-{
-   if (ev-cur_frame-done_func)
- 
ev-cur_frame-done_func(ev-cur_frame-done_data);
-   ev-cur_frame = NULL;
-}
-  else
-_emotion_frame_new(fr-obj);
+  if (ev-video_mute) em_frame_done(ev);
+  else _emotion_frame_new(fr-obj);
}
  _emotion_frame_resize(fr-obj, fr-w, fr-h, fr-ratio);
  _emotion_video_pos_update(fr-obj, ev-pos,

E CVS: libs/emotion raster

2007-01-02 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
emotion_smart.c 


Log Message:


there is a deadlock between the video out deocder thread and the main process
(emotion) thread as it continues while the main thread is stopped tyring to
stop the video playback - this ends up in a deadlock. this tries to eliminate
that by havng a much more limited framequeue.

===
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- emotion_smart.c 19 Dec 2006 14:15:17 -  1.23
+++ emotion_smart.c 3 Jan 2007 06:24:25 -   1.24
@@ -1038,7 +1038,10 @@
   }
  }
  }
+// no need for this because on any new frame decode info from the decoder
+// module, the previous current frame is released (done) for us anyway   
 //   sd-module-frame_done(sd-video);
+
 /*   
evas_object_image_size_get(obj, iw, ih);
sd-module-video_data_size_get(sd-video, w, h);



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2006-12-19 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
emotion_smart.c 


Log Message:


use the new colorspace support in evas... :)

===
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- emotion_smart.c 6 Sep 2006 07:12:24 -   1.22
+++ emotion_smart.c 19 Dec 2006 14:15:17 -  1.23
@@ -35,7 +35,7 @@
Emotion_Video_Module  *module;
void  *video;

-   char *module_name;
+   char  *module_name;
 
char  *file;
Evas_Object   *obj;
@@ -51,12 +51,12 @@

char *title;
struct {
-  char *info;
-  double stat;
+  char   *info;
+  double  stat;
} progress;
struct {
   char *file;
-  int num;
+  int   num;
} ref;
struct {
   int button_num;
@@ -992,53 +992,99 @@
int iw, ih, w, h;
Smart_Data *sd;
Emotion_Format format;
-
+   unsigned char *bgra_data;
+   
sd = data;
evas_object_image_size_get(obj, iw, ih);
sd-module-video_data_size_get(sd-video, w, h);
if ((w != iw) || (h != ih))
  {
-   evas_object_image_size_set(obj, w, h);
-   iw = w;
-   ih = h;
+   evas_object_image_colorspace_set(obj, EVAS_COLORSPACE_YCBCR422P601_PL);
+evas_object_image_alpha_set(obj, 0);
+   evas_object_image_size_set(obj, w, h);
+   iw = w;
+   ih = h;
+ }
+   if ((iw  1) || (ih  1))
+ {
+   evas_object_image_pixels_dirty_set(obj, 0);
+ }
+   else
+ {
+   format = sd-module-format_get(sd-video);
+   if ((format == EMOTION_FORMAT_YV12) || (format == EMOTION_FORMAT_I420))
+ {
+unsigned char **rows;
+
+evas_object_image_colorspace_set(obj, 
EVAS_COLORSPACE_YCBCR422P601_PL);
+rows = evas_object_image_data_get(obj, 1);
+if (rows)
+  {
+ if (sd-module-yuv_rows_get(sd-video, iw, ih,
+  rows, 
+  rows[ih], 
+  rows[ih + (ih / 2)]))
+   evas_object_image_data_update_add(obj, 0, 0, iw, ih);
+  }
+evas_object_image_data_set(obj, rows);
+evas_object_image_pixels_dirty_set(obj, 0);
+ }
+   else if (format == EMOTION_FORMAT_BGRA)
+ {
+if (sd-module-bgra_data_get(sd-video, bgra_data));
+  {
+ evas_object_image_data_set(obj, bgra_data);
+ evas_object_image_pixels_dirty_set(obj, 0);
+  }
+ }
+ }
+//   sd-module-frame_done(sd-video);
+/*   
+   evas_object_image_size_get(obj, iw, ih);
+   sd-module-video_data_size_get(sd-video, w, h);
+   if ((w != iw) || (h != ih))
+ {
+   evas_object_image_size_set(obj, w, h);
+   iw = w;
+   ih = h;
  }
format = sd-module-format_get(sd-video);
if ((format == EMOTION_FORMAT_YV12) || (format == EMOTION_FORMAT_I420))
  {
-   unsigned char **rows;
-   Evas_Pixel_Import_Source ps;
-   
-   ps.format = EVAS_PIXEL_FORMAT_YUV420P_601;
-   ps.w = iw;
-   ps.h = ih;
-  
-   ps.rows = malloc(ps.h * 2 * sizeof(void *));
-   if (!ps.rows)
- {
-   sd-module-frame_done(sd-video);
-   return;
- }
-   
-   rows = (unsigned char **)ps.rows;
-  
-   if (sd-module-yuv_rows_get(sd-video, iw, ih,
- rows, 
-rows[ps.h], 
-rows[ps.h + (ps.h / 2)]))
+   unsigned char **rows;
+   Evas_Pixel_Import_Source ps;
+   
+   ps.format = EVAS_PIXEL_FORMAT_YUV420P_601;
+   ps.w = iw;
+   ps.h = ih;
+   
+   ps.rows = malloc(ps.h * 2 * sizeof(void *));
+   if (!ps.rows)
+ {
+sd-module-frame_done(sd-video);
+return;
+ }
+   
+   rows = (unsigned char **)ps.rows;
+   
+   if (sd-module-yuv_rows_get(sd-video, iw, ih,
+rows, 
+rows[ps.h], 
+rows[ps.h + (ps.h / 2)]))
  evas_object_image_pixels_import(obj, ps);
-   evas_object_image_pixels_dirty_set(obj, 0);
-   free(ps.rows);
-   }
+   evas_object_image_pixels_dirty_set(obj, 0);
+   free(ps.rows);
+ }
else if (format == EMOTION_FORMAT_BGRA)
  {
-   unsigned char *bgra_data;
-   if (sd-module-bgra_data_get(sd-video, bgra_data));
- {
-   evas_object_image_data_set(obj, bgra_data);
- }
+   if (sd-module-bgra_data_get(sd-video, bgra_data));
+ {
+evas_object_image_data_set(obj, bgra_data);
+evas_object_image_pixels_dirty_set(obj, 0);
+

E CVS: libs/emotion raster

2006-09-30 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/bin


Modified Files:
emotion_test_main.c 


Log Message:


same as previous commit.

===
RCS file: /cvs/e/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- emotion_test_main.c 20 Oct 2005 05:05:52 -  1.13
+++ emotion_test_main.c 30 Sep 2006 10:18:31 -  1.14
@@ -392,7 +392,7 @@
Evas_Event_Mouse_Down *e;

e = event_info;
-   evas_object_color_set(obj, 255, 50, 40, 200);
+   evas_object_color_set(obj, 200, 50, 40, 200);
evas_object_raise(obj);
 }
 
@@ -402,7 +402,7 @@
Evas_Event_Mouse_Up *e;

e = event_info;
-   evas_object_color_set(obj, 255, 255, 255, 100);
+   evas_object_color_set(obj, 100, 100, 100, 100);
 }
 
 static void
@@ -641,7 +641,7 @@
ov = data;
edje_object_part_drag_value_get(o, source, x, y);
spd = 255 * y;
-   evas_object_color_set(ov, 255, 255, 255, spd);
+   evas_object_color_set(ov, spd, spd, spd, spd);
snprintf(buf, sizeof(buf), %.0f, spd);
edje_object_part_text_set(o, video_speed_txt, buf);
 }



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2006-06-11 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
configure.in emotion-config.in 


Log Message:


1. autofoot patches.
2. fix maximize to work again. :)

===
RCS file: /cvs/e/e17/libs/emotion/configure.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- configure.in21 Apr 2006 00:53:13 -  1.37
+++ configure.in11 Jun 2006 10:23:46 -  1.38
@@ -47,16 +47,12 @@
 fi
   fi
 fi
-
+   
 dnl Set PACKAGE_DATA_DIR in config.h.
-if test x${datadir} = 'x${prefix}/share'; then
-  if test x${prefix} = xNONE; then
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, 
${ac_default_prefix}/share/${PACKAGE}, [Package Data Directory])
-  else
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${prefix}/share/${PACKAGE}, 
[Package Data Directory])
-  fi
+if test x${prefix} = xNONE; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, 
${ac_default_prefix}/share/${PACKAGE}, [Shared Data Directory])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${datadir}/${PACKAGE}, [Package Data 
Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${prefix}/share/${PACKAGE}, [Shared 
Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
===
RCS file: /cvs/e/e17/libs/emotion/emotion-config.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- emotion-config.in   4 Sep 2005 18:58:11 -   1.5
+++ emotion-config.in   11 Jun 2006 10:23:46 -  1.6
@@ -39,8 +39,8 @@
   echo @VERSION@
   ;;
 --cflags)
-  if test @includedir@ != /usr/include ; then
-[EMAIL PROTECTED]@
+  if test @prefix@/local != /usr/include ; then
+includes=[EMAIL PROTECTED]@/local
   fi
   echo $includes @EVAS_CFLAGS@
   ;;




___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2006-06-11 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
emotion-config.in 


Log Message:


fix blah-config includes

===
RCS file: /cvs/e/e17/libs/emotion/emotion-config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- emotion-config.in   11 Jun 2006 10:23:46 -  1.6
+++ emotion-config.in   11 Jun 2006 22:37:24 -  1.7
@@ -39,8 +39,8 @@
   echo @VERSION@
   ;;
 --cflags)
-  if test @prefix@/local != /usr/include ; then
-includes=[EMAIL PROTECTED]@/local
+  if test @prefix@/include != /usr/include ; then
+includes=[EMAIL PROTECTED]@/include
   fi
   echo $includes @EVAS_CFLAGS@
   ;;




___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2006-02-08 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
configure.in 


Log Message:


its not an error until BOTH gstreamer and xine are not found.

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- configure.in4 Feb 2006 13:43:13 -   1.30
+++ configure.in9 Feb 2006 06:12:39 -   1.31
@@ -146,7 +146,7 @@
fi
 fi
 if test $enable_xine$HAVE_XINE = yesno ; then
-   AC_MSG_ERROR(xine not found)
+   AC_MSG_RESULT(xine not found)
 fi
 
 AC_ARG_ENABLE(gstreamer,
@@ -177,9 +177,9 @@
[HAVE_GSTFFMPEG=no])
 fi
 if test $enable_gstreamer$HAVE_GSTREAMER = yesno ; then
-   AC_MSG_ERROR(gstreamer not found)
+   AC_MSG_RESULT(gstreamer not found)
 fi
-if test $HAVE_GSTPLUG = no -o test $HAVE_GSTFFMPEG = no; then
+if test $HAVE_GSTPLUG = no; then
if test $HAVE_GSTREAMER = no ; then
GSTPLUG_MSG=no
else
@@ -187,10 +187,17 @@
GSTPLUG_MSG=no (you should install gst-plugins and gst-ffmpeg)
fi
 else
-   requirements=$requirements gstreamer
-   GSTPLUG_MSG=yes
+   if test $HAVE_GSTFFMPEG = no; then
+   if test $HAVE_GSTREAMER = no ; then
+   GSTPLUG_MSG=no
+   else
+   AC_MSG_WARN([You should install gstreamer plugins and 
gst-ffmpeg to properly decode your video and audio files])
+   GSTPLUG_MSG=no (you should install gst-plugins and 
gst-ffmpeg)
+   fi
+   requirements=$requirements gstreamer
+   GSTPLUG_MSG=yes
+   fi
 fi
-
 if test $HAVE_XINE$HAVE_GSTREAMER = nono ; then
AC_MSG_ERROR([Xine or Gstreamer must be installed to build emotion])
 fi




---
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=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2006-02-06 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/data


Modified Files:
Makefile.am theme.edc 
Added Files:
Vera.ttf 


Log Message:


text is back! :)

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/data/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 23 Mar 2005 03:16:11 -  1.7
+++ Makefile.am 6 Feb 2006 08:31:29 -   1.8
@@ -28,6 +28,7 @@
 video_frame_top.png \
 whb.png \
 window_inner_shadow.png \
+Vera.ttf \
 theme.edc
 
 theme.edj: Makefile
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/data/theme.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- theme.edc   1 Oct 2005 08:30:34 -   1.5
+++ theme.edc   6 Feb 2006 08:31:29 -   1.6
@@ -28,6 +28,10 @@
   image: pnl.png COMP;
 }
 
+fonts {
+   font: Vera.ttf   Vera;
+}
+
 collections {
group {
   name: background;
@@ -103,7 +107,7 @@
 }
   }
}
-#if 0   
+#if 0
group {
   name: video_controller;
   parts {
@@ -445,11 +449,11 @@
name: video_progress_img;
mouse_events: 0;
clip_to: panel_clip;
-fixed: 1 1;
description {
   state: default 0.0;
   min:   9 16;
   align: 0.5 1.0;
+  fixed: 1 1;
   rel1 {
  relative: 0.5  0.0;
  offset:   00;
@@ -612,7 +616,7 @@
  text: Video Progress;
  font: Vera;
  size: 6;
- align: 0.0: 1.0;
+ align: 0.0 1.0;
   };
}
 }
@@ -849,31 +853,6 @@
}
 }
 part {
-   name: video_progress_txt;
-   type: TEXT;
-   mouse_events: 0;
-   description {
-  state: default 0.0;
-  rel1 {
- to:   video_frame_bottom;
- relative: 0.0  0.0;
- offset:   08;
-  }
-  rel2 {
- to:   video_frame_bottom;
- relative: 1.0  1.0;
- offset:   -1   -13;
-  }
-  color:   0 0 0 255;
-  text {
- text: Video Progress;
- font: Vera;
- size: 6;
- align: 0.0 0.5;
-  };
-   }
-}
-part {
name: video_speed_txt;
type: TEXT;
mouse_events: 0;
@@ -1118,6 +1097,33 @@
   color: 20 20 255 20;
}
 }
+part {
+   name: video_progress_txt;
+   type: TEXT;
+   mouse_events: 0;
+   effect: OUTLINE;
+   description {
+  state: default 0.0;
+  align: 1.0 1.0;
+  rel1 {
+ relative: 1.0  1.0;
+ offset:   -2-2;
+  }
+  rel2 {
+ relative: 1.0  1.0;
+ offset:   -2   -2;
+  }
+  color:   255 255 255 255;
+  color2:  0 0 0 255;
+  text {
+ text: XX:XX:XX / XX:XX:XX;
+ font: Vera;
+ size: 10;
+ align: 1.0 1.0;
+ min: 1 1;
+  };
+   }
+}
   }
   programs {
 // emit signals:




---
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=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2006-01-31 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
Makefile.am 


Log Message:


link to pthread

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 21 Jan 2006 14:13:51 -  1.7
+++ Makefile.am 1 Feb 2006 06:21:52 -   1.8
@@ -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@
+emotion_decoder_xine_la_LIBADD   = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@ 
-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




---
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=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2006-01-22 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c 


Log Message:


less segv's

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- emotion_xine.c  21 Jan 2006 14:13:51 -  1.26
+++ emotion_xine.c  23 Jan 2006 03:00:35 -  1.27
@@ -360,7 +360,7 @@
Emotion_Xine_Video *ev;

ev = (Emotion_Xine_Video *)ef;
-
+   if (!ev) return;
printf(EX pause end...\n);
if (!emotion_object_play_get(ev-obj))
 //   if (xine_get_param(ev-stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE)




---
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=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2006-01-22 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
emotion_smart.c 


Log Message:


less segv's

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- emotion_smart.c 4 Nov 2005 08:21:28 -   1.19
+++ emotion_smart.c 23 Jan 2006 03:00:35 -  1.20
@@ -131,7 +131,7 @@

handle = mod-handle;
module_close = dlsym(handle, module_close);
-   if (module_close) module_close(mod, video);
+   if ((module_close)  (video)) module_close(mod, video);
dlclose(handle);
 }
 
@@ -190,6 +190,7 @@
if ((file)  (file[0] != 0))
  {
 int w, h;
+   
sd-file = strdup(file);
if (sd-module)
  {
@@ -210,6 +211,7 @@
  {
 sd-module-file_close(sd-video);
 sd-video = NULL;
+printf(VIDEO - NULL\n);
 evas_object_image_size_set(sd-obj, 0, 0);
  }
  }
@@ -1023,7 +1025,7 @@
  rows, 
 rows[ps.h], 
 rows[ps.h + (ps.h / 2)]))
- evas_object_image_pixels_import(obj, ps);
+ evas_object_image_pixels_import(obj, ps);
evas_object_image_pixels_dirty_set(obj, 0);
free(ps.rows);
}
@@ -1088,8 +1090,9 @@
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);
-   if (sd-module) _emotion_module_close(sd-module, sd-video);
+   _emotion_module_close(sd-module, sd-video);
evas_object_del(sd-obj);
if (sd-file) free(sd-file);
if (sd-job) ecore_job_del(sd-job);




---
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=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2006-01-22 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
configure.in 


Log Message:


need 1.1.2 - i KNOW 1.1.2 works. don't know about 1.1.1

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- configure.in22 Jan 2006 08:51:17 -  1.27
+++ configure.in23 Jan 2006 06:19:52 -  1.28
@@ -137,7 +137,7 @@
[enable_xine=$enableval],[enable_xine=auto])
 HAVE_XINE=no
 if test $enable_xine != no ; then
-   AC_PATH_GENERIC(xine, 1.0.0, [HAVE_XINE=yes])
+   AC_PATH_GENERIC(xine, 1.1.2, [HAVE_XINE=yes])
 
if test $HAVE_XINE = yes ; then
requirements=$requirements libxine




---
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=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2006-01-21 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules/xine


Removed Files:
.cvsignore Makefile.am emotion_xine_vo_out.c 


Log Message:


move plugin to be inlined ans loaded from code and make xine  emotion support
work again





---
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=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2006-01-21 Thread enlightenment-cvs

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 -   1.6
+++ Makefile.am 21 Jan 2006 14:13:51 -  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 -  1.25
+++ emotion_xine.c  21 Jan 2006 14:13:51 -  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 -   1.11
+++ emotion_xine.h  21 Jan 2006 14:13:51 -  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=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-10-03 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/bin


Modified Files:
emotion_test_main.c 


Log Message:


suprot testign xr engine

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- emotion_test_main.c 2 Oct 2005 07:34:36 -   1.11
+++ emotion_test_main.c 3 Oct 2005 13:53:18 -   1.12
@@ -87,6 +87,10 @@
{
  mode = 2;
}
+ else if (!strcmp(argv[i], -xr))
+   {
+ mode = 3;
+   }
   }
  }
 #if HAVE_ECORE_EVAS_X
@@ -101,6 +105,8 @@
if (mode == 2)
  ecore_evas = ecore_evas_fb_new(NULL, 0, startw, starth);
 #endif
+   if (mode == 3)
+ ecore_evas = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, startw, starth);

 #else
startw = 240;
@@ -836,6 +842,9 @@
else if (!strcmp(argv[i], -fb))
  {
  }
+   else if (!strcmp(argv[i], -xr))
+ {
+ }
else if (!strcmp(argv[i], -xine))
  {
  module_filename = emotion_decoder_xine.so;




---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-09-02 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
Emotion.h 


Log Message:


add c++ stuff

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/Emotion.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Emotion.h   4 May 2005 21:32:37 -   1.6
+++ Emotion.h   3 Sep 2005 01:38:45 -   1.7
@@ -53,6 +53,10 @@
 #define EMOTION_CHANNEL_AUTO -1
 #define EMOTION_CHANNEL_DEFAULT 0
 
+#ifdef __cplusplus
+extern C {
+#endif
+   
 /* api calls available */
 Evas_Object *emotion_object_add   (Evas *evas);
 Evas_Boolemotion_object_init  (Evas_Object *obj);
@@ -107,4 +111,8 @@
 int  emotion_object_spu_button_get(Evas_Object *obj);
 const char  *emotion_object_meta_info_get (Evas_Object *obj, 
Emotion_Meta_Info meta);
 
+#ifdef __cplusplus
+}
+#endif
+  
 #endif




---
SF.Net email is Sponsored by the Better Software Conference  EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile  Plan-Driven Development * Managing Projects  Teams * Testing  QA
Security * Process Improvement  Measurement * http://www.sqe.com/bsce5sf
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-07-30 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
configure.in 


Log Message:

apps/e/enlightenment.spec CVS: apps/entice/configure.in
apps/entrance/configure.in CVS: libs/ecore/configure.in libs/edb/configure.in
libs/embryo/configure.in CVS: libs/emotion/configure.in
libs/epeg/configure.in CVS: libs/epsilon/configure.in
libs/esmart/configure.in CVS: libs/etox/configure.in libs/evas/configure.in 
libs/imlib2_loaders/configure.in CVS:
--
¢¹ãÃãã©ã¼
:)

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- configure.in7 May 2005 06:01:15 -   1.13
+++ configure.in30 Jul 2005 06:16:01 -  1.14
@@ -4,7 +4,7 @@
 rm -f config.cache
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(emotion, 0.0.1.003)
+AM_INIT_AUTOMAKE(emotion, 0.0.1.004)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN




---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-05-07 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
configure.in 


Log Message:


full asparagus

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- configure.in29 Apr 2005 02:54:36 -  1.12
+++ configure.in7 May 2005 06:01:15 -   1.13
@@ -4,7 +4,7 @@
 rm -f config.cache
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(emotion, 0.0.1.002)
+AM_INIT_AUTOMAKE(emotion, 0.0.1.003)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN




---
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-05-05 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c 


Log Message:


use oss - alsa shoudl be doing oss emulation.

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- emotion_xine.c  24 Apr 2005 14:42:50 -  1.17
+++ emotion_xine.c  5 May 2005 08:01:52 -   1.18
@@ -227,8 +227,9 @@
ev-fd = ev-fd_write;
 
ev-video = xine_open_video_driver(ev-decoder, emotion, 
XINE_VISUAL_TYPE_NONE, ev);
-//   ev-audio = xine_open_audio_driver(ev-decoder, oss, ev); 
-   ev-audio = xine_open_audio_driver(ev-decoder, alsa, ev);
+   ev-audio = xine_open_audio_driver(ev-decoder, oss, ev); 
+// dont use alsa - alsa has oss emulation.   
+//   ev-audio = xine_open_audio_driver(ev-decoder, alsa, ev);
 //   ev-audio = xine_open_audio_driver(ev-decoder, arts, ev);
 //   ev-audio = xine_open_audio_driver(ev-decoder, esd, ev);
ev-stream = xine_stream_new(ev-decoder, ev-audio, ev-video);




---
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-04-15 Thread enlightenment-cvs

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:


simon treney's emotion patches - THANKs :o)

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_private.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emotion_private.h   24 Jul 2004 09:53:00 -  1.3
+++ emotion_private.h   15 Apr 2005 07:27:02 -  1.4
@@ -19,9 +19,9 @@
 
 struct _Emotion_Video_Module
 {
-   int  (*init) (void);
-   int  (*shutdown) (void);
-   void *   (*file_open) (const char *file, Evas_Object *obj);
+   unsigned char (*init) (Evas_Object *obj, void **video);
+   int  (*shutdown) (void *video);
+   unsigned char (*file_open) (const char *file, Evas_Object *obj, void 
*video);
void (*file_close) (void *ef);
void (*play) (void *ef, double pos);
void (*stop) (void *ef);
@@ -75,6 +75,7 @@
 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_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);
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- emotion_smart.c 24 Jul 2004 09:53:00 -  1.8
+++ emotion_smart.c 15 Apr 2005 07:27:02 -  1.9
@@ -88,8 +88,8 @@
 /**/
 static Evas_Smart  *smart = NULL;
 
-static Emotion_Video_Module *
-_emotion_module_open(const char *name)
+static unsigned char
+_emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module 
**mod, void **video)
 {
void *handle;
char buf[4096];
@@ -98,34 +98,31 @@
handle = dlopen(buf, RTLD_NOW | RTLD_GLOBAL);
if (handle)
  {
-   Emotion_Video_Module *(*func_module_open) (void);
+   unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module 
**, void **);

func_module_open = dlsym(handle, module_open);
if (func_module_open)
  {
-Emotion_Video_Module *mod;
-
-mod = func_module_open();
-if (mod)
+if (func_module_open(obj, mod, video))
   {
- mod-handle = handle;
- return mod;
+ (*mod)-handle = handle;
+ return 1;
   }
  }
dlclose(handle);
  }
-   return NULL;
+   return 0;
 }
 
 static void
-_emotion_module_close(Emotion_Video_Module *mod)
+_emotion_module_close(Emotion_Video_Module *mod, void *video)
 {
void *handle;
-   void (*module_close) (Emotion_Video_Module *module);
+   void (*module_close) (Emotion_Video_Module *module, void *);

handle = mod-handle;
module_close = dlsym(handle, module_close);
-   if (module_close) module_close(mod);
+   if (module_close) module_close(mod, video);
dlclose(handle);
 }
 
@@ -168,24 +165,23 @@
int w, h;

sd-file = strdup(file);
-   if ((sd-video)  (sd-module))
+   if (sd-module)
  {
 sd-module-file_close(sd-video);
-sd-video = NULL;
 evas_object_image_size_set(sd-obj, 0, 0);
  }
-   if (sd-module) _emotion_module_close(sd-module);
-   sd-module = _emotion_module_open(emotion_decoder_xine.so);
-   if (!sd-module) return;
-   sd-video = sd-module-file_open(sd-file, obj);
-   if (sd-video)
- {
-sd-module-size_get(sd-video, w, h);
-evas_object_image_size_set(sd-obj, w, h);
-sd-ratio = sd-module-ratio_get(sd-video);
-sd-pos = 0.0;
-if (sd-play) sd-module-play(sd-video, 0.0);
- }
+   if (!sd-module || !sd-video)
+   {
+  if (!_emotion_module_open(emotion_decoder_xine.so, obj, sd-module, 
sd-video))
+ return;
+   }
+   if (!sd-module-file_open(sd-file, obj, sd-video))
+  return;
+   sd-module-size_get(sd-video, w, h);
+   evas_object_image_size_set(sd-obj, w, h);
+   sd-ratio = sd-module-ratio_get(sd-video);
+   sd-pos = 0.0;
+   if (sd-play) sd-module-play(sd-video, 0.0);
  }
else
  {
@@ -195,8 +191,6 @@
 sd-video = NULL;
 evas_object_image_size_set(sd-obj, 0, 0);
  }
-   if (sd-module) _emotion_module_close(sd-module);
-   sd-module = NULL;
  }
 }
 
@@ -811,6 +805,12 @@
 }
 
 void
+_emotion_playback_finished(Evas_Object *obj)
+{
+

E CVS: libs/emotion raster

2005-04-15 Thread enlightenment-cvs

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:


simon treney's emotion patches - THANKs :o)

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- emotion_xine.c  2 Apr 2005 15:40:35 -   1.14
+++ emotion_xine.c  15 Apr 2005 07:27:02 -  1.15
@@ -2,11 +2,9 @@
 #include emotion_private.h
 #include emotion_xine.h
 
-static intinit_count = 0;
-
-static int em_init(void);
-static int em_shutdown(void);
-static void *em_file_open(const char *file, Evas_Object *obj);
+static unsigned char em_init(Evas_Object *obj, void **emotion_video);
+static int em_shutdown(void *video);
+static unsigned char em_file_open(const char *file, Evas_Object *obj, void 
*video);
 static void em_file_close(void *ef);
 static void em_play(void *ef, double pos);
 static void em_stop(void *ef);
@@ -60,42 +58,27 @@
 static void *_em_get_pos_len_th(void *par);
 static void  _em_get_pos_len (Emotion_Xine_Video *ev);
 
-static int
-em_init(void)
-{
-   init_count++;
-   if (init_count  1) return init_count;
-   return init_count;
-}
-
-static int
-em_shutdown(void)
-{
-   init_count--;
-   if (init_count  0) return init_count;
-   return 0;
-}
-
-static void *
-em_file_open(const char *file, Evas_Object *obj)
+static unsigned char
+em_init(Evas_Object *obj, void **emotion_video)
 {
Emotion_Xine_Video *ev;
-   int pos_stream = 0;
-   int pos_time = 0;
-   int length_time = 0;
-   uint32_t v;
+   int fds[2];
+
+   if (!emotion_video)
+  return;

ev = calloc(1, sizeof(Emotion_Xine_Video));
-   if (!ev) return NULL;
+   if (!ev) return 0;
ev-obj = obj;
 
ev-decoder = xine_new();
if (!ev-decoder)
- {
-   free(ev);
-   return NULL;
- }
+   {
+  free(ev);
+  return 0;
+   }
xine_init(ev-decoder);
+   xine_init(ev-decoder);
if (1)
  {
xine_cfg_entry_t cf;
@@ -222,39 +205,25 @@
   printf(MRL: %s\n, auto_play_mrls[i]);
  }
  }
+   
+   if (pipe(fds) == 0)
  {
-   int fds[2];
-   
-   if (pipe(fds) == 0)
- {
-ev-fd_read = fds[0];
-ev-fd_write = fds[1];
-fcntl(ev-fd_read, F_SETFL, O_NONBLOCK);
-ev-fd_handler = ecore_main_fd_handler_add(ev-fd_read,
-   ECORE_FD_READ, 
-   _em_fd_active,
-   ev,
-   NULL,
-   NULL);
-ecore_main_fd_handler_active_set(ev-fd_handler, ECORE_FD_READ);
- }
- }
- {
-   int fds[2];
-   
-   if (pipe(fds) == 0)
- {
-ev-fd_ev_read = fds[0];
-ev-fd_ev_write = fds[1];
-fcntl(ev-fd_ev_read, F_SETFL, O_NONBLOCK);
-ev-fd_ev_handler = ecore_main_fd_handler_add(ev-fd_ev_read, 
-  ECORE_FD_READ, 
-  _em_fd_ev_active,
-  ev,
-  NULL,
-  NULL);
-ecore_main_fd_handler_active_set(ev-fd_ev_handler, ECORE_FD_READ);
- }
+   ev-fd_read = fds[0];
+   ev-fd_write = fds[1];
+   fcntl(ev-fd_read, F_SETFL, O_NONBLOCK);
+   ev-fd_handler = ecore_main_fd_handler_add(ev-fd_read,
+  ECORE_FD_READ, 
_em_fd_active, ev, NULL, NULL);
+   ecore_main_fd_handler_active_set(ev-fd_handler, ECORE_FD_READ);
+ }
+   
+   if (pipe(fds) == 0)
+ {
+   ev-fd_ev_read = fds[0];
+   ev-fd_ev_write = fds[1];
+   fcntl(ev-fd_ev_read, F_SETFL, O_NONBLOCK);
+   ev-fd_ev_handler = ecore_main_fd_handler_add(ev-fd_ev_read,
+ ECORE_FD_READ, 
_em_fd_ev_active, ev, NULL, NULL);
+   ecore_main_fd_handler_active_set(ev-fd_ev_handler, ECORE_FD_READ);
  }
ev-fd = ev-fd_write;
 
@@ -266,21 +235,51 @@
ev-stream = xine_stream_new(ev-decoder, ev-audio, ev-video);
ev-queue = xine_event_new_queue(ev-stream);
xine_event_create_listener_thread(ev-queue, _em_event, ev);
+   *emotion_video = ev;
+   
+   return 1;
+}
+
+static int
+em_shutdown(void *video)
+{
+   Emotion_Xine_Video *ev;
+   
+   ev = (Emotion_Xine_Video *)video;
+   
+   printf(EX dispose\n);
+   xine_dispose(ev-stream);
+   printf(EX dispose evq\n);
+   xine_event_dispose_queue(ev-queue);
+   printf(EX

E CVS: libs/emotion raster

2005-04-15 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c 


Log Message:

init once!

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- emotion_xine.c  15 Apr 2005 07:27:02 -  1.15
+++ emotion_xine.c  15 Apr 2005 07:36:10 -  1.16
@@ -78,7 +78,6 @@
   return 0;
}
xine_init(ev-decoder);
-   xine_init(ev-decoder);
if (1)
  {
xine_cfg_entry_t cf;




---
SF email is sponsored by - The IT Product Guide
Read honest  candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-04-04 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules/xine


Modified Files:
emotion_xine_vo_out.c 


Log Message:


ansi damn u!

===
RCS file: 
/cvsroot/enlightenment/e17/libs/emotion/src/modules/xine/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   26 Mar 2005 15:49:17 -  1.5
+++ emotion_xine_vo_out.c   5 Apr 2005 02:21:06 -   1.6
@@ -507,20 +507,26 @@
 {
Emotion_Lut *my_clut;
uint8_t *my_trans;
-   
-   int src_width = img_overl-width;
-   int src_height = img_overl-height;
-   rle_elem_t *rle = img_overl-rle;
-   rle_elem_t *rle_limit = rle + img_overl-num_rle;
-   int x_off = img_overl-x;
-   int y_off = img_overl-y;
-   int ymask,xmask;
+   int src_width;
+   int src_height;
+   rle_elem_t *rle;
+   rle_elem_t *rle_limit;
+   int x_off;
+   int y_off;
+   int ymask, xmask;
int rle_this_bite;
int rle_remainder;
int rlelen;
int x, y;
int clip_right;
-   uint8_t clr=0;
+   uint8_t clr = 0;
+   
+   src_width = img_overl-width;
+   src_height = img_overl-height;
+   rle = img_overl-rle;
+   rle_limit = rle + img_overl-num_rle;
+   x_off = img_overl-x;
+   y_off = img_overl-y;

if (!rle) return;





---
SF email is sponsored by - The IT Product Guide
Read honest  candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-04-02 Thread enlightenment-cvs

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:


moom's patches

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- emotion_xine.c  24 Jul 2004 09:53:00 -  1.13
+++ emotion_xine.c  2 Apr 2005 15:40:35 -   1.14
@@ -304,6 +304,7 @@
v = xine_get_stream_info(ev-stream, XINE_STREAM_INFO_VIDEO_RATIO);
ev-ratio = (double)v / 1.0;
ev-just_loaded = 1;
+   ev-get_poslen = 0;

  {
pthread_attr_t thattr;
@@ -320,6 +321,8 @@
pthread_attr_init(thattr);
pthread_create(ev-get_pos_len_th, NULL, _em_get_pos_len_th, ev);
pthread_attr_destroy(thattr);
+
+   ev-get_pos_thread_deleted = 0;
  }
 //   em_debug(ev);
return ev;
@@ -334,10 +337,15 @@
ev-delete_me = 1;
 //   pthread_mutex_lock((ev-seek_mutex));
pthread_cond_broadcast((ev-seek_cond));
-//   pthread_mutex_lock((ev-get_pos_len_mutex));
-   pthread_cond_broadcast((ev-get_pos_len_cond));
while (ev-seek_to);
-   while (ev-get_poslen);
+
+//   pthread_mutex_lock((ev-get_pos_len_mutex));
+   if (!ev-get_pos_thread_deleted)
+   {
+  pthread_cond_broadcast((ev-get_pos_len_cond));
+  while (ev-get_poslen);
+   }
+
printf(EX pause end...\n);
if (!emotion_object_play_get(ev-obj))
 //   if (xine_get_param(ev-stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE)
@@ -1269,7 +1277,7 @@
for (;;)
  {
pthread_cond_wait((ev-get_pos_len_cond), (ev-get_pos_len_mutex));
-   while (ev-get_poslen  0)
+   while (ev-get_poslen  0 || ev-delete_me)
  {
 int pos_stream = 0;
 int pos_time = 0;
@@ -1296,6 +1304,7 @@
 if (ev-delete_me)
   {
  ev-get_poslen = 0;
+ev-get_pos_thread_deleted = 1;
  return NULL;
   }
 ev-get_poslen = 0;
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- emotion_xine.h  23 Jul 2004 03:15:30 -  1.6
+++ emotion_xine.h  2 Apr 2005 15:40:35 -   1.7
@@ -49,6 +49,7 @@
pthread_cond_tget_pos_len_cond;
pthread_mutex_t   seek_mutex;
pthread_mutex_t   get_pos_len_mutex;
+   unsigned char get_pos_thread_deleted : 1;
 };
 
 struct _Emotion_Xine_Video_Frame




---
SF email is sponsored by - The IT Product Guide
Read honest  candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-03-26 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules/xine


Modified Files:
emotion_xine_vo_out.c 


Log Message:


segv waiting to happen

===
RCS file: 
/cvsroot/enlightenment/e17/libs/emotion/src/modules/xine/emotion_xine_vo_out.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- emotion_xine_vo_out.c   12 Jan 2005 11:35:04 -  1.4
+++ emotion_xine_vo_out.c   26 Mar 2005 15:49:17 -  1.5
@@ -522,6 +522,8 @@
int clip_right;
uint8_t clr=0;

+   if (!rle) return;
+   
uint8_t *dst_y = dst_base[0] + dst_pitches[0] * y_off + x_off;
uint8_t *dst_cr = dst_base[2] + (y_off / 2) * dst_pitches[1] + (x_off / 2) 
+ 1;
uint8_t *dst_cb = dst_base[1] + (y_off / 2) * dst_pitches[2] + (x_off / 2) 
+ 1;




---
SF email is sponsored by - The IT Product Guide
Read honest  candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-03-23 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/bin


Modified Files:
emotion_test_main.c 


Log Message:


.edj

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- emotion_test_main.c 23 Sep 2004 21:45:59 -  1.7
+++ emotion_test_main.c 23 Mar 2005 03:16:12 -  1.8
@@ -161,7 +161,7 @@
Evas_Object *o;
 
o = edje_object_add(evas);
-   edje_object_file_set(o, PACKAGE_DATA_DIR/data/theme.eet, background);
+   edje_object_file_set(o, PACKAGE_DATA_DIR/data/theme.edj, background);
evas_object_move(o, 0, 0);
evas_object_resize(o, startw, starth);
evas_object_layer_set(o, -999);
@@ -739,7 +739,7 @@

oe = edje_object_add(evas);
evas_object_data_set(oe, frame_data, fd);
-   edje_object_file_set(oe, PACKAGE_DATA_DIR/data/theme.eet, 
video_controller);
+   edje_object_file_set(oe, PACKAGE_DATA_DIR/data/theme.edj, 
video_controller);
edje_extern_object_min_size_set(o, w, h);
edje_object_part_swallow(oe, video_swallow, o);
edje_object_size_min_calc(oe, w, h);




---
This SF.net email is sponsored by: 2005 Windows Mobile Application Contest
Submit applications for Windows Mobile(tm)-based Pocket PCs or Smartphones
for the chance to win $25,000 and application distribution. Enter today at
http://ads.osdn.com/?ad_id=6882alloc_id=15148op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-02-27 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
configure.in 


Log Message:


1. e17's init icons get put into an e_box for arrangement nad the init splash
determines the location...

2. .002 snap

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- configure.in21 Feb 2005 09:34:46 -  1.10
+++ configure.in28 Feb 2005 05:35:00 -  1.11
@@ -4,7 +4,7 @@
 rm -f config.cache
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(emotion, 0.0.1.001)
+AM_INIT_AUTOMAKE(emotion, 0.0.1.002)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN




---
SF email is sponsored by - The IT Product Guide
Read honest  candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-02-21 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
configure.in 


Log Message:


change versions. some went DOWN - because they arent releases and i'm trying
to remove the _pre ascii from the version. i added a .001 (a release number)
so we can automatically or easiyl generate releases... sorry guys. but it's
kind of for the good of the code. :)

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- configure.in5 Jan 2005 05:05:28 -   1.9
+++ configure.in21 Feb 2005 09:34:46 -  1.10
@@ -4,7 +4,7 @@
 rm -f config.cache
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(emotion, 0.0.1)
+AM_INIT_AUTOMAKE(emotion, 0.0.1.001)
 AM_CONFIG_HEADER(config.h)
 
 AC_C_BIGENDIAN
@@ -189,7 +189,7 @@
   exit -1
 fi
 VV=`vser $V`
-VM=1.0.0_pre7
+VM=0.9.9
 VVM=`vser $VM`
 if test $VV -lt $VVM; then
   echo Error. Ecore is not at least $VM. It is $V. Abort.
@@ -202,7 +202,7 @@
   exit -1
 fi
 VV=`vser $V`
-VM=1.0.0_pre13
+VM=0.9.9
 VVM=`vser $VM`
 if test $VV -lt $VVM; then
   echo Error. Evas is not at least $VM. It is $V. Abort.




---
SF email is sponsored by - The IT Product Guide
Read honest  candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-01-12 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules/xine


Modified Files:
emotion_xine_vo_out.c 


Log Message:


up to latest xine api! :)

===
RCS file: 
/cvsroot/enlightenment/e17/libs/emotion/src/modules/xine/emotion_xine_vo_out.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emotion_xine_vo_out.c   19 Jul 2004 05:44:54 -  1.3
+++ emotion_xine_vo_out.c   12 Jan 2005 11:35:04 -  1.4
@@ -103,7 +103,7 @@
 
 plugin_info_t xine_plugin_info[] = 
 {
- { PLUGIN_VIDEO_OUT, 19, emotion, XINE_VERSION_CODE, _emotion_info, 
_emotion_class_init },
+ { PLUGIN_VIDEO_OUT, 20, emotion, XINE_VERSION_CODE, _emotion_info, 
_emotion_class_init },
  { PLUGIN_NONE, 0, , 0, NULL, NULL }
 };
 




---
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almosthttp://www.thinkgeek.com/sfshirt
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2005-01-09 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/data


Modified Files:
Makefile.am 


Log Message:


edje build more cleanly

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/data/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 12 Nov 2004 00:15:55 -  1.5
+++ Makefile.am 10 Jan 2005 05:38:14 -  1.6
@@ -1,5 +1,5 @@
 EDJE_CC = edje_cc
-EDJE_FLAGS = -v
+EDJE_FLAGS = -v -id $(top_srcdir)/data -fd $(top_srcdir)/data
 
 filesdir = $(datadir)/emotion/data
 files_DATA = theme.eet




---
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almosthttp://www.thinkgeek.com/sfshirt
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-11-11 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/data


Modified Files:
Makefile.am 


Log Message:


dont double the flags

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/data/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 1 Sep 2004 01:42:31 -   1.4
+++ Makefile.am 12 Nov 2004 00:15:55 -  1.5
@@ -1,4 +1,4 @@
-EDJE_CC = edje_cc $(EDJE_FLAGS)
+EDJE_CC = edje_cc
 EDJE_FLAGS = -v
 
 filesdir = $(datadir)/emotion/data




---
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588alloc_id=12065op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-11-10 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/data


Modified Files:
theme.edc 


Log Message:


fixipoos

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/data/theme.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- theme.edc   25 Oct 2004 03:17:31 -  1.2
+++ theme.edc   10 Nov 2004 08:35:32 -  1.3
@@ -1,31 +1,31 @@
 images {
-  image: tiles.png   LOSSY 95;
+  image: tiles.png   COMP;
   image: window_inner_shadow.png LOSSY 70;
-/*  image: e_logo.png  LOSSY 95;*/
+/*  image: e_logo.png  COMP;*/
 
-  image: h_slider.pngLOSSY 95;
+  image: h_slider.pngCOMP;
 //   
-  image: video_frame_left.pngLOSSY 95;
-  image: video_frame_right.png   LOSSY 95;
-  image: video_frame_top.png LOSSY 95;
-  image: video_frame_bottom.png  LOSSY 95;
+  image: video_frame_left.pngCOMP;
+  image: video_frame_right.png   COMP;
+  image: video_frame_top.png COMP;
+  image: video_frame_bottom.png  COMP;

-  image: knob.pngLOSSY 95;
+  image: knob.pngCOMP;
 
-  image: fr1.png LOSSY 95;
-  image: fr2.png LOSSY 95;
-  image: fr3.png LOSSY 95;
-  image: fr4.png LOSSY 95;
-  image: fr5.png LOSSY 95;
-  image: fr6.png LOSSY 95;
-  image: fr7.png LOSSY 95;
-  image: sl.png  LOSSY 95;
-  image: orb.png LOSSY 95;
-  image: whb.png LOSSY 95;
-  image: bpause.png  LOSSY 95;
-  image: bplay.png   LOSSY 95;
-  image: bstop.png   LOSSY 95;
-  image: pnl.png LOSSY 95;
+  image: fr1.png COMP;
+  image: fr2.png COMP;
+  image: fr3.png COMP;
+  image: fr4.png COMP;
+  image: fr5.png COMP;
+  image: fr6.png COMP;
+  image: fr7.png COMP;
+  image: sl.png  COMP;
+  image: orb.png COMP;
+  image: whb.png COMP;
+  image: bpause.png  COMP;
+  image: bplay.png   COMP;
+  image: bstop.png   COMP;
+  image: pnl.png COMP;
 }
 
 collections {




---
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588alloc_id=12065op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-11-10 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
configure.in 


Log Message:


fixipoos

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.in25 Jul 2004 21:50:38 -  1.6
+++ configure.in10 Nov 2004 08:35:31 -  1.7
@@ -101,82 +101,82 @@
 }
 
 
-AC_ARG_WITH(eet-config,
-[  --with-eet-config=EET_CONFIGuse eet-config specified ],
-[
-  EET_CONFIG=$withval;
+AC_ARG_WITH(eet-config, [  --with-eet-config=EET_CONFIGuse eet-config 
specified ],
+[ EET_CONFIG=$withval;
   echo using $EET_CONFIG for eet-config;
 ],[
-  if [ test -z $EET_CONFIG ]; then
+  if test -z $EET_CONFIG; then
 PROG=eet-config;
 AC_PATH_PROG(EET_CONFIG, $PROG, , $PATH)
   fi
 ])
+eet_cflags=`$EET_CONFIG --cflags`
+eet_libs=`$EET_CONFIG --libs`
 
 
-AC_ARG_WITH(evas-config,
-[  --with-evas-config=EVAS_CONFIGuse evas-config specified ],
-[
-  EVAS_CONFIG=$withval;
+AC_ARG_WITH(evas-config, [  --with-evas-config=EVAS_CONFIGuse evas-config 
specified ],
+[ EVAS_CONFIG=$withval;
   echo using $EVAS_CONFIG for evas-config;
 ],[
-  if [ test -z $EVAS_CONFIG ]; then
+  if test -z $EVAS_CONFIG; then
 PROG=evas-config;
 AC_PATH_PROG(EVAS_CONFIG, $PROG, , $PATH)
   fi
 ])
+evas_cflags=`$EVAS_CONFIG --cflags`
+evas_libs=`$EVAS_CONFIG --libs`
 
 
-AC_ARG_WITH(edje-config,
-[  --with-edje-config=EDJE_CONFIGuse edje-config specified ],
-[
-  EDJE_CONFIG=$withval;
+AC_ARG_WITH(edje-config, [  --with-edje-config=EDJE_CONFIGuse edje-config 
specified ],
+[ EDJE_CONFIG=$withval;
   echo using $EDJE_CONFIG for edje-config;
 ],[
-  if [ test -z $EDJE_CONFIG ]; then
+  if test -z $EDJE_CONFIG; then
 PROG=edje-config;
 AC_PATH_PROG(EDJE_CONFIG, $PROG, , $PATH)
   fi
 ])
+edje_cflags=`$EDJE_CONFIG --cflags`
+edje_libs=`$EDJE_CONFIG --libs`
 
 
-AC_ARG_WITH(ecore-config,
-[  --with-ecore-config=ECORE_CONFIGuse ecore-config specified ],
-[
-  ECORE_CONFIG=$withval;
+AC_ARG_WITH(ecore-config, [  --with-ecore-config=ECORE_CONFIGuse 
ecore-config specified ],
+[ ECORE_CONFIG=$withval;
   echo using $ECORE_CONFIG for ecore-config;
 ],[
-  if [ test -z $ECORE_CONFIG ]; then
+  if test -z $ECORE_CONFIG; then
 PROG=ecore-config;
 AC_PATH_PROG(ECORE_CONFIG, $PROG, , $PATH)
   fi
 ])
+ecore_cflags=`$ECORE_CONFIG --cflags`
+ecore_libs=`$ECORE_CONFIG --libs`
 
 
-AC_ARG_WITH(embryo-config,
-[  --with-embryo-config=EMBRYO_CONFIGuse embryo-config specified ],
-[
-  EMBRYO_CONFIG=$withval;
+AC_ARG_WITH(embryo-config, [  --with-embryo-config=EMBRYO_CONFIGuse 
embryo-config specified ],
+[ EMBRYO_CONFIG=$withval;
   echo using $EMBRYO_CONFIG for embryo-config;
 ],[
-  if [ test -z $EMBRYO_CONFIG ]; then
+  if test -z $EMBRYO_CONFIG; then
 PROG=embryo-config;
 AC_PATH_PROG(EMBRYO_CONFIG, $PROG, , $PATH)
   fi
 ])
+embryo_cflags=`$EMBRYO_CONFIG --cflags`
+embryo_libs=`$EMBRYO_CONFIG --libs`
 
 
-AC_ARG_WITH(xine-config,
-[  --with-xine-config=XINE_CONFIGuse xine-config specified ],
-[
-  XINE_CONFIG=$withval;
+AC_ARG_WITH(xine-config, [  --with-xine-config=XINE_CONFIGuse xine-config 
specified ],
+[ XINE_CONFIG=$withval;
   echo using $XINE_CONFIG for xine-config;
 ],[
-  if [ test -z $XINE_CONFIG ]; then
+  if test -z $XINE_CONFIG; then
 PROG=xine-config;
 AC_PATH_PROG(XINE_CONFIG, $PROG, , $PATH)
   fi
 ])
+xine_cflags=`$XINE_CONFIG --cflags`
+xine_libs=`$XINE_CONFIG --libs`
 
 
 V=`$ECORE_CONFIG --version`




---
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588alloc_id=12065op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-11-01 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
Makefile.am 


Log Message:


LDFLAGS

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 29 Jun 2004 04:37:17 -  1.2
+++ Makefile.am 2 Nov 2004 03:50:27 -   1.3
@@ -4,7 +4,6 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-LDFLAGS = 
 INCLUDES= -I$(includedir) \
   -I$(top_srcdir) \
   -I$(top_srcdir)/src/lib \
@@ -16,6 +15,6 @@
 emotion_smart.c \
 emotion_private.h
 
-libemotion_la_LIBADD   = $(LDFLAGS) @my_libs@ @dlopen_libs@
+libemotion_la_LIBADD   = @my_libs@ @dlopen_libs@
 libemotion_la_DEPENDENCIES = $(top_builddir)/config.h
 libemotion_la_LDFLAGS  = -version-info 0:1:0




---
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588alloc_id=12065op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-11-01 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
Makefile.am 


Log Message:


LDFLAGS

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 24 Jun 2004 06:11:32 -  1.2
+++ Makefile.am 2 Nov 2004 03:50:27 -   1.3
@@ -6,7 +6,6 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-LDFLAGS = 
 INCLUDES= -I$(includedir) \
   -I$(top_srcdir) \
   -I$(top_srcdir)/src/lib \
@@ -20,8 +19,6 @@
 emotion_xine.c \
 emotion_xine.h
 emotion_decoder_xine_la_LIBADD   = @my_libs@ @xine_libs@
-emotion_decoder_xine_la_LDFLAGS  = \
-$(LDFLAGS) \
--module -avoid-version \
--L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+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




---
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588alloc_id=12065op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-11-01 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules/xine


Modified Files:
Makefile.am 


Log Message:


LDFLAGS

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/xine/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 24 Jun 2004 06:11:32 -  1.2
+++ Makefile.am 2 Nov 2004 03:50:27 -   1.3
@@ -4,7 +4,6 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-LDFLAGS = 
 INCLUDES= -I$(includedir) \
   -I$(top_srcdir) \
   -I$(top_srcdir)/src/lib \
@@ -15,11 +14,9 @@
 pkgdir   = @xine_plugins@
 
 pkg_LTLIBRARIES  = xineplug_vo_out_emotion.la
-xineplug_vo_out_emotion_la_SOURCES  = \
-emotion_xine_vo_out.c
+
+xineplug_vo_out_emotion_la_SOURCES  = emotion_xine_vo_out.c
 xineplug_vo_out_emotion_la_LIBADD   = @xine_libs@
-xineplug_vo_out_emotion_la_LDFLAGS  = \
-$(LDFLAGS) \
--module -avoid-version \
--L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+xineplug_vo_out_emotion_la_LDFLAGS  = -module -avoid-version \
+ -L$(top_builddir)/src/lib 
-L$(top_builddir)/src/lib/.libs
 xineplug_vo_out_emotion_la_DEPENDENCIES = $(top_builddir)/config.h




---
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588alloc_id=12065op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-09-23 Thread enlightenment-cvs

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 engine ifdefs

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- emotion_test_main.c 23 Sep 2004 01:29:32 -  1.6
+++ emotion_test_main.c 23 Sep 2004 21:45:59 -  1.7
@@ -85,15 +85,15 @@
}
   }
  }
-#ifdef HAVE_ECORE_EVAS_FB   
+#if HAVE_ECORE_EVAS_X
if (mode == 0)
  ecore_evas = ecore_evas_software_x11_new(NULL, 0,  0, 0, startw, starth);
 #endif   
-#ifdef HAVE_ECORE_EVAS_GL
+#if HAVE_ECORE_EVAS_GL
if (mode == 1)
  ecore_evas = ecore_evas_gl_x11_new(NULL, 0, 0, 0, startw, starth);
 #endif
-#ifdef HAVE_ECORE_EVAS_X   
+#if HAVE_ECORE_EVAS_FB
if (mode == 2)
  ecore_evas = ecore_evas_fb_new(NULL, 0, startw, starth);
 #endif




---
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-09-22 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/bin


Modified Files:
emotion_test_main.c 


Log Message:


conditionally...

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- emotion_test_main.c 31 Aug 2004 06:42:19 -  1.5
+++ emotion_test_main.c 23 Sep 2004 01:29:32 -  1.6
@@ -85,12 +85,19 @@
}
   }
  }
+#ifdef HAVE_ECORE_EVAS_FB   
if (mode == 0)
  ecore_evas = ecore_evas_software_x11_new(NULL, 0,  0, 0, startw, starth);
-   else if (mode == 1)
+#endif   
+#ifdef HAVE_ECORE_EVAS_GL
+   if (mode == 1)
  ecore_evas = ecore_evas_gl_x11_new(NULL, 0, 0, 0, startw, starth);
-   else if (mode == 2)
+#endif
+#ifdef HAVE_ECORE_EVAS_X   
+   if (mode == 2)
  ecore_evas = ecore_evas_fb_new(NULL, 0, startw, starth);
+#endif
+   
 #else
startw = 240;
starth = 320;




---
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-08-31 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/bin


Modified Files:
emotion_test_main.c 


Log Message:


source for .eet in.

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- emotion_test_main.c 19 Jul 2004 04:50:13 -  1.4
+++ emotion_test_main.c 31 Aug 2004 06:42:19 -  1.5
@@ -499,6 +499,8 @@
 
oe = data;
printf(video stopped!\n);
+   emotion_object_position_set(obj, 0.0);
+   emotion_object_play_set(obj, 1);
 }
 
 static void




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047alloc_id=10808op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-24 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
configure.in 


Log Message:


support fetching of meta-data

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- configure.in15 Jul 2004 19:23:03 -  1.4
+++ configure.in24 Jul 2004 09:53:00 -  1.5
@@ -180,6 +180,10 @@
 
 
 V=`$ECORE_CONFIG --version`
+if [ -z $V ]; then
+  echo Error. Ecore is not installed or $ECORE_CONFIG cannot be found. Abort.
+  exit -1
+fi
 VV=`vser $V`
 VM=1.0.0_pre7
 VVM=`vser $VM`
@@ -189,6 +193,10 @@
 fi
 
 V=`$EVAS_CONFIG --version`
+if [ -z $V ]; then
+  echo Error. Evas is not installed or $EVAS_CONFIG cannot be found. Abort.
+  exit -1
+fi
 VV=`vser $V`
 VM=1.0.0_pre13
 VVM=`vser $VM`
@@ -198,6 +206,10 @@
 fi
 
 V=`$EDJE_CONFIG --version`
+if [ -z $V ]; then
+  echo Error. Edje is not installed or $EDJE_CONFIG cannot be found. Abort.
+  exit -1
+fi
 VV=`vser $V`
 VM=0.5.0
 VVM=`vser $VM`
@@ -207,6 +219,10 @@
 fi
 
 V=`$XINE_CONFIG --version`
+if [ -z $V ]; then
+  echo Error. Xine is not installed or $XINE_CONFIG cannot be found. Abort.
+  exit -1
+fi
 VV=`vser $V`
 VM=1.0.0
 VVM=`vser $VM`




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-24 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
Emotion.h emotion_private.h emotion_smart.c 


Log Message:


support fetching of meta-data

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/Emotion.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Emotion.h   24 Jun 2004 10:55:43 -  1.3
+++ Emotion.h   24 Jul 2004 09:53:00 -  1.4
@@ -36,7 +36,19 @@
EMOTION_EVENT_10
 };
 
-typedef enum _Emotion_Event Emotion_Event;
+enum _Emotion_Meta_Info
+{
+   EMOTION_META_INFO_TRACK_TITLE,
+   EMOTION_META_INFO_TRACK_ARTIST,
+   EMOTION_META_INFO_TRACK_ALBUM,
+   EMOTION_META_INFO_TRACK_YEAR,
+   EMOTION_META_INFO_TRACK_GENRE,
+   EMOTION_META_INFO_TRACK_COMMENT,
+   EMOTION_META_INFO_TRACK_DISC_ID
+};
+
+typedef enum _Emotion_Event Emotion_Event;
+typedef enum _Emotion_Meta_Info Emotion_Meta_Info;
 
 #define EMOTION_CHANNEL_AUTO -1
 #define EMOTION_CHANNEL_DEFAULT 0
@@ -90,5 +102,6 @@
 int  emotion_object_ref_num_get   (Evas_Object *obj);
 int  emotion_object_spu_button_count_get  (Evas_Object *obj);
 int  emotion_object_spu_button_get(Evas_Object *obj);
-
+const char  *emotion_object_meta_info_get (Evas_Object *obj, 
Emotion_Meta_Info meta);
+
 #endif
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_private.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emotion_private.h   24 Jun 2004 10:55:43 -  1.2
+++ emotion_private.h   24 Jul 2004 09:53:00 -  1.3
@@ -7,6 +7,14 @@
 
 #include config.h
 
+#define META_TRACK_TITLE 1
+#define META_TRACK_ARTIST 2
+#define META_TRACK_GENRE 3
+#define META_TRACK_COMMENT 4
+#define META_TRACK_ALBUM 5
+#define META_TRACK_YEAR 6
+#define META_TRACK_DISCID 7
+
 typedef struct _Emotion_Video_Module Emotion_Video_Module;
 
 struct _Emotion_Video_Module
@@ -57,6 +65,7 @@
void (*speed_set) (void *ef, double speed);
double   (*speed_get) (void *ef);
int  (*eject) (void *ef);
+   const char * (*meta_get) (void *ef, int meta);

void  *handle;
 };
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- emotion_smart.c 23 Jul 2004 03:15:30 -  1.7
+++ emotion_smart.c 24 Jul 2004 09:53:00 -  1.8
@@ -694,6 +694,43 @@
return sd-spu.button;
 }
 
+const char *
+emotion_object_meta_info_get(Evas_Object *obj, Emotion_Meta_Info meta)
+{
+   Smart_Data *sd;
+   
+   E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, NULL);
+   if (!sd-module) return NULL;
+   if (!sd-video) return NULL;
+   switch (meta)
+ {
+  case EMOTION_META_INFO_TRACK_TITLE:
+   return sd-module-meta_get(sd-video, META_TRACK_TITLE);
+   break;
+  case EMOTION_META_INFO_TRACK_ARTIST:
+   return sd-module-meta_get(sd-video, META_TRACK_ARTIST);
+   break;
+  case EMOTION_META_INFO_TRACK_ALBUM:
+   return sd-module-meta_get(sd-video, META_TRACK_ALBUM);
+   break;
+  case EMOTION_META_INFO_TRACK_YEAR:
+   return sd-module-meta_get(sd-video, META_TRACK_YEAR);
+   break;
+  case EMOTION_META_INFO_TRACK_GENRE:
+   return sd-module-meta_get(sd-video, META_TRACK_GENRE);
+   break;
+  case EMOTION_META_INFO_TRACK_COMMENT:
+   return sd-module-meta_get(sd-video, META_TRACK_COMMENT);
+   break;
+  case EMOTION_META_INFO_TRACK_DISC_ID:
+   return sd-module-meta_get(sd-video, META_TRACK_DISCID);
+   break;
+  default:
+   break;
+ }
+   return NULL;
+}
+
 
 
 




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-22 Thread enlightenment-cvs

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:


1. create new xine_t per video - xine has a single internal clock so pause 1
video - all pause as clock stops. xine issue - but this works around it.

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- emotion_xine.c  21 Jul 2004 07:38:17 -  1.11
+++ emotion_xine.c  23 Jul 2004 03:15:30 -  1.12
@@ -3,7 +3,6 @@
 #include emotion_xine.h
 
 static intinit_count = 0;
-static xine_t*decoder = NULL;
 
 static int em_init(void);
 static int em_shutdown(void);
@@ -66,22 +65,6 @@
 {
init_count++;
if (init_count  1) return init_count;
-   decoder = xine_new();
-   if (decoder)
- {
-   /* load config... */
-   if (0)
- {
-xine_cfg_entry_t entry;
-
-if (xine_config_lookup_entry(decoder, video.num_buffers, entry))
-  {
- entry.num_value = 1;
- xine_config_update_entry(decoder, entry);
-  }
- }
-   xine_init(decoder);
- }
return init_count;
 }
 
@@ -90,11 +73,6 @@
 {
init_count--;
if (init_count  0) return init_count;
-   if (decoder)
- {
-   xine_exit(decoder);
-   decoder = NULL;
- }
return 0;
 }
 
@@ -111,13 +89,20 @@
if (!ev) return NULL;
ev-obj = obj;
 
+   ev-decoder = xine_new();
+   if (!ev-decoder)
+ {
+   free(ev);
+   return NULL;
+ }
+   xine_init(ev-decoder);
if (1)
  {
xine_cfg_entry_t cf;
-   if (xine_config_lookup_entry(decoder, input.dvd_use_readahead, cf))
+   if (xine_config_lookup_entry(ev-decoder, input.dvd_use_readahead, cf))
  {
 cf.num_value = 1; // 0 or 1
-xine_config_update_entry(decoder, cf);
+xine_config_update_entry(ev-decoder, cf);
  }
  }
/* some notes on parameters we could swizzle for certain inputs */
@@ -125,77 +110,82 @@
  {
xine_cfg_entry_t cf;

-   if (xine_config_lookup_entry(decoder, input.dvd_device, cf))
+   if (xine_config_lookup_entry(ev-decoder, video.num_buffers, cf))
+ {
+cf.num_value = 1;
+xine_config_update_entry(ev-decoder, cf);
+ }
+   if (xine_config_lookup_entry(ev-decoder, input.dvd_device, cf))
  {
 cf.str_value = /dev/dvd;
-xine_config_update_entry(decoder, cf);
+xine_config_update_entry(ev-decoder, cf);
  }
-   if (xine_config_lookup_entry(decoder, input.css_decryption_method, cf))
+   if (xine_config_lookup_entry(ev-decoder, input.css_decryption_method, cf))
  {
 cf.str_value = key; // key disk title
-xine_config_update_entry(decoder, cf);
+xine_config_update_entry(ev-decoder, cf);
  }
-   if (xine_config_lookup_entry(decoder, input.dvd_region, cf))
+   if (xine_config_lookup_entry(ev-decoder, input.dvd_region, cf))
  {
 cf.num_value = 0; // 0 ... 1 - 8
-xine_config_update_entry(decoder, cf);
+xine_config_update_entry(ev-decoder, cf);
  }
-   if (xine_config_lookup_entry(decoder, input.dvd_use_readahead, cf))
+   if (xine_config_lookup_entry(ev-decoder, input.dvd_use_readahead, cf))
  {
 cf.num_value = 1; // 0 or 1
-xine_config_update_entry(decoder, cf);
+xine_config_update_entry(ev-decoder, cf);
  }
// these are used any time in runtime - so changing affects all dvd's
-   if (xine_config_lookup_entry(decoder, input.dvd_skip_behaviour, cf))
+   if (xine_config_lookup_entry(ev-decoder, input.dvd_skip_behaviour, cf))
  {
 cf.str_value = skip program; // skip program skip part skip title
-xine_config_update_entry(decoder, cf);
+xine_config_update_entry(ev-decoder, cf);
  }
// these are used any time in runtime - so changing affects all dvd's
-   if (xine_config_lookup_entry(decoder, input.dvd_seek_behaviour, cf))
+   if (xine_config_lookup_entry(ev-decoder, input.dvd_seek_behaviour, cf))
  {
 cf.str_value = seek in program chain; // seek in program chain seek 
in program
-xine_config_update_entry(decoder, cf);
+xine_config_update_entry(ev-decoder, cf);
  }
-   if (xine_config_lookup_entry(decoder, input.v4l_video_device_path, cf))
+   if (xine_config_lookup_entry(ev-decoder, input.v4l_video_device_path, cf))
  {
 cf.str_value = /dev/video0;
-xine_config_update_entry(decoder, cf);
+

E CVS: libs/emotion raster

2004-07-22 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
emotion_smart.c 


Log Message:


1. create new xine_t per video - xine has a single internal clock so pause 1
video - all pause as clock stops. xine issue - but this works around it.

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- emotion_smart.c 22 Jul 2004 04:13:28 -  1.6
+++ emotion_smart.c 23 Jul 2004 03:15:30 -  1.7
@@ -168,9 +168,10 @@
int w, h;

sd-file = strdup(file);
-   if (sd-video)
+   if ((sd-video)  (sd-module))
  {
 sd-module-file_close(sd-video);
+sd-video = NULL;
 evas_object_image_size_set(sd-obj, 0, 0);
  }
if (sd-module) _emotion_module_close(sd-module);
@@ -191,6 +192,7 @@
if (sd-video)
  {
 sd-module-file_close(sd-video);
+sd-video = NULL;
 evas_object_image_size_set(sd-obj, 0, 0);
  }
if (sd-module) _emotion_module_close(sd-module);




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-21 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c 


Log Message:


moe robus pos reporting

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- emotion_xine.c  21 Jul 2004 06:34:17 -  1.10
+++ emotion_xine.c  21 Jul 2004 07:38:17 -  1.11
@@ -293,8 +293,17 @@
  }
if (xine_get_pos_length(ev-stream, pos_stream, pos_time, length_time))
  {
-   ev-pos = 0.0;
-   ev-len = (double)length_time / 1000.0;
+   if (length_time == 0)
+ {
+ev-pos = (double)pos_stream / 65535;
+ev-len = 1.0;
+ev-no_time = 1;
+ }
+   else
+ {
+ev-pos = 0.0;
+ev-len = (double)length_time / 1000.0;
+ }
  }
v = xine_get_stream_info(ev-stream, XINE_STREAM_INFO_FRAME_DURATION);
if (v  0) ev-fps = 9.0 / (double)v;
@@ -403,9 +412,19 @@
   pos_time,
   length_time))
  {
-   ev-pos = (double)pos_time / 1000.0;
-   ev-len = (double)length_time / 1000.0;
+   if (length_time == 0)
+ {
+ev-pos = (double)pos_stream / 65535;
+ev-len = 1.0;
+ev-no_time = 1;
+ }
+   else
+ {
+ev-pos = (double)pos_time / 1000.0;
+ev-len = (double)length_time / 1000.0;
+ }
  }
+   
if ((xine_get_stream_info(ev-stream, XINE_STREAM_INFO_HAS_VIDEO)) 
(xine_get_stream_info(ev-stream, XINE_STREAM_INFO_VIDEO_HANDLED)))
  _emotion_frame_new(ev-obj);
@@ -451,9 +470,12 @@
ev = (Emotion_Xine_Video *)ef;
 
if (ev-seek_to_pos == pos) return;
-   ev-seek_to_pos = pos;
-   ev-seek_to++;
-   pthread_cond_broadcast((ev-seek_cond));
+//   if (xine_get_stream_info(ev-stream, XINE_STREAM_INFO_SEEKABLE))
+ {
+   ev-seek_to_pos = pos;
+   ev-seek_to++;
+   pthread_cond_broadcast((ev-seek_cond));
+ }
 }
 
 static double




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-21 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
emotion_smart.c 


Log Message:


put jobs back... does this work?

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- emotion_smart.c 18 Jul 2004 08:25:45 -  1.5
+++ emotion_smart.c 22 Jul 2004 04:13:28 -  1.6
@@ -42,6 +42,8 @@
double seek_pos;
double len;

+   Ecore_Job *job;
+   
unsigned char  play : 1;
unsigned char  seek : 1;

@@ -62,6 +64,7 @@
 
 static void _mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info);
 static void _mouse_down(void *data, Evas *ev, Evas_Object *obj, void *event_info);
+static void _pos_set_job(void *data);
 static void _pixels_get(void *data, Evas_Object *obj);
 
 static void _smart_init(void);
@@ -238,7 +241,10 @@
if (!sd-module) return;
if (!sd-video) return;
sd-seek_pos = sec;
-   sd-module-pos_set(sd-video, sd-seek_pos);
+   sd-seek = 1;
+   sd-pos = sd-seek_pos;
+   if (sd-job) ecore_job_del(sd-job);
+   sd-job = ecore_job_add(_pos_set_job, obj);
 }
 
 double
@@ -874,6 +880,22 @@
sd-module-event_mouse_button_feed(sd-video, 1, x, y);
 }
 
+static void
+_pos_set_job(void *data)
+{
+   Evas_Object *obj;
+   Smart_Data *sd;
+   
+   obj = data;
+   E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
+   sd-job = NULL;
+   if (sd-seek)
+ {
+   sd-module-pos_set(sd-video, sd-seek_pos);
+   sd-seek = 0;
+ }
+}
+
 /* called by evas when it needs pixels for the image object */
 static void
 _pixels_get(void *data, Evas_Object *obj)
@@ -971,6 +993,7 @@
if (sd-module) _emotion_module_close(sd-module);
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);




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-20 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c 


Log Message:


oh poopie - i forgot to return 1!

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- emotion_xine.c  19 Jul 2004 05:44:54 -  1.8
+++ emotion_xine.c  20 Jul 2004 07:40:14 -  1.9
@@ -1035,6 +1035,7 @@
   }
  }
  }
+   return 1;
 }
 
 static void
@@ -1187,6 +1188,7 @@
 free(eev);
  }
  }
+   return 1;
 }
 
 static int




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-18 Thread enlightenment-cvs

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:


moved dome things off into threads of their own to minimise main ap impact

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- emotion_xine.c  24 Jun 2004 13:59:05 -  1.4
+++ emotion_xine.c  18 Jul 2004 08:04:41 -  1.5
@@ -2,10 +2,6 @@
 #include emotion_private.h
 #include emotion_xine.h
 
-#include unistd.h
-#include fcntl.h
-#include pthread.h
-
 static intinit_count = 0;
 static xine_t*decoder = NULL;
 
@@ -56,11 +52,14 @@
 static double em_speed_get(void *ef);
 static int em_eject(void *ef);
 
+
 static void *_em_seek(void *par);
 static int   _em_fd_active   (void *data, Ecore_Fd_Handler *fdh);
 static void  _em_event   (void *data, const xine_event_t *event);
 static int   _em_fd_ev_active(void *data, Ecore_Fd_Handler *fdh);
 static int   _em_timer   (void *data);
+static void *_em_get_pos_len_th(void *par);
+static void  _em_get_pos_len (Emotion_Xine_Video *ev);
 
 static int
 em_init(void)
@@ -112,6 +111,15 @@
if (!ev) return NULL;
ev-obj = obj;
 
+   if (1)
+ {
+   xine_cfg_entry_t cf;
+   if (xine_config_lookup_entry(decoder, input.dvd_use_readahead, cf))
+ {
+cf.num_value = 1; // 0 or 1
+xine_config_update_entry(decoder, cf);
+ }
+ }
/* some notes on parameters we could swizzle for certain inputs */
if (0)
  {
@@ -134,7 +142,7 @@
  }
if (xine_config_lookup_entry(decoder, input.dvd_use_readahead, cf))
  {
-cf.num_value = 0; // 0 or 1
+cf.num_value = 1; // 0 or 1
 xine_config_update_entry(decoder, cf);
  }
// these are used any time in runtime - so changing affects all dvd's
@@ -297,6 +305,23 @@
v = xine_get_stream_info(ev-stream, XINE_STREAM_INFO_VIDEO_RATIO);
ev-ratio = (double)v / 1.0;
ev-just_loaded = 1;
+   
+ {
+   pthread_attr_t thattr;
+   
+   pthread_cond_init((ev-seek_cond), NULL);
+   pthread_cond_init((ev-get_pos_len_cond), NULL);
+   pthread_mutex_init((ev-seek_mutex), NULL);
+   pthread_mutex_init((ev-get_pos_len_mutex), NULL);
+
+   pthread_attr_init(thattr);
+   pthread_create(ev-seek_th, NULL, _em_seek, ev);
+   pthread_attr_destroy(thattr);
+
+   pthread_attr_init(thattr);
+   pthread_create(ev-get_pos_len_th, NULL, _em_get_pos_len_th, ev);
+   pthread_attr_destroy(thattr);
+ }
return ev;
 }
 
@@ -306,16 +331,26 @@
Emotion_Xine_Video *ev;

ev = (Emotion_Xine_Video *)ef;
+   printf(xn stop\n);
+   xine_stop(ev-stream);
+   ev-delete_me = 1;
+//   pthread_mutex_lock((ev-seek_mutex));
+   pthread_cond_broadcast((ev-seek_cond));
+//   pthread_mutex_lock((ev-get_pos_len_mutex));
+   pthread_cond_broadcast((ev-get_pos_len_cond));
while (ev-seek_to);
+   while (ev-get_poslen);
ecore_main_fd_handler_del(ev-fd_handler);
close(ev-fd_write);
close(ev-fd_read);
ecore_main_fd_handler_del(ev-fd_ev_handler);
close(ev-fd_ev_write);
close(ev-fd_ev_read);
-   xine_stop(ev-stream);
+   printf(xn close\n);
xine_close(ev-stream);
+   printf(xn dispose\n);
xine_dispose(ev-stream);
+   printf(xn dispose evq\n);
xine_event_dispose_queue(ev-queue);
if (ev-video) xine_close_video_driver(decoder, ev-video);
if (ev-audio) xine_close_audio_driver(decoder, ev-audio);
@@ -401,14 +436,7 @@
if (ev-seek_to_pos == pos) return;
ev-seek_to_pos = pos;
ev-seek_to++;
-   if (ev-seek_to == 1)
- {
-   pthread_t th;
-   pthread_attr_t thattr;
-   
-   if (pthread_create(th, NULL, _em_seek, ev) != 0)
- ev-seek_to--;
- }
+   pthread_cond_broadcast((ev-seek_cond));
 }
 
 static double
@@ -922,21 +950,28 @@
 _em_seek(void *par)
 {
Emotion_Xine_Video *ev;
-   double ppos = -1.0;

ev = (Emotion_Xine_Video *)par;
-   while (ev-seek_to  0)
+   pthread_mutex_lock((ev-seek_mutex));
+   for (;;)
  {
-   if (ppos != ev-seek_to_pos)
+   double ppos = -1.0;
+   
+   pthread_cond_wait((ev-seek_cond), (ev-seek_mutex));
+   while (ev-seek_to  0)
  {
-ppos = ev-seek_to_pos;
-xine_play(ev-stream, 0, ev-seek_to_pos * 1000);
+if (ppos != ev-seek_to_pos)
+  {
+ ppos = ev-seek_to_pos;
+ xine_play(ev-stream, 0, ev-seek_to_pos * 1000);
+  }
+ev-seek_to = 0;
+if (ev-delete_me) return NULL;
  }
-   ev-seek_to--;
- }
-   if (!ev-play)
- {
-   xine_set_param(ev-stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+   if (!ev-play)
+

E CVS: libs/emotion raster

2004-07-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
emotion_smart.c 


Log Message:


moved dome things off into threads of their own to minimise main ap impact

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emotion_smart.c 24 Jun 2004 10:55:43 -  1.3
+++ emotion_smart.c 18 Jul 2004 08:04:41 -  1.4
@@ -163,12 +163,16 @@
sd-pos = 0;
sd-seek_pos = 0;
sd-len = 0;
-   if (file)
+   if ((file)  (strlen(file)  0))
  {
int w, h;

sd-file = strdup(file);
-   if (sd-video) sd-module-file_close(sd-video);
+   if (sd-video)
+ {
+sd-module-file_close(sd-video);
+evas_object_image_size_set(sd-obj, 0, 0);
+ }
if (sd-module) _emotion_module_close(sd-module);
sd-module = _emotion_module_open(emotion_decoder_xine.so);
if (!sd-module) return;




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c 


Log Message:


remove seek job... let the seek request thread do it all now

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- emotion_xine.c  18 Jul 2004 08:04:41 -  1.5
+++ emotion_xine.c  18 Jul 2004 08:25:45 -  1.6
@@ -331,8 +331,6 @@
Emotion_Xine_Video *ev;

ev = (Emotion_Xine_Video *)ef;
-   printf(xn stop\n);
-   xine_stop(ev-stream);
ev-delete_me = 1;
 //   pthread_mutex_lock((ev-seek_mutex));
pthread_cond_broadcast((ev-seek_cond));
@@ -346,11 +344,9 @@
ecore_main_fd_handler_del(ev-fd_ev_handler);
close(ev-fd_ev_write);
close(ev-fd_ev_read);
-   printf(xn close\n);
+   xine_stop(ev-stream);
xine_close(ev-stream);
-   printf(xn dispose\n);
xine_dispose(ev-stream);
-   printf(xn dispose evq\n);
xine_event_dispose_queue(ev-queue);
if (ev-video) xine_close_video_driver(decoder, ev-video);
if (ev-audio) xine_close_audio_driver(decoder, ev-audio);
@@ -960,19 +956,18 @@
pthread_cond_wait((ev-seek_cond), (ev-seek_mutex));
while (ev-seek_to  0)
  {
-if (ppos != ev-seek_to_pos)
-  {
- ppos = ev-seek_to_pos;
- xine_play(ev-stream, 0, ev-seek_to_pos * 1000);
-  }
+again:
+ppos = ev-seek_to_pos;
+xine_play(ev-stream, 0, ppos * 1000);
 ev-seek_to = 0;
 if (ev-delete_me) return NULL;
  }
if (!ev-play)
  xine_set_param(ev-stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
if (ev-delete_me) return NULL;
-   usleep(100 / 10);
- }
+   if (ppos != ev-seek_to_pos)
+ goto again;
+}
return NULL;
 }
 




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
emotion_smart.c 


Log Message:


remove seek job... let the seek request thread do it all now

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- emotion_smart.c 18 Jul 2004 08:04:41 -  1.4
+++ emotion_smart.c 18 Jul 2004 08:25:45 -  1.5
@@ -42,8 +42,6 @@
double seek_pos;
double len;

-   Ecore_Job *job;
-   
unsigned char  play : 1;
unsigned char  seek : 1;

@@ -64,7 +62,6 @@
 
 static void _mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info);
 static void _mouse_down(void *data, Evas *ev, Evas_Object *obj, void *event_info);
-static void _pos_set_job(void *data);
 static void _pixels_get(void *data, Evas_Object *obj);
 
 static void _smart_init(void);
@@ -241,10 +238,7 @@
if (!sd-module) return;
if (!sd-video) return;
sd-seek_pos = sec;
-   sd-seek = 1;
-   sd-pos = sd-seek_pos;
-   if (sd-job) ecore_job_del(sd-job);
-   sd-job = ecore_job_add(_pos_set_job, obj);
+   sd-module-pos_set(sd-video, sd-seek_pos);
 }
 
 double
@@ -880,22 +874,6 @@
sd-module-event_mouse_button_feed(sd-video, 1, x, y);
 }
 
-static void
-_pos_set_job(void *data)
-{
-   Evas_Object *obj;
-   Smart_Data *sd;
-   
-   obj = data;
-   E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
-   sd-job = NULL;
-   if (sd-seek)
- {
-   sd-module-pos_set(sd-video, sd-seek_pos);
-   sd-seek = 0;
- }
-}
-
 /* called by evas when it needs pixels for the image object */
 static void
 _pixels_get(void *data, Evas_Object *obj)
@@ -993,7 +971,6 @@
if (sd-module) _emotion_module_close(sd-module);
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);




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c 


Log Message:


grr - i'm trying to debug why xine locks up on closing/stopping/deleting a
stream in elation but NOt in emotion when emotion_test shuts down.

ok emotion_test:

emotion_test dvd://

now once its played a bit of the dvd hit:

q

and it will quit
destroy video objects then exit main loop and exit.

now with elation:

elation

now put a dvd in the drive (or already have one) elation will detect this.
now let it play a bit of the dvd, and hit Escape to eject the dvd (which
will try delete thevideo object). elatiojn will get STUCK inside an emotion
call whihc get stuckin the emotion_xine module call thsat gets stuck inside
xine_stop().

now WHY. what is it about elation that triggers xine to go batty?

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- emotion_xine.c  18 Jul 2004 08:25:45 -  1.6
+++ emotion_xine.c  19 Jul 2004 04:50:13 -  1.7
@@ -338,19 +338,29 @@
pthread_cond_broadcast((ev-get_pos_len_cond));
while (ev-seek_to);
while (ev-get_poslen);
-   ecore_main_fd_handler_del(ev-fd_handler);
-   close(ev-fd_write);
-   close(ev-fd_read);
-   ecore_main_fd_handler_del(ev-fd_ev_handler);
-   close(ev-fd_ev_write);
-   close(ev-fd_ev_read);
+   printf(EX pause...\n);
+//   xine_set_param(ev-stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+   printf(EX stop\n);
xine_stop(ev-stream);
+   printf(EX close\n);
xine_close(ev-stream);
+   printf(EX dispose\n);
xine_dispose(ev-stream);
+   printf(EX dispose evq\n);
xine_event_dispose_queue(ev-queue);
+   printf(EX close video drv\n);
if (ev-video) xine_close_video_driver(decoder, ev-video);
+   printf(EX close audio drv\n);
if (ev-audio) xine_close_audio_driver(decoder, ev-audio);
+   printf(EX del timer\n);
if (ev-timer) ecore_timer_del(ev-timer);
+   printf(EX del fds\n);
+   ecore_main_fd_handler_del(ev-fd_handler);
+   close(ev-fd_write);
+   close(ev-fd_read);
+   ecore_main_fd_handler_del(ev-fd_ev_handler);
+   close(ev-fd_ev_write);
+   close(ev-fd_ev_read);
free(ev);
 }
 




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/bin


Modified Files:
emotion_test_main.c 


Log Message:


grr - i'm trying to debug why xine locks up on closing/stopping/deleting a
stream in elation but NOt in emotion when emotion_test shuts down.

ok emotion_test:

emotion_test dvd://

now once its played a bit of the dvd hit:

q

and it will quit
destroy video objects then exit main loop and exit.

now with elation:

elation

now put a dvd in the drive (or already have one) elation will detect this.
now let it play a bit of the dvd, and hit Escape to eject the dvd (which
will try delete thevideo object). elatiojn will get STUCK inside an emotion
call whihc get stuckin the emotion_xine module call thsat gets stuck inside
xine_stop().

now WHY. what is it about elation that triggers xine to go batty?

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emotion_test_main.c 28 Jun 2004 01:24:04 -  1.3
+++ emotion_test_main.c 19 Jul 2004 04:50:13 -  1.4
@@ -132,6 +132,13 @@
 main_signal_exit(void *data, int ev_type, void *ev)
 {
ecore_main_loop_quit();
+   while (video_objs)
+ {
+   printf(del obj!\n);
+   evas_object_del(video_objs-data);
+   video_objs = evas_list_remove_list(video_objs, video_objs);
+   printf(done\n);
+ }
return 1;
 }
 
@@ -332,6 +339,17 @@
else
  ecore_evas_borderless_set(ecore_evas, 0);
  }
+   else if (!strcmp(ev-keyname, q))
+ {
+   ecore_main_loop_quit();
+   while (video_objs)
+ {
+printf(del obj!\n);
+evas_object_del(video_objs-data);
+video_objs = evas_list_remove_list(video_objs, video_objs);
+printf(done\n);
+ }
+ }
else
  {
printf(UNHANDLED: %s\n, ev-keyname);




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules/xine


Modified Files:
emotion_xine_vo_out.c 


Log Message:


grr - i'm trying to debug why xine locks up on closing/stopping/deleting a
stream in elation but NOt in emotion when emotion_test shuts down.

ok emotion_test:

emotion_test dvd://

now once its played a bit of the dvd hit:

q

and it will quit
destroy video objects then exit main loop and exit.

now with elation:

elation

now put a dvd in the drive (or already have one) elation will detect this.
now let it play a bit of the dvd, and hit Escape to eject the dvd (which
will try delete thevideo object). elatiojn will get STUCK inside an emotion
call whihc get stuckin the emotion_xine module call thsat gets stuck inside
xine_stop().

now WHY. what is it about elation that triggers xine to go batty?

===
RCS file: 
/cvsroot/enlightenment/e17/libs/emotion/src/modules/xine/emotion_xine_vo_out.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- emotion_xine_vo_out.c   18 Jun 2004 15:38:03 -  1.1
+++ emotion_xine_vo_out.c   19 Jul 2004 04:50:14 -  1.2
@@ -122,7 +122,8 @@
cl-driver_class.dispose = _emotion_class_dispose;
cl-config   = xine-config;
cl-xine = xine;
-   
+
+   printf(VO class init\n);
return cl;
 }
 
@@ -133,6 +134,7 @@

cl = (Emotion_Class *)driver_class;
free(cl);
+   printf(VO class dispose\n);
 }
 
 static char *
@@ -183,6 +185,7 @@
dv-vo_driver.dispose  = _emotion_dispose;
dv-vo_driver.redraw_needed= _emotion_redraw;
dv-ev = (Emotion_Xine_Video *)visual;
+   printf(VO open\n);
return dv-vo_driver;
 }
 
@@ -194,6 +197,7 @@
dv = (Emotion_Driver *)vo_driver;
 //   printf(emotion: _emotion_dispose()\n);
free(dv);
+   printf(VO dispose\n);
 }
 
 /***/
@@ -319,6 +323,7 @@
fr-vo_frame.dispose= _emotion_frame_dispose;
fr-vo_frame.driver = vo_driver;

+   printf(VO frame alloc\n);
return (vo_frame_t *)fr;
 }
 
@@ -328,6 +333,7 @@
Emotion_Frame *fr;

fr = (Emotion_Frame *)vo_frame;
+   printf(VO frame dispose\n);
 //   printf(emotion: _emotion_frame_dispose()\n);
_emotion_frame_data_free(fr);  
free(fr);




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-07-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c 


Log Message:


eject works.. xine bug.. if video is paused (*or int he process of being
paused) when we try shut down the stream - POOF - xine hangs

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- emotion_xine.c  19 Jul 2004 04:50:13 -  1.7
+++ emotion_xine.c  19 Jul 2004 05:44:54 -  1.8
@@ -338,8 +338,19 @@
pthread_cond_broadcast((ev-get_pos_len_cond));
while (ev-seek_to);
while (ev-get_poslen);
-   printf(EX pause...\n);
-//   xine_set_param(ev-stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+   printf(EX pause end...\n);
+   if (!emotion_object_play_get(ev-obj))
+//   if (xine_get_param(ev-stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE)
+ {
+   printf(sync...\n);
+   while (xine_get_param(ev-stream, XINE_PARAM_SPEED) == XINE_SPEED_NORMAL);
+   printf(sync...\n);
+   while (xine_get_param(ev-stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE)
+ {
+printf(  ... unpause\n);
+xine_set_param(ev-stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
+ }
+ }
printf(EX stop\n);
xine_stop(ev-stream);
printf(EX close\n);




---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-28 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
configure.in 


Log Message:


check if we need libdl...

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- configure.in18 Jun 2004 15:38:01 -  1.1
+++ configure.in29 Jun 2004 04:37:16 -  1.2
@@ -161,6 +161,9 @@
 AC_SUBST(xine_libs)
 AC_SUBST(xine_plugins)
 
+AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
+AC_SUBST(dlopen_libs)
+
 AC_OUTPUT([
 Makefile
 src/Makefile




---
This SF.Net email sponsored by Black Hat Briefings  Training.
Attend Black Hat Briefings  Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-28 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
Makefile.am 


Log Message:


check if we need libdl...

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 18 Jun 2004 15:38:03 -  1.1
+++ Makefile.am 29 Jun 2004 04:37:17 -  1.2
@@ -16,6 +16,6 @@
 emotion_smart.c \
 emotion_private.h
 
-libemotion_la_LIBADD   = $(LDFLAGS) @my_libs@ -ldl
+libemotion_la_LIBADD   = $(LDFLAGS) @my_libs@ @dlopen_libs@
 libemotion_la_DEPENDENCIES = $(top_builddir)/config.h
 libemotion_la_LDFLAGS  = -version-info 0:1:0




---
This SF.Net email sponsored by Black Hat Briefings  Training.
Attend Black Hat Briefings  Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-27 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/bin


Modified Files:
emotion_test_main.c 


Log Message:


that slider on the left.. playes with alpha now...

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emotion_test_main.c 24 Jun 2004 10:55:42 -  1.2
+++ emotion_test_main.c 28 Jun 2004 01:24:04 -  1.3
@@ -602,9 +602,9 @@

ov = data;
edje_object_part_drag_value_get(o, source, x, y);
-   spd = (y * 20.0) - 10.0;
-   emotion_object_play_speed_set(ov, spd);
-   snprintf(buf, sizeof(buf), %1.1f, spd);
+   spd = 255 * y;
+   evas_object_color_set(ov, 255, 255, 255, spd);
+   snprintf(buf, sizeof(buf), %i, spd);
edje_object_part_text_set(o, video_speed_txt, buf);
 }
 
@@ -746,7 +746,7 @@
edje_object_signal_callback_add(oe, frame_resize, stop, 
video_obj_signal_frame_resize_stop_cb, oe);
edje_object_signal_callback_add(oe, mouse,move, *, 
video_obj_signal_frame_move_cb, oe);

-   edje_object_part_drag_value_set(oe, video_speed, 0.0, 11.0 / 20.0);
+   edje_object_part_drag_value_set(oe, video_speed, 0.0, 1.0);
edje_object_part_text_set(oe, video_speed_txt, 1.0);
 
edje_object_signal_emit(o, video_state, play);




---
This SF.Net email sponsored by Black Hat Briefings  Training.
Attend Black Hat Briefings  Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-24 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/m4




Log Message:
Directory /cvsroot/enlightenment/e17/libs/emotion/m4 added to the repository





---
This SF.Net email sponsored by Black Hat Briefings  Training.
Attend Black Hat Briefings  Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-24 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/m4


Added Files:
ac_expand_dir.m4 ac_path_generic.m4 


Log Message:


autofool cleanups... argh! i hate autofools!





---
This SF.Net email sponsored by Black Hat Briefings  Training.
Attend Black Hat Briefings  Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-24 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules/xine


Modified Files:
Makefile.am 


Log Message:


autofool cleanups... argh! i hate autofools!

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/xine/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 18 Jun 2004 15:38:03 -  1.1
+++ Makefile.am 24 Jun 2004 06:11:32 -  1.2
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 foreign
+#AUTOMAKE_OPTIONS = 1.4 foreign
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -20,6 +20,6 @@
 xineplug_vo_out_emotion_la_LIBADD   = @xine_libs@
 xineplug_vo_out_emotion_la_LDFLAGS  = \
 $(LDFLAGS) \
--no-undefined -module -avoid-version \
+-module -avoid-version \
 -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
 xineplug_vo_out_emotion_la_DEPENDENCIES = $(top_builddir)/config.h




---
This SF.Net email sponsored by Black Hat Briefings  Training.
Attend Black Hat Briefings  Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-24 Thread enlightenment-cvs

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 


Log Message:


autofool cleanups... argh! i hate autofools!

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 18 Jun 2004 15:38:03 -  1.1
+++ Makefile.am 24 Jun 2004 06:11:32 -  1.2
@@ -2,7 +2,7 @@
 
 SUBDIRS = xine
 
-AUTOMAKE_OPTIONS = 1.4 foreign
+#AUTOMAKE_OPTIONS = 1.4 foreign
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -22,6 +22,6 @@
 emotion_decoder_xine_la_LIBADD   = @my_libs@ @xine_libs@
 emotion_decoder_xine_la_LDFLAGS  = \
 $(LDFLAGS) \
--no-undefined -module -avoid-version \
+-module -avoid-version \
 -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
 emotion_decoder_xine_la_DEPENDENCIES = $(top_builddir)/config.h
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- emotion_xine.c  18 Jun 2004 15:38:03 -  1.1
+++ emotion_xine.c  24 Jun 2004 06:11:32 -  1.2
@@ -10,6 +10,9 @@
 static intfd_read = -1;
 static intfd_write = -1;
 Ecore_Fd_Handler *fd_handler = NULL;
+static intfd_ev_read = -1;
+static intfd_ev_write = -1;
+Ecore_Fd_Handler *fd_ev_handler = NULL;
 static xine_t*decoder = NULL;
 
 static int em_init(void);
@@ -59,9 +62,11 @@
 static double em_speed_get(void *ef);
 static int em_eject(void *ef);
 
-static void *_em_seek (void *par);
-static int   _em_fd_active(void *data, Ecore_Fd_Handler *fdh);
-static int   _em_timer(void *data);
+static void *_em_seek(void *par);
+static int   _em_fd_active   (void *data, Ecore_Fd_Handler *fdh);
+static void  _em_event   (void *data, const xine_event_t *event);
+static int   _em_fd_ev_active(void *data, Ecore_Fd_Handler *fdh);
+static int   _em_timer   (void *data);
 
 static int
 em_init(void)
@@ -100,6 +105,23 @@
  ecore_main_fd_handler_active_set(fd_handler, ECORE_FD_READ);
   }
  }
+ {
+int fds[2];
+
+if (pipe(fds) == 0)
+  {
+ fd_ev_read = fds[0];
+ fd_ev_write = fds[1];
+ fcntl(fd_ev_read, F_SETFL, O_NONBLOCK);
+ fd_ev_handler = ecore_main_fd_handler_add(fd_ev_read, 
+   ECORE_FD_READ, 
+   _em_fd_ev_active,
+   decoder,
+   NULL,
+   NULL);
+ ecore_main_fd_handler_active_set(fd_ev_handler, ECORE_FD_READ);
+  }
+ }
  }
return init_count;
 }
@@ -115,11 +137,17 @@
ecore_main_fd_handler_del(fd_handler);
close(fd_write);
close(fd_read);
+   ecore_main_fd_handler_del(fd_ev_handler);
+   close(fd_ev_write);
+   close(fd_ev_read);

decoder = NULL;
fd_handler = NULL;
fd_read = -1;
fd_write = -1;
+   fd_ev_handler = NULL;
+   fd_ev_read = -1;
+   fd_ev_write = -1;
  }
return 0;
 }
@@ -218,10 +246,29 @@
  }
if (1)
  {
+   xine_mrl_t **mrls;
+   int mrls_num;
+   
+   mrls = xine_get_browse_mrls(decoder, dvd, dvd://, mrls_num);
+   printf(mrls = %p\n, mrls);
+   if (mrls)
+ {
+int i;
+
+for (i = 0; i  mrls_num; i++)
+  {
+ printf(MRL: origin \%s\ mrl \%s\ link \%s\ type %x size 
%i\n, 
+mrls[i]-origin, mrls[i]-mrl, mrls[i]-link,
+(int)mrls[i]-type, (int)mrls[i]-size);
+  }
+ }
+ }
+   if (1)
+ {
char **auto_play_mrls;
int auto_play_num;

-   auto_play_mrls = xine_get_autoplay_mrls(decoder, cdda, auto_play_num);
+   auto_play_mrls = xine_get_autoplay_mrls(decoder, dvd, auto_play_num);
printf(auto_play_mrls = %p\n, auto_play_mrls);
if (auto_play_mrls)
  {
@@ -232,13 +279,19 @@
  }
  }
ev-video = xine_open_video_driver(decoder, emotion, XINE_VISUAL_TYPE_NONE, ev);
-   ev-audio = xine_open_audio_driver(decoder, oss, ev);
+   ev-audio = xine_open_audio_driver(decoder, oss, ev); 
+//   ev-audio = xine_open_audio_driver(decoder, alsa, ev);
+//   ev-audio = xine_open_audio_driver(decoder, arts, ev);
+//   ev-audio = xine_open_audio_driver(decoder, esd, ev);
ev-stream =

E CVS: libs/emotion raster

2004-06-24 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
Emotion.h 


Log Message:


autofool cleanups... argh! i hate autofools!

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/Emotion.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Emotion.h   18 Jun 2004 15:38:03 -  1.1
+++ Emotion.h   24 Jun 2004 06:11:32 -  1.2
@@ -6,13 +6,13 @@
 
 enum _Emotion_Event
 {
-   EMOTION_EVENT_MENU1,
-   EMOTION_EVENT_MENU2,
-   EMOTION_EVENT_MENU3,
-   EMOTION_EVENT_MENU4,
-   EMOTION_EVENT_MENU5,
-   EMOTION_EVENT_MENU6,
-   EMOTION_EVENT_MENU7,
+   EMOTION_EVENT_MENU1, // Escape Menu
+   EMOTION_EVENT_MENU2, // Title Menu
+   EMOTION_EVENT_MENU3, // Root Menu
+   EMOTION_EVENT_MENU4, // Subpicture Menu
+   EMOTION_EVENT_MENU5, // Audio Menu
+   EMOTION_EVENT_MENU6, // Angle Menu
+   EMOTION_EVENT_MENU7, // Part Menu
EMOTION_EVENT_UP,
EMOTION_EVENT_DOWN,
EMOTION_EVENT_LEFT,




---
This SF.Net email sponsored by Black Hat Briefings  Training.
Attend Black Hat Briefings  Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-24 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion


Modified Files:
autogen.sh 


Log Message:


autofool cleanups... argh! i hate autofools!

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- autogen.sh  19 Jun 2004 04:19:19 -  1.2
+++ autogen.sh  24 Jun 2004 06:11:31 -  1.3
@@ -1,137 +1,13 @@
 #!/bin/sh
-# Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`
-PKG_NAME=the package.
+rm -rf autom4te.cache
+rm -f aclocal.m4
 
-DIE=0
+echo Running aclocal...; aclocal $ACLOCAL_FLAGS -I m4 \
+ echo Running autoheader...; autoheader \
+ echo Running autoconf...; autoconf \
+ echo Running libtoolize...; libtoolize --automake \
+ echo Running automake...; automake --add-missing --copy --gnu
 
-(autoconf --version)  /dev/null  /dev/null 21 || {
-  echo
-  echo **Error**: You must have \`autoconf' installed to.
-  echo Download the appropriate package for your distribution,
-  echo or get the source tarball at ftp://ftp.gnu.org/pub/gnu/;
-  DIE=1
-}
-
-(grep ^AM_PROG_LIBTOOL $srcdir/configure.in /dev/null)  {
-  (libtoolize --version)  /dev/null  /dev/null 21 || {
-echo
-echo **Error**: You must have \`libtool' installed.
-echo Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz;
-echo (or a newer version if it is available)
-DIE=1
-  }
-}
-
-grep ^AM_GNU_GETTEXT $srcdir/configure.in /dev/null  {
-  grep sed.*POTFILES $srcdir/configure.in /dev/null || \
-  (gettext --version)  /dev/null  /dev/null 21 || {
-echo
-echo **Error**: You must have \`gettext' installed.
-echo Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz;
-echo (or a newer version if it is available)
-DIE=1
-  }
-}
-
-(automake --version)  /dev/null  /dev/null 21 || {
-  echo
-  echo **Error**: You must have \`automake' installed.
-  echo Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz;
-  echo (or a newer version if it is available)
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n $NO_AUTOMAKE || (aclocal --version)  /dev/null  /dev/null 21 || {
-  echo
-  echo **Error**: Missing \`aclocal'.  The version of \`automake'
-  echo installed doesn't appear recent enough.
-  echo Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz;
-  echo (or a newer version if it is available)
-  DIE=1
-}
-
-if test $DIE -eq 1; then
-  exit 1
-fi
-
-if test -z $*; then
-  echo **Warning**: I am going to run \`configure' with no arguments.
-  echo If you wish to pass any to it, please specify them on the
-  echo \`$0\' command line.
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -name configure.in -print`
-do 
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-echo skipping $dr -- flagged as no auto-gen
-  else
-echo processing $dr
-macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp'  $coin`
-( cd $dr
-  aclocalinclude=$ACLOCAL_FLAGS
-  for k in $macrodirs; do
-   if test -d $k; then
-  aclocalinclude=$aclocalinclude -I $k
-   ##else 
-   ##  echo **Warning**: No such directory \`$k'.  Ignored.
-fi
-  done
-  if grep ^AM_GNU_GETTEXT configure.in /dev/null; then
-   if grep sed.*POTFILES configure.in /dev/null; then
- : do nothing -- we still have an old unmodified configure.in
-   else
- echo Creating $dr/aclocal.m4 ...
- test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
- echo Running gettextize...  Ignore non-fatal messages.
- echo no | gettextize --force --copy
- echo Making $dr/aclocal.m4 writable ...
- test -r $dr/aclocal.m4  chmod u+w $dr/aclocal.m4
-fi
-  fi
-  if grep ^AM_GNOME_GETTEXT configure.in /dev/null; then
-   echo Creating $dr/aclocal.m4 ...
-   test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-   echo Running gettextize...  Ignore non-fatal messages.
-   echo no | gettextize --force --copy
-   echo Making $dr/aclocal.m4 writable ...
-   test -r $dr/aclocal.m4  chmod u+w $dr/aclocal.m4
-  fi
-  if grep ^AM_PROG_LIBTOOL configure.in /dev/null; then
-   echo Running libtoolize...
-   libtoolize --force --copy
-  fi
-  echo Running aclocal $aclocalinclude ...
-  aclocal $aclocalinclude
-  if grep ^AM_CONFIG_HEADER configure.in /dev/null; then
-   echo Running autoheader...
-   autoheader
-  fi
-  echo Running automake --gnu $am_opt ...
-  automake --add-missing --gnu $am_opt
-  echo Running autoconf ...
-  autoconf
-)
-  fi
-done
-
-#conf_flags=--enable-maintainer-mode --enable-compile-warnings #--enable-iso-c
-
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags $@ ...
-  $srcdir/configure $conf_flags $@ \

E CVS: libs/emotion raster

2004-06-24 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_xine.c 


Log Message:


support events coming from xine a lot better...

still need to support title, artist etc. for mp3's and such...

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emotion_xine.c  24 Jun 2004 06:11:32 -  1.2
+++ emotion_xine.c  24 Jun 2004 10:55:43 -  1.3
@@ -244,7 +244,7 @@
 xine_config_update_entry(decoder, cf);
  }
  }
-   if (1)
+   if (0)
  {
xine_mrl_t **mrls;
int mrls_num;
@@ -263,7 +263,7 @@
   }
  }
  }
-   if (1)
+   if (0)
  {
char **auto_play_mrls;
int auto_play_num;
@@ -1040,104 +1040,103 @@
 Emotion_Xine_Video *ev;
 Emotion_Xine_Event *eev;
 
-printf(event from xine...\n);
 ev = buf[0];
 eev = buf[1];
 switch (eev-type)
   {
case XINE_EVENT_UI_PLAYBACK_FINISHED:
{
-  printf(EV: Playback finished\n);
-  /* no data in this event */
+  if (ev-timer)
+{
+   ecore_timer_del(ev-timer);
+   ev-timer = NULL;
+}
+  ev-play = 0;
+  _emotion_decode_stop(ev-obj);
}
  break;
case XINE_EVENT_UI_CHANNELS_CHANGED:
{
-  printf(EV: Channels changed\n);
-  /* no data in this event */
+  _emotion_channels_change(ev-obj);
}
  break;
case XINE_EVENT_UI_SET_TITLE:
{
-  xine_ui_data_t *ev;
+  xine_ui_data_t *e;
   
-  ev = eev-xine_event;
-  printf(EV: New Title \%s\\n, ev-str);
-  // title is ev-str
+  e = eev-xine_event;
+  _emotion_title_set(ev-obj, e-str);
}
  break;
case XINE_EVENT_UI_MESSAGE:
{
-  xine_ui_message_data_t *ev;
+  xine_ui_message_data_t *e;
   
-  ev = eev-xine_event;
-  printf(EV: UI Message\n);
-  // ev-type = error type(XINE_MSG_NO_ERROR, 
XINE_MSG_GENERAL_WARNING, XINE_MSG_UNKNOWN_HOST etc.)
-  // ev-messages is a list of messages DOUBLE null terminated
+  e = eev-xine_event;
+  printf(EV: UI Message [FIXME: break this out to emotion 
api]\n);
+  // e-type = error type(XINE_MSG_NO_ERROR, 
XINE_MSG_GENERAL_WARNING, XINE_MSG_UNKNOWN_HOST etc.)
+  // e-messages is a list of messages DOUBLE null terminated
}
  break;
case XINE_EVENT_AUDIO_LEVEL:
{
-  xine_audio_level_data_t *ev;
+  xine_audio_level_data_t *e;
 
-  ev = eev-xine_event;
-  printf(EV: Audio Level\n);
-  // ev-left (0-100) 
-  // ev-right
-  // ev-mute
+  e = eev-xine_event;
+  printf(EV: Audio Level [FIXME: break this out to emotion 
api]\n);
+  // e-left (0-100) 
+  // e-right
+  // e-mute
}
  break;
case XINE_EVENT_PROGRESS:
{
-  xine_progress_data_t *ev;
+  xine_progress_data_t *e;
   
-  ev = eev-xine_event;
-  printf(EV: Progress \%s\ %i%%\n, ev-description, 
ev-percent);
-  // ev-description is text
-  // ev-percent is a percentage marker (0-100)
+  e = eev-xine_event;
+  _emotion_progress_set(ev-obj, e-description, 
(double)e-percent / 100.0);
}
  break;
case XINE_EVENT_MRL_REFERENCE:
{
-  xine_mrl_reference_data_t *ev;
+  xine_mrl_reference_data_t *e;
   
-  ev = eev-xine_event;
-  printf(EV: MRL Ref to \%s\\n, ev-mrl);
-  // ev-alternative

E CVS: libs/emotion raster

2004-06-24 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/bin


Modified Files:
emotion_test_main.c 


Log Message:


support events coming from xine a lot better...

still need to support title, artist etc. for mp3's and such...

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- emotion_test_main.c 18 Jun 2004 15:38:03 -  1.1
+++ emotion_test_main.c 24 Jun 2004 10:55:42 -  1.2
@@ -474,6 +474,77 @@
edje_object_part_text_set(oe, video_progress_txt, buf);
 }
 
+static void
+video_obj_stopped_cb(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *oe;
+
+   oe = data;
+   printf(video stopped!\n);
+}
+
+static void
+video_obj_channels_cb(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *oe;
+
+   oe = data;
+   printf(channels changed: [AUD %i][VID %i][SPU %i]\n,
+ emotion_object_audio_channel_count(obj),
+ emotion_object_video_channel_count(obj),
+ emotion_object_spu_channel_count(obj));
+}
+
+static void
+video_obj_title_cb(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *oe;
+
+   oe = data;
+   printf(video title to: \%s\\n, emotion_object_title_get(obj));
+}
+
+static void
+video_obj_progress_cb(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *oe;
+
+   oe = data;
+   printf(progress: \%s\ %3.3f\n, 
+ emotion_object_progress_info_get(obj),
+ emotion_object_progress_status_get(obj));
+}
+
+static void
+video_obj_ref_cb(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *oe;
+
+   oe = data;
+   printf(video ref to: \%s\ %i\n,
+ emotion_object_ref_file_get(obj),
+ emotion_object_ref_num_get(obj));
+}
+
+static void
+video_obj_button_num_cb(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *oe;
+
+   oe = data;
+   printf(video spu buttons to: %i\n,
+ emotion_object_spu_button_count_get(obj));
+}
+
+static void
+video_obj_button_cb(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *oe;
+
+   oe = data;
+   printf(video selected spu button: %i\n,
+ emotion_object_spu_button_get(obj));
+}
 
 
 
@@ -621,18 +692,6 @@
Frame_Data *fd;
 

-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
 /* basic video object setup */   
o = emotion_object_add(evas);   
emotion_object_file_set(o, file);
@@ -642,18 +701,7 @@
emotion_object_smooth_scale_set(o, 1);
evas_object_show(o);
 /* end basic video setup. all the rest here is just to be fancy */
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+

video_objs = evas_list_append(video_objs, o);

@@ -677,7 +725,15 @@
evas_object_smart_callback_add(o, frame_decode, video_obj_frame_decode_cb, oe);
evas_object_smart_callback_add(o, frame_resize, video_obj_frame_resize_cb, oe);
evas_object_smart_callback_add(o, length_change, video_obj_length_change_cb, oe);
-  
+
+   evas_object_smart_callback_add(o, decode_stop, video_obj_stopped_cb, oe);
+   evas_object_smart_callback_add(o, channels_change, video_obj_channels_cb, oe);
+   evas_object_smart_callback_add(o, title_change, video_obj_title_cb, oe);
+   evas_object_smart_callback_add(o, progress_change, video_obj_progress_cb, oe);
+   evas_object_smart_callback_add(o, ref_change, video_obj_ref_cb, oe);
+   evas_object_smart_callback_add(o, button_num_change, video_obj_button_num_cb, 
oe);
+   evas_object_smart_callback_add(o, button_change, video_obj_button_cb, oe);
+   
edje_object_signal_callback_add(oe, video_control, play, 
video_obj_signal_play_cb, o);
edje_object_signal_callback_add(oe, video_control, pause, 
video_obj_signal_pause_cb, o);
edje_object_signal_callback_add(oe, video_control, stop, 
video_obj_signal_stop_cb, o);




---
This SF.Net email sponsored by Black Hat Briefings  Training.
Attend Black Hat Briefings  Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-24 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
Emotion.h emotion_private.h emotion_smart.c 


Log Message:


support events coming from xine a lot better...

still need to support title, artist etc. for mp3's and such...

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/Emotion.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Emotion.h   24 Jun 2004 06:11:32 -  1.2
+++ Emotion.h   24 Jun 2004 10:55:43 -  1.3
@@ -70,12 +70,12 @@
 const char  *emotion_object_video_channel_name_get(Evas_Object *obj, int channel);
 void emotion_object_video_channel_set (Evas_Object *obj, int channel);
 int  emotion_object_video_channel_get (Evas_Object *obj);
-void emotion_object_spu_mute_set(Evas_Object *obj, Evas_Bool mute);
-Evas_Boolemotion_object_spu_mute_get(Evas_Object *obj);
-int  emotion_object_spu_channel_count   (Evas_Object *obj);
-const char  *emotion_object_spu_channel_name_get(Evas_Object *obj, int channel);
-void emotion_object_spu_channel_set (Evas_Object *obj, int channel);
-int  emotion_object_spu_channel_get (Evas_Object *obj);
+void emotion_object_spu_mute_set  (Evas_Object *obj, Evas_Bool mute);
+Evas_Boolemotion_object_spu_mute_get  (Evas_Object *obj);
+int  emotion_object_spu_channel_count (Evas_Object *obj);
+const char  *emotion_object_spu_channel_name_get  (Evas_Object *obj, int channel);
+void emotion_object_spu_channel_set   (Evas_Object *obj, int channel);
+int  emotion_object_spu_channel_get   (Evas_Object *obj);
 int  emotion_object_chapter_count (Evas_Object *obj);
 void emotion_object_chapter_set   (Evas_Object *obj, int chapter);
 int  emotion_object_chapter_get   (Evas_Object *obj);
@@ -83,5 +83,12 @@
 void emotion_object_play_speed_set(Evas_Object *obj, double speed);
 double   emotion_object_play_speed_get(Evas_Object *obj);
 void emotion_object_eject (Evas_Object *obj);
-
+const char  *emotion_object_title_get (Evas_Object *obj);
+const char  *emotion_object_progress_info_get (Evas_Object *obj);
+double   emotion_object_progress_status_get   (Evas_Object *obj);
+const char  *emotion_object_ref_file_get  (Evas_Object *obj);
+int  emotion_object_ref_num_get   (Evas_Object *obj);
+int  emotion_object_spu_button_count_get  (Evas_Object *obj);
+int  emotion_object_spu_button_get(Evas_Object *obj);
+
 #endif
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- emotion_private.h   18 Jun 2004 15:38:03 -  1.1
+++ emotion_private.h   24 Jun 2004 10:55:43 -  1.2
@@ -65,5 +65,12 @@
 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_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);
+
 #endif
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emotion_smart.c 20 Jun 2004 03:20:31 -  1.2
+++ emotion_smart.c 24 Jun 2004 10:55:43 -  1.3
@@ -46,6 +46,20 @@

unsigned char  play : 1;
unsigned char  seek : 1;
+   
+   char *title;
+   struct {
+  char *info;
+  double stat;
+   } progress;
+   struct {
+  char *file;
+  int num;
+   } ref;
+   struct {
+  int button_num;
+  int button;
+   } spu;
 };
 
 static void _mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info);
@@ -135,7 +149,20 @@
if ((file)  (sd-file)  (!strcmp(file, sd-file))) return;
if (sd-file) free(sd-file);
sd-file = NULL;
-   
+   if (sd-title) free(sd-title);
+   sd-title = NULL;
+   if (sd-progress.info) free(sd-progress.info);
+   sd-progress.info = NULL;
+   sd-progress.stat = 0.0;
+   if (sd-ref.file) free(sd-ref.file);
+   sd-ref.file = NULL;
+   sd-ref.num = 0;
+   sd-spu.button_num = 0;
+   sd-spu.button = -1;
+   sd-ratio = 1.0;
+   sd-pos = 0;
+

E CVS: libs/emotion raster

2004-06-24 Thread enlightenment-cvs

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:


remove race conditions! SMELLY! this does mean more fd's though ! :(

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emotion_xine.c  24 Jun 2004 10:55:43 -  1.3
+++ emotion_xine.c  24 Jun 2004 13:59:05 -  1.4
@@ -7,12 +7,6 @@
 #include pthread.h
 
 static intinit_count = 0;
-static intfd_read = -1;
-static intfd_write = -1;
-Ecore_Fd_Handler *fd_handler = NULL;
-static intfd_ev_read = -1;
-static intfd_ev_write = -1;
-Ecore_Fd_Handler *fd_ev_handler = NULL;
 static xine_t*decoder = NULL;
 
 static int em_init(void);
@@ -88,40 +82,6 @@
   }
  }
xine_init(decoder);
- {
-int fds[2];
-
-if (pipe(fds) == 0)
-  {
- fd_read = fds[0];
- fd_write = fds[1];
- fcntl(fd_read, F_SETFL, O_NONBLOCK);
- fd_handler = ecore_main_fd_handler_add(fd_read, 
-ECORE_FD_READ, 
-_em_fd_active,
-decoder,
-NULL,
-NULL);
- ecore_main_fd_handler_active_set(fd_handler, ECORE_FD_READ);
-  }
- }
- {
-int fds[2];
-
-if (pipe(fds) == 0)
-  {
- fd_ev_read = fds[0];
- fd_ev_write = fds[1];
- fcntl(fd_ev_read, F_SETFL, O_NONBLOCK);
- fd_ev_handler = ecore_main_fd_handler_add(fd_ev_read, 
-   ECORE_FD_READ, 
-   _em_fd_ev_active,
-   decoder,
-   NULL,
-   NULL);
- ecore_main_fd_handler_active_set(fd_ev_handler, ECORE_FD_READ);
-  }
- }
  }
return init_count;
 }
@@ -134,20 +94,7 @@
if (decoder)
  {
xine_exit(decoder);
-   ecore_main_fd_handler_del(fd_handler);
-   close(fd_write);
-   close(fd_read);
-   ecore_main_fd_handler_del(fd_ev_handler);
-   close(fd_ev_write);
-   close(fd_ev_read);
-   
decoder = NULL;
-   fd_handler = NULL;
-   fd_read = -1;
-   fd_write = -1;
-   fd_ev_handler = NULL;
-   fd_ev_read = -1;
-   fd_ev_write = -1;
  }
return 0;
 }
@@ -164,7 +111,6 @@
ev = calloc(1, sizeof(Emotion_Xine_Video));
if (!ev) return NULL;
ev-obj = obj;
-   ev-fd = fd_write;
 
/* some notes on parameters we could swizzle for certain inputs */
if (0)
@@ -278,6 +224,42 @@
   printf(MRL: %s\n, auto_play_mrls[i]);
  }
  }
+ {
+   int fds[2];
+   
+   if (pipe(fds) == 0)
+ {
+ev-fd_read = fds[0];
+ev-fd_write = fds[1];
+fcntl(ev-fd_read, F_SETFL, O_NONBLOCK);
+ev-fd_handler = ecore_main_fd_handler_add(ev-fd_read,
+   ECORE_FD_READ, 
+   _em_fd_active,
+   ev,
+   NULL,
+   NULL);
+ecore_main_fd_handler_active_set(ev-fd_handler, ECORE_FD_READ);
+ }
+ }
+ {
+   int fds[2];
+   
+   if (pipe(fds) == 0)
+ {
+ev-fd_ev_read = fds[0];
+ev-fd_ev_write = fds[1];
+fcntl(ev-fd_ev_read, F_SETFL, O_NONBLOCK);
+ev-fd_ev_handler = ecore_main_fd_handler_add(ev-fd_ev_read, 
+  ECORE_FD_READ, 
+  _em_fd_ev_active,
+  ev,
+  NULL,
+  NULL);
+ecore_main_fd_handler_active_set(ev-fd_ev_handler, ECORE_FD_READ);
+ }
+ }
+   ev-fd = ev-fd_write;
+
ev-video = xine_open_video_driver(decoder, emotion, XINE_VISUAL_TYPE_NONE, ev);
ev-audio = xine_open_audio_driver(decoder, oss, ev); 
 //   ev-audio =

E CVS: libs/emotion raster

2004-06-19 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib


Modified Files:
emotion_smart.c 


Log Message:


oops - missed a check for smart data...

===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- emotion_smart.c 18 Jun 2004 15:38:03 -  1.1
+++ emotion_smart.c 20 Jun 2004 03:20:31 -  1.2
@@ -848,6 +848,7 @@
Smart_Data *sd;

sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
evas_object_lower(sd-obj);
 }
  




---
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion




Log Message:
Directory /cvsroot/enlightenment/e17/libs/emotion added to the repository





---
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/doc




Log Message:
Directory /cvsroot/enlightenment/e17/libs/emotion/doc added to the repository





---
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/data




Log Message:
Directory /cvsroot/enlightenment/e17/libs/emotion/data added to the repository





---
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src




Log Message:
Directory /cvsroot/enlightenment/e17/libs/emotion/src added to the repository





---
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/doc/img




Log Message:
Directory /cvsroot/enlightenment/e17/libs/emotion/doc/img added to the repository





---
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/lib




Log Message:
Directory /cvsroot/enlightenment/e17/libs/emotion/src/lib added to the repository





---
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2004-06-18 Thread enlightenment-cvs

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules




Log Message:
Directory /cvsroot/enlightenment/e17/libs/emotion/src/modules added to the repository





---
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

1 2 >

1 - 100 of 110 matches

Mail list logo