E CVS: libs/evas barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/software_16
Modified Files:
Makefile.am evas_engine.c evas_soft16.h evas_soft16_main.c
Added Files:
evas_soft16_image_cache.c
Log Message:
Add software_16 cache.
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_16/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 25 Oct 2007 16:17:18 - 1.7
+++ Makefile.am 26 Oct 2007 18:53:39 - 1.8
@@ -14,6 +14,7 @@
evas_soft16.h \
evas_soft16_dither_mask.c \
evas_soft16_main.c \
+evas_soft16_image_cache.c \
evas_soft16_image_unscaled.c \
evas_soft16_image_scaled_sampled.c \
evas_soft16_font.c \
@@ -32,6 +33,7 @@
evas_soft16.h \
evas_soft16_dither_mask.c \
evas_soft16_main.c \
+evas_soft16_image_cache.c \
evas_soft16_image_unscaled.c \
evas_soft16_image_scaled_sampled.c \
evas_soft16_font.c \
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_16/evas_engine.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- evas_engine.c 25 Oct 2007 22:09:49 - 1.10
+++ evas_engine.c 26 Oct 2007 18:53:39 - 1.11
@@ -491,16 +491,23 @@
{
Soft16_Image *im_new;
-im_new = soft16_image_new(im->w, im->h, im->stride,
im->have_alpha, im->pixels, 1);
-if (!im_new) return im;
+im_new = soft16_image_new(im->w, im->h, im->stride, im->have_alpha,
+ im->pixels, 1);
+if (!im_new)
+ {
+ if (image_data) *image_data = NULL;
+ return im;
+ }
soft16_image_free(im);
im = im_new;
}
+ if (im->cache_key)
+ soft16_image_cache_del(im);
}
if (image_data) *image_data = (DATA32 *) im->pixels;
- return image;
+ return im;
}
static void *
@@ -532,23 +539,19 @@
static void
eng_image_cache_flush(void *data)
{
- int tmp_size;
-
- tmp_size = evas_common_image_get_cache();
- evas_common_image_set_cache(0);
- evas_common_image_set_cache(tmp_size);
+ soft16_image_cache_flush();
}
static void
eng_image_cache_set(void *data, int bytes)
{
- evas_common_image_set_cache(bytes);
+ soft16_image_cache_size_set(bytes);
}
static int
eng_image_cache_get(void *data)
{
- return evas_common_image_get_cache();
+ return soft16_image_cache_size_get();
}
static void *
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_16/evas_soft16.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evas_soft16.h 25 Oct 2007 22:09:49 - 1.11
+++ evas_soft16.h 26 Oct 2007 18:53:39 - 1.12
@@ -58,6 +58,9 @@
#define pld(addr, off)
#endif /* __ARMEL__ */
+#define IMG_BYTE_SIZE(stride, height, has_alpha) \
+ ((stride) * (height) * (!(has_alpha) ? 2 : 3))
+
typedef struct _Soft16_Image Soft16_Image;
struct _Soft16_Image
@@ -75,9 +78,10 @@
Evas_Image_Load_Opts lo; // load options
+ const char *cache_key;
+
unsigned char have_alpha : 1; // 1 if we have halpha
unsigned char free_pixels : 1; // 1 if pixels should be freed
- unsigned char free_alpha : 1; // 1 if alpha mask should be freed
};
/**
@@ -85,6 +89,7 @@
*/
Soft16_Image *soft16_image_new(int w, int h, int stride, int have_alpha,
DATA16 *pixels, int copy);
void soft16_image_free(Soft16_Image *im);
+void soft16_image_destroy(Soft16_Image *im);
Soft16_Image *soft16_image_load(const char *file, const char *key, int *error,
Evas_Image_Load_Opts *lo);
void soft16_image_load_data(Soft16_Image *im);
void soft16_image_draw(Soft16_Image *src, Soft16_Image *dst, RGBA_Draw_Context
*dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h,
int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h, int
smooth);
@@ -99,6 +104,17 @@
void soft16_image_convert_from_rgb(Soft16_Image *im, const DATA32 *src);
void soft16_image_convert_from_rgba(Soft16_Image *im, const DATA32 *src);
+/**
+ * Image cache (evas_soft16_image_cache.c)
+ */
+void soft16_image_cache_flush(void);
+int soft16_image_cache_size_get(void);
+void soft16_image_cache_size_set(int limit);
+
+Soft16_Image *soft16_image_cache_get(const char *cache_key);
+void soft16_image_cache_put(Soft16_Image *im);
+void soft16_image_cache_add(Soft16_Image *im, const char *cache_key);
+void soft16_image_cache_del(Soft16_Image *im);
/**
* Rectangle (evas_soft16_rectangle.c)
===
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/software_16/evas_soft16_main.c,v
re
E CVS: apps/emphasis lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : apps/emphasis
Dir : e17/apps/emphasis/src/bin
Modified Files:
emphasis_callbacks.c emphasis_callbacks.h emphasis_player.c
emphasis_player.h
Log Message:
Aji's patch for the new signals API.
===
RCS file: /cvs/e/e17/apps/emphasis/src/bin/emphasis_callbacks.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- emphasis_callbacks.c28 Sep 2007 22:48:56 - 1.28
+++ emphasis_callbacks.c26 Oct 2007 10:54:34 - 1.29
@@ -62,7 +62,7 @@
ecore_config_shutdown();
etk_main_quit();
- return ETK_TRUE;
+ return ETK_FALSE; /* don't set to TRUE */
}
/* TODO : doc */
@@ -75,9 +75,8 @@
if(data) etk_toggle_button_toggle(ETK_TOGGLE_BUTTON(player->small.media));
etk_widget_hide(ETK_WIDGET(object));
- return ETK_TRUE;
+ return ETK_FALSE; /* don't quit, hide */
}
-
Etk_Bool
cb_pack_quit(Etk_Object *object, void *data)
{
@@ -86,11 +85,13 @@
if(data && player->small.packed == ETK_FALSE)
{
+ /* We are in the tiny mode */
Etk_Widget *win = NULL;
win = (object == (Etk_Object*)player->small.cov.window) ?
player->small.ctr.window : player->small.cov.window;
if (etk_widget_is_visible(win) == ETK_TRUE)
+/* The other window is visible, don't quit, hide this window */
{ return cb_window_hide(object, data); }
etk_widget_hide(player->small.cov.window);
@@ -107,7 +108,8 @@
if(player->state == EMPHASIS_SMALL)
{ cb_quit(NULL, player); }
}
- return ETK_FALSE;
+
+ return ETK_TRUE; /* else, quit */
}
Etk_Bool
@@ -115,77 +117,84 @@
{
UNUSED(data);
etk_widget_hide(ETK_WIDGET(object));
- return ETK_TRUE;
+ return ETK_FALSE; /* don't quit, hide */
}
/**
* @brief Stop the playing
*/
-void
+Etk_Bool
cb_button_stop_clicked(Etk_Object *object, void *data)
{
UNUSED_CLICKED_PARAM
mpc_stop();
+
+ return ETK_TRUE;
}
/**
* @brief Re-play the song from the start or play the previous song
*/
-void
+Etk_Bool
cb_button_prev_clicked(Etk_Object *object, void *data)
{
UNUSED_CLICKED_PARAM
mpc_prev();
+ return ETK_TRUE;
}
/**
* @brief Toggle play/pause the current song
*/
-void
+Etk_Bool
cb_button_play_clicked(Etk_Object *object, void *data)
{
UNUSED_CLICKED_PARAM
mpc_toggle_play_pause();
+ return ETK_TRUE;
}
/**
* @brief Play the next song
*/
-void
+Etk_Bool
cb_button_next_clicked(Etk_Object *object, void *data)
{
UNUSED_CLICKED_PARAM
mpc_next();
+ return ETK_TRUE;
}
/**
* @brief Toggle the random mode
*/
-void
+Etk_Bool
cb_toggle_random(Etk_Object *object, void *data)
{
UNUSED_CLICKED_PARAM
mpc_toggle_random();
+ return ETK_TRUE;
}
/**
* @brief Toggle the repeat mode
*/
-void
+Etk_Bool
cb_toggle_repeat(Etk_Object *object, void *data)
{
UNUSED_CLICKED_PARAM
mpc_toggle_repeat();
+ return ETK_TRUE;
}
/* TODO : doc */
-void
+Etk_Bool
cb_toggle_full(Etk_Object *object, void *data)
{
Emphasis_Player_Gui *player;
player = data;
- if(!data) return;
+ if(!data) return ETK_TRUE;
if (player->state == EMPHASIS_FULL)
{
@@ -195,43 +204,42 @@
{
cb_switch_full(object, data);
}
+ return ETK_TRUE;
}
/* TODO : doc */
-void
+Etk_Bool /* why? */
cb_toggle_media(Etk_Object *object, void *data)
{
/* Okay, now I have an ETK_FALSE. */
Emphasis_Player_Gui *player;
- Etk_Bool checked;
player = data;
- if(!data) return;
+ if(!data) return ETK_TRUE;
- checked =
- etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(object));
-
- if(checked == ETK_FALSE)
+ if(etk_widget_is_visible(player->media.window))
{
- etk_widget_show(player->media.window);
+ etk_widget_hide(player->media.window);
}
else
{
- etk_widget_hide(player->media.window);
+ etk_widget_show(player->media.window);
}
+
+ return ETK_TRUE; /* why? */
}
/**
* @brief Seek in the song the same percent position than the progress bar
click
*/
-void
+Etk_Bool
cb_seek_time(Etk_Object *object, Etk_Event_Mouse_Down *event, void *data)
{
UNUSED(data)
Etk_Widget *progress;
int x_click, widget_width;
- if(event->button != 1) { return; }
+ if(event->button != 1) { return ETK_TRUE; }
progress = ETK_WIDGET(object);
x_click = event->widget.x;
@@ -239,9 +247,10 @@
etk_widget_geometry_get(progress, NULL, NULL, &widget_width, NULL);
mpc_seek((float) x_click / widget_width);
+ return ETK_TRUE;
}
-void
+Etk_Bool
cb_vol_image_clicked(Etk_Object *object,
Etk_Event_Mouse_Down *event,
void *data)
@@ -249,10 +258,10 @@
UNUSED(event);
Emphasis_Player_Gui *player;
- if(event->button != 1) { return; }
+ if(event->button != 1) { return ETK_TRUE; }
player = data;
- if(!data) return;
+ if(!data) return E
E CVS: libs/emotion raster
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/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_filelist_icon.c Log Message: fix alignment === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_icon.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- ewl_filelist_icon.c 23 Aug 2007 05:26:51 - 1.23 +++ ewl_filelist_icon.c 26 Oct 2007 08:53:11 - 1.24 @@ -283,6 +283,7 @@ icon = ewl_icon_simple_new(); ewl_box_orientation_set(EWL_BOX(icon), EWL_ORIENTATION_HORIZONTAL); + ewl_object_alignment_set(EWL_OBJECT(icon), EWL_FLAG_ALIGN_LEFT); ewl_icon_label_set(EWL_ICON(icon), file); snprintf(path, PATH_MAX, "%s/%s", dir, file); - 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
