Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : apps/euphoria
Dir : e17/apps/euphoria/src
Modified Files:
callbacks.c playlist.c playlist.h
Log Message:
some style fixes for atmos' code
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- callbacks.c 25 Feb 2004 06:06:51 -0000 1.2
+++ callbacks.c 25 Feb 2004 18:39:08 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: callbacks.c,v 1.2 2004/02/25 06:06:51 atmosphere Exp $
+ * $Id: callbacks.c,v 1.3 2004/02/25 18:39:08 tsauerbeck Exp $
*/
#include <config.h>
@@ -423,23 +423,22 @@
/* Callback to to close the filedialog window */
static void destroy_ewl_filedialog(Ewl_Widget * w, void *ev_data,
- void *user_data)
-{
+ void *user_data) {
ewl_widget_destroy(w);
_fd_win = NULL;
}
static void cb_file_dialog_value_changed(Ewl_Widget *w, void *ev_data,
- void *udata)
-{
+ void *udata) {
Euphoria *e = udata;
- if (ev_data)
- {
+ if (ev_data) {
char buf[PATH_MAX];
+
snprintf(buf, PATH_MAX, "file://%s", (char*)ev_data);
xmmsc_playlist_add(e->xmms, buf);
}
+
ewl_widget_hide(_fd_win);
}
@@ -522,21 +521,22 @@
XMMS_CB(playback_currentid) {
unsigned int id = (unsigned int) arg;
unsigned int *ids = NULL;
+
/* if there's no current item, use the first one instead */
id = MAX(id, 1);
- if((id = xmmscs_playback_current_id(e->xmms)) < 1)
- {
- if((ids = xmmscs_playlist_list(e->xmms)))
- {
- if(ids[0])
- id = ids[0];
- }
+
+ if ((id = xmmscs_playback_current_id(e->xmms)) < 1) {
+ if ((ids = xmmscs_playlist_list(e->xmms))) {
+ if (ids[0])
+ id = ids[0];
+ }
}
- if(id >= 1)
- {
- playlist_set_current(e->playlist, id);
- xmmsc_playlist_get_mediainfo(e->xmms, id);
+
+ if (id >= 1) {
+ playlist_set_current(e->playlist, id);
+ xmmsc_playlist_get_mediainfo(e->xmms, id);
}
+
hilight_current_track(e);
}
@@ -586,18 +586,18 @@
unsigned int id = (unsigned int) arg;
/* FIXME: I think this is xmms2, id is always 0, stopping segv */
- if(id < 1)
+ if (id < 1)
fprintf(stderr, "Is %d what really was removed??? :)\n", id);
- else
- {
+ else {
pli = playlist_item_find_by_id(e->playlist, id);
assert(pli);
playlist_item_remove(e->playlist, pli);
}
}
+
XMMS_CB(playlist_clear) {
PlayListItem *pli;
-
+
playlist_remove_all(e->playlist);
/* FIXME: Set the text in the player to the default */
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- playlist.c 25 Feb 2004 06:06:52 -0000 1.2
+++ playlist.c 25 Feb 2004 18:39:08 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: playlist.c,v 1.2 2004/02/25 06:06:52 atmosphere Exp $
+ * $Id: playlist.c,v 1.3 2004/02/25 18:39:08 tsauerbeck Exp $
*/
#include <config.h>
@@ -125,28 +125,18 @@
PlayListItem *pli = NULL;
assert(pl);
- if((pli = playlist_item_find_by_id (pl, id)))
- {
- pl->current_item = pli;
- }
+
+ if ((pli = playlist_item_find_by_id (pl, id)))
+ pl->current_item = pli;
else
- {
- fprintf(stderr, "%p %d\n", pl, id);
- }
+ fprintf(stderr, "%p %d\n", pl, id);
+
return pli;
}
-bool
-playlist_load_file(PlayList *pl, const char *fileuri, bool append)
-{
- if(pl)
- {
- if(fileuri)
- {
- xmmsc_playlist_add(pl->xmms, (char*)fileuri);
- return(true);
- }
- }
- else
- fprintf(stderr, "Playlist was NULL in playlist_load_file\n");
- return(false);
+
+void playlist_load_file(PlayList *pl, const char *uri, bool append) {
+ assert(pl);
+ assert(fileuri);
+
+ xmmsc_playlist_add(pl->xmms, (char *) uri);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- playlist.h 22 Feb 2004 10:12:11 -0000 1.1
+++ playlist.h 25 Feb 2004 18:39:08 -0000 1.2
@@ -2,7 +2,7 @@
#define __PLAYLIST_H
/*
- * $Id: playlist.h,v 1.1 2004/02/22 10:12:11 tsauerbeck Exp $
+ * $Id: playlist.h,v 1.2 2004/02/25 18:39:08 tsauerbeck Exp $
*/
#include <Evas.h>
@@ -27,7 +27,7 @@
void playlist_container_set(PlayList *pl, Evas_Object *container);
-bool playlist_load_file(PlayList *pl, const char *file, bool append);
+void playlist_load_file(PlayList *pl, const char *uri, bool append);
bool playlist_load_dir(PlayList *pl, const char *dir, bool append);
bool playlist_load_any(PlayList *pl, const char *path, bool append);
-------------------------------------------------------
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
