Enlightenment CVS committal
Author : captainigloo
Project : misc
Module : enna
Dir : misc/enna/src/bin
Modified Files:
enna.h enna_emotion.c enna_emusic.c enna_mainmenu.c
enna_module.c
Log Message:
* Enable miniplayer selection part2
* Center emotion object in media module
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna.h 14 Jan 2008 22:16:05 -0000 1.1
+++ enna.h 22 Jan 2008 19:21:22 -0000 1.2
@@ -83,6 +83,8 @@
int fd_ev_write;
Ecore_Fd_Handler *fd_ev_handler;
pthread_t thread_scan_cover;
+ void (*func) (Enna_Db * db, char *path);
+
#if WITH_IPOD_SUPPORT
Itdb_iTunesDB *itdb;
#endif
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_emotion.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_emotion.c 14 Jan 2008 22:16:05 -0000 1.1
+++ enna_emotion.c 22 Jan 2008 19:21:22 -0000 1.2
@@ -167,12 +167,12 @@
if (focus)
{
emotion_object_video_mute_set(sd->emotion, 0);
- edje_object_signal_emit(enna->edje, "enna,state,video,show", "enna");
+ edje_object_signal_emit(enna->edje, "video,show", "enna");
}
else
{
emotion_object_video_mute_set(sd->emotion, 1);
- edje_object_signal_emit(enna->edje, "enna,state,video,hide", "enna");
+ edje_object_signal_emit(enna->edje, "video,hide", "enna");
}
}
@@ -204,11 +204,11 @@
iw = (ih * ratio) + 0.5;
edje_object_part_text_set(sd->edje, "enna.text.title", v->label);
edje_extern_object_min_size_set(sd->emotion, iw, ih);
- edje_object_part_swallow(enna->edje, "enna.video.swallow", sd->emotion);
+ edje_object_part_swallow(enna->edje, "video.swallow", sd->emotion);
edje_object_size_min_calc(sd->edje, &w, &h);
evas_object_resize(sd->edje, w, h);
edje_extern_object_min_size_set(sd->emotion, 0, 0);
- edje_object_part_swallow(enna->edje, "enna.video.swallow", sd->emotion);
+ edje_object_part_swallow(enna->edje, "video.swallow", sd->emotion);
return 1;
}
@@ -251,11 +251,11 @@
if (ratio > 0.0)
iw = (ih * ratio) + 0.5;
edje_extern_object_min_size_set(sd->emotion, iw, ih);
- edje_object_part_swallow(enna->edje, "enna.video.swallow", sd->emotion);
+ edje_object_part_swallow(enna->edje, "video.swallow", sd->emotion);
edje_object_size_min_calc(sd->edje, &w, &h);
evas_object_resize(sd->edje, w, h);
edje_extern_object_min_size_set(sd->emotion, 0, 0);
- edje_object_part_swallow(enna->edje, "enna.video.swallow", sd->emotion);
+ edje_object_part_swallow(enna->edje, "video.swallow", sd->emotion);
return 1;
}
@@ -275,14 +275,14 @@
sd->fullscreen = ~sd->fullscreen;
if (!sd->fullscreen)
{
- edje_object_signal_emit(enna->edje, "enna,state,fullscreen,off",
+ edje_object_signal_emit(enna->edje, "fullscreen,off",
"enna");
edje_object_signal_emit(sd->edje, "enna,state,infos,show", "enna");
enna->fs_obj = 0;
}
else
{
- edje_object_signal_emit(enna->edje, "enna,state,fullscreen,on", "enna");
+ edje_object_signal_emit(enna->edje, "fullscreen,on", "enna");
edje_object_signal_emit(sd->edje, "enna,state,infos,hide", "enna");
enna->fs_obj = 1;
}
@@ -464,9 +464,9 @@
h = 10240;
edje_extern_object_aspect_set(sd->emotion, EDJE_ASPECT_CONTROL_BOTH, w, h);
- edje_object_part_swallow(enna->edje, "enna.video.swallow", sd->emotion);
+ edje_object_part_swallow(enna->edje, "video.swallow", sd->emotion);
edje_object_signal_emit(sd->edje, "enna,scanning,stop", "enna");
- edje_object_signal_emit(enna->edje, "enna,state,video,show", "enna");
+ edje_object_signal_emit(enna->edje, "video,show", "enna");
}
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_emusic.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_emusic.c 14 Jan 2008 22:16:05 -0000 1.1
+++ enna_emusic.c 22 Jan 2008 19:21:22 -0000 1.2
@@ -155,10 +155,8 @@
enna_emusic_stop(sd->obj);
- //ecore_list_destroy(sd->playlist);
-
d = ecore_file_dir_get(filename);
-
+
files = ecore_file_ls(ecore_file_dir_get(filename));
file = ecore_list_first_goto(files);
while ((file = (char *)ecore_list_next(files)) != NULL)
@@ -166,7 +164,6 @@
if (enna_util_has_suffix(file, enna_config_extensions_get("music")))
{
char tmp[4096];
-
sprintf(tmp, "file://%s/%s", d, (char *)file);
if (!strcmp(file, ecore_file_file_get(filename)))
sd->playlist_id = i;
@@ -174,6 +171,7 @@
ecore_list_append(sd->playlist, strdup(tmp));
}
}
+
ecore_list_index_goto(sd->playlist, sd->playlist_id);
sd->music_type = ENNA_EMUSIC_TYPE_AUDIO;
return 1;
@@ -219,15 +217,19 @@
enna = evas_data_attach_get(evas_object_evas_get(sd->edje));
dbg("PLAY\n");
+
+
if (sd->state == ENNA_EMUSIC_STATE_STOP)
{
+ char *filename;
+
sd->state = ENNA_EMUSIC_STATE_PLAYING;
-
- emotion_object_file_set(sd->emotion,
- (char *)ecore_list_index_goto(sd->playlist,
- sd->playlist_id));
edje_object_signal_emit(sd->edje, "enna,state,play", "enna");
edje_object_signal_emit(sd->edje, "enna,state,play", "enna");
+ filename = ecore_list_index_goto(sd->playlist, sd->playlist_id);
+ dbg("filename : %s\n", filename);
+
+ emotion_object_file_set(sd->emotion, filename);
emotion_object_play_set(sd->emotion, 1);
enna_miniplayer_play(enna->miniplayer);
_update_metadata(sd);
@@ -479,7 +481,6 @@
evas_object_resize(sd->cover, w, h);
evas_object_image_fill_set(sd->cover, 0, 0, w, h);
-
enna_miniplayer_infos_set(enna->miniplayer, metadata->title,
metadata->album, metadata->artist,
metadata->cover);
@@ -717,7 +718,6 @@
/* Add Play/Next/Prev Clic signal */
o_play = edje_object_part_object_get(sd->edje, "enna.btn.play");
- dbg("%p\n", o_play);
evas_object_event_callback_add(o_play, EVAS_CALLBACK_MOUSE_DOWN,
_play_event_mouse_up, sd);
o_pause = edje_object_part_object_get(sd->edje, "enna.btn.pause");
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_mainmenu.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_mainmenu.c 14 Jan 2008 22:16:05 -0000 1.1
+++ enna_mainmenu.c 22 Jan 2008 19:21:22 -0000 1.2
@@ -70,7 +70,6 @@
Evas_Object *edje;
Evas_Object *base_obj;
Evas_Object *icon_obj;
- Evas_Object *miniplayer_obj;
void (*func) (void *data, void *data2);
void (*func_hilight) (void *data, void *data2);
void *data;
@@ -241,20 +240,7 @@
si->sd = sd;
si->base_obj = edje_object_add(evas_object_evas_get(sd->smart_obj));
- if (miniplayer)
- {
- edje_object_file_set(si->base_obj, enna_config_theme_get(),
- "widget/menu/item");
- si->icon_obj = NULL;
- si->miniplayer_obj = icon;
- if (si->miniplayer_obj)
- {
- edje_object_part_swallow(si->base_obj, "enna.swallow.miniplayer",
- si->miniplayer_obj);
- evas_object_show(si->miniplayer_obj);
- }
- }
- else
+ if (!miniplayer)
{
edje_object_file_set(si->base_obj, enna_config_theme_get(),
"widget/menu/item");
@@ -262,7 +248,6 @@
evas_object_show(si->base_obj);
si->icon_obj = icon;
- si->miniplayer_obj = NULL;
if (si->icon_obj)
{
edje_extern_object_min_size_set(si->icon_obj, sd->icon_w,
@@ -319,20 +304,8 @@
si->sd = sd;
si->base_obj = edje_object_add(evas_object_evas_get(sd->smart_obj));
- if (miniplayer)
- {
- edje_object_file_set(si->base_obj, enna_config_theme_get(),
- "widget/menu/miniplayer");
- si->icon_obj = NULL;
- si->miniplayer_obj = icon;
- if (si->miniplayer_obj)
- {
- edje_object_part_swallow(si->base_obj, "enna.swallow.miniplayer",
- si->miniplayer_obj);
- evas_object_show(si->miniplayer_obj);
- }
- }
- else
+
+ if (!miniplayer)
{
edje_object_file_set(si->base_obj, enna_config_theme_get(),
"widget/menu/item");
@@ -438,16 +411,8 @@
((double)sd->selected /
((double)evas_list_count(sd->items) - 1.0));
}
-
- //evas_object_raise (si->base_obj);
-
- if (si->miniplayer_obj)
- {
- edje_object_signal_emit(si->base_obj, "selected", "enna");
- edje_object_signal_emit(si->miniplayer_obj, "selected", "enna");
- }
- else
- edje_object_signal_emit(si->base_obj, "selected", "enna");
+
+ edje_object_signal_emit(si->base_obj, "selected", "enna");
if (si->func_hilight)
si->func_hilight(si->data, si->data2);
if (sd->selector)
@@ -604,7 +569,6 @@
* evas_object_del(si->icon_obj); */
evas_object_del(si->base_obj);
evas_object_del(si->icon_obj);
- //evas_object_del(si->miniplayer_obj);
//free(si->func);
//free(si->func_hilight);
free(si);
@@ -700,7 +664,7 @@
if (!sd->items)
return;
si = evas_list_nth(sd->items, n);
- if (si && !si->miniplayer_obj)
+ if (si)
{
if (si->icon_obj)
{
@@ -708,7 +672,6 @@
evas_object_hide(si->icon_obj);
evas_object_del(si->icon_obj);
}
-
si->icon_obj = icon;
if (si->icon_obj)
{
@@ -741,8 +704,6 @@
sd->items = evas_list_remove_list(sd->items, sd->items);
if (si->icon_obj)
evas_object_del(si->icon_obj);
- if (si->miniplayer_obj)
- evas_object_del(si->miniplayer_obj);
evas_object_del(si->base_obj);
free(si);
}
@@ -1064,7 +1025,7 @@
sd->icon_h = 24;
sd->selected = -1;
- sd->active = 0;
+ sd->active = 1;
sd->box_scroll = NULL;
sd->scroll_align = 0.0;
sd->has_focus = 0;
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_module.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_module.c 14 Jan 2008 22:16:05 -0000 1.1
+++ enna_module.c 22 Jan 2008 19:21:22 -0000 1.2
@@ -285,6 +285,8 @@
if (!sd->modules)
return;
si = evas_list_nth(sd->modules, sd->selected);
+ if (!si) return;
+
switch (si->type)
{
case ENNA_MODULE_MUSIC:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs