Enlightenment CVS committal
Author : xenith
Project : misc
Module : envision
Dir : misc/envision/src
Modified Files:
callbacks.c envision.c envision.h
Added Files:
callbacks.h
Log Message:
More renaming/organizing.
I like to do a lot of this, don't I?
===================================================================
RCS file: /cvsroot/enlightenment/misc/envision/src/callbacks.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- callbacks.c 14 Aug 2004 08:19:19 -0000 1.3
+++ callbacks.c 31 Aug 2004 09:06:28 -0000 1.4
@@ -1,6 +1,15 @@
+/*
+ * $Id: callbacks.c,v 1.4 2004/08/31 09:06:28 xenith Exp $
+ * vim:expandtab:ts=3:sts=3:sw=3
+ */
+
#include "envision.h"
+#include "callbacks.h"
-/* if the canvas is resized - resize the video too */
+/**
+ * canvas_resize
+ * If the canvas is resized, resize the video too
+ */
void
canvas_resize(Ecore_Evas *ee)
{
@@ -67,23 +76,33 @@
}
void
-pause_callback(void *data, Evas_Object *obj, const char *emission, const char *source)
+update_timer(void *data, Evas_Object *obj, void *event_info)
{
Envision * e = data;
- printf("DEBUG: Pause\n");
- emotion_object_play_set(e->gui.emotion, 0);
-}
+ char buffer[512];
+ double len, pos;
+ int pos_h, pos_m, len_h, len_m;
+ double pos_s, len_s;
-void
-play_callback(void *data, Evas_Object *obj, const char *emission, const char *source)
-{
- Envision * e = data;
- printf("DEBUG: Play\n");
- emotion_object_play_set(e->gui.emotion, 1);
+ /* get the current position and length (in seconds) */
+ pos = emotion_object_position_get(e->gui.emotion);
+ len = emotion_object_play_length_get(e->gui.emotion);
+ /* now convert this into hrs:mins:secs */
+ pos_h = (int)pos / (60 * 60);
+ pos_m = ((int)pos / (60)) - (pos_h * 60);
+ pos_s = pos - (pos_h * 60 * 60) - (pos_m * 60);
+ len_h = (int)len / (60 * 60);
+ len_m = ((int)len / (60)) - (len_h * 60);
+ len_s = len - (len_h * 60 * 60) - (len_m * 60);
+ /* print this to a stirng buffer */
+ /* snprintf(buffer, sizeof(buffer), "%02i:%02i:%02.2f / %02i:%02i:%02.2f",
+ pos_h, pos_m, pos_s, len_h, len_m, len_s); */
+ snprintf(buffer, sizeof(buffer), "%02i:%02i:%02.0f", pos_h, pos_m, pos_s);
+ edje_object_part_text_set(e->gui.edje, "time_text", buffer);
}
void
-keydown_evascallback(void *data, Evas *e, Evas_Object *obj, void *event_info)
+callback_evas_keydown(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Key_Down *ev;
@@ -135,14 +154,27 @@
}
}
-void
-quit_edjecallback(void *data, Evas_Object *obj, const char *emission, const char
*source)
+
+EDJE_CALLBACK(quit)
{
ecore_main_loop_quit();
}
-void
-raisevol_edjecallback(void *data, Evas_Object *obj, const char *emission, const char
*source)
+EDJE_CALLBACK(play)
+{
+ Envision * e = data;
+ printf("DEBUG: Play\n");
+ emotion_object_play_set(e->gui.emotion, 1);
+}
+
+EDJE_CALLBACK(pause)
+{
+ Envision * e = data;
+ printf("DEBUG: Pause\n");
+ emotion_object_play_set(e->gui.emotion, 0);
+}
+
+EDJE_CALLBACK(volume_raise)
{
Envision * e = data;
double volume;
@@ -158,8 +190,7 @@
evas_object_show(e->gui.edje);
}
-void
-lowervol_edjecallback(void *data, Evas_Object *obj, const char *emission, const char
*source)
+EDJE_CALLBACK(volume_lower)
{
Envision * e = data;
double volume;
@@ -174,19 +205,7 @@
evas_object_show(e->gui.edje);
}
-void
-seekbackward_edjecallback(void *data, Evas_Object *obj, const char *emission, const
char *source)
-{
- Envision * e = data;
- double pos;
-
- pos = emotion_object_position_get(e->gui.emotion);
- printf("DEBUG: Position is %2f - Backward\n", pos);
- emotion_object_position_set(e->gui.emotion, pos-60);
-}
-
-void
-seekforward_edjecallback(void *data, Evas_Object *obj, const char *emission, const
char *source)
+EDJE_CALLBACK(seek_forward)
{
Envision * e = data;
double pos;
@@ -196,28 +215,12 @@
emotion_object_position_set(e->gui.emotion, pos+60);
}
-void
-update_timer(void *data, Evas_Object *obj, void *event_info)
+EDJE_CALLBACK(seek_backward)
{
Envision * e = data;
- char buffer[512];
- double len, pos;
- int pos_h, pos_m, len_h, len_m;
- double pos_s, len_s;
+ double pos;
- /* get the current position and length (in seconds) */
pos = emotion_object_position_get(e->gui.emotion);
- len = emotion_object_play_length_get(e->gui.emotion);
- /* now convert this into hrs:mins:secs */
- pos_h = (int)pos / (60 * 60);
- pos_m = ((int)pos / (60)) - (pos_h * 60);
- pos_s = pos - (pos_h * 60 * 60) - (pos_m * 60);
- len_h = (int)len / (60 * 60);
- len_m = ((int)len / (60)) - (len_h * 60);
- len_s = len - (len_h * 60 * 60) - (len_m * 60);
- /* print this to a stirng buffer */
- /* snprintf(buffer, sizeof(buffer), "%02i:%02i:%02.2f / %02i:%02i:%02.2f",
- pos_h, pos_m, pos_s, len_h, len_m, len_s); */
- snprintf(buffer, sizeof(buffer), "%02i:%02i:%02.0f", pos_h, pos_m, pos_s);
- edje_object_part_text_set(e->gui.edje, "time_text", buffer);
+ printf("DEBUG: Position is %2f - Backward\n", pos);
+ emotion_object_position_set(e->gui.emotion, pos-60);
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/envision/src/envision.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- envision.c 14 Aug 2004 08:19:20 -0000 1.11
+++ envision.c 31 Aug 2004 09:06:28 -0000 1.12
@@ -1,5 +1,11 @@
+/*
+ * $Id: envision.c,v 1.12 2004/08/31 09:06:28 xenith Exp $
+ * vim:expandtab:ts=3:sts=3:sw=3
+ */
+
#include <config.h>
#include "envision.h"
+#include "callbacks.h"
Envision *
envision_new()
@@ -93,24 +99,24 @@
/* Callbacks */
ecore_evas_callback_resize_set(e->gui.ee, ecore_resize);
- evas_object_event_callback_add(e->gui.emotion, EVAS_CALLBACK_KEY_DOWN,
- keydown_evascallback, NULL);
+ evas_object_event_callback_add(e->gui.emotion, EVAS_CALLBACK_KEY_DOWN,
+ callback_evas_keydown, NULL);
evas_object_smart_callback_add(e->gui.emotion, "frame_decode", update_timer,
e);
edje_object_signal_callback_add(e->gui.edje, "VOL_INCR", "vol_incr_button",
- raisevol_edjecallback, e);
+ callback_edje_volume_raise, e);
edje_object_signal_callback_add(e->gui.edje, "VOL_DECR", "vol_decr_button",
- lowervol_edjecallback, e);
- edje_object_signal_callback_add(e->gui.edje, "QUIT", "quit", quit_edjecallback,
- NULL);
+ callback_edje_volume_lower, e);
+ edje_object_signal_callback_add(e->gui.edje, "QUIT", "quit",
+ callback_edje_quit, NULL);
edje_object_signal_callback_add(e->gui.edje, "SEEK_BACK", "seekback_button",
- seekbackward_edjecallback, e);
+ callback_edje_seek_backward, e);
edje_object_signal_callback_add(e->gui.edje, "SEEK_FORWARD", "seekforward_button",
- seekforward_edjecallback, e);
+ callback_edje_seek_forward, e);
edje_object_signal_callback_add(e->gui.edje, "PAUSE", "pause_button",
- pause_callback, e);
+ callback_edje_pause, e);
edje_object_signal_callback_add(e->gui.edje, "PLAY", "play_button",
- play_callback, e);
+ callback_edje_play, e);
// Begin the program
ecore_main_loop_begin();
===================================================================
RCS file: /cvsroot/enlightenment/misc/envision/src/envision.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- envision.h 14 Aug 2004 08:19:20 -0000 1.3
+++ envision.h 31 Aug 2004 09:06:28 -0000 1.4
@@ -1,3 +1,8 @@
+/*
+ * $Id: envision.h,v 1.4 2004/08/31 09:06:28 xenith Exp $
+ * vim:expandtab:ts=3:sts=3:sw=3
+ */
+
#ifndef __ENVISION_H
#define __ENVISION_H
@@ -28,25 +33,4 @@
Envision * envision_new();
void envision_delete(Envision *e);
-// callbacks.c
-void canvas_resize(Ecore_Evas *ee);
-void ecore_resize(Ecore_Evas *ee);
-void update_timer(void *data, Evas_Object *obj, void *event_info);
-void quit_edjecallback(void *data, Evas_Object *obj, const char *emission,
- const char *source);
-void raisevol_edjecallback(void *data, Evas_Object *obj, const char *emission,
- const char *source);
-void lowervol_edjecallback(void *data, Evas_Object *obj, const char *emission,
- const char *source);
-void keydown_evascallback(void *data, Evas *e, Evas_Object *obj,
- void *event_info);
-void seekforward_edjecallback(void *data, Evas_Object *obj,
- const char *emission, const char *source);
-void seekbackward_edjecallback(void *data, Evas_Object *obj,
- const char *emission, const char *source);
-void pause_callback(void *data, Evas_Object *obj, const char *emission,
- const char *source);
-void play_callback(void *data, Evas_Object *obj, const char *emission,
- const char *source);
-
#endif /* __ENVISION_H */
-------------------------------------------------------
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=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs