Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/elation
Dir : e17/apps/elation/src/modules
Modified Files:
elation_cd.c elation_dvd.c elation_media.c elation_vcd.c
Log Message:
cd module does more
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elation/src/modules/elation_cd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- elation_cd.c 24 Jul 2004 07:19:47 -0000 1.2
+++ elation_cd.c 24 Jul 2004 10:44:23 -0000 1.3
@@ -20,6 +20,7 @@
int track;
int track_num;
Evas_Object *video;
+ Evas_Object *overlay;
};
static void shutdown(Elation_Module *em);
@@ -37,9 +38,8 @@
static void progress_change_cb(void *data, Evas_Object *obj, void *event_info);
static void channels_change_cb(void *data, Evas_Object *obj, void *event_info);
static void key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static int media_play_timer_cb(void *data);
-static int media_fade_in_timer_cb(void *data);
-
+static void new_track(Elation_Module *em, int track);
+
void *
init(Elation_Module *em)
{
@@ -56,6 +56,8 @@
em->focus = focus;
em->unfocus = unfocus;
em->action = action;
+
+ em->data = pr;
pr->device = strdup("/dev/cdrom");
@@ -108,14 +110,12 @@
close(fd);
}
}
- {
- char buf[256];
-
- snprintf(buf, sizeof(buf), "cdda:/%i", pr->track + 1);
- emotion_object_file_set(pr->video, buf);
- emotion_object_play_set(pr->video, 1);
- }
+ pr->overlay = edje_object_add(em->info->evas);
+ edje_object_file_set(pr->overlay, PACKAGE_DATA_DIR"/data/theme.eet", "cd");
+ edje_object_signal_emit(pr->overlay, "media", "1");
+
+ new_track(em, 0);
return pr;
}
@@ -126,6 +126,7 @@
pr = em->data;
evas_object_del(pr->video);
+ evas_object_del(pr->overlay);
free(pr);
}
@@ -140,6 +141,9 @@
evas_object_move(pr->video, 0, 0);
evas_object_resize(pr->video, w, h);
+
+ evas_object_move(pr->overlay, 0, 0);
+ evas_object_resize(pr->overlay, w, h);
}
static void
@@ -148,6 +152,7 @@
Elation_Module_Private *pr;
pr = em->data;
+ evas_object_show(pr->overlay);
}
static void
@@ -156,6 +161,7 @@
Elation_Module_Private *pr;
pr = em->data;
+ evas_object_hide(pr->overlay);
}
static void
@@ -185,27 +191,10 @@
switch (action)
{
case ELATION_ACT_NEXT:
- pr->track++;
- if (pr->track >= pr->track_num) pr->track = 0;
- printf("next to %i\n", pr->track);
- {
- char buf[256];
-
- snprintf(buf, sizeof(buf), "cdda:/%i", pr->track + 1);
- emotion_object_file_set(pr->video, buf);
- emotion_object_play_set(pr->video, 1);
- }
+ new_track(em, pr->track + 1);
break;
case ELATION_ACT_PREV:
- pr->track--;
- if (pr->track < 0) pr->track = pr->track_num - 1;
- {
- char buf[256];
-
- snprintf(buf, sizeof(buf), "cdda:/%i", pr->track + 1);
- emotion_object_file_set(pr->video, buf);
- emotion_object_play_set(pr->video, 1);
- }
+ new_track(em, pr->track - 1);
break;
case ELATION_ACT_SELECT:
if (emotion_object_play_get(pr->video))
@@ -298,15 +287,7 @@
printf("EL video stop\n");
// emotion_object_position_set(pr->video, 0.0);
// emotion_object_play_set(pr->video, 1);
- pr->track++;
- if (pr->track >= pr->track_num) pr->track = 0;
- {
- char buf[256];
-
- snprintf(buf, sizeof(buf), "cdda:/%i", pr->track + 1);
- emotion_object_file_set(pr->video, buf);
- emotion_object_play_set(pr->video, 1);
- }
+ new_track(em, pr->track + 1);
}
static void
@@ -379,3 +360,38 @@
else if (!strcmp(ev->keyname, "k")) action = ELATION_ACT_SKIP;
em->action(em, action);
}
+
+static void
+new_track(Elation_Module *em, int track)
+{
+ Elation_Module_Private *pr;
+ char buf[256];
+
+ pr = em->data;
+ pr->track = track;
+ while (pr->track >= pr->track_num) pr->track -= pr->track_num;
+ while (pr->track < 0) pr->track += pr->track_num;
+
+ snprintf(buf, sizeof(buf), "cdda:/%i", pr->track + 1);
+ emotion_object_file_set(pr->video, buf);
+ emotion_object_play_set(pr->video, 1);
+ snprintf(buf, sizeof(buf), "%i", pr->track + 1);
+ edje_object_part_text_set(pr->overlay,
+ "track_number",
+ buf);
+ edje_object_part_text_set(pr->overlay,
+ "track_title",
+ emotion_object_meta_info_get(pr->video,
EMOTION_META_INFO_TRACK_TITLE));
+ edje_object_part_text_set(pr->overlay,
+ "track_artist",
+ emotion_object_meta_info_get(pr->video,
EMOTION_META_INFO_TRACK_ARTIST));
+ edje_object_part_text_set(pr->overlay,
+ "track_album",
+ emotion_object_meta_info_get(pr->video,
EMOTION_META_INFO_TRACK_ALBUM));
+ printf("track %i, %s - %s - %s\n",
+ pr->track,
+ emotion_object_meta_info_get(pr->video, EMOTION_META_INFO_TRACK_ARTIST),
+ emotion_object_meta_info_get(pr->video, EMOTION_META_INFO_TRACK_ALBUM),
+ emotion_object_meta_info_get(pr->video, EMOTION_META_INFO_TRACK_TITLE)
+ );
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elation/src/modules/elation_dvd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- elation_dvd.c 24 Jul 2004 05:19:33 -0000 1.6
+++ elation_dvd.c 24 Jul 2004 10:44:23 -0000 1.7
@@ -87,7 +87,7 @@
emotion_object_smooth_scale_set(pr->video, 1);
- emotion_object_file_set(pr->video, "dvd:/");
+ emotion_object_file_set(pr->video, "dvd://");
emotion_object_play_set(pr->video, 1);
pr->media_fade_in_timer = ecore_timer_add(1.0 / 30.0, media_fade_in_timer_cb, em);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elation/src/modules/elation_media.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- elation_media.c 24 Jul 2004 05:19:33 -0000 1.1
+++ elation_media.c 24 Jul 2004 10:44:23 -0000 1.2
@@ -53,7 +53,7 @@
em->action = action;
pr->overlay = edje_object_add(em->info->evas);
- edje_object_file_set(pr->overlay, PACKAGE_DATA_DIR"/data/theme.eet", "dvd");
+ edje_object_file_set(pr->overlay, PACKAGE_DATA_DIR"/data/theme.eet", "media");
edje_object_signal_emit(pr->overlay, "media", "0");
return pr;
@@ -207,6 +207,7 @@
evas_object_raise(pr->overlay);
if (new_em)
{
+ new_em->resize(new_em);
new_em->show(new_em);
new_em->focus(new_em);
}
@@ -219,6 +220,7 @@
evas_object_raise(pr->overlay);
if (new_em)
{
+ new_em->resize(new_em);
new_em->show(new_em);
new_em->focus(new_em);
}
@@ -231,6 +233,7 @@
evas_object_raise(pr->overlay);
if (new_em)
{
+ new_em->resize(new_em);
new_em->show(new_em);
new_em->focus(new_em);
}
@@ -243,6 +246,7 @@
evas_object_raise(pr->overlay);
if (new_em)
{
+ new_em->resize(new_em);
new_em->show(new_em);
new_em->focus(new_em);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elation/src/modules/elation_vcd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- elation_vcd.c 24 Jul 2004 05:19:33 -0000 1.1
+++ elation_vcd.c 24 Jul 2004 10:44:23 -0000 1.2
@@ -87,7 +87,7 @@
emotion_object_smooth_scale_set(pr->video, 1);
- emotion_object_file_set(pr->video, "vcd:/");
+ emotion_object_file_set(pr->video, "vcd://");
emotion_object_play_set(pr->video, 1);
pr->media_fade_in_timer = ecore_timer_add(1.0 / 30.0, media_fade_in_timer_cb, em);
-------------------------------------------------------
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=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs