Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : apps/euphoria
Dir : e17/apps/euphoria/src
Modified Files:
callbacks.c playlist.c
Log Message:
mostly style fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- callbacks.c 28 Feb 2004 08:23:00 -0000 1.11
+++ callbacks.c 28 Feb 2004 08:40:05 -0000 1.12
@@ -1,5 +1,5 @@
/*
- * $Id: callbacks.c,v 1.11 2004/02/28 08:23:00 atmosphere Exp $
+ * $Id: callbacks.c,v 1.12 2004/02/28 08:40:05 tsauerbeck Exp $
* vim:noexpandtab:sw=4:sts=4:ts=4
*/
@@ -186,9 +186,8 @@
}
static void remove_playlist_item(Euphoria *e, PlayListItem *pli) {
-
assert(pli);
-
+
xmmsc_playlist_remove(e->xmms, pli->id);
}
@@ -330,8 +329,7 @@
xmmsc_playback_seek_ms(e->xmms, (int) pos);
}
-static int _euphoria_seek_timer(void *data)
-{
+static int _euphoria_seek_timer(void *data) {
Euphoria *e = data;
int new_pos;
@@ -349,8 +347,8 @@
}
/* Handle Key Bindings via EVAS Event Callback */
-void
-cb_key_press(void *data, Evas *evas, Evas_Object *obj, void *event_info) {
+void cb_key_press(void *data, Evas *evas, Evas_Object *obj,
+ void *event_info) {
Euphoria *e = data;
Evas_Event_Key_Down *ev;
@@ -397,11 +395,11 @@
/* - This only works IF you turn off X key repeat, which raster */
/* pointed out is global... so for most of us, this won't work. */
/* This function is, thus, currently unused, but left in for testing. */
-void
-cb_key_release(void *data, Evas *evas, Evas_Object *obj, void *event_info) {
- Euphoria *e = data;
+void cb_key_release(void *data, Evas *evas, Evas_Object *obj,
+ void *event_info) {
+ Euphoria *e = data;
+ Evas_Event_Key_Down *ev;
- Evas_Event_Key_Down *ev;
ev = (Evas_Event_Key_Down *)event_info;
//printf("DEBUG: You released key: %s\n", ev->keyname);
@@ -502,15 +500,16 @@
}
XMMS_CB(playback_playtime) {
- PlayListItem *pli = e->playlist->current_item;
+ unsigned int duration;
- if(pli) {
- e->track_current_pos = (int) arg / 1000; /* time is in msecs */
+ if (!e->playlist->current_item)
+ return;
- ui_refresh_time(e, e->track_current_pos);
- ui_refresh_seeker(e, (double) e->track_current_pos /
- playlist_item_duration_get(pli));
- }
+ e->track_current_pos = (int) arg / 1000; /* time is in msecs */
+ duration = playlist_item_duration_get(e->playlist->current_item);
+
+ ui_refresh_time(e, e->track_current_pos);
+ ui_refresh_seeker(e, (double) e->track_current_pos / duration);
}
XMMS_CB(playback_currentid) {
@@ -527,7 +526,7 @@
}
}
- if (id > 0)
+ if (id > 0)
playlist_set_current(e->playlist, id);
hilight_current_track(e);
@@ -554,15 +553,14 @@
}
XMMS_CB(playlist_mediainfo_id) {
- PlayListItem *pli;
unsigned int id = (unsigned int) arg;
-
+
xmmsc_playlist_get_mediainfo(e->xmms, id);
}
XMMS_CB(playlist_list) {
int i, *id = arg;
-
+
if (!id)
return;
@@ -586,9 +584,8 @@
*/
assert (id > 0);
- if (xmmscs_playback_current_id(e->xmms) == id) {
+ if (xmmscs_playback_current_id(e->xmms) == id)
xmmsc_playback_stop(e->xmms);
- }
pli = playlist_item_find_by_id(e->playlist, id);
assert(pli);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- playlist.c 28 Feb 2004 08:23:00 -0000 1.6
+++ playlist.c 28 Feb 2004 08:40:05 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: playlist.c,v 1.6 2004/02/28 08:23:00 atmosphere Exp $
+ * $Id: playlist.c,v 1.7 2004/02/28 08:40:05 tsauerbeck Exp $
* vim:noexpandtab:sw=4:sts=4:ts=4
*/
@@ -75,8 +75,9 @@
pl->duration -= playlist_item_duration_get(pli);
pl->items = evas_list_remove(pl->items, pli);
playlist_item_free(pli);
- if(pl->current_item == pli)
- pl->current_item = NULL;
+
+ if (pl->current_item == pli)
+ pl->current_item = NULL;
}
/**
@@ -133,7 +134,8 @@
if ((pli = playlist_item_find_by_id (pl, id)))
pl->current_item = pli;
else
- fprintf(stderr, "%p %d\n", pl, id);
+ debug(DEBUG_LEVEL_INFO, "%s() failed for id %d\n",
+ __FUNCTION__, id);
return pli;
}
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
