Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : apps/euphoria
Dir : e17/apps/euphoria/src
Modified Files:
callbacks.c callbacks.h euphoria.c
Log Message:
playlist_current_id was renamed to playback_current_id
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- callbacks.c 20 Jun 2004 15:44:03 -0000 1.28
+++ callbacks.c 30 Jul 2004 22:42:29 -0000 1.29
@@ -1,5 +1,5 @@
/*
- * $Id: callbacks.c,v 1.28 2004/06/20 15:44:03 tsauerbeck Exp $
+ * $Id: callbacks.c,v 1.29 2004/07/30 22:42:29 tsauerbeck Exp $
* vim:noexpandtab:sw=4:sts=4:ts=4
*/
@@ -317,7 +317,7 @@
ui_shutdown_edje(e);
ui_init_edje(e, src);
- xmmsc_result_unref(xmmsc_playlist_current_id(e->xmms));
+ xmmsc_result_unref(xmmsc_playback_current_id(e->xmms));
playlist_container_set(e->playlist, e->gui.playlist);
signal_playback_state(e);
@@ -604,7 +604,7 @@
}
}
-XMMS_CB(playlist_current_id) {
+XMMS_CB(playback_current_id) {
handle_current_id(e, res);
XMMS_CB_FINISH(res);
}
@@ -669,12 +669,6 @@
}
xmmsc_result_unref(res);
-
- /* hack: get the current id */
- res2 = xmmsc_playlist_current_id(e->xmms);
- xmmsc_result_wait(res2);
- handle_current_id(e, res2);
- xmmsc_result_unref(res2);
}
static void playlist_refill(struct _Euphoria *e) {
@@ -710,7 +704,7 @@
playlist_item_add(e->playlist, id);
break;
case XMMSC_PLAYLIST_REMOVE:
- if (xmmscs_playlist_current_id(e->xmms) == id)
+ if (xmmscs_playback_current_id(e->xmms) == id)
xmmsc_playback_stop(e->xmms);
if ((pli = playlist_item_find_by_id(e->playlist, id)))
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- callbacks.h 20 Jun 2004 15:44:03 -0000 1.10
+++ callbacks.h 30 Jul 2004 22:42:29 -0000 1.11
@@ -2,7 +2,7 @@
#define __CALLBACKS_H
/*
- * $Id: callbacks.h,v 1.10 2004/06/20 15:44:03 tsauerbeck Exp $
+ * $Id: callbacks.h,v 1.11 2004/07/30 22:42:29 tsauerbeck Exp $
* vim:noexpandtab:sw=4:sts=4:ts=4
*/
@@ -68,7 +68,7 @@
XMMS_CB(playback_status);
XMMS_CB(playback_playtime);
-XMMS_CB(playlist_current_id);
+XMMS_CB(playback_current_id);
XMMS_CB(playlist_mediainfo);
XMMS_CB(playlist_entry_changed);
XMMS_CB(playlist_list);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- euphoria.c 20 Jun 2004 15:44:03 -0000 1.14
+++ euphoria.c 30 Jul 2004 22:42:29 -0000 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: euphoria.c,v 1.14 2004/06/20 15:44:03 tsauerbeck Exp $
+ * $Id: euphoria.c,v 1.15 2004/07/30 22:42:29 tsauerbeck Exp $
* vim:noexpandtab:sw=4:sts=4:ts=4
*/
@@ -85,8 +85,8 @@
(XmmsCb) on_xmms_playback_status, e);
XMMS_CALLBACK_SET(e->xmms, xmmsc_playback_playtime,
(XmmsCb) on_xmms_playback_playtime, e);
- XMMS_CALLBACK_SET(e->xmms, xmmsc_playlist_current_id,
- (XmmsCb) on_xmms_playlist_current_id, e);
+ XMMS_CALLBACK_SET(e->xmms, xmmsc_playback_current_id,
+ (XmmsCb) on_xmms_playback_current_id, e);
XMMS_CALLBACK_SET(e->xmms, xmmsc_playlist_entry_changed,
(XmmsCb) on_xmms_playlist_entry_changed, e);
XMMS_CALLBACK_SET(e->xmms, xmmsc_playlist_list,
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
