E CVS: proto/entropy chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto/entropy
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c filesystem.c layout_etk_simple.c
Log Message:
eFolder creation dialog
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- etk_list_viewer.c 19 Aug 2007 01:50:06 - 1.89
+++ etk_list_viewer.c 1 Sep 2007 12:13:14 - 1.90
@@ -847,7 +847,7 @@
* value depending on SMALL, NORMAL, LARGE for etk_stock */
viewer-tree_col1 = etk_tree_col_new(ETK_TREE(viewer-tree), _(Icon),
48,0.0);
model = etk_tree_model_image_new();
- etk_tree_rows_height_set(ETK_TREE(viewer-tree), 48);
+ //etk_tree_rows_height_set(ETK_TREE(viewer-tree), 48);
etk_tree_col_model_add(viewer-tree_col1, model);
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- filesystem.c30 Aug 2007 13:07:02 - 1.90
+++ filesystem.c1 Sep 2007 12:13:14 - 1.91
@@ -41,6 +41,7 @@
Ecore_List* entropy_filesystem_metadata_groups_retrieve();
void entropy_filesystem_auth_response(char* location, char* user, char*
password);
void entropy_filesystem_meta_all_retrieve();
+void entropy_filesystem_vfolder_create(char* name, Evas_List* entries);
static evfs_connection *con;
@@ -503,6 +504,29 @@
}
break;
+ case EVFS_EV_METAALL: {
+ entropy_gui_component_instance* instance = NULL;
+ entropy_gui_event* gui_event;
+
+instance = ecore_hash_get (evfs_dir_requests,
(long*)data-command-client_identifier);
+ecore_hash_remove (evfs_dir_requests,
(long*)data-command-client_identifier);
+
+
+
+if (instance) {
+ /*Build up the gui_event wrapper */
+gui_event = entropy_malloc (sizeof (entropy_gui_event));
+gui_event-event_type =
+entropy_core_gui_event_get
(ENTROPY_GUI_EVENT_META_ALL_REQUEST);
+
+gui_event-data = EVFS_EVENT_META_ALL(data)-meta;
+
+ entropy_core_layout_notify_event (instance, gui_event,
+ ENTROPY_EVENT_LOCAL);
+ }
+ }
+ break;
+
case EVFS_EV_AUTH_REQUIRED: {
entropy_file_request* calling_request = NULL;
@@ -632,6 +656,7 @@
plugin-file_functions.group_file_remove =
entropy_filesystem_file_group_remove;
plugin-file_functions.auth_respond = entropy_filesystem_auth_response;
plugin-misc_functions.meta_all_get = entropy_filesystem_meta_all_retrieve;
+ plugin-misc_functions.vfolder_create = entropy_filesystem_vfolder_create;
return base;
@@ -1184,4 +1209,21 @@
id = evfs_client_meta_list_all(con);
ecore_hash_set (evfs_dir_requests, (long*)id, instance);
+}
+
+void entropy_filesystem_vfolder_create(char* name, Evas_List* entries)
+{
+ evfs_command* com;
+ EvfsVfolderEntry* e;
+ Evas_List* l;
+
+ com = evfs_vfolder_create_command_new(name);
+ for (l=entries;l;) {
+ e=l-data;
+
+ evfs_vfolder_command_entry_add(com,e-type,e-name,e-value);
+
+ l=l-next;
+ }
+ evfs_vfolder_command_send(con,com);
}
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- layout_etk_simple.c 29 Aug 2007 04:55:06 - 1.79
+++ layout_etk_simple.c 1 Sep 2007 12:13:15 - 1.80
@@ -118,6 +118,18 @@
entropy_core_gui_event_get
(ENTROPY_GUI_EVENT_METADATA_GROUPS));
+ entropy_core_component_event_deregister (instance,
+entropy_core_gui_event_get
+(ENTROPY_GUI_EVENT_PASTE_REQUEST));
+
+ entropy_core_component_event_deregister (instance,
+entropy_core_gui_event_get
+(ENTROPY_GUI_EVENT_AUTH_REQUEST));
+
+ entropy_core_component_event_deregister (instance,
+entropy_core_gui_event_get
+(ENTROPY_GUI_EVENT_META_ALL_REQUEST));
+
/*Deregister this layout*/
entropy_core_layout_deregister(instance-core, instance);
@@ -481,6 +493,12 @@
etk_location_add_dialog_create((entropy_gui_component_instance*)data,
layout_etk_simple_add_header);
}
+void _entropy_etk_efolder_dialog_show_cb(Etk_Object *obj, void *data)
+{
+ entropy_gui_component_instance* layout =
E CVS: proto/entropy chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto/entropy
Dir : e17/proto/entropy/src
Modified Files:
entropy_core.c entropy_gui_event_handlers.c plugin_helper.c
Log Message:
eFolder creation dialog
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_core.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- entropy_core.c 16 Aug 2007 11:32:52 - 1.99
+++ entropy_core.c 1 Sep 2007 12:13:14 - 1.100
@@ -295,6 +295,7 @@
entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_HOVER,
entropy_event_handler_hover_request_handler);
entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_DEHOVER,
entropy_event_handler_dehover_request_handler);
entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_AUTH_REQUEST,
entropy_event_handler_auth_request_handler);
+ entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_META_ALL_REQUEST,
entropy_event_handler_meta_all_request_handler);
//printf(\n\nDetails of thumbnailers:\n);
@@ -647,6 +648,8 @@
return entropy_gui_event_dehover;
} else if (!strcmp(event, ENTROPY_GUI_EVENT_AUTH_REQUEST)) {
return entropy_gui_event_auth_request;
+ } else if (!strcmp(event, ENTROPY_GUI_EVENT_META_ALL_REQUEST)) {
+ return entropy_gui_event_meta_all_request;
} else
return ;
}
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_gui_event_handlers.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- entropy_gui_event_handlers.c13 Aug 2007 03:08:08 - 1.17
+++ entropy_gui_event_handlers.c1 Sep 2007 12:13:14 - 1.18
@@ -521,6 +521,35 @@
return data;
}
+/*Metadata All */
+Entropy_Gui_Event_Handler* entropy_event_handler_meta_all_request_handler()
+{
+ return entropy_gui_event_handler_new(
+ entropy_event_handler_metadata_all_instance_data,
+ entropy_event_handler_instance_data_generic_cleanup);
+
+}
+
+Entropy_Gui_Event_Handler_Instance_Data*
entropy_event_handler_metadata_all_instance_data(entropy_gui_event* event,
+ entropy_gui_component_instance* requestor)
+{
+ Entropy_Gui_Event_Handler_Instance_Data* data = NULL;
+ entropy_notify_event* ev = NULL;
+
+ data = entropy_malloc(sizeof(Entropy_Gui_Event_Handler_Instance_Data));
+
+ ev = entropy_notify_event_new();
+ ev-event_type = ENTROPY_NOTIFY_METADATA_ALL;
+ ev-return_struct = event-data;
+ ev-processed = 1;
+
+ data-notify = ev;
+
+
+ return data;
+}
+
+
/*Copy Request */
Entropy_Gui_Event_Handler* entropy_event_handler_copy_request_handler()
{
===
RCS file: /cvs/e/e17/proto/entropy/src/plugin_helper.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- plugin_helper.c 30 Aug 2007 13:07:02 - 1.35
+++ plugin_helper.c 1 Sep 2007 12:13:14 - 1.36
@@ -353,6 +353,18 @@
}
}
+void entropy_plugin_filesystem_vfolder_create(char* name, Evas_List* entries)
+{
+Entropy_Plugin_File* plugin =
+ENTROPY_PLUGIN_FILE(entropy_plugins_type_get_first
(ENTROPY_PLUGIN_BACKEND_FILE,
+ ENTROPY_PLUGIN_SUB_TYPE_ALL));
+
+ if (plugin) {
+ return (*plugin-misc_functions.vfolder_create)(name,entries);
+ }
+}
+
+
void entropy_plugin_filesystem_file_group_add(entropy_generic_file* file,
char* group)
{
Entropy_Plugin_File* plugin =
-
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/epsilon doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/epsilon Dir : e17/libs/epsilon/src/lib Modified Files: Epsilon.c Log Message: * src/lib/Epsilon.c: (epsilon_mime_for_extension_get): add dvi mime type === RCS file: /cvs/e/e17/libs/epsilon/src/lib/Epsilon.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- Epsilon.c 25 Jul 2007 17:00:58 - 1.36 +++ Epsilon.c 1 Sep 2007 13:37:53 - 1.37 @@ -412,6 +412,7 @@ else if (!strcasecmp(extension, avi)) return video/x-msvideo; else if (!strcasecmp(extension, mov)) return video/quicktime; else if (!strcasecmp(extension, pdf)) return application/pdf; + else if (!strcasecmp(extension, dvi)) return application/dvi; else return NULL; } - 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/epsilon doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/epsilon Dir : e17/libs/epsilon Modified Files: ChangeLog Log Message: * src/lib/Epsilon.c: (epsilon_mime_for_extension_get): add dvi mime type === RCS file: /cvs/e/e17/libs/epsilon/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ChangeLog 12 Dec 2003 21:14:55 - 1.1 +++ ChangeLog 1 Sep 2007 13:37:53 - 1.2 @@ -0,0 +1,4 @@ +2007-09-01 Vincent Torri doursse at users dot sf dot net + + * src/lib/Epsilon.c: (epsilon_mime_for_extension_get): + add dvi mime type - 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: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/evas Modified Files: __init__.py evas.c_evas.pyx evas.c_evas_canvas.pxi evas.c_evas_object.pxi evas.c_evas_object_gradient.pxi evas.c_evas_object_image.pxi evas.c_evas_object_line.pxi evas.c_evas_object_polygon.pxi evas.c_evas_object_rectangle.pxi evas.c_evas_object_smart.pxi evas.c_evas_object_text.pxi Log Message: Cleanup: simplify construction of wrappers for already existent objects. Before I had one class redefinition in __init__.py for each used class, this was used to have an end-user constructor that would call evas to create new objects, while the base class would start shallow and would accept Evas_Object with _set_obj(). Caio noticed that we should instead have end-user constructor in the base class and use Class.__new__() to avoid calling it when we require, like Object_from_instance(). Patch by Caio Marcelo with minor adjustments. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/__init__.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- __init__.py 15 Aug 2007 14:01:54 - 1.12 +++ __init__.py 1 Sep 2007 15:59:30 - 1.13 @@ -2,13 +2,12 @@ import c_evas -shutdown = c_evas.shutdown -render_method_lookup = c_evas.render_method_lookup -render_method_list = c_evas.render_method_list -color_argb_premul = c_evas.color_argb_premul -color_argb_unpremul = c_evas.color_argb_unpremul -color_rgb_to_hsv = c_evas.color_rgb_to_hsv -color_hsv_to_rgb = c_evas.color_hsv_to_rgb +from c_evas import Canvas, SmartObject, Rectangle, Line, Image, \ + Gradient, Polygon, Text, Rect, EvasLoadError, \ + shutdown, render_method_lookup, render_method_list, \ + color_argb_premul, color_argb_unpremul, \ + color_rgb_to_hsv, color_hsv_to_rgb + EVAS_CALLBACK_MOUSE_IN = 0 EVAS_CALLBACK_MOUSE_OUT = 1 @@ -72,89 +71,5 @@ EVAS_OBJECT_POINTER_MODE_AUTOGRAB = 0 EVAS_OBJECT_POINTER_MODE_NOGRAB = 1 -EvasLoadError = c_evas.EvasLoadError -Rect = c_evas.Rect - -class Canvas(c_evas.Canvas): -def __init__(self, method=None, size=None, viewport=None): -c_evas.Canvas.__init__(self) -self._new_evas() -if method: -self.output_method_set(method) -if size: -self.size_set(*size) -if viewport: -self.viewport_set(*viewport) - - -class SmartObject(c_evas.SmartObject): -def __init__(self, canvas, size=None, pos=None, geometry=None, color=None, - name=None): -if type(self) is SmartObject or type(self) is c_evas.SmartObject: -raise TypeError(Must not instantiate SmartObject, but subclasses) -c_evas.SmartObject.__init__(self, canvas) -self._new_obj() -self._set_common_params(size=size, pos=pos, geometry=geometry, -color=color, name=name) - - -class Rectangle(c_evas.Rectangle): -def __init__(self, canvas, size=None, pos=None, geometry=None, color=None, - name=None): -c_evas.Rectangle.__init__(self, canvas) -self._new_obj() -self._set_common_params(size=size, pos=pos, geometry=geometry, -color=color, name=name) - - -class Line(c_evas.Line): -def __init__(self, canvas, start=None, end=None, size=None, pos=None, - geometry=None, color=None, name=None): -c_evas.Line.__init__(self, canvas) -self._new_obj() -self._set_common_params(start=start, end=end, size=size, pos=pos, -geometry=geometry, color=color, name=name) - - -class Image(c_evas.Image): -def __init__(self, canvas, file=None, size=None, pos=None, geometry=None, - color=None, name=None): -c_evas.Image.__init__(self, canvas) -self._new_obj() -self._set_common_params(file=file, size=size, pos=pos, -geometry=geometry, color=color, name=name) - - -class Gradient(c_evas.Gradient): -def __init__(self, canvas, size=None, pos=None, geometry=None, color=None, - name=None): -c_evas.Gradient.__init__(self, canvas) -self._new_obj() -self._set_common_params(size=size, pos=pos, geometry=geometry, -color=color, name=name) - - -class Polygon(c_evas.Polygon): -def __init__(self, canvas, points=None, size=None, pos=None, geometry=None, -color=None, name=None): -c_evas.Polygon.__init__(self, canvas) -self._new_obj() -self._set_common_params(points=points, size=size, pos=pos, -geometry=geometry, color=color, name=name) - - -class Text(c_evas.Text): -def __init__(self, canvas, text=None, font=None, font_source=None, -
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-edje/edje
Modified Files:
__init__.py edje.c_edje_object.pxi
Log Message:
Cleanup: simplify construction of wrappers for already existent objects.
Before I had one class redefinition in __init__.py for each used
class, this was used to have an end-user constructor that would call
evas to create new objects, while the base class would start shallow
and would accept Evas_Object with _set_obj().
Caio noticed that we should instead have end-user constructor in the
base class and use Class.__new__() to avoid calling it when we
require, like Object_from_instance().
Patch by Caio Marcelo with minor adjustments.
===
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/__init__.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- __init__.py 19 Jul 2007 16:07:06 - 1.4
+++ __init__.py 1 Sep 2007 15:59:30 - 1.5
@@ -2,62 +2,16 @@
import c_edje
-shutdown = c_edje.shutdown
-
-frametime_set = c_edje.frametime_set
-frametime_get = c_edje.frametime_get
-
-freeze = c_edje.freeze
-thaw = c_edje.thaw
-
-fontset_append_get = c_edje.fontset_append_get
-fontset_append_set = c_edje.fontset_append_set
-
-file_collection_list = c_edje.file_collection_list
-file_group_exists = c_edje.file_group_exists
-
-file_data_get = c_edje.file_data_get
-
-file_cache_set = c_edje.file_cache_set
-file_cache_get = c_edje.file_cache_get
-file_cache_flush = c_edje.file_cache_flush
-
-collection_cache_set = c_edje.collection_cache_set
-collection_cache_get = c_edje.collection_cache_get
-collection_cache_flush = c_edje.collection_cache_flush
-
-color_class_set = c_edje.color_class_set
-color_class_del = c_edje.color_class_del
-color_class_list = c_edje.color_class_list
-
-text_class_set = c_edje.text_class_set
-text_class_del = c_edje.text_class_del
-text_class_list = c_edje.text_class_list
-
-message_signal_process = c_edje.message_signal_process
-
-EdjeLoadError = c_edje.EdjeLoadError
-
-Message = c_edje.Message
-MessageSignal = c_edje.MessageSignal
-MessageString = c_edje.MessageString
-MessageInt = c_edje.MessageInt
-MessageFloat = c_edje.MessageFloat
-MessageStringSet = c_edje.MessageStringSet
-MessageIntSet = c_edje.MessageIntSet
-MessageFloatSet = c_edje.MessageFloatSet
-MessageStringInt = c_edje.MessageStringInt
-MessageStringFloat = c_edje.MessageStringFloat
-MessageStringIntSet = c_edje.MessageStringIntSet
-MessageStringFloatSet = c_edje.MessageStringFloatSet
-
-
-class Edje(c_edje.Edje):
-def __init__(self, canvas, file=None, group=None,
- size=None, pos=None, geometry=None, color=None, name=None):
-c_edje.Edje.__init__(self, canvas)
-self._new_obj()
-self._set_common_params(file=file, group=group, size=size, pos=pos,
-geometry=geometry, color=color, name=name)
+from c_edje import Edje, shutdown, frametime_set, frametime_get, \
+ freeze, thaw, fontset_append_get, fontset_append_set, \
+ file_collection_list, file_group_exists, \
+ file_data_get, file_cache_set, file_cache_get, file_cache_flush, \
+ collection_cache_set, collection_cache_get, collection_cache_flush, \
+ color_class_set, color_class_del, color_class_list, \
+ text_class_set, text_class_del, text_class_list, \
+ message_signal_process, EdjeLoadError, \
+ Message, MessageSignal, MessageString, MessageInt, MessageFloat, \
+ MessageStringSet, MessageIntSet, MessageFloatSet, MessageStringInt, \
+ MessageStringFloat, MessageStringIntSet, MessageStringFloatSet
c_edje.init()
===
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- edje.c_edje_object.pxi 15 Aug 2007 15:09:09 - 1.13
+++ edje.c_edje_object.pxi 1 Sep 2007 15:59:30 - 1.14
@@ -80,10 +80,12 @@
def __new__(self, *a, **ka):
self._signal_callbacks = {}
-def _new_obj(self):
+def __init__(self, evas.c_evas.Canvas canvas not None, **kargs):
+evas.c_evas.Object.__init__(self, canvas)
if self.obj == NULL:
self._set_obj(edje_object_add(self._evas.obj))
_register_decorated_callbacks(self)
+self._set_common_params(**kargs)
def _set_common_params(self, file=None, group=None, size=None, pos=None,
geometry=None, color=None, name=None):
-
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/
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-emotion/emotion
Modified Files:
__init__.py emotion.c_emotion.pyx
Log Message:
Cleanup: simplify construction of wrappers for already existent objects.
Before I had one class redefinition in __init__.py for each used
class, this was used to have an end-user constructor that would call
evas to create new objects, while the base class would start shallow
and would accept Evas_Object with _set_obj().
Caio noticed that we should instead have end-user constructor in the
base class and use Class.__new__() to avoid calling it when we
require, like Object_from_instance().
Patch by Caio Marcelo with minor adjustments.
===
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/emotion/__init__.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- __init__.py 19 Jul 2007 16:05:25 - 1.3
+++ __init__.py 1 Sep 2007 15:59:30 - 1.4
@@ -2,6 +2,8 @@
import c_emotion
+from c_emotion import Emotion, EmotionModuleInitError
+
EMOTION_EVENT_MENU1 = 0
EMOTION_EVENT_MENU2 = 1
EMOTION_EVENT_MENU3 = 2
@@ -30,16 +32,3 @@
EMOTION_EVENT_8 = 25
EMOTION_EVENT_9 = 26
EMOTION_EVENT_10 = 27
-
-EmotionModuleInitError = c_emotion.EmotionModuleInitError
-
-class Emotion(c_emotion.Emotion):
-def __init__(self, canvas, module_filename=emotion_decoder_xine.so,
- module_params=None, size=None, pos=None, geometry=None,
- color=None, name=None):
-c_emotion.Emotion.__init__(self, canvas)
-self._new_obj()
-self._set_common_params(module_filename=module_filename,
-module_params=module_params,
-size=size, pos=pos, geometry=geometry,
-color=color, name=name)
===
RCS file:
/cvs/e/e17/proto/python-efl/python-emotion/emotion/emotion.c_emotion.pyx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- emotion.c_emotion.pyx 19 Jul 2007 15:06:44 - 1.4
+++ emotion.c_emotion.pyx 1 Sep 2007 15:59:30 - 1.5
@@ -22,11 +22,14 @@
def __new__(self, *a, **ka):
self._emotion_callbacks = {}
-def _new_obj(self):
+def __init__(self, evas.c_evas.Canvas canvas not None, **kargs):
+evas.c_evas.Object.__init__(self, canvas)
if self.obj == NULL:
self._set_obj(emotion_object_add(self._evas.obj))
+self._set_common_params(**kargs)
-def _set_common_params(self, char *module_filename,
+def _set_common_params(self,
+ char *module_filename=emotion_decoder_xine.so,
module_params=None, size=None, pos=None,
geometry=None, color=None, name=None):
evas.c_evas.Object._set_common_params(self, size=size, pos=pos,
-
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: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-emotion/examples Modified Files: emotion_test.py Log Message: Fix Emotion example, it was broken by removal of SmartObject default implementations. === RCS file: /cvs/e/e17/proto/python-efl/python-emotion/examples/emotion_test.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- emotion_test.py 19 Jul 2007 16:07:07 - 1.2 +++ emotion_test.py 1 Sep 2007 16:10:17 - 1.3 @@ -35,12 +35,31 @@ self.frame.data[resizing] = False self.frame.part_drag_value_set(video_speed, 0.0, 1.0) self.frame.part_text_set(video_speed_txt, 1.0) +self.vid.show() evas.SmartObject.__init__(self, canvas) self._setup_signals() def show(self): -evas.SmartObject.show(self) +self.frame.show() + +def hide(self): +self.frame.hide() + +def move(self, x, y): +self.frame.move(x, y) + +def resize(self, w, h): +self.frame.resize(w, h) + +def clip_set(self, o): +self.frame.clip_set(o) + +def clip_unset(self): +self.frame.clip_unset() + +def color_set(self, r, g, b, a): +self.frame.color_set(r, g, b, a) def play_get(self): return self.vid.play - 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 doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_gstreamer.c emotion_gstreamer_pipeline.c
emotion_gstreamer_pipeline.h
Log Message:
* src/modules/emotion_gstreamer.c: (em_file_open):
* src/modules/emotion_gstreamer_pipeline.c: (cb_handoff),
(emotion_pipeline_dvd_build), (emotion_pipeline_uri_build),
(emotion_pipeline_file_build), (_emotion_streams_sinks_get),
(_emotion_video_sink_fill), (_emotion_audio_sink_fill):
* src/modules/emotion_gstreamer_pipeline.h:
add the support of URI playback. Minor fixes.
Fix bug #114
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- emotion_gstreamer.c 19 Aug 2007 14:11:38 - 1.24
+++ emotion_gstreamer.c 1 Sep 2007 17:51:40 - 1.25
@@ -366,21 +366,29 @@
device = NULL;
sscanf (file,cdda://%d, track);
}
- printf (build cdda pipeline\n);
+ fprintf (stderr, [Emotion] [gst] build CD Audio pipeline\n);
if (!(emotion_pipeline_cdda_build (ev, device, track))) {
-printf (error building CA Audio pipeline\n);
+fprintf (stderr, [Emotion] [gst] error while building CD Audio
pipeline\n);
return 0;
}
}
/* Dvd */
else if (strstr (file, dvd://)) {
- printf (build dvd pipeline \n);
+ fprintf (stderr, [Emotion] [gst] build DVD pipeline \n);
if (!(emotion_pipeline_dvd_build (ev, NULL))) {
-printf (error building DVD pipeline\n);
+fprintf (stderr, [Emotion] [gst] error while building DVD
pipeline\n);
return 0;
}
}
+ /* http */
+ else if (strstr (file, http://;)) {
+ fprintf (stderr, [Emotion] [gst] build URI pipeline \n);
+ if (!(emotion_pipeline_uri_build (ev, file))) {
+ fprintf (stderr, [Emotion] [gst] error while building URI pipeline\n);
+ return 0;
+ }
+ }
/* Normal media file */
else {
const char *filename;
@@ -389,9 +397,9 @@
? file + strlen (file://)
: file;
- printf (build file pipeline \n);
+ fprintf (stderr, [Emotion] [gst] build file pipeline \n);
if (!(emotion_pipeline_file_build (ev, filename))) {
-printf (error building File pipeline\n);
+fprintf (stderr, [Emotion] [gst] error while building File
pipeline\n);
return 0;
}
}
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer_pipeline.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- emotion_gstreamer_pipeline.c25 Jul 2007 17:00:56 - 1.4
+++ emotion_gstreamer_pipeline.c1 Sep 2007 17:51:40 - 1.5
@@ -26,13 +26,17 @@
static Emotion_Video_Sink * _emotion_video_sink_new (Emotion_Gstreamer_Video
*ev);
-static void _emotion_video_sink_free (Emotion_Gstreamer_Video
*ev, Emotion_Video_Sink *asink);
+static void _emotion_video_sink_free (Emotion_Gstreamer_Video
*ev, Emotion_Video_Sink *vsink);
+static void _emotion_video_sink_fill (Emotion_Video_Sink
*vsink, GstPad *pad, GstCaps *caps);
+
static Emotion_Audio_Sink * _emotion_audio_sink_new (Emotion_Gstreamer_Video
*ev);
static void _emotion_audio_sink_free (Emotion_Gstreamer_Video
*ev, Emotion_Audio_Sink *asink);
+static GstElement * _emotion_audio_sink_create
(Emotion_Gstreamer_Video *ev, int index);
+static void _emotion_audio_sink_fill (Emotion_Audio_Sink
*asink, GstPad *pad, GstCaps *caps);
static Emotion_Video_Sink * _emotion_visualization_sink_create
(Emotion_Gstreamer_Video *ev, Emotion_Audio_Sink *asink);
-static GstElement * _emotion_audio_sink_create
(Emotion_Gstreamer_Video *ev, int index);
+static void _emotion_streams_sinks_get
(Emotion_Gstreamer_Video *ev, GstElement *decoder);
gboolean
emotion_pipeline_pause (GstElement *pipeline)
@@ -78,7 +82,7 @@
write(ev-fd_ev_write, buf, sizeof(buf));
}
else {
- Emotion_Audio_Sink *asink;
+ Emotion_Audio_Sink *asink;
asink = (Emotion_Audio_Sink *)ecore_list_index_goto (ev-audio_sinks,
ev-audio_sink_nbr);
_emotion_video_pos_update(ev-obj, ev-position, asink-length_time);
}
@@ -211,7 +215,7 @@
if (!emotion_pipeline_pause (ev-pipeline))
goto failure_gstreamer_pause;
- while (no_more_pads == 0) {
+ while (no_more_pads == 0) {
g_print (toto\n);}
no_more_pads = 0;
@@ -237,9 +241,6 @@
/* video stream */
if (g_str_has_prefix (str, video/mpeg)) {
Emotion_Video_Sink *vsink;
-GstStructure *structure;
-const GValue *val;
-GstQuery *query;
GstPad
E CVS: libs/emotion doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: ChangeLog Log Message: * src/modules/emotion_gstreamer.c: (em_file_open): * src/modules/emotion_gstreamer_pipeline.c: (cb_handoff), (emotion_pipeline_dvd_build), (emotion_pipeline_uri_build), (emotion_pipeline_file_build), (_emotion_streams_sinks_get), (_emotion_video_sink_fill), (_emotion_audio_sink_fill): * src/modules/emotion_gstreamer_pipeline.h: add the support of URI playback. Minor fixes. Fix bug #114 === RCS file: /cvs/e/e17/libs/emotion/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ChangeLog 30 Mar 2006 01:33:37 - 1.2 +++ ChangeLog 1 Sep 2007 17:51:40 - 1.3 @@ -1,3 +1,14 @@ +2007-09-01 Vincent Torri doursse at users dot sf dot net + + * src/modules/emotion_gstreamer.c: (em_file_open): + * src/modules/emotion_gstreamer_pipeline.c: (cb_handoff), + (emotion_pipeline_dvd_build), (emotion_pipeline_uri_build), + (emotion_pipeline_file_build), (_emotion_streams_sinks_get), + (_emotion_video_sink_fill), (_emotion_audio_sink_fill): + * src/modules/emotion_gstreamer_pipeline.h: + add the support of URI playback. Minor fixes. + Fix bug #114 + Wed Mar 29 20:33:40 2006Michael Jennings (mej) Xine plugins seem to no longer be built. - 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
