Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : apps/euphoria
Dir : e17/apps/euphoria/src
Modified Files:
callbacks.c callbacks.h euphoria.c interface.c utils.c
Log Message:
xmms2 api update. fixed some warnings as well
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- callbacks.c 27 May 2004 10:49:21 -0000 1.27
+++ callbacks.c 20 Jun 2004 15:44:03 -0000 1.28
@@ -1,5 +1,5 @@
/*
- * $Id: callbacks.c,v 1.27 2004/05/27 10:49:21 technikolor Exp $
+ * $Id: callbacks.c,v 1.28 2004/06/20 15:44:03 tsauerbeck Exp $
* vim:noexpandtab:sw=4:sts=4:ts=4
*/
@@ -130,6 +130,7 @@
EDJE_CB(track_next) {
debug(DEBUG_LEVEL_INFO, "Next File Called\n");
+ xmmsc_result_unref(xmmsc_playlist_set_next(e->xmms, 0, 1));
xmmsc_result_unref(xmmsc_playback_next(e->xmms));
if (playback_state != PLAYBACK_STATE_PLAYING)
@@ -149,7 +150,8 @@
return;
#endif
- xmmsc_result_unref(xmmsc_playback_prev(e->xmms));
+ xmmsc_result_unref(xmmsc_playlist_set_next(e->xmms, 0, -1));
+ xmmsc_result_unref(xmmsc_playback_next(e->xmms));
if (playback_state != PLAYBACK_STATE_PLAYING)
xmmsc_result_unref(xmmsc_playback_start(e->xmms));
@@ -210,7 +212,7 @@
EDJE_CB(playlist_item_play) {
PlayListItem *pli = evas_object_data_get(obj, "PlayListItem");
- xmmsc_result_unref(xmmsc_playback_jump(e->xmms, pli->id));
+ xmmsc_result_unref(xmmsc_playlist_set_next(e->xmms, 1, pli->id));
xmmsc_result_unref(xmmsc_playback_start(e->xmms));
}
@@ -315,7 +317,7 @@
ui_shutdown_edje(e);
ui_init_edje(e, src);
- xmmsc_result_unref(xmmsc_playback_current_id(e->xmms));
+ xmmsc_result_unref(xmmsc_playlist_current_id(e->xmms));
playlist_container_set(e->playlist, e->gui.playlist);
signal_playback_state(e);
@@ -587,6 +589,7 @@
static void handle_current_id(struct _Euphoria *e,
xmmsc_result_t *res) {
+ PlayListItem *pli;
unsigned int id = 0;
assert(e);
@@ -595,11 +598,13 @@
if (!xmmsc_result_get_uint (res, &id))
return;
- if (playlist_set_current(e->playlist, id))
+ if ((pli = playlist_set_current(e->playlist, id))) {
hilight_current_track(e);
+ ui_fill_track_info(e, pli);
+ }
}
-XMMS_CB(playback_current_id) {
+XMMS_CB(playlist_current_id) {
handle_current_id(e, res);
XMMS_CB_FINISH(res);
}
@@ -666,7 +671,7 @@
xmmsc_result_unref(res);
/* hack: get the current id */
- res2 = xmmsc_playback_current_id(e->xmms);
+ res2 = xmmsc_playlist_current_id(e->xmms);
xmmsc_result_wait(res2);
handle_current_id(e, res2);
xmmsc_result_unref(res2);
@@ -705,7 +710,7 @@
playlist_item_add(e->playlist, id);
break;
case XMMSC_PLAYLIST_REMOVE:
- if (xmmscs_playback_current_id(e->xmms) == id)
+ if (xmmscs_playlist_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.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- callbacks.h 25 Mar 2004 20:39:29 -0000 1.9
+++ callbacks.h 20 Jun 2004 15:44:03 -0000 1.10
@@ -2,7 +2,7 @@
#define __CALLBACKS_H
/*
- * $Id: callbacks.h,v 1.9 2004/03/25 20:39:29 tsauerbeck Exp $
+ * $Id: callbacks.h,v 1.10 2004/06/20 15:44:03 tsauerbeck Exp $
* vim:noexpandtab:sw=4:sts=4:ts=4
*/
@@ -68,7 +68,7 @@
XMMS_CB(playback_status);
XMMS_CB(playback_playtime);
-XMMS_CB(playback_current_id);
+XMMS_CB(playlist_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.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- euphoria.c 7 May 2004 14:07:40 -0000 1.13
+++ euphoria.c 20 Jun 2004 15:44:03 -0000 1.14
@@ -1,5 +1,5 @@
/*
- * $Id: euphoria.c,v 1.13 2004/05/07 14:07:40 rbdpngn Exp $
+ * $Id: euphoria.c,v 1.14 2004/06/20 15:44:03 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_playback_current_id,
- (XmmsCb) on_xmms_playback_current_id, e);
+ XMMS_CALLBACK_SET(e->xmms, xmmsc_playlist_current_id,
+ (XmmsCb) on_xmms_playlist_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,
@@ -96,11 +96,6 @@
/*XMMS_CALLBACK_SET(e->xmms, xmmsc_get_vis_data,
(XmmsCb) on_xmms_visdata, e);*/
- xmmsc_playback_status(e->xmms);
- xmmsc_playback_playtime(e->xmms);
- xmmsc_playlist_list(e->xmms);
- xmmsc_playback_current_id(e->xmms);
-
return true;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/interface.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- interface.c 27 May 2004 10:49:21 -0000 1.18
+++ interface.c 20 Jun 2004 15:44:03 -0000 1.19
@@ -1,5 +1,5 @@
/*
- * $Id: interface.c,v 1.18 2004/05/27 10:49:21 technikolor Exp $
+ * $Id: interface.c,v 1.19 2004/06/20 15:44:03 tsauerbeck Exp $
* vim:noexpandtab:sw=4:sts=4:ts=4
*/
@@ -422,7 +422,6 @@
char buf[PATH_MAX];
Euphoria *e = NULL;
Evas_List *l = NULL;
- Ecore_Evas *ee = NULL;
const char *directory = NULL;
if((e = (Euphoria*)data))
@@ -454,12 +453,9 @@
}
bool ui_init_esmart_file_dialog(Euphoria *e)
{
- int zero = 0;
- char buf[PATH_MAX];
Ecore_Evas *ee = NULL;
Evas_Object *o = NULL;
Evas_Object *efd = NULL;
- Evas_Object *edje = NULL;
Evas_Object *trans = NULL;
Evas_Object *dragger = NULL;
Evas_Coord w = 320, h = 240;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/utils.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- utils.c 27 May 2004 10:49:21 -0000 1.3
+++ utils.c 20 Jun 2004 15:44:03 -0000 1.4
@@ -1,13 +1,15 @@
/*
- * $Id: utils.c,v 1.3 2004/05/27 10:49:21 technikolor Exp $
+ * $Id: utils.c,v 1.4 2004/06/20 15:44:03 tsauerbeck Exp $
* vim:noexpandtab:sw=4:sts=4:ts=4
*/
#include <config.h>
#include <Evas.h>
+#include <Edje.h>
#include <string.h>
#include <ctype.h>
#include <sys/stat.h>
+#include <sys/ioctl.h>
#include <stdarg.h>
#include <stdio.h>
#include <limits.h>
@@ -125,7 +127,7 @@
}
if (mixer_fd == -1) {
printf("MIXER: Can't open mixer device\n");
- return;
+ return 0;
}
if (mixer_fd != -1) {
-------------------------------------------------------
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
