Enlightenment CVS committal
Author : doursse
Project : misc
Module : rage
Dir : misc/rage/src/bin
Modified Files:
main.c rage_thumb.c
Log Message:
update rage to fit emotion changes, remove trailing spaces
===================================================================
RCS file: /cvs/e/misc/rage/src/bin/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- main.c 11 Aug 2007 15:48:03 -0000 1.5
+++ main.c 31 Oct 2007 20:10:30 -0000 1.6
@@ -64,7 +64,7 @@
{
int n, w, h;
char buf[16], buf2[16];
-
+
n = sscanf(argv[i +1], "%10[^x]x%10s", buf, buf2);
if (n == 2)
{
@@ -78,7 +78,7 @@
else if (!strcmp(argv[i], "-t"))
{
char buf[4096];
-
+
snprintf(buf, sizeof(buf), "%s/%s.edj", PACKAGE_DATA_DIR, argv[i
+1]);
theme = strdup(buf);
i++;
@@ -101,12 +101,12 @@
else
main_usage();
}
-
+
/* load config */
if (!config)
{
char buf[4096];
-
+
if (getenv("HOME"))
snprintf(buf, sizeof(buf), "%s/.rage", getenv("HOME"));
else if (getenv("TMPDIR"))
@@ -154,7 +154,7 @@
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, main_key_down,
NULL);
evas_object_focus_set(o, 1);
o_bg = o;
-
+
/* if fullscreen mode - go fullscreen and hide mouse */
if (fullscreen)
{
@@ -189,17 +189,17 @@
menu_item_add("icon/update", "Scan Media",
"Scan all media again and update", NULL,
main_menu_scan, NULL, NULL, NULL, NULL);
-
+
menu_item_enabled_set("Main", "Settings", 1);
menu_item_enabled_set("Main", "DVD", 1);
-
+
menu_go();
-
+
menu_item_select("Settings");
/* show our canvas */
ecore_evas_show(ecore_evas);
-
+
/* add event handlers for volume add/del event from the volume scanner
* system so we know when volumes come and go */
ecore_event_handler_add(VOLUME_ADD, main_volume_add, NULL);
@@ -207,7 +207,7 @@
/* ... run the program core loop ... */
ecore_main_loop_begin();
-
+
ecore_evas_shutdown();
ecore_file_shutdown();
ecore_shutdown();
@@ -219,7 +219,7 @@
main_mode_push(int mode)
{
Mode *md;
-
+
md = calloc(1, sizeof(Mode));
md->mode = mode;
modes = evas_list_prepend(modes, md);
@@ -230,7 +230,7 @@
main_mode_pop(void)
{
Mode *md;
-
+
if (!modes) return;
md = modes->data;
modes = evas_list_remove_list(modes, modes);
@@ -320,7 +320,7 @@
main_resize(Ecore_Evas *ee)
{
Evas_Coord w, h;
-
+
evas_output_viewport_get(evas, NULL, NULL, &w, &h);
evas_object_resize(o_bg, w, h);
layout_resize();
@@ -363,7 +363,7 @@
{
Evas_List *l;
Genre *ge;
-
+
for (l = list; l; l = l->next)
{
ge = l->data;
@@ -386,7 +386,7 @@
while (list)
{
Genre *ge;
-
+
ge = list->data;
evas_stringshare_del(ge->label);
free(ge);
@@ -404,7 +404,7 @@
for (l = volume_items_get(); l; l = l->next)
{
Volume_Item *vi;
-
+
vi = l->data;
if (!strcmp(vi->type, "video"))
{
@@ -446,7 +446,7 @@
video_lib_item_free(void *data)
{
Video_Lib_Item *vli;
-
+
vli = data;
evas_stringshare_del(vli->label);
evas_stringshare_del(vli->path);
@@ -460,10 +460,10 @@
main_menu_video_over_delay(void *data)
{
Video_Lib_Item *vli;
-
+
vli = data;
if (over_video) minivid_del(over_video);
- over_video = minivid_add("emotion_decoder_xine.so", vli->vi->path, 1);
+ over_video = minivid_add("xine", vli->vi->path, 1);
layout_swallow("video_preview", over_video);
over_delay_timer = NULL;
return 0;
@@ -486,7 +486,7 @@
minivid_del(over_video);
over_video = NULL;
}
- video_init("emotion_decoder_xine.so", vli->vi->path, "video");
+ video_init("xine", vli->vi->path, "video");
}
static void
@@ -541,19 +541,19 @@
vl->path = evas_stringshare_add(vli->path);
menu_push("menu", vl->label, video_lib_free, vl);
}
-
+
/* determine toplevel genres */
genres = list_video_genres();
if (genres)
{
int vlpn;
-
+
vlpn = strlen(vl->path);
printf("--- %s\n", vl->path);
for (l = genres; l; l = l->next)
{
Genre *ge;
-
+
ge = l->data;
if (vlpn > 0)
{
@@ -561,7 +561,7 @@
(strlen(ge->label) != vlpn))
{
char *s, *p;
-
+
s = strdup(ge->label + vlpn + 1);
p = strchr(s, '/');
if (p) *p = 0;
@@ -573,7 +573,7 @@
else
{
char *s, *p;
-
+
s = strdup(ge->label);
p = strchr(s, '/');
if (p) *p = 0;
@@ -589,7 +589,7 @@
{
Genre *ge;
char buf[4096];
-
+
ge = l->data;
if (vl->path[0])
snprintf(buf, sizeof(buf), "%s/%s", vl->path, ge->label);
@@ -613,18 +613,18 @@
else
{
const char *sel = NULL;
-
+
for (l = volume_items_get(); l; l = l->next)
{
Volume_Item *vi;
-
+
vi = l->data;
if (!strcmp(vi->type, "video"))
{
if (!strcmp(vi->genre, vl->path))
{
char buf[4096];
-
+
buf[0] = 0;
vli = calloc(1, sizeof(Video_Lib_Item));
vli->label = evas_stringshare_add(vi->name);
@@ -633,7 +633,7 @@
// snprintf(buf, sizeof(buf), "3:00:00");
menu_item_add(vli->path, vli->label,
"", buf,
- main_menu_video_view, vli,
+ main_menu_video_view, vli,
video_lib_item_free,
main_menu_video_over,
main_menu_video_out);
@@ -665,7 +665,7 @@
minivid_del(over_video);
over_video = NULL;
}
- video_init("emotion_decoder_xine.so", "dvd://", "video");
+ video_init("xine", "dvd://", "video");
}
static void
===================================================================
RCS file: /cvs/e/misc/rage/src/bin/rage_thumb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- rage_thumb.c 15 Apr 2007 18:27:18 -0000 1.2
+++ rage_thumb.c 31 Oct 2007 20:10:30 -0000 1.3
@@ -19,7 +19,7 @@
static int signal_exit(void *data, int ev_type, void *ev);
static int frame_grab(void *data);
-char *module_filename = "emotion_decoder_xine.so";
+char *module_filename = "xine";
Ecore_Evas *ee = NULL, *ee_im = NULL, *ee_im2 = NULL;
Evas *evas = NULL, *evas_im = NULL, *evas_im2 = NULL;
Evas_Object *video = NULL, *bg = NULL, *im = NULL, *im2 = NULL;
@@ -47,7 +47,7 @@
if (!ecore_evas_init()) return -1;
args_parse();
-
+
ee = ecore_evas_buffer_new(outw, outh);
if (!ee)
{
@@ -55,7 +55,7 @@
exit(-1);
}
evas = ecore_evas_get(ee);
-
+
video = emotion_object_add(evas);
emotion_object_module_option_set(video, "audio", "off");
emotion_object_init(video, module_filename);
@@ -65,18 +65,18 @@
evas_object_move(video, 0, 0);
evas_object_resize(video, outw, outh);
evas_object_show(video);
- emotion_object_play_set(video, 1);
+ emotion_object_play_set(video, 1);
emotion_object_audio_mute_set(video, 1);
video_resize();
frame_grab(NULL);
ecore_timer_add(1.0 / fps, frame_grab, NULL);
ecore_main_loop_begin();
-
+
if (ef) eet_close(ef);
-
+
evas_object_del(video);
- ecore_evas_free(ee);
+ ecore_evas_free(ee);
ecore_evas_shutdown();
ecore_shutdown();
return 0;
@@ -105,7 +105,7 @@
if ((iw == 0) || (ih == 0)) return;
ratio = emotion_object_ratio_get(video);
if (ratio > 0.0) iw = (ih * ratio) + 0.5;
-
+
if ((firstsize) && (iw > 1))
{
outw = (outh * iw) / ih;
@@ -130,7 +130,7 @@
int argc;
char **argv;
int i;
-
+
ecore_app_args_get(&argc, &argv);
for (i = 1; i < argc; i++)
{
@@ -147,7 +147,7 @@
{
int n;
char buf[16], buf2[16];
-
+
n = sscanf(argv[i +1], "%10[^x]x%10s", buf, buf2);
if (n == 2)
{
@@ -243,7 +243,7 @@
pos = 1;
endpos = 3;
}
- emotion_object_position_set(video, p1 - snip);
+ emotion_object_position_set(video, p1 - snip);
}
p = emotion_object_position_get(video);
printf("fr %i pos %i p %3.3f\n", frnum, pos, p);
-------------------------------------------------------------------------
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
