Enlightenment

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/etc




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/etc added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/m4




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/m4 added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/src added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/fonts




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/fonts added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/default




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/default added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/streamline




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/streamline added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/default/images




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/default/images added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/collections




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/img




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/img added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/fonts




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/fonts added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/streamline/images




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/streamline/images added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/img




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/img added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/groups




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/groups added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/programs




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/programs added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/images




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/images added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/parts




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/parts added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/macros




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/macros added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/fonts


Added Files:
	.cvsignore Makefile.am Vera.ttf micro.ttf redensek.ttf 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/default


Added Files:
	.cvsignore Makefile.am default.edc default_images.edc 
	default_parts.edc default_playlist_parts.edc 
	default_playlist_progs.edc default_progs.edc 
	default_small_parts.edc default_small_progs.edc 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio


Added Files:
	.cvsignore Makefile.am iio.edc 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/default/images


Added Files:
	.cvsignore Makefile.am background-dark-green.png 
	background-green.png border-scale.png 
	button-3stage-fulldown.png button-3stage-selected.png 
	button-3stage-unselected.png button-full-blinking.png 
	button-full-clicked.png button-full-normal.png 
	button-full-unblinking.png button-off.png button-on.png 
	button-small-clicked.png button-small-normal.png 
	close_button.png controls-back.png function-button-clicked.png 
	function-button-normal.png lcd_area.png minimize.png 
	set-button-normal.png small-text-button.png 
	tracktor-sample-alive.png tracktor-sample-dead.png 
	vol-display.png vol-label.png vol-minus-clicked.png 
	vol-minus.png vol-plus-clicked.png vol-plus.png 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes


Added Files:
	.cvsignore Makefile.am 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data


Added Files:
	.cvsignore Makefile.am README 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Added Files:
	.cvsignore AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS 
	README TODO autogen.sh configure.ac 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/collections


Added Files:
	.cvsignore Makefile.am base.edc playlist.edc switch.edc 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/fonts


Added Files:
	.cvsignore Makefile.am fonts.edc visitor.txt visitor1.ttf 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/streamline


Added Files:
	.cvsignore Makefile.am streamline.edc streamline_images.edc 
	streamline_parts.edc streamline_playlist_parts.edc 
	streamline_playlist_progs.edc streamline_progs.edc 
	streamline_small_parts.edc streamline_small_progs.edc 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter


Added Files:
	.cvsignore Makefile.am winter.edc 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/img


Added Files:
	.cvsignore Makefile.am a_1.png a_10.png a_11.png a_12.png 
	a_13.png a_14.png a_15.png a_16.png a_17.png a_18.png a_19.png 
	a_1_r.png a_2.png a_20.png a_21.png a_22.png a_3.png a_4.png 
	a_5.png a_6.png a_7.png a_8.png a_9.png a_base.png a_s_lcd.png 
	a_s_lcd_01.png a_s_lcd_010.png a_s_lcd_011.png 
	a_s_lcd_0112.png a_s_lcd_0113.png a_s_lcd_0114.png 
	a_s_lcd_0115.png a_s_lcd_0116.png a_s_lcd_0117.png 
	a_s_lcd_0118.png a_s_lcd_0119.png a_s_lcd_0120.png 
	a_s_lcd_0121.png a_s_lcd_0122.png a_s_lcd_0123.png 
	a_s_lcd_0124.png a_s_lcd_0125.png a_s_lcd_0126.png 
	a_s_lcd_0127.png a_s_lcd_0128.png a_s_lcd_0129.png 
	a_s_lcd_0130.png a_s_lcd_0131.png a_s_lcd_0132.png 
	a_s_lcd_0133.png a_s_lcd_02.png a_s_lcd_03.png a_s_lcd_04.png 
	a_s_lcd_05.png a_s_lcd_06.png a_s_lcd_07.png a_s_lcd_08.png 
	a_s_lcd_09.png align_bottom.png align_center.png 
	align_left.png align_right.png align_top.png arrow.png 
	bar_delay_clicked.png bar_delay_hilited.png bar_delay_left.png 
	bar_delay_right.png bar_delay_right_clicked.png 
	bar_delay_right_hilited.png base_anim.png base_layer.png 
	close_button.png close_button_clicked.png 
	close_button_hilited.png close_mode_button_clicked.png 
	close_mode_button_hilited.png close_mode_button_normal.png 
	fake_rect.png lcd_window.png next_button.png 
	next_button_clicked.png next_button_hilited.png 
	pause_button.png pause_button_clicked.png 
	pause_button_hilited.png play_button.png 
	play_button_clicked.png play_button_hilited.png 
	previous_button.png previous_button_clicked.png 
	previous_button_hilited.png s_b_next.png s_b_pause.png 
	s_b_play.png s_b_prev.png s_b_stop.png small_base.png 
	small_base_for_scaling.png small_lcd.png small_lcd_active.png 
	stop_button.png stop_button_clicked.png 
	stop_button_hilited.png switch_mode.png 
	switch_mode_clicked.png switch_mode_hilited.png 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/streamline/images


Added Files:
	.cvsignore Makefile.am background-dark-green.png 
	background-green.png border-scale.png 
	button-3stage-fulldown.png button-3stage-selected.png 
	button-3stage-unselected.png button-full-blinking.png 
	button-full-clicked.png button-full-normal.png 
	button-full-unblinking.png button-off.png button-on.png 
	button-small-clicked.png button-small-normal.png 
	close_button.png compact-nexttrack-clicked.png 
	compact-nexttrack-normal.png compact-prevtrack-clicked.png 
	compact-prevtrack-normal.png compact-seekback-clicked.png 
	compact-seekback-normal.png compact-seekforward-clicked.png 
	compact-seekforward-normal.png controls-back.png 
	eplayer-interface-2b.png lcd_area.png minimize.png 
	playpause-clicked.png playpause-down.png playpause-normal.png 
	playpause-orange-held.png playpause-orange-released.png 
	set-button-normal.png small-text-button.png vol-display.png 
	vol-label.png vol-minus-clicked.png vol-minus.png 
	vol-plus-clicked.png vol-plus.png 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Added Files:
	.cvsignore Makefile.am controls.edc mini_controls.edc 
	playlist.edc 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/groups


Added Files:
	.cvsignore Makefile.am collapsed.edc euphoria.edc 
	playlist_item.edc 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/img


Added Files:
	.cvsignore Makefile.am bot.png dot.png edit1.png edit2.png 
	ff1.png ff2.png main.png minus1.png minus2.png next1.png 
	next2.png panel.png pause1.png pause2.png pl1.png pl2.png 
	play1.png play2.png plus1.png plus2.png prev1.png prev2.png 
	rew1.png rew2.png screen.png seeker_bar.png seeker_trough.png 
	shad.png small-ff1.png small-ff2.png small-main.png 
	small-next1.png small-next2.png small-panel.png 
	small-pause1.png small-pause2.png small-play1.png 
	small-play2.png small-prev1.png small-prev2.png small-rew1.png 
	small-rew2.png small-right.png small-seeker-bar.png 
	small-seeker-trough.png vol-dn-clicked.png vol-dn-over.png 
	vol-dn.png vol-up-clicked.png vol-up-over.png vol-up.png 
	volume.png x1.png x2.png 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/etc


Added Files:
	.cvsignore Makefile.am 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/m4


Added Files:
	Makefile.am ac_expand_dir.m4 ac_path_generic.m4 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Added Files:
	.cvsignore Makefile.am callbacks.c callbacks.h euphoria.c 
	euphoria.h interface.c interface.h playlist.c playlist.h 
	playlist_item.c playlist_item.h utils.c utils.h 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/programs


Added Files:
	.cvsignore Makefile.am ani.edc buttons.edc playlist.edc 
	seeker.edc switch.edc text.edc volume.edc 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/images


Added Files:
	.cvsignore Makefile.am collapsed.edc euphoria.edc 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/macros


Added Files:
	.cvsignore Makefile.am macros.inc toggle.inc 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/parts


Added Files:
	.cvsignore Makefile.am ani.edc buttons.edc main.edc 
	playlist.edc seeker.edc text.edc volume.edc 


Log Message:
Can you feel the Euphoria? ;D

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/img


Added Files:
	images.edc 


Log Message:
Oops

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/m4


Added Files:
	.cvsignore 


Log Message:
Oops

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);

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	controls.edc 


Log Message:
fixed small mode
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/controls.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- controls.edc	22 Feb 2004 10:12:01 -0000	1.1
+++ controls.edc	27 Feb 2004 19:39:58 -0000	1.2
@@ -46,7 +46,7 @@
 			name, 			"_switch_mode_1";
 			signal, 			"mouse,down,1";
 			source, 			"left_bar";
-			action, 			SIGNAL_EMIT "SWITCH_GROUP", "euphoria";
+			action, 			SIGNAL_EMIT "SWITCH_GROUP", "euphoria_small";
 	}
 
 	program {
@@ -89,14 +89,14 @@
 			name, 			"__switch_mode_1";
 			signal, 			"mouse,down,1";
 			source, 			"right_bar";
-			action, 			SIGNAL_EMIT "SWITCH_GROUP", "euphoria";
+			action, 			SIGNAL_EMIT "SWITCH_GROUP", "euphoria_small";
 	} 
 
 	program {
 			name, 			"switch_mode_2";
 			signal, 			"mouse,down,1,double";
 			source, 			"small_base";
-			action, 			SIGNAL_EMIT "SWITCH_GROUP", "euphoria";
+			action, 			SIGNAL_EMIT "SWITCH_GROUP", "euphoria_small";
 	}

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	callbacks.c callbacks.h euphoria.c euphoria.h interface.c 
	interface.h playlist.c playlist.h playlist_item.c 
	playlist_item.h utils.c utils.h 


Log Message:
added vim modelines.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- callbacks.c	27 Feb 2004 21:17:28 -0000	1.4
+++ callbacks.c	27 Feb 2004 21:55:31 -0000	1.5
@@ -1,5 +1,6 @@
 /*
- * $Id: callbacks.c,v 1.4 2004/02/27 21:17:28 atmosphere Exp $
+ * $Id: callbacks.c,v 1.5 2004/02/27 21:55:31 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <config.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- callbacks.h	25 Feb 2004 06:06:52 -0000	1.2
+++ callbacks.h	27 Feb 2004 21:55:31 -0000	1.3
@@ -2,7 +2,8 @@
 #define __CALLBACKS_H
 
 /*
- * $Id: callbacks.h,v 1.2 2004/02/25 06:06:52 atmosphere Exp $
+ * $Id: callbacks.h,v 1.3 2004/02/27 21:55:31 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <Evas.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- euphoria.c	27 Feb 2004 18:26:46 -0000	1.3
+++ euphoria.c	27 Feb 2004 21:55:31 -0000	1.4
@@ -1,5 +1,6 @@
 /*
- * $Id: euphoria.c,v 1.3 2004/02/27 18:26:46 rbdpngn Exp $
+ * $Id: euphoria.c,v 1.4 2004/02/27 21:55:31 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <config.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- euphoria.h	26 Feb 2004 19:49:09 -0000	1.2
+++ euphoria.h	27 Feb 2004 21:55:31 -0000	1.3
@@ -2,7 +2,8 @@
 #define __EUPHORIA_H
 
 /*
- * $Id: euphoria.h,v 1.2 2004/02/26 19:49:09 rbdpngn Exp $
+ * $Id: euphoria.h,v 1.3 2004/02/27 21:55:31 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <Ecore.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/interface.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- interface.c	27 Feb 2004 18:26:47 -0000	1.2
+++ interface.c	27 Feb 2004 21:55:33 -0000	1.3
@@ -1,5 +1,6 @@
 /*
- * $Id: interface.c,v 1.2 2004/02/27 18:26:47 rbdpngn Exp $
+ * $Id: interface.c,v 1.3 2004/02/27 21:55:33 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <config.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/interface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- interface.h	22 Feb 2004 10:12:11 -0000	1.1
+++ interface.h	27 Feb 2004 21:55:33 -0000	1.2
@@ -2,7 +2,8 @@
 #define __INTERFACE_H
 
 /*
- * $Id: interface.h,v 1.1 2004/02/22 10:12:11 tsauerbeck Exp $
+ * $Id: interface.h,v 1.2 2004/02/27 21:55:33 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include "euphoria.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- playlist.c	26 Feb 2004 00:43:14 -0000	1.4
+++ playlist.c	27 Feb 2004 21:55:33 -0000	1.5
@@ -1,5 +1,6 @@
 /*
- * $Id: playlist.c,v 1.4 2004/02/26 00:43:14 atmosphere Exp $
+ * $Id: playlist.c,v 1.5 2004/02/27 21:55:33 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <config.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- playlist.h	25 Feb 2004 18:39:08 -0000	1.2
+++ playlist.h	27 Feb 2004 21:55:33 -0000	1.3
@@ -2,7 +2,8 @@
 #define __PLAYLIST_H
 
 /*
- * $Id: playlist.h,v 1.2 2004/02/25 18:39:08 tsauerbeck Exp $
+ * $Id: playlist.h,v 1.3 2004/02/27 21:55:33 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <Evas.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- playlist_item.c	25 Feb 2004 06:06:52 -0000	1.2
+++ playlist_item.c	27 Feb 2004 21:55:33 -0000	1.3
@@ -1,5 +1,6 @@
 /*
- * $Id: playlist_item.c,v 1.2 2004/02/25 06:06:52 atmosphere Exp $
+ * $Id: playlist_item.c,v 1.3 2004/02/27 21:55:33 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <config.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- playlist_item.h	22 Feb 2004 10:12:11 -0000	1.1
+++ playlist_item.h	27 Feb 2004 21:55:33 -0000	1.2
@@ -2,7 +2,8 @@
 #define __PLAYLIST_ITEM_H
 
 /*
- * $Id: playlist_item.h,v 1.1 2004/02/22 10:12:11 tsauerbeck Exp $
+ * $Id: playlist_item.h,v 1.2 2004/02/27 21:55:33 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <Evas.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/utils.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- utils.c	22 Feb 2004 10:12:11 -0000	1.1
+++ utils.c	27 Feb 2004 21:55:33 -0000	1.2
@@ -1,5 +1,6 @@
 /*
- * $Id: utils.c,v 1.1 2004/02/22 10:12:11 tsauerbeck Exp $
+ * $Id: utils.c,v 1.2 2004/02/27 21:55:33 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <config.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/utils.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- utils.h	22 Feb 2004 10:12:11 -0000	1.1
+++ utils.h	27 Feb 2004 21:55:33 -0000	1.2
@@ -2,7 +2,8 @@
 #define __UTILS_H
 
 /*
- * $Id: utils.h,v 1.1 2004/02/22 10:12:11 tsauerbeck Exp $
+ * $Id: utils.h,v 1.2 2004/02/27 21:55:33 tsauerbeck Exp $
+ * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 typedef enum {

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio


Modified Files:
	iio.edc 


Log Message:
add a } here, remove a { there... :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/iio.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- iio.edc	22 Feb 2004 10:11:57 -0000	1.1
+++ iio.edc	27 Feb 2004 22:09:08 -0000	1.2
@@ -8,30 +8,28 @@
 		name,	"euphoria";
 		min,		413 94;
 		max,	413 94;
-      
+
 #include "collections/base.edc"
-}
 
-	programs {
+		programs {
 
 #include "programs/controls.edc"
 
-}
+		}
+	}
 
 	group {
 		name,	"playlist_item";
 		min,		122 9;
 		max,	122 9;
-	
+
 #include "collections/playlist.edc"
-}
 
-	programs {
+		programs {
 
 #include "programs/playlist.edc"
-} 
-
-collections {
+		}
+	}
 
 	group {
 		name,	"euphoria_small";
@@ -39,11 +37,10 @@
 		max,	93 187;
 
 #include "collections/switch.edc"
-}
 
-	programs {
+		programs {
 
 #include "programs/mini_controls.edc"
-}
-
+		}
+	}
 }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	controls.edc mini_controls.edc playlist.edc 


Log Message:
add a } here, remove a { there... :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/controls.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- controls.edc	27 Feb 2004 19:39:58 -0000	1.2
+++ controls.edc	27 Feb 2004 22:09:08 -0000	1.3
@@ -451,6 +451,3 @@
 			source,			"stop_button";
 			action, 			SIGNAL_EMIT "STOP" "stop_button";
 	} 
-	
-	}
-
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/mini_controls.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- mini_controls.edc	22 Feb 2004 10:12:01 -0000	1.1
+++ mini_controls.edc	27 Feb 2004 22:09:08 -0000	1.2
@@ -369,5 +369,3 @@
 			source,     		"_quit";
 			action,     		SIGNAL_EMIT "QUIT" "quit";
 	}
-
-	}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/playlist.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- playlist.edc	22 Feb 2004 10:12:01 -0000	1.1
+++ playlist.edc	27 Feb 2004 22:09:08 -0000	1.2
@@ -44,6 +44,3 @@
 				source, "*";
 				action, SIGNAL_EMIT "PLAYLIST_SCROLL_DOWN" "";
 			}
-
-		}
-	}

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/collections


Modified Files:
	base.edc playlist.edc switch.edc 


Log Message:
add a } here, remove a { there... :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/base.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- base.edc	22 Feb 2004 10:11:58 -0000	1.1
+++ base.edc	27 Feb 2004 22:09:08 -0000	1.2
@@ -1325,3 +1325,4 @@
 		}
 	}
 }
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/playlist.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- playlist.edc	22 Feb 2004 10:11:58 -0000	1.1
+++ playlist.edc	27 Feb 2004 22:09:08 -0000	1.2
@@ -74,3 +74,4 @@
 				}
 			}
 		}
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/switch.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- switch.edc	22 Feb 2004 10:11:58 -0000	1.1
+++ switch.edc	27 Feb 2004 22:09:08 -0000	1.2
@@ -905,3 +905,4 @@
                        	}
                	}
   	}
+	}

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	callbacks.c 


Log Message:
playlist_list() doesn't need to call playlist_remove_all(), since it's only called once (on startup)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- callbacks.c	27 Feb 2004 21:55:31 -0000	1.5
+++ callbacks.c	27 Feb 2004 22:18:19 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.c,v 1.5 2004/02/27 21:55:31 tsauerbeck Exp $
+ * $Id: callbacks.c,v 1.6 2004/02/27 22:18:19 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -560,10 +560,6 @@
 XMMS_CB(playlist_list) {
 	int i, *id = arg;
 	
-	/*
-	playlist_remove_all(e->playlist);
-	 */
-
 	if (!id)
 		return;
 
@@ -581,16 +577,20 @@
 XMMS_CB(playlist_remove) {
 	PlayListItem *pli = NULL;
 	unsigned int id = (unsigned int) arg;
-	
-	if (id > 0) {
-	    if (xmmscs_playback_current_id(e->xmms) == id) {
+
+	/* make sure we got a valid id. if this assertion fails,
+	 * blame XMMS2!
+	 */
+	assert (id > 0);
+
+	if (xmmscs_playback_current_id(e->xmms) == id) {
 		xmmsc_playback_stop(e->xmms);
 		e->playlist->current_item = NULL;
-	    }
-	    pli = playlist_item_find_by_id(e->playlist, id);
-	    assert(pli);
-	    playlist_item_remove(e->playlist, pli);
 	}
+
+	pli = playlist_item_find_by_id(e->playlist, id);
+	assert(pli);
+	playlist_item_remove(e->playlist, pli);
 }
 
 XMMS_CB(playlist_clear) {

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	callbacks.c euphoria.c euphoria.h playlist_item.c 


Log Message:
didn't i commit this some minutes ago?
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- callbacks.c	27 Feb 2004 23:11:28 -0000	1.7
+++ callbacks.c	27 Feb 2004 23:15:27 -0000	1.8
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.c,v 1.7 2004/02/27 23:11:28 atmosphere Exp $
+ * $Id: callbacks.c,v 1.8 2004/02/27 23:15:27 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -598,8 +598,6 @@
 }
 
 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/euphoria.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- euphoria.c	27 Feb 2004 23:11:28 -0000	1.5
+++ euphoria.c	27 Feb 2004 23:15:27 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- * $Id: euphoria.c,v 1.5 2004/02/27 23:11:28 atmosphere Exp $
+ * $Id: euphoria.c,v 1.6 2004/02/27 23:15:27 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -181,9 +181,6 @@
 					(char *)argv[o]);
 		xmmsc_playlist_add(e->xmms, buf);
 	}
-
-	e->args = argv;
-	e->opt_start = optind;
 }
 
 int main(int argc, const char **argv) {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- euphoria.h	27 Feb 2004 23:11:28 -0000	1.4
+++ euphoria.h	27 Feb 2004 23:15:27 -0000	1.5
@@ -2,7 +2,7 @@
 #define __EUPHORIA_H
 
 /*
- * $Id: euphoria.h,v 1.4 2004/02/27 23:11:28 atmosphere Exp $
+ * $Id: euphoria.h,v 1.5 2004/02/27 23:15:27 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -39,9 +39,6 @@
 } SeekerFlags;
 
 typedef struct _Euphoria {
-	const char **args;
-	int opt_start;
-
 	PlayList *playlist;
 	xmmsc_connection_t *xmms;
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- playlist_item.c	27 Feb 2004 21:55:33 -0000	1.3
+++ playlist_item.c	27 Feb 2004 23:15:27 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * $Id: playlist_item.c,v 1.3 2004/02/27 21:55:33 tsauerbeck Exp $
+ * $Id: playlist_item.c,v 1.4 2004/02/27 23:15:27 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -76,6 +76,7 @@
 
 void playlist_item_properties_set(PlayListItem *pli, x_hash_t *p) {
 	assert(pli);
+	assert(p);
 
 	if (pli->properties == p)
 		return;

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;
 }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	interface.c playlist_item.c playlist_item.h 


Log Message:
fixed samplerate and bitrate parts
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/interface.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- interface.c	28 Feb 2004 04:52:53 -0000	1.4
+++ interface.c	28 Feb 2004 09:36:26 -0000	1.5
@@ -1,5 +1,5 @@
 /*
- * $Id: interface.c,v 1.4 2004/02/28 04:52:53 atmosphere Exp $
+ * $Id: interface.c,v 1.5 2004/02/28 09:36:26 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -180,38 +180,32 @@
 
 void ui_fill_track_info(Euphoria *e, PlayListItem *pli) {
 	char *tmp;
-#if 0
 	char buf[32];
-#endif
 
 	/* XMMS should fill these for us! */
 	if (!(tmp = (char *) playlist_item_title_get(pli)))
 		tmp = "Unknown";
-	
+
 	edje_object_part_text_set(e->gui.edje, "song_name", tmp);
 
 	if (!(tmp = (char *) playlist_item_artist_get(pli)))
 		tmp = "Unknown";
 
 	edje_object_part_text_set(e->gui.edje, "artist_name", tmp);
-	
+
 	if (!(tmp = (char *) playlist_item_album_get(pli)))
 		tmp = "Unknown";
 
 	edje_object_part_text_set(e->gui.edje, "album_name", tmp);
 
 	/* sample rate */
-#if 0
 	snprintf(buf, sizeof(buf), "%.1f",
-	         (float) pli->samplerate / 1000);
-	edje_object_part_text_set(e->gui.edje, "track_samplerate",
-	                          buf);
+	         (float) playlist_item_samplerate_get(pli) / 1000);
+	edje_object_part_text_set(e->gui.edje, "track_samplerate", buf);
 
 	/* bitrate */
-	snprintf(buf, sizeof(buf), "%i", pli->bitrate / 1000);
-	edje_object_part_text_set(e->gui.edje, "track_bitrate",
-	                          buf);
-#endif
+	snprintf(buf, sizeof(buf), "%i", playlist_item_bitrate_get(pli));
+	edje_object_part_text_set(e->gui.edje, "track_bitrate", buf);
 }
 
 bool ui_init_edje(Euphoria *e, const char *name) {
@@ -251,7 +245,7 @@
 
 	setup_playlist(e);
 	ui_refresh_volume(e);
-	if(e->playlist && e->playlist->current_item) 
+	if(e->playlist && e->playlist->current_item)
 	    ui_fill_track_info(e, e->playlist->current_item);
 
 	register_callbacks(e);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- playlist_item.c	27 Feb 2004 23:15:27 -0000	1.4
+++ playlist_item.c	28 Feb 2004 09:36:26 -0000	1.5
@@ -1,5 +1,5 @@
 /*
- * $Id: playlist_item.c,v 1.4 2004/02/27 23:15:27 tsauerbeck Exp $
+ * $Id: playlist_item.c,v 1.5 2004/02/28 09:36:26 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -33,6 +33,24 @@
 		return 0;
 }
 
+unsigned int playlist_item_samplerate_get(PlayListItem *pli) {
+	void *tmp;
+
+	if ((tmp = x_hash_lookup(pli->properties, "samplerate")))
+		return atoi(tmp);
+	else
+		return 0;
+}
+
+unsigned int playlist_item_bitrate_get(PlayListItem *pli) {
+	void *tmp;
+
+	if ((tmp = x_hash_lookup(pli->properties, "bitrate")))
+		return atoi(tmp);
+	else
+		return 0;
+}
+
 /**
  * Frees a PlayListItem object.
  *
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- playlist_item.h	27 Feb 2004 21:55:33 -0000	1.2
+++ playlist_item.h	28 Feb 2004 09:36:26 -0000	1.3
@@ -2,7 +2,7 @@
 #define __PLAYLIST_ITEM_H
 
 /*
- * $Id: playlist_item.h,v 1.2 2004/02/27 21:55:33 tsauerbeck Exp $
+ * $Id: playlist_item.h,v 1.3 2004/02/28 09:36:26 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -34,5 +34,7 @@
 const char *playlist_item_title_get(PlayListItem *pli);
 const char *playlist_item_album_get(PlayListItem *pli);
 unsigned int playlist_item_duration_get(PlayListItem *pli);
+unsigned int playlist_item_samplerate_get(PlayListItem *pli);
+unsigned int playlist_item_bitrate_get(PlayListItem *pli);
 
 #endif

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	euphoria.c 


Log Message:
if DBUS_PATH is set, use that path to connect to xmms2d
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- euphoria.c	27 Feb 2004 23:15:27 -0000	1.6
+++ euphoria.c	29 Feb 2004 13:38:13 -0000	1.7
@@ -1,5 +1,5 @@
 /*
- * $Id: euphoria.c,v 1.6 2004/02/27 23:15:27 tsauerbeck Exp $
+ * $Id: euphoria.c,v 1.7 2004/02/29 13:38:13 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -69,14 +69,17 @@
 }
 
 static bool setup_xmms(Euphoria *e) {
-	char path[PATH_MAX + 1];
+	char *dbus_path, path[PATH_MAX + 1];
 
 	if (!(e->xmms = xmmsc_init()))
 		return false;
 
-	snprintf(path, sizeof(path), "unix:path=/tmp/xmms-dbus-%s", get_login());
+	if (!(dbus_path = getenv("DBUS_PATH"))) {
+		snprintf(path, sizeof(path), "unix:path=/tmp/xmms-dbus-%s", get_login());
+		dbus_path = path;
+	}
 
-	xmmsc_connect(e->xmms, path);
+	xmmsc_connect(e->xmms, dbus_path);
 	xmmsc_setup_with_ecore(e->xmms);
 
 	xmmsc_playback_status(e->xmms);

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	interface.c playlist_item.c 


Log Message:
fixed playlist item property code
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/interface.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- interface.c	28 Feb 2004 09:36:26 -0000	1.5
+++ interface.c	29 Feb 2004 13:52:05 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- * $Id: interface.c,v 1.5 2004/02/28 09:36:26 tsauerbeck Exp $
+ * $Id: interface.c,v 1.6 2004/02/29 13:52:05 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -179,24 +179,16 @@
 }
 
 void ui_fill_track_info(Euphoria *e, PlayListItem *pli) {
-	char *tmp;
 	char buf[32];
 
-	/* XMMS should fill these for us! */
-	if (!(tmp = (char *) playlist_item_title_get(pli)))
-		tmp = "Unknown";
+	edje_object_part_text_set(e->gui.edje, "song_name",
+	                          playlist_item_title_get(pli));
 
-	edje_object_part_text_set(e->gui.edje, "song_name", tmp);
+	edje_object_part_text_set(e->gui.edje, "artist_name",
+	                          playlist_item_artist_get(pli));
 
-	if (!(tmp = (char *) playlist_item_artist_get(pli)))
-		tmp = "Unknown";
-
-	edje_object_part_text_set(e->gui.edje, "artist_name", tmp);
-
-	if (!(tmp = (char *) playlist_item_album_get(pli)))
-		tmp = "Unknown";
-
-	edje_object_part_text_set(e->gui.edje, "album_name", tmp);
+	edje_object_part_text_set(e->gui.edje, "album_name",
+	                          playlist_item_album_get(pli));
 
 	/* sample rate */
 	snprintf(buf, sizeof(buf), "%.1f",
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- playlist_item.c	28 Feb 2004 09:36:26 -0000	1.5
+++ playlist_item.c	29 Feb 2004 13:52:05 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- * $Id: playlist_item.c,v 1.5 2004/02/28 09:36:26 tsauerbeck Exp $
+ * $Id: playlist_item.c,v 1.6 2004/02/29 13:52:05 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -13,15 +13,31 @@
 #include "utils.h"
 
 const char *playlist_item_artist_get(PlayListItem *pli) {
-	return x_hash_lookup(pli->properties, "artist");
+	const char *tmp = x_hash_lookup(pli->properties, "artist");
+
+	return tmp ? tmp : "Unknown";
 }
 
 const char *playlist_item_title_get(PlayListItem *pli) {
-	return x_hash_lookup(pli->properties, "title");
+	const char *title, *url;
+
+	if ((title = x_hash_lookup(pli->properties, "title")))
+		return title;
+
+	/* we don't have a title, so let's try to use the url instead */
+	url = x_hash_lookup(pli->properties, "url");
+	assert(url);
+
+	if (!strncmp(url, "file://", 7))
+		return strrchr(url, '/') + 1;
+	else
+		return strstr(url, "//") + 2;
 }
 
 const char *playlist_item_album_get(PlayListItem *pli) {
-	return x_hash_lookup(pli->properties, "album");
+	const char *tmp = x_hash_lookup(pli->properties, "album");
+
+	return tmp ? tmp : "Unknown";
 }
 
 unsigned int playlist_item_duration_get(PlayListItem *pli) {

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	playlist_item.c 


Log Message:
put these sanity checks everywhere
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- playlist_item.c	29 Feb 2004 14:52:07 -0000	1.7
+++ playlist_item.c	1 Mar 2004 10:47:04 -0000	1.8
@@ -1,5 +1,5 @@
 /*
- * $Id: playlist_item.c,v 1.7 2004/02/29 14:52:07 atmosphere Exp $
+ * $Id: playlist_item.c,v 1.8 2004/03/01 10:47:04 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -13,7 +13,14 @@
 #include "utils.h"
 
 const char *playlist_item_artist_get(PlayListItem *pli) {
-	const char *tmp = x_hash_lookup(pli->properties, "artist");
+	const char *tmp;
+
+	assert(pli);
+
+	if (!pli->properties)
+		return "Unknown";
+
+	tmp = x_hash_lookup(pli->properties, "artist");
 
 	return tmp ? tmp : "Unknown";
 }
@@ -21,6 +28,11 @@
 const char *playlist_item_title_get(PlayListItem *pli) {
 	const char *title, *url;
 
+	assert(pli);
+
+	if (!pli->properties)
+		return "Unknown";
+
 	if ((title = x_hash_lookup(pli->properties, "title")))
 		return title;
 
@@ -35,15 +47,26 @@
 }
 
 const char *playlist_item_album_get(PlayListItem *pli) {
-	const char *tmp = x_hash_lookup(pli->properties, "album");
+	const char *tmp;
+
+	assert(pli);
+
+	if (!pli->properties)
+		return "Unknown";
+
+	tmp = x_hash_lookup(pli->properties, "album");
 
 	return tmp ? tmp : "Unknown";
 }
 
 unsigned int playlist_item_duration_get(PlayListItem *pli) {
 	void *tmp;
-	
-	if (!pli->properties) return 0;
+
+	assert(pli);
+
+	if (!pli->properties)
+		return 0;
+
 	if ((tmp = x_hash_lookup(pli->properties, "duration")))
 		return atoi(tmp) / 1000;
 	else
@@ -53,6 +76,11 @@
 unsigned int playlist_item_samplerate_get(PlayListItem *pli) {
 	void *tmp;
 
+	assert(pli);
+
+	if (!pli->properties)
+		return 0;
+
 	if ((tmp = x_hash_lookup(pli->properties, "samplerate")))
 		return atoi(tmp);
 	else
@@ -62,6 +90,11 @@
 unsigned int playlist_item_bitrate_get(PlayListItem *pli) {
 	void *tmp;
 
+	assert(pli);
+
+	if (!pli->properties)
+		return 0;
+
 	if ((tmp = x_hash_lookup(pli->properties, "bitrate")))
 		return atoi(tmp);
 	else

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	callbacks.c 


Log Message:
shut down the daemon on QUIT, too
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- callbacks.c	1 Mar 2004 22:45:36 -0000	1.18
+++ callbacks.c	9 Mar 2004 18:45:06 -0000	1.19
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.c,v 1.18 2004/03/01 22:45:36 atmosphere Exp $
+ * $Id: callbacks.c,v 1.19 2004/03/09 18:45:06 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -270,6 +270,7 @@
 
 EDJE_CB(euphoria_quit) {
 	xmmsc_playback_stop(e->xmms);
+	xmmsc_quit(e->xmms);
 	ecore_main_loop_quit();
 }
 
@@ -615,7 +616,7 @@
 }
 
 XMMS_CB(playlist_shuffle) {
-	int i, id, *ids = NULL;
+	int i, *ids = NULL;
 	PlayListItem *pli = NULL;
 
 	if ((ids = xmmscs_playlist_list(e->xmms))) {

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	callbacks.c interface.c playlist.c 


Log Message:
when an item is added to an empty playlist, make the new item the current item. sanitized ui_zero_track_info(). indentation fixes.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- callbacks.c	9 Mar 2004 18:45:06 -0000	1.19
+++ callbacks.c	14 Mar 2004 13:27:31 -0000	1.20
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.c,v 1.19 2004/03/09 18:45:06 tsauerbeck Exp $
+ * $Id: callbacks.c,v 1.20 2004/03/14 13:27:31 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -619,15 +619,14 @@
 	int i, *ids = NULL;
 	PlayListItem *pli = NULL;
 
-	if ((ids = xmmscs_playlist_list(e->xmms))) {
-	    for(i = 0; ids[i]; i++) {
-		if((pli = playlist_item_find_by_id(e->playlist, ids[i]))) {
-		    e_container_element_remove(pli->container, pli->edje);
-		    e_container_element_append(pli->container, pli->edje);
-		}
-		else {
-		    fprintf(stderr, "Unable to find %d: %d\n", i, ids[i]);
-		}
-	    }
+	if (!(ids = xmmscs_playlist_list(e->xmms)))
+		return;
+
+	for (i = 0; ids[i]; i++) {
+		if ((pli = playlist_item_find_by_id(e->playlist, ids[i]))) {
+			e_container_element_remove(pli->container, pli->edje);
+			e_container_element_append(pli->container, pli->edje);
+		} else
+			fprintf(stderr, "Unable to find %d: %d\n", i, ids[i]);
 	}
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/interface.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- interface.c	1 Mar 2004 22:45:36 -0000	1.9
+++ interface.c	14 Mar 2004 13:27:31 -0000	1.10
@@ -1,5 +1,5 @@
 /*
- * $Id: interface.c,v 1.9 2004/03/01 22:45:36 atmosphere Exp $
+ * $Id: interface.c,v 1.10 2004/03/14 13:27:31 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -376,7 +376,7 @@
 	edje_object_part_text_set(e->gui.edje, "song_name", "");
 	edje_object_part_text_set(e->gui.edje, "artist_name", "");
 	edje_object_part_text_set(e->gui.edje, "album_name", "");
-	edje_object_part_text_set(e->gui.edje, "track_samplerate", "44.1");
-	edje_object_part_text_set(e->gui.edje, "track_bitrate", "192");
+	edje_object_part_text_set(e->gui.edje, "track_samplerate", "---");
+	edje_object_part_text_set(e->gui.edje, "track_bitrate", "---");
 	edje_object_part_text_set(e->gui.edje, "time_text", "0:00");
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- playlist.c	28 Feb 2004 08:40:05 -0000	1.7
+++ playlist.c	14 Mar 2004 13:27:31 -0000	1.8
@@ -1,5 +1,5 @@
 /*
- * $Id: playlist.c,v 1.7 2004/02/28 08:40:05 tsauerbeck Exp $
+ * $Id: playlist.c,v 1.8 2004/03/14 13:27:31 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -122,6 +122,9 @@
 
 	pl->items = evas_list_append(pl->items, pli);
 
+	if (!pl->current_item)
+		pl->current_item = pli;
+
 	return pli;
 }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data


Modified Files:
	README 


Log Message:
added support for vertical and inverted seekers
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- README	29 Feb 2004 14:58:50 -0000	1.2
+++ README	16 Mar 2004 18:14:34 -0000	1.3
@@ -73,6 +73,10 @@
   captures mouse down/move events to actually seek. Create programs for
   this part that emit SEEKER_START on mouse down, SEEKER_UPDATE on mouse
   move and SEEKER_STOP on mouse up.
+  By default, the seeker will (be) move(d) from position 0 to 
+  position 1, however, if the data key "seeker_invert_dir" is set to "1",
+  which will make the seeker move from position 1 to position 0.
+  Inverted mode is on by default for vertical seekers.
 
 Dragging:
   Euphoria contains an object underneath the theme that catches mouse

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	callbacks.c euphoria.c euphoria.h interface.c 


Log Message:
added support for vertical and inverted seekers
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- callbacks.c	14 Mar 2004 13:27:31 -0000	1.20
+++ callbacks.c	16 Mar 2004 18:14:34 -0000	1.21
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.c,v 1.20 2004/03/14 13:27:31 tsauerbeck Exp $
+ * $Id: callbacks.c,v 1.21 2004/03/16 18:14:34 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -325,11 +325,17 @@
 	edje_object_part_geometry_get(e->gui.edje, "seeker_grabber",
 	                              &x, &y, &w, &h);
 
-	pos = ((double)(ex - x)) / ((double)w);
+	if (e->seekerflags.is_vertical)
+		pos = ((double) (ey - y)) / ((double) h);
+	else
+		pos = ((double) (ex - x)) / ((double) w);
 
 	if (pos < 0) pos = 0;
 	if (pos > 1) pos = 1;
 
+	if (e->seekerflags.invert_dir)
+		pos = 1 - pos;
+
 	pos *= playlist_item_duration_get(e->playlist->current_item) * 1000;
 
 	xmmsc_playback_seek_ms(e->xmms, (int) pos);
@@ -518,6 +524,7 @@
 
 XMMS_CB(playback_playtime) {
 	unsigned int duration;
+	double pos;
 
 	if (!e->playlist->current_item)
 		return;
@@ -526,7 +533,13 @@
 	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);
+
+	pos = ((double) e->track_current_pos / duration);
+
+	if (e->seekerflags.invert_dir)
+		pos = 1 - pos;
+
+	ui_refresh_seeker(e, pos);
 }
 
 XMMS_CB(playback_currentid) {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- euphoria.c	1 Mar 2004 22:45:36 -0000	1.9
+++ euphoria.c	16 Mar 2004 18:14:34 -0000	1.10
@@ -1,5 +1,5 @@
 /*
- * $Id: euphoria.c,v 1.9 2004/03/01 22:45:36 atmosphere Exp $
+ * $Id: euphoria.c,v 1.10 2004/03/16 18:14:34 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -203,7 +203,7 @@
 	}
 
 	ui_refresh_time(e, 0);
-	ui_refresh_seeker(e, 0);
+	ui_refresh_seeker(e, e->seekerflags.invert_dir);
 	ui_refresh_volume(e);
 	ecore_timer_add(1.5, ui_refresh_volume, e);
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- euphoria.h	27 Feb 2004 23:15:27 -0000	1.5
+++ euphoria.h	16 Mar 2004 18:14:34 -0000	1.6
@@ -2,7 +2,7 @@
 #define __EUPHORIA_H
 
 /*
- * $Id: euphoria.h,v 1.5 2004/02/27 23:15:27 tsauerbeck Exp $
+ * $Id: euphoria.h,v 1.6 2004/03/16 18:14:34 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -35,6 +35,8 @@
 typedef struct {
 	bool seeker_seeking; /* true if seeking, false if not */
 	bool seeking;
+	bool is_vertical;
+	bool invert_dir;
 	int seek_dir;
 } SeekerFlags;
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/interface.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- interface.c	14 Mar 2004 13:27:31 -0000	1.10
+++ interface.c	16 Mar 2004 18:14:34 -0000	1.11
@@ -1,5 +1,5 @@
 /*
- * $Id: interface.c,v 1.10 2004/03/14 13:27:31 tsauerbeck Exp $
+ * $Id: interface.c,v 1.11 2004/03/16 18:14:34 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -202,6 +202,7 @@
 
 bool ui_init_edje(Euphoria *e, const char *name) {
 	double edje_w = 0, edje_h = 0;
+	const char *invert;
 
 	debug(DEBUG_LEVEL_INFO, "EDJE: Defining Edje \n");
 
@@ -220,6 +221,16 @@
 		return false;
 	}
 
+	invert = edje_object_data_get(e->gui.edje, "seeker_invert_dir");
+
+	e->seekerflags.is_vertical = (edje_object_part_drag_dir_get(e->gui.edje, "seeker")
+	                              == EDJE_DRAG_DIR_Y);
+	/* inverted mode is on by default for vertical seekers */
+	e->seekerflags.invert_dir = e->seekerflags.is_vertical;
+
+	if (invert)
+		e->seekerflags.invert_dir = atoi(invert);
+
 	evas_object_move(e->gui.edje, 0, 0);
 	evas_object_pass_events_set (e->gui.edje, 1);
 	evas_object_show(e->gui.edje);

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	ChangeLog 


Log Message:
added support for vertical and inverted seekers
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ChangeLog	22 Feb 2004 10:11:55 -0000	1.1
+++ ChangeLog	16 Mar 2004 18:14:33 -0000	1.2
@@ -1,4 +1,9 @@
-$Id: ChangeLog,v 1.1 2004/02/22 10:11:55 tsauerbeck Exp $
+$Id: ChangeLog,v 1.2 2004/03/16 18:14:33 tsauerbeck Exp $
+
+2004-03-16 Tilman Sauerbeck <tilman -at- code-monkey.de>
+        * data/README, src/interface.c, src/euphoria.[ch],
+          src/callbacks.c: added support for vertical and inverted
+          seekers.
 
 2004-02-22 Tilman Sauerbeck <tilman -at- code-monkey.de>
         * This sweet application is a XMMS2 frontend now

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/etc


Modified Files:
	.cvsignore 


Log Message:
added support for vertical and inverted seekers
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/etc/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore	22 Feb 2004 10:12:10 -0000	1.1
+++ .cvsignore	16 Mar 2004 18:14:34 -0000	1.2
@@ -1,3 +1,3 @@
 Makefile
 Makefile.in
-eplayer.db
+euphoria.db

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:
added peak analyzer code
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- callbacks.c	16 Mar 2004 18:14:34 -0000	1.21
+++ callbacks.c	19 Mar 2004 20:45:22 -0000	1.22
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.c,v 1.21 2004/03/16 18:14:34 tsauerbeck Exp $
+ * $Id: callbacks.c,v 1.22 2004/03/19 20:45:22 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -13,6 +13,9 @@
 #include "utils.h"
 #include "callbacks.h"
 
+#define FFT_BITS 10
+#define FFT_LEN (1 << FFT_BITS)
+
 typedef enum {
 	PLAYBACK_STATE_STOPPED,
 	PLAYBACK_STATE_PAUSED,
@@ -635,11 +638,34 @@
 	if (!(ids = xmmscs_playlist_list(e->xmms)))
 		return;
 
-	for (i = 0; ids[i]; i++) {
+	for (i = 0; ids[i]; i++)
 		if ((pli = playlist_item_find_by_id(e->playlist, ids[i]))) {
 			e_container_element_remove(pli->container, pli->edje);
 			e_container_element_append(pli->container, pli->edje);
 		} else
 			fprintf(stderr, "Unable to find %d: %d\n", i, ids[i]);
+}
+
+XMMS_CB(visdata) {
+	double *input = arg;
+	float spec[FFT_LEN / 2], sum, peak = 0.0;
+	int i, j;
+
+	for (i = 0; i < FFT_LEN / 2; i++)
+		spec[i] = input[i + 1];
+
+	for (i = 0; i < FFT_LEN / 32 / 2; i++) {
+		for (sum = 0.0, j = 0; j < 32; j++)
+			sum += spec[i * 16 + j];
+
+		if (sum)
+			sum = log(sum / 32);
+
+		sum = MIN(255, sum * 64);
+		peak = MAX(peak, sum);
 	}
+
+	peak = 1 - (peak / 255);
+
+	edje_object_part_drag_value_set(e->gui.edje, "peak_analyzer", 0, peak);
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- callbacks.h	1 Mar 2004 22:45:36 -0000	1.7
+++ callbacks.h	19 Mar 2004 20:45:22 -0000	1.8
@@ -2,7 +2,7 @@
 #define __CALLBACKS_H
 
 /*
- * $Id: callbacks.h,v 1.7 2004/03/01 22:45:36 atmosphere Exp $
+ * $Id: callbacks.h,v 1.8 2004/03/19 20:45:22 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -74,6 +74,7 @@
 XMMS_CB(playlist_remove);
 XMMS_CB(playlist_clear);
 XMMS_CB(playlist_shuffle);
+XMMS_CB(visdata);
 
 #endif
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- euphoria.c	16 Mar 2004 18:14:34 -0000	1.10
+++ euphoria.c	19 Mar 2004 20:45:22 -0000	1.11
@@ -1,5 +1,5 @@
 /*
- * $Id: euphoria.c,v 1.10 2004/03/16 18:14:34 tsauerbeck Exp $
+ * $Id: euphoria.c,v 1.11 2004/03/19 20:45:22 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -104,6 +104,8 @@
 	                   (XmmsCb) on_xmms_playlist_clear, e);
 	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_PLAYLIST_SHUFFLE,
 	                   (XmmsCb) on_xmms_playlist_shuffle, e);
+	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_VISUALISATION_SPECTRUM,
+	                   (XmmsCb) on_xmms_visdata, e);
 
 	return true;
 }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/img


Modified Files:
	images.edc 


Log Message:
peak analyzer for iio
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/img/images.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- images.edc	8 Mar 2004 10:02:01 -0000	1.3
+++ images.edc	20 Mar 2004 08:28:12 -0000	1.4
@@ -14,6 +14,7 @@
 	image, "s_b_play.png" RAW;
 	image, "s_b_next.png" RAW; 
 	image, "s_b_stop.png" RAW; 
+	/* unused
 	image, "a_s_lcd.png" LOSSY 98;	 
 	image, "a_s_lcd_01.png" LOSSY 98; 
 	image, "a_s_lcd_02.png" LOSSY 98; 
@@ -24,8 +25,9 @@
 	image, "a_s_lcd_07.png" LOSSY 98;	
 	image, "a_s_lcd_08.png" LOSSY 98; 
 	image, "a_s_lcd_09.png" LOSSY 98;	
-	image, "a_s_lcd_010.png" LOSSY 98; 
+	image, "a_s_lcd_010.png" LOSSY 98;*/ 
 	image, "a_s_lcd_011.png" LOSSY 98;	
+	/* unused
 	image, "a_s_lcd_0112.png" LOSSY 98; 
 	image, "a_s_lcd_0113.png" LOSSY 98; 
 	image, "a_s_lcd_0114.png" LOSSY 98; 
@@ -47,7 +49,7 @@
 	image, "a_s_lcd_0130.png" LOSSY 98; 
 	image, "a_s_lcd_0131.png" LOSSY 98;	
 	image, "a_s_lcd_0132.png" LOSSY 98; 
-	image, "a_s_lcd_0133.png" LOSSY 98;	
+	image, "a_s_lcd_0133.png" LOSSY 98;*/	
 	image, "bar_delay_left.png" LOSSY 98;
 	image, "bar_delay_right.png" LOSSY 98;
 	image, "align_top.png" LOSSY 98;

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/collections


Modified Files:
	switch.edc 


Log Message:
peak analyzer for iio
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/switch.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- switch.edc	8 Mar 2004 09:55:49 -0000	1.4
+++ switch.edc	20 Mar 2004 08:28:12 -0000	1.5
@@ -46,29 +46,33 @@
 	rel1 { relative, 1.0 0.0; offset, 0 0; to, "a_play_b"; }       		
 	rel2 { relative, 1.0 0.0; offset, 25 -1; to, "a_play_b"; }       
 	image { normal, "s_b_pause.png"; } } }
-//
-	part { name, "count"; type, IMAGE; mouse_events, 0;	 
-	description { state, "default" 0.0; max, 63 32; min, 63 32; align,	0.0 0.0;       
-	rel1 { relative, 0.5  1.0; offset, 0 0; to, "small_lcd"; }       		
+
+	part { name, "peak_analyzer_img"; type, IMAGE; clip_to, "peak_analyzer_clip";
+	description { state, "default" 0.0; max, 63 32; min, 63 32; align, 0.0 0.0;
+
+	rel1 { relative, 0.5 1.0; offset, 0 0; to, "small_lcd"; }
 	rel2 { relative, 1.0 1.0; offset, -16 -13; to, "small_lcd"; }
-	       
-	image { normal, "a_s_lcd.png"; tween, "a_s_lcd_01.png"; tween, "a_s_lcd_02.png";
-	tween, "a_s_lcd_03.png"; tween, "a_s_lcd_04.png"; tween, "a_s_lcd_05.png";
-	tween, "a_s_lcd_06.png"; tween, "a_s_lcd_07.png"; tween, "a_s_lcd_08.png";
-	tween, "a_s_lcd_09.png"; tween, "a_s_lcd_010.png"; tween, "a_s_lcd_011.png";
-	tween, "a_s_lcd_0112.png"; tween, "a_s_lcd_0113.png"; tween, "a_s_lcd_0114.png";
-	tween, "a_s_lcd_0115.png"; tween, "a_s_lcd_0116.png"; tween, "a_s_lcd_0117.png";
-	tween, "a_s_lcd_0118.png"; tween, "a_s_lcd_0119.png"; tween, "a_s_lcd_0120.png";
-	tween, "a_s_lcd_0121.png"; tween, "a_s_lcd_0122.png"; tween, "a_s_lcd_0123.png";
-	tween, "a_s_lcd_0124.png"; tween, "a_s_lcd_0125.png"; tween, "a_s_lcd_0126.png";
-	tween, "a_s_lcd_0127.png"; tween, "a_s_lcd_0128.png"; tween, "a_s_lcd_0129.png";
-	tween, "a_s_lcd_0130.png"; tween, "a_s_lcd_0131.png"; tween, "a_s_lcd_0132.png"; 
-	} }
-
-	description { state, "default" 1.0; max, 63 32; min, 63 32; align, 0.0 0.0; visible, 1;       
-	rel1 { relative, 0.5  1.0; offset, 0 0; to, "small_lcd"; }	       		
-	rel2 { relative, 1.0 1.0; offset, -16 -13; to, "small_lcd"; }       
-	image { normal, "a_s_lcd.png"; tween, "a_s_lcd_0133.png"; } } }
+
+	image { normal, "a_s_lcd_011.png"; } } }
+
+	part { name, "peak_analyzer_clip"; type, RECT;
+	description { state, "default" 0.0;
+
+	rel1 { relative, 0.0 0.0; to, "peak_analyzer"; }
+	rel2 { relative, 1.0 1.0; to, "peak_analyzer"; } } }
+
+	part { name, "peak_analyzer_trough"; type, RECT; repeat_events, 1;
+	description { state, "default" 0.0; color, 0 0 0 0;
+
+	rel1 { relative, 0.0 0.0; to, "peak_analyzer_img"; }
+	rel2 { relative, 1.0 1.0; to, "peak_analyzer_img"; offset, 0 32; } } }
+
+	part { name, "peak_analyzer"; type, RECT; mouse_events, 0;
+	dragable { x, 0 0 0; y, 1 1 0; confine, "peak_analyzer_trough"; }
+	description { state, "default" 0.0; color, 0 0 0 0; min, 1 1;
+
+	rel1 { relative, 0.0 0.0; to, "peak_analyzer_img"; }
+	rel2 { relative, 1.0 1.0; to, "peak_analyzer_img"; } } }
 //
 	part { name, "time_text"; type, TEXT; mouse_events, 0;                     
 	description { state,  "default" 0.0;

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	switch.edc 


Log Message:
peak analyzer for iio
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/switch.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- switch.edc	8 Mar 2004 09:53:29 -0000	1.1
+++ switch.edc	20 Mar 2004 08:28:12 -0000	1.2
@@ -100,24 +100,9 @@
 	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, "_stop_button";
 }
 program { name, "_stop_click"; signal, "mouse,down,1"; source, "_stop_button";
-	action, SIGNAL_EMIT "STOP" "stop_button"; after, "mode_animation_stop";
-} 
-
-//
-program { name, "mpb_started"; signal, "PLAYBACK_STATE_PLAYING"; source, "*";
-	action, STATE_SET "default" 0.0; transition, DECELERATE 5.0; target, "count"; 
-	after, "mode_animation"; }
-
-program { name, "mpb_paused"; signal, "PLAYBACK_STATE_PAUSED"; source, "*";
-	action, STATE_SET "default" 1.0; transition, DECELERATE 0.5; target, "count"; }
-
-program { name, "mpb_stopped"; signal, "PLAYBACK_STATE_STOPPED"; source, "*";
-	action, STATE_SET "default" 1.0; transition, DECELERATE 0.5; target, "count"; }
+	action, SIGNAL_EMIT "STOP" "stop_button";
+}
 
-program { name, "mode_animation"; signal, "mouse,click,1"; source, "play_button";
-	action, STATE_SET "default" 0.0; transition, DECELERATE, 5.0; target,  "count";
-	after, "mode_animation"; }
-//
 program { name, "playback_has_begun"; signal, "PLAYBACK_STATE_PLAYING"; source, "*";
 	action, STATE_SET "active" 0.0; transition, DECELERATE 0.1; 
 	target, "small_lcd"; 
@@ -141,11 +126,6 @@
 	target, "small_lcd";
 	target, "strans_Rect"; }
 //
-program { name, "mode_animation_stop"; signal, "mouse,clicked,2"; source, "stop_button";
-	action, ACTION_STOP; target, "mode_animation";
-} 
-
-//
 program { name, "_quit_hilited"; signal, "mouse,in"; source, "_quit";
 	action, STATE_SET "hilited" 0.0; transition, LINEAR, 0.1; target, "_quit"; 
 }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	playlist_item.c 


Log Message:
free playlist item properties when we're done with it
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- playlist_item.c	1 Mar 2004 10:47:04 -0000	1.8
+++ playlist_item.c	20 Mar 2004 11:29:44 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- * $Id: playlist_item.c,v 1.8 2004/03/01 10:47:04 tsauerbeck Exp $
+ * $Id: playlist_item.c,v 1.9 2004/03/20 11:29:44 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -109,6 +109,9 @@
 void playlist_item_free(PlayListItem *pli) {
 	assert(pli);
 
+	if (pli->properties)
+		xmmsc_playlist_entry_free(pli->properties);
+
 	if (pli->container && pli->edje)
 		e_container_element_destroy(pli->container, pli->edje);
 
@@ -149,6 +152,9 @@
 	if (pli->properties == p)
 		return;
 
+	if (pli->properties)
+		xmmsc_playlist_entry_free(pli->properties);
+
 	pli->properties = p;
 
 	if (pli->edje)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	callbacks.c callbacks.h euphoria.c euphoria.h playlist_item.c 
	playlist_item.h 


Log Message:
updated to the new libxmmsclient API. this means you'll need to get 'xmms2' instead of 'xmms2-ecore' now
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- callbacks.c	19 Mar 2004 20:45:22 -0000	1.22
+++ callbacks.c	25 Mar 2004 20:39:29 -0000	1.23
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.c,v 1.22 2004/03/19 20:45:22 tsauerbeck Exp $
+ * $Id: callbacks.c,v 1.23 2004/03/25 20:39:29 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -16,6 +16,15 @@
 #define FFT_BITS 10
 #define FFT_LEN (1 << FFT_BITS)
 
+#define XMMS_CB_FINISH(result) { \
+	xmmsc_result_t *pants = xmmsc_result_restart((result)); \
+\
+	if (pants) \
+		xmmsc_result_unref(pants); \
+\
+	xmmsc_result_unref((result)); \
+}
+
 typedef enum {
 	PLAYBACK_STATE_STOPPED,
 	PLAYBACK_STATE_PAUSED,
@@ -57,11 +66,11 @@
 	switch (playback_state) {
 		case PLAYBACK_STATE_STOPPED:
 		case PLAYBACK_STATE_PAUSED: /* continue playback */
-			xmmsc_playback_start(e->xmms);
+			xmmsc_result_unref(xmmsc_playback_start(e->xmms));
 			break;
 		case PLAYBACK_STATE_PLAYING: /* restart from beginning */
-			xmmsc_playback_stop(e->xmms);
-			xmmsc_playback_start(e->xmms);
+			xmmsc_result_unref(xmmsc_playback_stop(e->xmms));
+			xmmsc_result_unref(xmmsc_playback_start(e->xmms));
 			break;
 		default:
 			assert(false);
@@ -75,7 +84,7 @@
 EDJE_CB(stop) {
 	debug(DEBUG_LEVEL_INFO, "Stop callback entered\n");
 
-	xmmsc_playback_stop(e->xmms);
+	xmmsc_result_unref(xmmsc_playback_stop(e->xmms));
 }
 
 /**
@@ -88,10 +97,10 @@
 		case PLAYBACK_STATE_STOPPED:
 			break;
 		case PLAYBACK_STATE_PAUSED:
-			xmmsc_playback_start(e->xmms);
+			xmmsc_result_unref(xmmsc_playback_start(e->xmms));
 			break;
 		case PLAYBACK_STATE_PLAYING:
-			xmmsc_playback_pause(e->xmms);
+			xmmsc_result_unref(xmmsc_playback_pause(e->xmms));
 			break;
 		default:
 			assert(false);
@@ -106,8 +115,8 @@
  */
 static void hilight_current_track(Euphoria *e) {
 	PlayListItem *pli;
-	
-	if ((!e->playlist) || !(pli = e->playlist->current_item))
+
+	if (!e->playlist || !(pli = e->playlist->current_item))
 		return;
 
 	if (pli->edje)
@@ -121,8 +130,10 @@
 EDJE_CB(track_next) {
 	debug(DEBUG_LEVEL_INFO, "Next File Called\n");
 
-	xmmsc_playback_next(e->xmms);
-	xmmsc_playback_start(e->xmms);
+	xmmsc_result_unref(xmmsc_playback_next(e->xmms));
+
+	if (playback_state != PLAYBACK_STATE_PLAYING)
+		xmmsc_result_unref(xmmsc_playback_start(e->xmms));
 }
 
 /**
@@ -138,8 +149,10 @@
 		return;
 #endif
 
-	xmmsc_playback_prev(e->xmms);
-	xmmsc_playback_start(e->xmms);
+	xmmsc_result_unref(xmmsc_playback_prev(e->xmms));
+
+	if (playback_state != PLAYBACK_STATE_PLAYING)
+		xmmsc_result_unref(xmmsc_playback_start(e->xmms));
 }
 
 EDJE_CB(volume_raise) {
@@ -184,14 +197,14 @@
 EDJE_CB(playlist_item_play) {
 	PlayListItem *pli = evas_object_data_get(obj, "PlayListItem");
 
-	xmmsc_playback_jump(e->xmms, pli->id);
-	xmmsc_playback_start(e->xmms);
+	xmmsc_result_unref(xmmsc_playback_jump(e->xmms, pli->id));
+	xmmsc_result_unref(xmmsc_playback_start(e->xmms));
 }
 
 static void remove_playlist_item(Euphoria *e, PlayListItem *pli) {
 	assert(pli);
 
-	xmmsc_playlist_remove(e->xmms, pli->id);
+	xmmsc_result_unref(xmmsc_playlist_remove(e->xmms, pli->id));
 }
 
 EDJE_CB(playlist_item_remove) {
@@ -272,8 +285,8 @@
 }
 
 EDJE_CB(euphoria_quit) {
-	xmmsc_playback_stop(e->xmms);
-	xmmsc_quit(e->xmms);
+	xmmsc_result_unref(xmmsc_playback_stop(e->xmms));
+	xmmsc_result_unref(xmmsc_quit(e->xmms));
 	ecore_main_loop_quit();
 }
 
@@ -289,7 +302,7 @@
 	ui_shutdown_edje(e);
 	ui_init_edje(e, src);
 
-	xmmsc_playback_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);
@@ -341,7 +354,7 @@
 
 	pos *= playlist_item_duration_get(e->playlist->current_item) * 1000;
 
-	xmmsc_playback_seek_ms(e->xmms, (int) pos);
+	xmmsc_result_unref(xmmsc_playback_seek_ms(e->xmms, (int) pos));
 }
 
 static int _euphoria_seek_timer(void *data) {
@@ -356,7 +369,7 @@
 	if (new_pos > playlist_item_duration_get(e->playlist->current_item))
 		new_pos = playlist_item_duration_get(e->playlist->current_item);
 
-	xmmsc_playback_seek_ms(e->xmms, new_pos * 1000);
+	xmmsc_result_unref(xmmsc_playback_seek_ms(e->xmms, new_pos * 1000));
 
 	return !!e->seekerflags.seeking;
 }
@@ -438,10 +451,10 @@
 	Euphoria *e = udata;
 
 	if (ev_data) {
-	    char buf[PATH_MAX];
+		char buf[PATH_MAX];
 
-	    snprintf(buf, PATH_MAX, "file://%s", (char*)ev_data);
-	    xmmsc_playlist_add(e->xmms, buf);
+		snprintf(buf, PATH_MAX, "file://%s", (char*)ev_data);
+		xmmsc_result_unref(xmmsc_playlist_add(e->xmms, buf));
 	}
 
 	ewl_widget_hide(_fd_win);
@@ -494,27 +507,30 @@
 }
 
 EDJE_CB(playlist_shuffle) {
-    assert(e->xmms);
-    xmmsc_playlist_shuffle(e->xmms);
+	assert(e->xmms);
+	xmmsc_result_unref(xmmsc_playlist_shuffle(e->xmms));
 }
 
 EDJE_CB(playlist_clear) {
-    assert(e->xmms);
-    xmmsc_playback_stop(e->xmms);
-    xmmsc_playlist_clear(e->xmms);
+	assert(e->xmms);
+	xmmsc_result_unref(xmmsc_playback_stop(e->xmms));
+	xmmsc_result_unref(xmmsc_playlist_clear(e->xmms));
 }
 
 XMMS_CB(playback_status) {
 	PlaybackState state;
+	unsigned int xstate = 0;
+
+	xmmsc_result_get_uint (res, &xstate);
 
-	switch ((unsigned int) arg) {
-		case 0:
+	switch (xstate) {
+		case XMMSC_PLAYBACK_PLAY:
 			state = PLAYBACK_STATE_PLAYING;
 			break;
-		case 1:
+		case XMMSC_PLAYBACK_STOP:
 			state = PLAYBACK_STATE_STOPPED;
 			break;
-		case 2:
+		case XMMSC_PLAYBACK_PAUSE:
 			state = PLAYBACK_STATE_PAUSED;
 			break;
 		default:
@@ -523,16 +539,21 @@
 	}
 
 	playback_state_set(e, state);
+	XMMS_CB_FINISH(res);
 }
 
 XMMS_CB(playback_playtime) {
-	unsigned int duration;
+	unsigned int duration = 0;
 	double pos;
 
-	if (!e->playlist->current_item)
+	if (!e->playlist->current_item) {
+		XMMS_CB_FINISH(res);
 		return;
+	}
+
+	xmmsc_result_get_uint (res, &duration);
 
-	e->track_current_pos = (int) arg / 1000; /* time is in msecs */
+	e->track_current_pos = duration / 1000; /* time is in msecs */
 	duration = playlist_item_duration_get(e->playlist->current_item);
 
 	ui_refresh_time(e, e->track_current_pos);
@@ -543,38 +564,42 @@
 		pos = 1 - pos;
 
 	ui_refresh_seeker(e, pos);
+	XMMS_CB_FINISH(res);
 }
 
-XMMS_CB(playback_currentid) {
-	unsigned int id = (unsigned int) arg;
-	unsigned int *ids = NULL;
+static void handle_current_id(struct _Euphoria *e,
+                              xmmsc_result_t *res) {
+	unsigned int id = 0;
 
-	/* if there's no current item, use the first one instead */
-	id = MAX(id, 1);
+	assert(e);
+	assert(res);
 
-	if ((id = xmmscs_playback_current_id(e->xmms)) < 1) {
-	    if ((ids = xmmscs_playlist_list(e->xmms))) {
-			if (ids[0])
-				id = ids[0];
-		}
-	}
+	if (!xmmsc_result_get_uint (res, &id))
+		return;
 
-	if (id > 0)
-		playlist_set_current(e->playlist, id);
+	if (playlist_set_current(e->playlist, id))
+		hilight_current_track(e);
+}
 
-	hilight_current_track(e);
+XMMS_CB(playback_current_id) {
+	handle_current_id(e, res);
+	XMMS_CB_FINISH(res);
 }
 
 XMMS_CB(playlist_mediainfo) {
 	PlayListItem *pli;
+	x_hash_t *hash = NULL;
 	unsigned int id;
 
-	id = (unsigned int) x_hash_lookup(arg, "id");
+	xmmsc_result_get_mediainfo(res, &hash);
+	id = (unsigned int) x_hash_lookup(hash, "id");
 
-	if (!(pli = playlist_item_find_by_id(e->playlist, id)))
+	if (!(pli = playlist_item_find_by_id(e->playlist, id))) {
+		xmmsc_result_unref(res);
 		return;
+	}
 
-	playlist_item_properties_set(pli, arg);
+	playlist_item_properties_set(pli, hash);
 
 	/* we need to call this here, too, since the Edje might have been
 	 * created after the playback_currentid callback has been called
@@ -583,76 +608,120 @@
 		hilight_current_track(e);
 		ui_fill_track_info(e, pli);
 	}
+
+	xmmsc_result_unref(res);
 }
 
-XMMS_CB(playlist_mediainfo_id) {
-	unsigned int id = (unsigned int) arg;
+XMMS_CB(playlist_entry_changed) {
+	xmmsc_result_t *res2;
+	unsigned int id = 0;
+
+	xmmsc_result_get_uint (res, &id);
 
-	xmmsc_playlist_get_mediainfo(e->xmms, id);
+	res2 = xmmsc_playlist_get_mediainfo(e->xmms, id);
+	xmmsc_result_notifier_set(res2,
+	                          (XmmsCb) on_xmms_playlist_mediainfo, e);
+	xmmsc_result_unref(res2);
+	XMMS_CB_FINISH(res);
 }
 
 XMMS_CB(playlist_list) {
-	int i, *id = arg;
+	xmmsc_result_t *res2;
+	x_list_t *list = NULL, *l;
+	unsigned int id;
+	int r;
 
-	if (!id)
+	if ((!(r = xmmsc_result_get_uintlist(res, &list)))) {
+		xmmsc_result_unref(res);
 		return;
+	}
 
-	for (i = 0; id[i]; i++) {
-		playlist_item_add(e->playlist, id[i]);
-		xmmsc_playlist_get_mediainfo(e->xmms, id[i]);
+	for (l = list; l; l = l->next) {
+		id = (unsigned int) l->data;
+		playlist_item_add(e->playlist, id);
+
+		res2 = xmmsc_playlist_get_mediainfo(e->xmms, id);
+		xmmsc_result_notifier_set(res2,
+		                          (XmmsCb) on_xmms_playlist_mediainfo,
+		                          e);
+		xmmsc_result_unref(res2);
 	}
-}
 
-XMMS_CB(playlist_add) {
-	unsigned int id = (unsigned int) arg;
+	xmmsc_result_unref(res);
 
-	playlist_item_add(e->playlist, id);
+	/* hack: get the current id */
+	res2 = xmmsc_playback_current_id(e->xmms);
+	xmmsc_result_wait(res2);
+	handle_current_id(e, res2);
+	xmmsc_result_unref(res2);
 }
 
-XMMS_CB(playlist_remove) {
-	PlayListItem *pli = NULL;
-	unsigned int id = (unsigned int) arg;
-
-	/* make sure we got a valid id. if this assertion fails,
-	 * blame XMMS2!
-	 */
-	assert (id > 0);
+static void playlist_refill(struct _Euphoria *e) {
+	PlayListItem *pli;
+	x_list_t *list, *l;
+	unsigned int id;
 
-	if (xmmscs_playback_current_id(e->xmms) == id)
-		xmmsc_playback_stop(e->xmms);
+	if (!(list = xmmscs_playlist_list(e->xmms)))
+		return;
 
-	pli = playlist_item_find_by_id(e->playlist, id);
-	assert(pli);
-	playlist_item_remove(e->playlist, pli);
-}
+	for (l = list; l; l = l->next) {
+		id = (unsigned int) l->data;
 
-XMMS_CB(playlist_clear) {
-	playlist_remove_all(e->playlist);
-	ui_zero_track_info(e);
+		if ((pli = playlist_item_find_by_id(e->playlist, id))) {
+			e_container_element_remove(pli->container, pli->edje);
+			e_container_element_append(pli->container, pli->edje);
+		} else
+			fprintf(stderr, "Unable to find id %d\n", id);
+	}
 }
 
-XMMS_CB(playlist_shuffle) {
-	int i, *ids = NULL;
-	PlayListItem *pli = NULL;
+XMMS_CB(playlist_changed) {
+	PlayListItem *pli;
+	unsigned type = 0, id = 0, arg = 0;
 
-	if (!(ids = xmmscs_playlist_list(e->xmms)))
+	if (!xmmsc_result_get_playlist_change(res, &type, &id, &arg)) {
+		XMMS_CB_FINISH(res);
 		return;
+	}
 
-	for (i = 0; ids[i]; i++)
-		if ((pli = playlist_item_find_by_id(e->playlist, ids[i]))) {
-			e_container_element_remove(pli->container, pli->edje);
-			e_container_element_append(pli->container, pli->edje);
-		} else
-			fprintf(stderr, "Unable to find %d: %d\n", i, ids[i]);
+	switch (type) {
+		case XMMSC_PLAYLIST_ADD:
+			playlist_item_add(e->playlist, id);
+			break;
+		case XMMSC_PLAYLIST_REMOVE:
+			if (xmmscs_playback_current_id(e->xmms) == id)
+				xmmsc_playback_stop(e->xmms);
+
+			if ((pli = playlist_item_find_by_id(e->playlist, id)))
+				playlist_item_remove (e->playlist, pli);
+
+			break;
+		case XMMSC_PLAYLIST_CLEAR:
+			playlist_remove_all(e->playlist);
+			ui_zero_track_info(e);
+			break;
+		case XMMSC_PLAYLIST_SHUFFLE:
+		case XMMSC_PLAYLIST_SORT:
+			playlist_refill(e);
+			break;
+		default:
+			break;
+	}
+
+	XMMS_CB_FINISH(res);
 }
 
+#if 0
 XMMS_CB(visdata) {
-	double *input = arg;
-	float spec[FFT_LEN / 2], sum, peak = 0.0;
-	int i, j;
+	x_list_t *list, *l;
+	double spec[FFT_LEN / 2], sum, peak = 0.0;
+	int r, i, j;
+
+	r = xmmsc_result_get_doublelist (res, &list);
+	assert (r);
 
-	for (i = 0; i < FFT_LEN / 2; i++)
-		spec[i] = input[i + 1];
+	for (i = 0, l = list; l; l = l->next, i++)
+		spec[i] = *(double *) l->data;
 
 	for (i = 0; i < FFT_LEN / 32 / 2; i++) {
 		for (sum = 0.0, j = 0; j < 32; j++)
@@ -668,4 +737,6 @@
 	peak = 1 - (peak / 255);
 
 	edje_object_part_drag_value_set(e->gui.edje, "peak_analyzer", 0, peak);
+	XMMS_CB_FINISH(res);
 }
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- callbacks.h	19 Mar 2004 20:45:22 -0000	1.8
+++ callbacks.h	25 Mar 2004 20:39:29 -0000	1.9
@@ -2,16 +2,18 @@
 #define __CALLBACKS_H
 
 /*
- * $Id: callbacks.h,v 1.8 2004/03/19 20:45:22 tsauerbeck Exp $
+ * $Id: callbacks.h,v 1.9 2004/03/25 20:39:29 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <Evas.h>
 #include <Ewl.h>
+#include <xmms/xmmsclient.h>
+#include <xmms/xmmsclient-result.h>
 
 typedef void (*EdjeCb)(void *udata, Evas_Object *o,
                        const char *emission, const char *src);
-typedef void (*XmmsCb)(void *udata, void *arg);
+typedef void (*XmmsCb)(xmmsc_result_t *res, void *udata);
 
 struct _Euphoria;
 
@@ -20,7 +22,7 @@
 	                    const char *emission, const char *src)
 
 #define XMMS_CB(name) \
-	void on_xmms_##name(struct _Euphoria *e, void *arg)
+	void on_xmms_##name(xmmsc_result_t *res, struct _Euphoria *e)
 
 EDJE_CB(play);
 EDJE_CB(pause);
@@ -66,15 +68,12 @@
 
 XMMS_CB(playback_status);
 XMMS_CB(playback_playtime);
-XMMS_CB(playback_currentid);
+XMMS_CB(playback_current_id);
 XMMS_CB(playlist_mediainfo);
-XMMS_CB(playlist_mediainfo_id);
+XMMS_CB(playlist_entry_changed);
 XMMS_CB(playlist_list);
-XMMS_CB(playlist_add);
-XMMS_CB(playlist_remove);
-XMMS_CB(playlist_clear);
-XMMS_CB(playlist_shuffle);
-XMMS_CB(visdata);
+XMMS_CB(playlist_changed);
+/*XMMS_CB(visdata);*/
 
 #endif
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- euphoria.c	19 Mar 2004 20:45:22 -0000	1.11
+++ euphoria.c	25 Mar 2004 20:39:29 -0000	1.12
@@ -1,5 +1,5 @@
 /*
- * $Id: euphoria.c,v 1.11 2004/03/19 20:45:22 tsauerbeck Exp $
+ * $Id: euphoria.c,v 1.12 2004/03/25 20:39:29 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -73,40 +73,34 @@
 		return false;
 
 	if (!(dbus_path = getenv("DBUS_PATH"))) {
-		snprintf(path, sizeof(path), "unix:path=/tmp/xmms-dbus-%s", get_login());
+		snprintf(path, sizeof(path), "unix:path=/tmp/xmms-dbus-%s",
+		         get_login());
 		dbus_path = path;
 	}
 
 	xmmsc_connect(e->xmms, dbus_path);
 	xmmsc_setup_with_ecore(e->xmms);
 
+	XMMS_CALLBACK_SET(e->xmms, xmmsc_playback_status,
+	                  (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_entry_changed,
+	                  (XmmsCb) on_xmms_playlist_entry_changed, e);
+	XMMS_CALLBACK_SET(e->xmms, xmmsc_playlist_list,
+	                  (XmmsCb) on_xmms_playlist_list, e);
+	XMMS_CALLBACK_SET(e->xmms, xmmsc_playlist_changed,
+	                  (XmmsCb) on_xmms_playlist_changed, e);
+	/*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);
 
-	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_PLAYBACK_STATUS,
-	                   (XmmsCb) on_xmms_playback_status, e);
-	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_PLAYBACK_PLAYTIME,
-	                   (XmmsCb) on_xmms_playback_playtime, e);
-	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_PLAYBACK_CURRENTID,
-	                   (XmmsCb) on_xmms_playback_currentid, e);
-	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_PLAYLIST_MEDIAINFO,
-	                   (XmmsCb) on_xmms_playlist_mediainfo, e);
-	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_PLAYLIST_MEDIAINFO_ID,
-	                   (XmmsCb) on_xmms_playlist_mediainfo_id, e);
-	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_PLAYLIST_LIST,
-	                   (XmmsCb) on_xmms_playlist_list, e);
-	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_PLAYLIST_ADD,
-	                   (XmmsCb) on_xmms_playlist_add, e);
-	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_PLAYLIST_REMOVE,
-	                   (XmmsCb) on_xmms_playlist_remove, e);
-	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_PLAYLIST_CLEAR,
-	                   (XmmsCb) on_xmms_playlist_clear, e);
-	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_PLAYLIST_SHUFFLE,
-	                   (XmmsCb) on_xmms_playlist_shuffle, e);
-	xmmsc_set_callback(e->xmms, XMMS_SIGNAL_VISUALISATION_SPECTRUM,
-	                   (XmmsCb) on_xmms_visdata, e);
-
 	return true;
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- euphoria.h	16 Mar 2004 18:14:34 -0000	1.6
+++ euphoria.h	25 Mar 2004 20:39:30 -0000	1.7
@@ -2,7 +2,7 @@
 #define __EUPHORIA_H
 
 /*
- * $Id: euphoria.h,v 1.6 2004/03/16 18:14:34 tsauerbeck Exp $
+ * $Id: euphoria.h,v 1.7 2004/03/25 20:39:30 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -11,6 +11,7 @@
 #include <Ecore_Evas.h>
 #include <Ecore_Fb.h>
 #include <xmms/xmmsclient.h>
+#include <xmms/xmmsclient-result.h>
 #include "playlist.h"
 
 typedef enum {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- playlist_item.c	20 Mar 2004 11:29:44 -0000	1.9
+++ playlist_item.c	25 Mar 2004 20:39:30 -0000	1.10
@@ -1,11 +1,12 @@
 /*
- * $Id: playlist_item.c,v 1.9 2004/03/20 11:29:44 tsauerbeck Exp $
+ * $Id: playlist_item.c,v 1.10 2004/03/25 20:39:30 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <config.h>
 #include <Edje.h>
 #include <Esmart/container.h>
+#include <xmms/xmmsclient.h>
 #include <stdio.h>
 #include <assert.h>
 #include "callbacks.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- playlist_item.h	28 Feb 2004 09:36:26 -0000	1.3
+++ playlist_item.h	25 Mar 2004 20:39:30 -0000	1.4
@@ -2,13 +2,12 @@
 #define __PLAYLIST_ITEM_H
 
 /*
- * $Id: playlist_item.h,v 1.3 2004/02/28 09:36:26 tsauerbeck Exp $
+ * $Id: playlist_item.h,v 1.4 2004/03/25 20:39:30 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <Evas.h>
 #include <limits.h>
-#include <xmms/xmmsclient.h>
 
 typedef struct {
 	Evas *evas;

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	README 


Log Message:
updated to the new libxmmsclient API. this means you'll need to get 'xmms2' instead of 'xmms2-ecore' now
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- README	4 Mar 2004 19:24:26 -0000	1.3
+++ README	25 Mar 2004 20:39:29 -0000	1.4
@@ -1,4 +1,4 @@
-$Id: README,v 1.3 2004/03/04 19:24:26 technikolor Exp $
+$Id: README,v 1.4 2004/03/25 20:39:29 tsauerbeck Exp $
 
 Euphoria v0.8.0
 
@@ -29,19 +29,20 @@
  
 To use build Euphoria you will need to first install XMMS2,
 to do so:
-1) Get the XMMS2-Ecore patched code from BitKeeper:
- 	$ bk clone bk://debian.as:5555/xmms2-ecore
-2) Build XMMS2.  In the xmms2 top source directory run
+1) Get the XMMS2 code from BitKeeper:
+ 	$ bk clone bk://debian.as:5555/xmms2
+2) Configure XMMS2. In the xmms2 top source directory run
 	the command: scons
-3) Install XMMS2.  In the same directoy after the source
+3) Build XMMS2. In the same directory run "scons" again.
+4) Install XMMS2.  In the same directory after the source
 	finished building use the command (probly as root):
 	# scons /usr/local
 	This assumes that you want to install in /usr/local,
 	change the patch accordingly.
-4) You must manually install the headers, do this by
+5) You must manually install the headers, do this by
 	copying the src/include/xmms and src/include/internal
 	directories to the proper header location (probly /usr/local/include)
-5) Done.  XMMS2 is ready to fly, start the daemon via "xmms2d"
+6) Done.  XMMS2 is ready to fly, start the daemon via "xmms2d"
 	and use the CLI interface with the "xmms2" command.
 
 Now you can build Euphoria.  Before you start make sure your

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	callbacks.c playlist_item.c playlist_item.h 


Log Message:
fixed playlist item property handling. the properties hash is freed when the xmmsc_result_t is freed, so don't unref it in the handler
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- callbacks.c	25 Mar 2004 20:39:29 -0000	1.23
+++ callbacks.c	28 Mar 2004 15:59:53 -0000	1.24
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.c,v 1.23 2004/03/25 20:39:29 tsauerbeck Exp $
+ * $Id: callbacks.c,v 1.24 2004/03/28 15:59:53 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -599,7 +599,7 @@
 		return;
 	}
 
-	playlist_item_properties_set(pli, hash);
+	playlist_item_properties_set(pli, res);
 
 	/* we need to call this here, too, since the Edje might have been
 	 * created after the playback_currentid callback has been called
@@ -608,8 +608,6 @@
 		hilight_current_track(e);
 		ui_fill_track_info(e, pli);
 	}
-
-	xmmsc_result_unref(res);
 }
 
 XMMS_CB(playlist_entry_changed) {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- playlist_item.c	25 Mar 2004 20:39:30 -0000	1.10
+++ playlist_item.c	28 Mar 2004 15:59:53 -0000	1.11
@@ -1,5 +1,5 @@
 /*
- * $Id: playlist_item.c,v 1.10 2004/03/25 20:39:30 tsauerbeck Exp $
+ * $Id: playlist_item.c,v 1.11 2004/03/28 15:59:53 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -110,8 +110,10 @@
 void playlist_item_free(PlayListItem *pli) {
 	assert(pli);
 
-	if (pli->properties)
-		xmmsc_playlist_entry_free(pli->properties);
+	if (pli->props_res) {
+		xmmsc_result_unref(pli->props_res);
+		pli->props_res = NULL;
+	}
 
 	if (pli->container && pli->edje)
 		e_container_element_destroy(pli->container, pli->edje);
@@ -146,17 +148,24 @@
 	                          playlist_item_title_get(pli));
 }
 
-void playlist_item_properties_set(PlayListItem *pli, x_hash_t *p) {
+void playlist_item_properties_set(PlayListItem *pli, xmmsc_result_t *r) {
+	x_hash_t *hash = NULL;
+
 	assert(pli);
-	assert(p);
+	assert(r);
+
+	xmmsc_result_get_mediainfo(r, &hash);
 
-	if (pli->properties == p)
+	if (pli->properties == hash)
 		return;
 
-	if (pli->properties)
-		xmmsc_playlist_entry_free(pli->properties);
+	if (pli->props_res) {
+		xmmsc_result_unref(pli->props_res);
+		pli->props_res = NULL;
+	}
 
-	pli->properties = p;
+	pli->properties = hash;
+	pli->props_res = r;
 
 	if (pli->edje)
 		set_parts_text(pli);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- playlist_item.h	25 Mar 2004 20:39:30 -0000	1.4
+++ playlist_item.h	28 Mar 2004 15:59:53 -0000	1.5
@@ -2,7 +2,7 @@
 #define __PLAYLIST_ITEM_H
 
 /*
- * $Id: playlist_item.h,v 1.4 2004/03/25 20:39:30 tsauerbeck Exp $
+ * $Id: playlist_item.h,v 1.5 2004/03/28 15:59:53 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -17,6 +17,7 @@
 
 	unsigned int id;
 	x_hash_t *properties;
+	xmmsc_result_t *props_res;
 } PlayListItem;
 
 PlayListItem *playlist_item_new(unsigned int id, Evas *evas,
@@ -27,7 +28,7 @@
 bool playlist_item_show(PlayListItem *pli);
 void playlist_item_container_set(PlayListItem *pli,
                                  Evas_Object *container);
-void playlist_item_properties_set(PlayListItem *pli, x_hash_t *p);
+void playlist_item_properties_set(PlayListItem *pli, xmmsc_result_t *r);
 
 const char *playlist_item_artist_get(PlayListItem *pli);
 const char *playlist_item_title_get(PlayListItem *pli);

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	interface.c 


Log Message:
fixed window class
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/interface.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- interface.c	16 Mar 2004 18:14:34 -0000	1.11
+++ interface.c	18 Apr 2004 16:31:04 -0000	1.12
@@ -1,5 +1,5 @@
 /*
- * $Id: interface.c,v 1.11 2004/03/16 18:14:34 tsauerbeck Exp $
+ * $Id: interface.c,v 1.12 2004/04/18 16:31:04 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -119,8 +119,7 @@
 	}
 
 	ecore_evas_title_set(e->gui.ee, "Euphoria");
-	ecore_evas_name_class_set(e->gui.ee, "ecore_test",
-	                          "test_evas");
+	ecore_evas_name_class_set(e->gui.ee, "euphoria", "Euphoria");
 	ecore_evas_borderless_set(e->gui.ee, 1);
 	ecore_evas_shaped_set(e->gui.ee, 1);

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
	interface.c playlist_item.c 


Log Message:
use Evas_Coord
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/interface.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- interface.c	22 Apr 2004 16:46:33 -0000	1.14
+++ interface.c	2 May 2004 16:02:51 -0000	1.15
@@ -1,5 +1,5 @@
 /*
- * $Id: interface.c,v 1.14 2004/04/22 16:46:33 atmosphere Exp $
+ * $Id: interface.c,v 1.15 2004/05/02 16:02:51 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -200,7 +200,7 @@
 }
 
 bool ui_init_edje(Euphoria *e, const char *name) {
-	double edje_w = 0, edje_h = 0;
+	Evas_Coord edje_w = 0, edje_h = 0;
 	const char *invert;
 
 	debug(DEBUG_LEVEL_INFO, "EDJE: Defining Edje \n");
@@ -236,11 +236,11 @@
 
 	/* set max size */
 	edje_object_size_max_get(e->gui.edje, &edje_w, &edje_h);
-	ecore_evas_size_max_set(e->gui.ee, edje_w, edje_h);
+	ecore_evas_size_max_set(e->gui.ee, (int) edje_w, (int) edje_h);
 
 	/* set min size */
 	edje_object_size_min_get(e->gui.edje, &edje_w, &edje_h);
-	ecore_evas_size_min_set(e->gui.ee, edje_w, edje_h);
+	ecore_evas_size_min_set(e->gui.ee, (int) edje_w, (int) edje_h);
 
 	/* resize to the min size */
 	ecore_evas_resize(e->gui.ee, (int) edje_w, (int) edje_h);
@@ -335,7 +335,7 @@
 	esmart_container_direction_set(e->gui.playlist, 1);
 	esmart_container_spacing_set(e->gui.playlist, 0);
 	esmart_container_fill_policy_set(e->gui.playlist,
-	                            CONTAINER_FILL_POLICY_FILL_X);
+	                                 CONTAINER_FILL_POLICY_FILL_X);
 
 	edje_object_part_swallow(e->gui.edje, "playlist",
 	                         e->gui.playlist);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- playlist_item.c	22 Apr 2004 16:46:33 -0000	1.12
+++ playlist_item.c	2 May 2004 16:02:51 -0000	1.13
@@ -1,5 +1,5 @@
 /*
- * $Id: playlist_item.c,v 1.12 2004/04/22 16:46:33 atmosphere Exp $
+ * $Id: playlist_item.c,v 1.13 2004/05/02 16:02:51 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -174,7 +174,7 @@
 }
 
 bool playlist_item_show(PlayListItem *pli) {
-	double w = 0, h = 0;
+	Evas_Coord w = 0, h = 0;
 	void *udata;
 
 	assert(pli);

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/m4


Modified Files:
	ac_expand_dir.m4 ac_path_generic.m4 


Log Message:
fixes for automake 1.8
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/m4/ac_expand_dir.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ac_expand_dir.m4	22 Feb 2004 10:12:10 -0000	1.1
+++ ac_expand_dir.m4	21 May 2004 18:43:08 -0000	1.2
@@ -3,7 +3,7 @@
 dnl and assigns the resulting string to VARNAME
 dnl example: AC_DEFINE_DIR(DATADIR, "$datadir")
 dnl by Alexandre Oliva <oliva@...>
-AC_DEFUN(AC_EXPAND_DIR, [
+AC_DEFUN([AC_EXPAND_DIR], [
 	$1=$2
 	$1=`(
 	    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/m4/ac_path_generic.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ac_path_generic.m4	22 Feb 2004 10:12:10 -0000	1.1
+++ ac_path_generic.m4	21 May 2004 18:43:08 -0000	1.2
@@ -25,7 +25,7 @@
 dnl
 dnl @author Angus Lees <gusl@...>
 
-AC_DEFUN(AC_PATH_GENERIC,
+AC_DEFUN([AC_PATH_GENERIC],
 [dnl
 dnl we're going to need uppercase, lowercase and user-friendly versions of the
 dnl string `LIBRARY'

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) {

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/collections


Modified Files:
	base_to.edc playlist.edc 


Log Message:
hopefully this fixes the compilation issues with old releases of cpp
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/base_to.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- base_to.edc	8 Mar 2004 09:55:49 -0000	1.1
+++ base_to.edc	10 Jul 2004 20:57:21 -0000	1.2
@@ -1,20 +1,20 @@
-	part { name, "base_to"; type, IMAGE; mouse_events, 1; repeat_events, 1;
+#define BASE "base_to"
+
+	part { name, BASE; type, IMAGE; mouse_events, 1; repeat_events, 1;
 	description { state, "default" 0.0; min, 123 94; max, 123 94; 
 	rel1 { relative, 0.0 0.0; offset, 0.0 0.0; }              
 	rel2 { relative, 1.0 1.0; offset, 0 0; }	
 	image { normal, "base_layer.png"; }		
 	border, 6 6 6 6; fill { smooth, 1; } } }
-//	
-	#define BASE "base_to"
 ///////////////////////////////////////////////////////////////////////
-	part { name, RIGHT"panel"; type, IMAGE; mouse_events, 1; repeat_events, 1;
+	part { name, RIGHT "panel"; type, IMAGE; mouse_events, 1; repeat_events, 1;
 	description { state, "default" 0.0; min, 0 94; max, 145 94;
 	rel1 { to, BASE; relative, 1.0 0.0; offset, 0 0; }
-	rel2 { to, RIGHT"border"; relative, 0.0 1.0; offset, -1 -1; } 
+	rel2 { to, RIGHT "border"; relative, 0.0 1.0; offset, -1 -1; } 
 	image { normal, "base_layer.png"; }
 	border, 6 6 6 6; fill { smooth, 1; } } }
 
-	part { name, RIGHT"border"; mouse_events, 1;
+	part { name, RIGHT "border"; mouse_events, 1;
 	description { state, "default" 0.0; min, 19 94; max, 19 94;
 	rel1 { to, BASE; relative, 2.0 0.0; offset, 145 0; }
 	rel2 { to, BASE; relative, 1.0 1.0; offset, 3 -1; }
@@ -27,18 +27,18 @@
 	image { normal, "bar_delay_right.png"; }
 	border, 0 0 7 8; } }
 
-	part { name, RIGHT"border-slide"; 
+	part { name, RIGHT "border-slide";
 	description { state, "default" 0.0; visible, 0; min, 0 94; max, 9999 9999;
-	rel1 { to, RIGHT"border"; relative, 1.0 0.0; offset, 0 0; }
-	rel2 { to, RIGHT"border"; relative, 1.0 1.0; offset, 0 0; }
+	rel1 { to, RIGHT "border"; relative, 1.0 0.0; offset, 0 0; }
+	rel2 { to, RIGHT "border"; relative, 1.0 1.0; offset, 0 0; }
 	border, 0 0 0 0; }
 
 	description { state, "slide" 0.0; visible, 1; min, 0 94; max, 9999 9999; 
-	rel1 { to, RIGHT"border"; relative, 0.0 0.0; offset, 0 0; }
-	rel2 { to, RIGHT"border"; relative, 1.0 1.0; offset, 0 0; }
+	rel1 { to, RIGHT "border"; relative, 0.0 0.0; offset, 0 0; }
+	rel2 { to, RIGHT "border"; relative, 1.0 1.0; offset, 0 0; }
 	border, 0 0 0 0; } }
 ///////////////////////////////////////////////////////////////////////
-	part { name, LEFT"panel"; type, IMAGE; mouse_events, 1; repeat_events, 1;
+	part { name, LEFT "panel"; type, IMAGE; mouse_events, 1; repeat_events, 1;
 	description { state, "default" 0.0; min, 0 94; max, 145 94;
 	rel1 { to, LEFT"border"; relative, 1.0 0.0; offset, 0 0; }
 	rel2 { to, BASE; relative, 0.0 1.0; offset, -1 -1; } 
@@ -67,34 +67,34 @@
 	rel2 { to, LEFT"border"; relative, 1.0 1.0; offset, 0 0; }
 	border, 0 0 0 0; } }
 ///////////////////////////////////////////////////////////////////////
-	part { name, RIGHT"lcd"; type, IMAGE; mouse_events, 0;
+	part { name, RIGHT "lcd"; type, IMAGE; mouse_events, 0;
 	description { state, "default" 0.0; min, 0 94; max, 142 94; 
 	rel1 { to, BASE; relative, 1.0  0.0; offset, -16 0; }
-	rel2 { to, RIGHT"border"; relative, 0.0 1.0; offset, -1 -1; }
+	rel2 { to, RIGHT "border"; relative, 0.0 1.0; offset, -1 -1; }
 	image { normal, "lcd_window.png"; }
 	border, 9 9 9 9; fill { smooth, 0; } } 
 
 	description { state, "slide" 0.0; min, 0 94; max, 142 94; 
 	rel1 { to, BASE; relative, 1.0  0.0; offset, -8 0; }
-	rel2 { to, RIGHT"border"; relative, 0.0 1.0; offset, -1 -1; }
+	rel2 { to, RIGHT "border"; relative, 0.0 1.0; offset, -1 -1; }
 	image { normal, "lcd_window.png"; }
 	border, 9 9 9 9; fill { smooth, 0; } } }
 
 //	part { name, "RpanelClipArea"; description {
 //	state, "default" 0.0; min, 0 94; max, 142 94;
-//	rel1 { to, RIGHT"panel"; relative, 0.0 0.0; offset, 0 0; }
+//	rel1 { to, RIGHT "panel"; relative, 0.0 0.0; offset, 0 0; }
 //	rel2 { to, BASE; relative, 1.0 1.0; offset, 0 0; }
 //	border, 0 0 0 0; } }
 //
-	part { name, LEFT"lcd";  type, IMAGE; mouse_events, 0;	  
+	part { name, LEFT "lcd";  type, IMAGE; mouse_events, 0;	  
 	description { state, "default" 0.0; min, 0 94; max, 142 94; align, 0.0 0.0; 
-	rel1 { to, LEFT"border"; relative, 1.0 0.0; offset, 0 0; }	       		
+	rel1 { to, LEFT "border"; relative, 1.0 0.0; offset, 0 0; }	       		
 	rel2 { to, BASE; relative, 0.0 1.0; offset, 16 0;  }
 	image { normal, "lcd_window.png"; }
 	border, 9 9 9 9; fill { smooth, 0; } }
 
 	description { state, "slide" 0.0; min, 0 94; max, 142 94; align, 0.0 0.0; 
-	rel1 { to, LEFT"border"; relative, 1.0  0.0; offset, 0 0; }	       		
+	rel1 { to, LEFT "border"; relative, 1.0  0.0; offset, 0 0; }	       		
 	rel2 { to, BASE; relative, 0.0 1.0; offset, 7 0;  }
 	image { normal, "lcd_window.png"; }
 	border, 9 9 9 9; fill { smooth, 0; } } }
@@ -225,16 +225,16 @@
 //
 ///////////////////////////////////////////////////////////////////
 /* Track information and misc. */
-// First object CONTAINER for LEFT"lcd" data
+// First object CONTAINER for LEFT "lcd" data
 
 	part { name, "trans_Rect"; type, RECT; 
 	description { state, "default" 0.0; min, 132 71; max, 124 71; 
-	rel1 { relative, 1.0 1.0; offset, 19 0; to, LEFT"border"; }       		
-	rel2 { relative, 1.0 0.0; offset, 0 0; to, LEFT"panel"; } }
+	rel1 { relative, 1.0 1.0; offset, 19 0; to, LEFT "border"; }       		
+	rel2 { relative, 1.0 0.0; offset, 0 0; to, LEFT "panel"; } }
 
 	description { state, "slide" 0.0; min, 0 71; max, 132 71;
-	rel1 { relative, 1.0 1.0; offset, 19 0; to, LEFT"border"; }       		
-	rel2 { relative, 1.0 0.0; offset, 0 0; to, LEFT"panel"; } } }
+	rel1 { relative, 1.0 1.0; offset, 19 0; to, LEFT "border"; }       		
+	rel2 { relative, 1.0 0.0; offset, 0 0; to, LEFT "panel"; } } }
 //
 	part { name, "time_arrow"; type, IMAGE; clip_to, "trans_Rect";
 	description { min, 4 7; max, 4 7; state, "default" 0.0;
@@ -352,8 +352,8 @@
 
 	part { name, "playlistPanel"; mouse_events, 1; type, RECT;
 	description { state, "default" 0.0; min, 0 72; max, 120 72;
-	rel1 { to, RIGHT"lcd"; relative, 0 1; offset, 8 0; }
-	rel2 { to, RIGHT"border"; relative, 0 0; offset, -8 -1; }
+	rel1 { to, RIGHT "lcd"; relative, 0 1; offset, 8 0; }
+	rel2 { to, RIGHT "border"; relative, 0 0; offset, -8 -1; }
 	border, 0 0 0 0; } }
 
 	part { name, "playlist"; type, RECT; mouse_events, 1; repeat_events, 1; clip_to, "playlistPanel";
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/playlist.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- playlist.edc	8 Mar 2004 09:55:49 -0000	1.4
+++ playlist.edc	10 Jul 2004 20:57:21 -0000	1.5
@@ -1,9 +1,10 @@
-	part { name, "background"; type, RECT; 
+#define BG "background"
+
+	part { name, BG; type, RECT;
 	description { state, "default" 0.0; color, 249 249 251 255; }
 	// Enable line bellow if you want to hilite your playlist entry	
 	//description { state, "selected" 0.0; color, 225 222 229 255; }
 	description { state, "selected" 0.0; color, 249 249 251 255; } }
-	#define BG "background"
 //
 	part { name, "title"; type, TEXT; mouse_events, 1;
 	description { state, "default" 0.0; color, 31 31 55 128; max, 103 7;

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	controls_to.edc 


Log Message:
ansi compatible now
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/controls_to.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- controls_to.edc	7 May 2004 03:26:08 -0000	1.2
+++ controls_to.edc	10 Jul 2004 21:41:07 -0000	1.3
@@ -9,26 +9,26 @@
 ///////////////////////////////////////////////////////////////////////
 // slides
 
-program { name, "hide_Lpanel"; signal, "mouse,clicked,*"; source, LEFT"border";
+program { name, "hide_Lpanel"; signal, "mouse,clicked,*"; source, LEFT "border";
 	action, STATE_SET "slide" 0.0; transition, DECELERATE, 0.5; 
-	target, LEFT"border"; target, LEFT"border-slide"; target, LEFT"lcd";
+	target, LEFT"border"; target, LEFT"border-slide"; target, LEFT "lcd";
 	target, "trans_Rect";
 }
 
-program { name, "show_Lpanel"; signal, "mouse,clicked,*"; source, LEFT"border-slide";
+program { name, "show_Lpanel"; signal, "mouse,clicked,*"; source, LEFT "border-slide";
 	action, STATE_SET "default" 0.0; transition, DECELERATE, 0.5;
-	target, LEFT"border"; target, LEFT"border-slide"; target, LEFT"lcd";
+	target, LEFT"border"; target, LEFT"border-slide"; target, LEFT "lcd";
 	target, "trans_Rect";
 }
 
-program { name, "hide_Rpanel"; signal, "mouse,clicked,*"; source, RIGHT"border";
+program { name, "hide_Rpanel"; signal, "mouse,clicked,*"; source, RIGHT "border";
 	action, STATE_SET "slide" 0.0; transition, DECELERATE, 0.5; 
-	target, RIGHT"border"; target, RIGHT"border-slide"; target, RIGHT"lcd";
+	target, RIGHT "border"; target, RIGHT "border-slide"; target, RIGHT "lcd";
 }
 
-program { name, "show_Rpanel"; signal, "mouse,clicked,*"; source, RIGHT"border-slide";
+program { name, "show_Rpanel"; signal, "mouse,clicked,*"; source, RIGHT "border-slide";
 	action, STATE_SET "default" 0.0; transition, DECELERATE, 0.5;
-	target, RIGHT"border"; target, RIGHT"border-slide"; target, RIGHT"lcd";
+	target, RIGHT "border"; target, RIGHT "border-slide"; target, RIGHT "lcd";
 }
 ///////////////////////////////////////////////////////////////////////
 // playback signals

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,

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	controls_to.edc 


Log Message:
seems like my last commit broke iio :/
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/controls_to.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- controls_to.edc	10 Jul 2004 21:41:07 -0000	1.3
+++ controls_to.edc	31 Jul 2004 12:38:02 -0000	1.4
@@ -9,26 +9,26 @@
 ///////////////////////////////////////////////////////////////////////
 // slides
 
-program { name, "hide_Lpanel"; signal, "mouse,clicked,*"; source, LEFT "border";
+program { name, "hide_Lpanel"; signal, "mouse,clicked,*"; source, LEFT"border";
 	action, STATE_SET "slide" 0.0; transition, DECELERATE, 0.5; 
-	target, LEFT"border"; target, LEFT"border-slide"; target, LEFT "lcd";
+	target, LEFT"border"; target, LEFT"border-slide"; target, LEFT"lcd";
 	target, "trans_Rect";
 }
 
-program { name, "show_Lpanel"; signal, "mouse,clicked,*"; source, LEFT "border-slide";
+program { name, "show_Lpanel"; signal, "mouse,clicked,*"; source, LEFT"border-slide";
 	action, STATE_SET "default" 0.0; transition, DECELERATE, 0.5;
-	target, LEFT"border"; target, LEFT"border-slide"; target, LEFT "lcd";
+	target, LEFT"border"; target, LEFT"border-slide"; target, LEFT"lcd";
 	target, "trans_Rect";
 }
 
-program { name, "hide_Rpanel"; signal, "mouse,clicked,*"; source, RIGHT "border";
+program { name, "hide_Rpanel"; signal, "mouse,clicked,*"; source, RIGHT"border";
 	action, STATE_SET "slide" 0.0; transition, DECELERATE, 0.5; 
-	target, RIGHT "border"; target, RIGHT "border-slide"; target, RIGHT "lcd";
+	target, RIGHT"border"; target, RIGHT"border-slide"; target, RIGHT"lcd";
 }
 
-program { name, "show_Rpanel"; signal, "mouse,clicked,*"; source, RIGHT "border-slide";
+program { name, "show_Rpanel"; signal, "mouse,clicked,*"; source, RIGHT"border-slide";
 	action, STATE_SET "default" 0.0; transition, DECELERATE, 0.5;
-	target, RIGHT "border"; target, RIGHT "border-slide"; target, RIGHT "lcd";
+	target, RIGHT"border"; target, RIGHT"border-slide"; target, RIGHT"lcd";
 }
 ///////////////////////////////////////////////////////////////////////
 // playback signals

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/collections


Modified Files:
	base_to.edc 


Log Message:
seems like my last commit broke iio :/
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/base_to.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- base_to.edc	10 Jul 2004 20:57:21 -0000	1.2
+++ base_to.edc	31 Jul 2004 12:38:02 -0000	1.3
@@ -7,14 +7,14 @@
 	image { normal, "base_layer.png"; }		
 	border, 6 6 6 6; fill { smooth, 1; } } }
 ///////////////////////////////////////////////////////////////////////
-	part { name, RIGHT "panel"; type, IMAGE; mouse_events, 1; repeat_events, 1;
+	part { name, RIGHT"panel"; type, IMAGE; mouse_events, 1; repeat_events, 1;
 	description { state, "default" 0.0; min, 0 94; max, 145 94;
 	rel1 { to, BASE; relative, 1.0 0.0; offset, 0 0; }
-	rel2 { to, RIGHT "border"; relative, 0.0 1.0; offset, -1 -1; } 
+	rel2 { to, RIGHT"border"; relative, 0.0 1.0; offset, -1 -1; } 
 	image { normal, "base_layer.png"; }
 	border, 6 6 6 6; fill { smooth, 1; } } }
 
-	part { name, RIGHT "border"; mouse_events, 1;
+	part { name, RIGHT"border"; mouse_events, 1;
 	description { state, "default" 0.0; min, 19 94; max, 19 94;
 	rel1 { to, BASE; relative, 2.0 0.0; offset, 145 0; }
 	rel2 { to, BASE; relative, 1.0 1.0; offset, 3 -1; }
@@ -27,18 +27,18 @@
 	image { normal, "bar_delay_right.png"; }
 	border, 0 0 7 8; } }
 
-	part { name, RIGHT "border-slide";
+	part { name, RIGHT"border-slide";
 	description { state, "default" 0.0; visible, 0; min, 0 94; max, 9999 9999;
-	rel1 { to, RIGHT "border"; relative, 1.0 0.0; offset, 0 0; }
-	rel2 { to, RIGHT "border"; relative, 1.0 1.0; offset, 0 0; }
+	rel1 { to, RIGHT"border"; relative, 1.0 0.0; offset, 0 0; }
+	rel2 { to, RIGHT"border"; relative, 1.0 1.0; offset, 0 0; }
 	border, 0 0 0 0; }
 
 	description { state, "slide" 0.0; visible, 1; min, 0 94; max, 9999 9999; 
-	rel1 { to, RIGHT "border"; relative, 0.0 0.0; offset, 0 0; }
-	rel2 { to, RIGHT "border"; relative, 1.0 1.0; offset, 0 0; }
+	rel1 { to, RIGHT"border"; relative, 0.0 0.0; offset, 0 0; }
+	rel2 { to, RIGHT"border"; relative, 1.0 1.0; offset, 0 0; }
 	border, 0 0 0 0; } }
 ///////////////////////////////////////////////////////////////////////
-	part { name, LEFT "panel"; type, IMAGE; mouse_events, 1; repeat_events, 1;
+	part { name, LEFT"panel"; type, IMAGE; mouse_events, 1; repeat_events, 1;
 	description { state, "default" 0.0; min, 0 94; max, 145 94;
 	rel1 { to, LEFT"border"; relative, 1.0 0.0; offset, 0 0; }
 	rel2 { to, BASE; relative, 0.0 1.0; offset, -1 -1; } 
@@ -67,34 +67,34 @@
 	rel2 { to, LEFT"border"; relative, 1.0 1.0; offset, 0 0; }
 	border, 0 0 0 0; } }
 ///////////////////////////////////////////////////////////////////////
-	part { name, RIGHT "lcd"; type, IMAGE; mouse_events, 0;
+	part { name, RIGHT"lcd"; type, IMAGE; mouse_events, 0;
 	description { state, "default" 0.0; min, 0 94; max, 142 94; 
 	rel1 { to, BASE; relative, 1.0  0.0; offset, -16 0; }
-	rel2 { to, RIGHT "border"; relative, 0.0 1.0; offset, -1 -1; }
+	rel2 { to, RIGHT"border"; relative, 0.0 1.0; offset, -1 -1; }
 	image { normal, "lcd_window.png"; }
 	border, 9 9 9 9; fill { smooth, 0; } } 
 
 	description { state, "slide" 0.0; min, 0 94; max, 142 94; 
 	rel1 { to, BASE; relative, 1.0  0.0; offset, -8 0; }
-	rel2 { to, RIGHT "border"; relative, 0.0 1.0; offset, -1 -1; }
+	rel2 { to, RIGHT"border"; relative, 0.0 1.0; offset, -1 -1; }
 	image { normal, "lcd_window.png"; }
 	border, 9 9 9 9; fill { smooth, 0; } } }
 
 //	part { name, "RpanelClipArea"; description {
 //	state, "default" 0.0; min, 0 94; max, 142 94;
-//	rel1 { to, RIGHT "panel"; relative, 0.0 0.0; offset, 0 0; }
+//	rel1 { to, RIGHT"panel"; relative, 0.0 0.0; offset, 0 0; }
 //	rel2 { to, BASE; relative, 1.0 1.0; offset, 0 0; }
 //	border, 0 0 0 0; } }
 //
-	part { name, LEFT "lcd";  type, IMAGE; mouse_events, 0;	  
+	part { name, LEFT"lcd";  type, IMAGE; mouse_events, 0;	  
 	description { state, "default" 0.0; min, 0 94; max, 142 94; align, 0.0 0.0; 
-	rel1 { to, LEFT "border"; relative, 1.0 0.0; offset, 0 0; }	       		
+	rel1 { to, LEFT"border"; relative, 1.0 0.0; offset, 0 0; }	       		
 	rel2 { to, BASE; relative, 0.0 1.0; offset, 16 0;  }
 	image { normal, "lcd_window.png"; }
 	border, 9 9 9 9; fill { smooth, 0; } }
 
 	description { state, "slide" 0.0; min, 0 94; max, 142 94; align, 0.0 0.0; 
-	rel1 { to, LEFT "border"; relative, 1.0  0.0; offset, 0 0; }	       		
+	rel1 { to, LEFT"border"; relative, 1.0  0.0; offset, 0 0; }	       		
 	rel2 { to, BASE; relative, 0.0 1.0; offset, 7 0;  }
 	image { normal, "lcd_window.png"; }
 	border, 9 9 9 9; fill { smooth, 0; } } }
@@ -229,12 +229,12 @@
 
 	part { name, "trans_Rect"; type, RECT; 
 	description { state, "default" 0.0; min, 132 71; max, 124 71; 
-	rel1 { relative, 1.0 1.0; offset, 19 0; to, LEFT "border"; }       		
-	rel2 { relative, 1.0 0.0; offset, 0 0; to, LEFT "panel"; } }
+	rel1 { relative, 1.0 1.0; offset, 19 0; to, LEFT"border"; }       		
+	rel2 { relative, 1.0 0.0; offset, 0 0; to, LEFT"panel"; } }
 
 	description { state, "slide" 0.0; min, 0 71; max, 132 71;
-	rel1 { relative, 1.0 1.0; offset, 19 0; to, LEFT "border"; }       		
-	rel2 { relative, 1.0 0.0; offset, 0 0; to, LEFT "panel"; } } }
+	rel1 { relative, 1.0 1.0; offset, 19 0; to, LEFT"border"; }       		
+	rel2 { relative, 1.0 0.0; offset, 0 0; to, LEFT"panel"; } } }
 //
 	part { name, "time_arrow"; type, IMAGE; clip_to, "trans_Rect";
 	description { min, 4 7; max, 4 7; state, "default" 0.0;
@@ -352,8 +352,8 @@
 
 	part { name, "playlistPanel"; mouse_events, 1; type, RECT;
 	description { state, "default" 0.0; min, 0 72; max, 120 72;
-	rel1 { to, RIGHT "lcd"; relative, 0 1; offset, 8 0; }
-	rel2 { to, RIGHT "border"; relative, 0 0; offset, -8 -1; }
+	rel1 { to, RIGHT"lcd"; relative, 0 1; offset, 8 0; }
+	rel2 { to, RIGHT"border"; relative, 0 0; offset, -8 -1; }
 	border, 0 0 0 0; } }
 
 	part { name, "playlist"; type, RECT; mouse_events, 1; repeat_events, 1; clip_to, "playlistPanel";

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/programs


Modified Files:
	ani.edc 


Log Message:
.resets delayed execution breaks the animations, so don't call it on init. this is a hack, the animation code needs to be rewritten with embryo.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/programs/ani.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ani.edc	22 Feb 2004 10:12:10 -0000	1.1
+++ ani.edc	18 Aug 2004 01:20:37 -0000	1.2
@@ -42,7 +42,11 @@
         name, "ani"NUM".init"; \
         signal, "show"; \
         source, ""; \
-        after, "ani"NUM".stop";\
+        /* the following line breaks the animation, since .reset's
+         * execution (called by .stop) is delayed by 0.5-1.0 seconds.
+         * *not* calling .stop here breaks re-initialisation though.
+         * rewrite with embryo! :)
+        after, "ani"NUM".stop";*/ \
       } \
       program { \
         name, "ani"NUM".reset"; \
@@ -64,17 +68,14 @@
         after, "ani"NUM".stop"; \
       } \
       program {  \
-        name, "ani"NUM".paused"; \
+        name, "ani"NUM".stopped"; \
         signal, "PLAYBACK_STATE_STOPPED";  \
         source, "*";  \
         after, "ani"NUM".stop"; \
-      } \
-
+      }
 
 DOT_PROG(0, 1.15, .85)
 DOT_PROG(1, .75, 1)
 DOT_PROG(2, 1.5, 2.0)
 DOT_PROG(3, 1.25, .75)
 DOT_PROG(4, 1.0, 1.5)
-
-

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/programs


Modified Files:
	ani.edc 


Log Message:
not calling stop on init isn't enough to fix the bad behaviour, since stop and reset are called on track changes too
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/programs/ani.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ani.edc	18 Aug 2004 01:20:37 -0000	1.2
+++ ani.edc	18 Aug 2004 09:56:45 -0000	1.3
@@ -42,18 +42,18 @@
         name, "ani"NUM".init"; \
         signal, "show"; \
         source, ""; \
-        /* the following line breaks the animation, since .reset's
-         * execution (called by .stop) is delayed by 0.5-1.0 seconds.
-         * *not* calling .stop here breaks re-initialisation though.
-         * rewrite with embryo! :)
-        after, "ani"NUM".stop";*/ \
+        after, "ani"NUM".stop"; \
       } \
       program { \
         name, "ani"NUM".reset"; \
         action, STATE_SET "default" 0.0; \
         target, "dot"NUM; \
         transition, LINEAR 0.0; \
-        in, .5 .5; \
+        /* the following line breaks the animation, since the
+         * program's execution is delayed by 0.5-1.0 seconds.
+         * This kinda spoils the effect though :/
+         * rewrite with embryo! :)
+        in, .5 .5;*/ \
       } \
       program {  \
         name, "ani"NUM".playing"; \

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/groups


Modified Files:
	collapsed.edc playlist_item.edc 


Log Message:
updated for latest edje_cc and evas changes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/groups/collapsed.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- collapsed.edc	7 Mar 2004 18:15:28 -0000	1.2
+++ collapsed.edc	23 Oct 2004 16:16:46 -0000	1.3
@@ -11,7 +11,6 @@
 	  state, "default" 0.0;
 	  min, 110 32;
 	  max, 110 32;
-	  border, 10 2 2 2;
 	  rel1 {
 	    relative, 0 0;
 	    offset, 0 0;
@@ -22,6 +21,7 @@
 	  }
 	  image {
 	      normal, "small-main.png";
+		  border, 10 2 2 2;
 	  }
 	}
       } //part
@@ -100,7 +100,6 @@
 	  state, "default" 0.0;
 	  min, 0 30;
 	  max, 9999 30;
-	  border, 10 2 2 2;
 	  rel1 {
             to, "main";
 	    relative, 1 0;
@@ -113,6 +112,7 @@
 	  }
 	  image {
 	      normal, "small-panel.png";
+		  border, 10 2 2 2;
 	  }
 	}
       } //part
@@ -141,7 +141,6 @@
 	  state, "default" 0.0;
 	  min, 17 4;
 	  max, 9999 4;
-	  border, 3 3 2 2;
 	  rel1 {
             to, "main";
 	    relative, 0 0;
@@ -154,6 +153,7 @@
 	  }
 	  image {
 	      normal, "small-seeker-trough.png";
+		  border, 3 3 2 2;
 	  }
 	}
       } //part
@@ -165,8 +165,7 @@
 	  state, "default" 0.0;
 	  min, 0 2;
 	  max, 9999 2;
-          color, WINTER_COLOR;
-	  border, 3 3 2 2;
+	  color, WINTER_COLOR;
 	  rel1 {
             to, "seekerTrough";
 	    relative, 0 0;
@@ -180,6 +179,7 @@
 	  }
 	  image {
 	      normal, "small-seeker-bar.png";
+		  border, 3 3 2 2;
 	  }
 	}
       } //part
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/groups/playlist_item.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- playlist_item.edc	22 Feb 2004 10:12:08 -0000	1.1
+++ playlist_item.edc	23 Oct 2004 16:16:46 -0000	1.2
@@ -32,7 +32,7 @@
 		    text {
 		        text, "title";
 			font, "Vera";
-			size, 10;
+			size, 12;
 			align, 0.0 0.0;
 		    }
 		}
@@ -51,7 +51,7 @@
 		    text {
 		        text, "title";
 			font, "Vera";
-			size, 10;
+			size, 12;
 			align, 0.0 0.0;
 		    }
 		}
@@ -74,7 +74,7 @@
 		    text {
 		        text, "00:00";
 			font, "Vera";
-			size, 10;
+			size, 12;
 			min, 1 1;
 			align, 1.0 0.0;
 		    }
@@ -93,7 +93,7 @@
 		    text {
 		        text, "00:00";
 			font, "Vera";
-			size, 10;
+			size, 12;
 			min, 1 1;
 			align, 1.0 0.0;
 		    }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/parts


Modified Files:
	main.edc playlist.edc seeker.edc text.edc 


Log Message:
updated for latest edje_cc and evas changes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/parts/main.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- main.edc	7 Mar 2004 18:15:29 -0000	1.2
+++ main.edc	23 Oct 2004 16:16:46 -0000	1.3
@@ -7,7 +7,6 @@
 		    state, "default" 0.0;
 		    min, 199 182;
 		    max, 99999 182;
-		    border, 0 0 0 0;
 		    rel1 {
 		      relative, 0 0;
 		      offset, 0 0;
@@ -18,8 +17,8 @@
 		    }
 		    image {
 		        normal, "main.png";
+				border, 10 10 20 10;
 		    }
-		    border, 10 10 20 10;
 		}
 	    } //part
 
@@ -31,8 +30,7 @@
 		    state, "default" 0.0;
 		    min, 30 10;
 		    max, 99999 10;
-		    border, 0 0 0 0;
-                    color, WINTER_COLOR;
+			color, WINTER_COLOR;
 		    rel1 {
                       to, "main";
 		      relative, 0 0;
@@ -45,8 +43,8 @@
 		    }
 		    image {
 		        normal, "top_grad.png";
+				border, 10 10 10 10;
 		    }
-		    border, 10 10 10 10;
 		}
 	    } //part
 
@@ -67,8 +65,8 @@
 	  }
 	  image {
 	    normal, "screen.png";
+		border, 5 5 5 5;
 	  }
-	  border, 5 5 5 5;
 	}
       }
 
@@ -126,7 +124,6 @@
 
 	      description {
 	        state, "default" 0.0;
-	        border, 0 0 0 0;
 	        min, 199 10;
 		max, 99999 10;
 	        rel1 {
@@ -141,12 +138,11 @@
 	        }
 	        image {
 	          normal, "bot.png";
+			  border, 7 7 0 0;
 	        }
-	        border, 7 7 0 0;
 	      }
 	      description {
 	        state, "open" 0.0;
-	        border, 0 0 0 0;
 	        min, 199 10;
 		max, 99999 10;
 	        rel1 {
@@ -161,8 +157,8 @@
 	        }
 	        image {
 	          normal, "bot.png";
+			  border, 7 7 0 0;
 	        }
-	        border, 7 7 0 0;
 	      }
 	    } //part
 
@@ -174,8 +170,7 @@
 		    state, "default" 0.0;
 		    min, 30 10;
 		    max, 99999 10;
-		    border, 0 0 0 0;
-                    color, WINTER_COLOR;
+			color, WINTER_COLOR;
 		    rel1 {
                       to, "bottom";
 		      relative, 0 0;
@@ -188,7 +183,7 @@
 		    }
 		    image {
 		        normal, "bot_grad.png";
+				border, 10 10 10 10;
 		    }
-		    border, 10 10 10 10;
 		}
 	    } //part
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/parts/playlist.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- playlist.edc	22 Feb 2004 10:12:09 -0000	1.1
+++ playlist.edc	23 Oct 2004 16:16:46 -0000	1.2
@@ -16,8 +16,8 @@
 		    }
 		    image {
 		        normal, "panel.png";
+				border, 3 3 0 0;
 		    }
-		    border, 3 3 0 0;
 		}
 	    } //part
 
@@ -72,7 +72,6 @@
 		clip_to, "playlistClip";
 		description {
 		    state, "default" 0.0;
-		    border, 0 0 0 0;
 		    rel1 {
 		      to, "playlistPanel";
 		      relative, 0 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/parts/seeker.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- seeker.edc	7 Mar 2004 18:15:29 -0000	1.2
+++ seeker.edc	23 Oct 2004 16:16:46 -0000	1.3
@@ -18,8 +18,8 @@
 	  }
 	  image {
 	    normal, "seeker_trough.png";
+		border, 5 5 1 1;
 	  }
-	  border, 5 5 1 1;
 	}
       }
 
@@ -43,8 +43,8 @@
 	  }
 	  image {
 	    normal, "seeker_bar.png";
+		border, 5 5 1 1;
 	  }
-	  border, 5 5 1 1;
 	}
       }
       part {
@@ -67,8 +67,8 @@
 	  }
 	  image {
 	    normal, "seeker_bar_grad.png";
-	  }
 	  border, 5 5 1 1;
+	  }
 	}
       }
 
@@ -96,7 +96,6 @@
 	    relative, 1 1;
 	    offset,  -1 -1;
 	  }
-	  border, 5 5 1 1;
 	}
       }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/parts/text.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- text.edc	22 Feb 2004 10:12:09 -0000	1.1
+++ text.edc	23 Oct 2004 16:16:46 -0000	1.2
@@ -19,7 +19,7 @@
 	  text {
 	    text, "artist";
 	    font, "Vera";
-	    size, 10;
+	    size, 12;
 	    min, 0 1;
 	    align, 0 0;
 	  }
@@ -47,7 +47,7 @@
 	  text {
 	    text, "album";
 	    font, "Vera";
-	    size, 8;
+	    size, 10;
 	    min, 0 1;
 	    align, 0 0;
 	  }
@@ -75,7 +75,7 @@
 	  text {
 	    text, "song";
 	    font, "Vera";
-	    size, 8;
+	    size, 10;
 	    min, 0 1;
 	    align, 0 0;
 	  }
@@ -104,7 +104,7 @@
 	  text {
 	    text, "00:00";
 	    font, "Vera";
-	    size, 12;
+	    size, 14;
 	    min, 0 1;
 	    align, 1 0;
 	  }
@@ -133,7 +133,7 @@
 	  text {
 	    text, "100";
 	    font, "Vera";
-	    size, 8;
+	    size, 10;
 	    min, 0 0;
 	    align, .5 .5;
 	  }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/macros


Modified Files:
	macros.inc 


Log Message:
fixed some silly errors
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/macros/macros.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- macros.inc	7 Mar 2004 18:15:29 -0000	1.2
+++ macros.inc	23 Oct 2004 20:47:06 -0000	1.3
@@ -90,7 +90,7 @@
         name, NAME"-down2";		\
 	signal, "mouse,down,1";		\
 	source, NAME;			\
-	action, STATE_SET "down" 0.0	\
+	action, STATE_SET "down" 0.0;	\
         transition, LINEAR, 0.0;	\
 	target, NAME;			\
       }					\
@@ -98,7 +98,7 @@
         name, NAME"-up";		\
 	signal, "mouse,up,1";		\
 	source, NAME;			\
-	action, STATE_SET "over" 0.0	\
+	action, STATE_SET "over" 0.0;	\
         transition, LINEAR, 0.0;	\
 	target, NAME;			\
       }					\
@@ -225,7 +225,7 @@
         name, P4;			\
 	signal, "mouse,down,1";		\
 	source, NAME;			\
-	action, STATE_SET "down" 0.0	\
+	action, STATE_SET "down" 0.0;	\
         transition, LINEAR, 0.0;	\
 	target, NAME;			\
       }					\
@@ -233,7 +233,7 @@
         name, P5;			\
 	signal, "mouse,up,1";		\
 	source, NAME;			\
-	action, STATE_SET "over" 0.0	\
+	action, STATE_SET "over" 0.0;	\
         transition, LINEAR, 0.0;	\
 	target, NAME;			\
       }					\
@@ -332,7 +332,7 @@
         name, NAME"-down2";		\
 	signal, "mouse,down,1";		\
 	source, NAME;			\
-	action, STATE_SET "down" 0.0	\
+	action, STATE_SET "down" 0.0;	\
         transition, LINEAR, 0.0;	\
 	target, NAME;			\
       }					\
@@ -346,7 +346,7 @@
         name, NAME"-up2";		\
 	signal, "mouse,up,1";		\
 	source, NAME;			\
-	action, STATE_SET "over" 0.0	\
+	action, STATE_SET "over" 0.0;	\
         transition, LINEAR, 0.0;	\
 	target, NAME;			\
       }					\

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/macros


Modified Files:
	fd_entity.edc 


Log Message:
fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/macros/fd_entity.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- fd_entity.edc	4 May 2004 03:27:21 -0000	1.3
+++ fd_entity.edc	23 Oct 2004 21:52:00 -0000	1.4
@@ -5,13 +5,13 @@
     rel1 { relative, 0.0 0.0; offset, 5 0; } \
     rel2 { relative, 1.0 1.0; offset, -5 0; } \
     color, 150 150 160 255; text {text,"";font,"Edje.visitor1"; \
-    size, 7; align, talign; fit, 0 0; } } \
+    size, 9; align, talign; fit, 0 0; } } \
     description { \
 	state, "hilited" 0.0; visible, 1; \
 	rel1 { relative, 0.0 0.0; offset, 5 0; } \
 	rel2 { relative, 1.0 1.0; offset, -5 0; } \
 	color, 31 31 55 255; \
-	text {text,"";font,"Edje.visitor1"; size, 7; align, talign; fit, 0 0; } } \
+	text {text,"";font,"Edje.visitor1"; size, 9; align, talign; fit, 0 0; } } \
      } \
 part { name, "base"; type, RECT; mouse_events, 1; repeat_events, 1; \
     description { state, "default" 0.0; visible, 1; \

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	controls_to.edc 


Log Message:
fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/controls_to.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- controls_to.edc	10 Oct 2004 02:54:21 -0000	1.6
+++ controls_to.edc	23 Oct 2004 21:52:00 -0000	1.7
@@ -94,7 +94,7 @@
 }	
 program { name, "play_click"; signal, "mouse,down,*";source, PLAY;
 	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, PLAY;
-	after, "play_unclick", in, 0.15 0.0;
+	after, "play_unclick"; in, 0.15 0.0;
 }	
 program { name, "play_unclick"; signal, "mouse,up,*"; source, PLAY;
 	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, PLAY;
@@ -132,7 +132,7 @@
 }
 program { name, "next_click"; signal, "mouse,down,*"; source, NEXT;
 	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, NEXT;
-	after, "next_unclick", in, 0.15 0.0;
+	after, "next_unclick"; in, 0.15 0.0;
 }
 program { name, "next_unclick"; signal, "mouse,up,*"; source, NEXT;
 	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, NEXT;

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/collections


Modified Files:
	base_to.edc playlist.edc switch.edc 


Log Message:
fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/base_to.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- base_to.edc	26 Aug 2004 01:00:06 -0000	1.4
+++ base_to.edc	23 Oct 2004 21:51:59 -0000	1.5
@@ -27,16 +27,16 @@
 	image { normal, "bar_delay_right.png"; }
 	border, 0 0 7 8; } }
 
-	part { name, RIGHT"border-slide";
+	part { name, RIGHT"border-slide"; type, RECT;
 	description { state, "default" 0.0; visible, 0; min, 0 94; max, 9999 9999;
+	color, 0 0 0 0;
 	rel1 { to, RIGHT"border"; relative, 1.0 0.0; offset, 0 0; }
-	rel2 { to, RIGHT"border"; relative, 1.0 1.0; offset, 0 0; }
-	border, 0 0 0 0; }
+	rel2 { to, RIGHT"border"; relative, 1.0 1.0; offset, 0 0; } }
 
 	description { state, "slide" 0.0; visible, 1; min, 0 94; max, 9999 9999; 
+	color, 0 0 0 0;
 	rel1 { to, RIGHT"border"; relative, 0.0 0.0; offset, 0 0; }
-	rel2 { to, RIGHT"border"; relative, 1.0 1.0; offset, 0 0; }
-	border, 0 0 0 0; } }
+	rel2 { to, RIGHT"border"; relative, 1.0 1.0; offset, 0 0; } } }
 ///////////////////////////////////////////////////////////////////////
 	part { name, LEFT"panel"; type, IMAGE; mouse_events, 1; repeat_events, 1;
 	description { state, "default" 0.0; min, 0 94; max, 145 94;
@@ -56,16 +56,16 @@
 	rel2 { to, BASE; relative, 0.0 1.0; offset, 1 -1; }       
 	image { normal, "bar_delay_left.png"; } } }
 
-	part { name, LEFT"border-slide"; 
+	part { name, LEFT"border-slide"; type, RECT;
 	description { state, "default" 0.0; visible, 0; min, 0 94; max, 9999 9999;
+	color, 0 0 0 0;
 	rel1 { to, LEFT"border"; relative, 0.0 0.0; offset, 0 0; }
-	rel2 { to, LEFT"border"; relative, 1.0 1.0; offset, 0 0; }
-	border, 0 0 0 0; }
+	rel2 { to, LEFT"border"; relative, 1.0 1.0; offset, 0 0; } }
 
 	description { state, "slide" 0.0; visible, 1; min, 0 94; max, 9999 9999; 
+	color, 0 0 0 0;
 	rel1 { to, LEFT"border"; relative, 0.0 0.0; offset, 0 0; }
-	rel2 { to, LEFT"border"; relative, 1.0 1.0; offset, 0 0; }
-	border, 0 0 0 0; } }
+	rel2 { to, LEFT"border"; relative, 1.0 1.0; offset, 0 0; } } }
 ///////////////////////////////////////////////////////////////////////
 	part { name, RIGHT"lcd"; type, IMAGE; mouse_events, 0;
 	description { state, "default" 0.0; min, 0 94; max, 142 94; 
@@ -100,8 +100,10 @@
 	border, 9 9 9 9; fill { smooth, 0; } } }
 //
 ///////////////////////////////////////////////////////////////////////
-	part { name, "CenterClipArea"; mouse_events, 1; repeat_events, 1;
+	part { name, "CenterClipArea"; type, RECT;
+	mouse_events, 1; repeat_events, 1;
 	description { state, "default" 0.0; min, 123 94; max, 123 94;
+	color, 0 0 0 0;
 	rel1 { to, BASE; relative, 0.0 0.0; offset, 0 0; }
 	rel2 { to, BASE; relative, 1.0 1.0; offset, 0 0; } } }
 ///////////////////////////////////////////////////////////////////////
@@ -248,7 +250,7 @@
 	rel1 { to, "trans_Rect"; relative, 0 0; offset, 10 14; }
 	rel2 { to, "trans_Rect"; relative, 0.5 0; offset, 0 0; }
 	color, 76 67 88 255;
-	text { text, "00:00"; font, "Edje.visitor1"; size, 7; align, 0 0; } } }
+	text { text, "00:00"; font, "Edje.visitor1"; size, 9; align, 0 0; } } }
 //
 	part { name, "artist_bullet"; type, IMAGE; clip_to, "trans_Rect";
 	description { min, 3 3; max, 3 3; state, "default" 0.0;
@@ -262,7 +264,7 @@
 	rel1 { relative, 0.0 0.0; offset, 10 13; to, "trans_Rect"; }
 	rel2 { relative, 1.0 1.0; offset, -4 12; to, "trans_Rect"; }
 	color, 76 67 88 255;
-	text { text, "Artist"; font, "Edje.visitor1"; size, 7; align, 0.0 0.1; } } }
+	text { text, "Artist"; font, "Edje.visitor1"; size, 9; align, 0.0 0.1; } } }
 //
 	part { name, "album_bullet"; type, IMAGE; clip_to, "trans_Rect";
 	description { min, 3 3; max, 3 3; state, "default" 0.0;
@@ -276,7 +278,7 @@
 	rel1 { relative, 0.0 0.0; offset, 0 15; to, "artist_name"; }
 	rel2 { relative, 1.0 1.0; offset, 0 17; to, "artist_name"; }
 	color, 76 67 88 255;
-	text { text, "Album"; font, "Edje.visitor1"; size, 7; align, 0 0; } } }
+	text { text, "Album"; font, "Edje.visitor1"; size, 9; align, 0 0; } } }
 //
 	part { name, "song_bullet"; type, IMAGE; clip_to, "trans_Rect";
 	description { min, 3 3; max, 3 3; state, "default" 0.0;
@@ -290,7 +292,7 @@
 	rel1 { relative, 0 0; offset, 0 10; to, "album_name"; }
 	rel2 { relative, 1 0; offset, 0 10; to, "album_name"; }
 	color, 76 67 88 255;
-	text { text, "Song"; font, "Edje.visitor1"; size, 7; align, 0 0; } } }
+	text { text, "Song"; font, "Edje.visitor1"; size, 9; align, 0 0; } } }
 //
 	part { name, "bitrate_bullet"; type, IMAGE; clip_to, "trans_Rect";
 	description { min, 3 3; max, 3 3; state, "default" 0.0;
@@ -304,7 +306,7 @@
 	rel1 { relative, 0 0; offset, 48 22; to, "trans_Rect"; }
 	rel2 { relative, 0 1; offset, -8 30; to, "trans_Rect"; }
 	color, 76 67 88 255;
-	text { text, "000"; font, "Edje.visitor1"; size, 7; align, 0 0; } } }
+	text { text, "000"; font, "Edje.visitor1"; size, 9; align, 0 0; } } }
 ///////////////////////////////////////////////////////////////////////
 // SeekerBar
 
@@ -326,8 +328,7 @@
 	dragable { x, 1 1 1;  y, 0 0 0; confine, "seekerTrough"; }
 	description { state, "default" 0.0; visible, 0; color, 0 0 0 255; min, 1 5; max, 1 5;
 	rel1 { to, "seekerTrough"; relative, 0 0; offset, 0 0; }
-	rel2 { to, "seekerTrough"; relative, 1 1; offset,  -1 -1; } 
-	border, 5 5 1 1; } }
+	rel2 { to, "seekerTrough"; relative, 1 1; offset,  -1 -1; } } }
 //
 	part { name, "switch_stance"; type, RECT; mouse_events, 1; clip_to, "trans_Rect";
 	description { min, 10 10; max, 10 10; state, "default" 0.0;
@@ -340,8 +341,7 @@
 	part { name, "playlistPanel"; mouse_events, 1; type, RECT;
 	description { state, "default" 0.0; min, 0 72; max, 120 72;
 	rel1 { to, RIGHT"lcd"; relative, 0 1; offset, 8 0; }
-	rel2 { to, RIGHT"border"; relative, 0 0; offset, -8 -1; }
-	border, 0 0 0 0; } }
+	rel2 { to, RIGHT"border"; relative, 0 0; offset, -8 -1; } } }
 
 	part { name, "playlist"; type, RECT; mouse_events, 1; repeat_events, 1; clip_to, "playlistPanel";
 	description { state, "default" 0.0; min, 0 62; max, 120 62;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/playlist.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- playlist.edc	10 Jul 2004 20:57:21 -0000	1.5
+++ playlist.edc	23 Oct 2004 21:51:59 -0000	1.6
@@ -10,16 +10,16 @@
 	description { state, "default" 0.0; color, 31 31 55 128; max, 103 7;
 	rel1 { relative, 0.0 0.0; offset, 0 0; to, BG; }
 	rel2 { relative, 1.0 1.0; offset, -25 2; to, BG; }
-	text { text, "title"; font, "Edje.visitor1"; size, 7; align, 0.0 0.0; } }
+	text { text, "title"; font, "Edje.visitor1"; size, 9; align, 0.0 0.0; } }
 
 	description { state, "selected" 0.0; color, 31 31 55 255; max, 103 7;
 	rel1 { to, BG; relative, 0.0 0.0; offset, 0 0; }	
 	rel2 { to, BG; relative, 1.0 1.0; offset, -25 2; } 
-	text { text, "title"; font, "Edje.visitor1"; size, 7; align, 0.0 0.0; } } }
+	text { text, "title"; font, "Edje.visitor1"; size, 9; align, 0.0 0.0; } } }
 //	
 	part { name, "length"; type, TEXT; mouse_events, 1;
 	description { state, "default" 0.0; color,  31 31 55 128;
-	text { text, "00:00"; font, "Edje.visitor1"; size, 7; align, 1.0 1.0; } }
+	text { text, "00:00"; font, "Edje.visitor1"; size, 9; align, 1.0 1.0; } }
 
 	description { state, "selected" 0.0; color,  31 31 55 255;
-	text { text, "00:00"; font, "Edje.visitor1"; size, 7; align, 1.0 1.0; } } }
+	text { text, "00:00"; font, "Edje.visitor1"; size, 9; align, 1.0 1.0; } } }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/switch.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- switch.edc	20 Mar 2004 08:28:12 -0000	1.5
+++ switch.edc	23 Oct 2004 21:51:59 -0000	1.6
@@ -79,7 +79,7 @@
 	rel1 { relative, 0.5 1.0; offset, -10 -3; to, "small_lcd"; }
 	rel2 { relative, 1.0 0.5; offset, 0 0; to, "small_lcd"; }
 	color,  31 31 55 255;
-	text { text, "0:00"; font, "Edje.visitor1"; size, 7; align, 0.0 0.0; } } }
+	text { text, "0:00"; font, "Edje.visitor1"; size, 9; align, 0.0 0.0; } } }
 //
 	part { name, "_prev_button"; type, IMAGE; mouse_events, 1;	    
 	description { state, "default" 0.0; max, 13 39; min, 13 39;       		
@@ -216,4 +216,4 @@
 	rel1 { relative, 0.10 0.6; offset, 0 0; to, "strans_Rect"; }
 	rel2 { relative, 1.0 0.0; offset, 0 0; to, "strans_Rect"; }
 	color,  31 31 55 255;
-	text { text, "song"; font, "Edje.visitor1"; size, 7; align, 0.0 0.0; } } }
+	text { text, "song"; font, "Edje.visitor1"; size, 9; align, 0.0 0.0; } } }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/collections


Modified Files:
	base_to.edc esmart_fd.edc 


Log Message:
warning fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/base_to.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- base_to.edc	23 Oct 2004 21:51:59 -0000	1.5
+++ base_to.edc	23 Oct 2004 22:07:44 -0000	1.6
@@ -4,28 +4,26 @@
 	description { state, "default" 0.0; min, 123 94; max, 123 94; 
 	rel1 { relative, 0.0 0.0; offset, 0.0 0.0; }              
 	rel2 { relative, 1.0 1.0; offset, 0 0; }	
-	image { normal, "base_layer.png"; }		
-	border, 6 6 6 6; fill { smooth, 1; } } }
+	image { normal, "base_layer.png"; border, 6 6 6 6; }
+	fill { smooth, 1; } } }
 ///////////////////////////////////////////////////////////////////////
 	part { name, RIGHT"panel"; type, IMAGE; mouse_events, 1; repeat_events, 1;
 	description { state, "default" 0.0; min, 0 94; max, 145 94;
 	rel1 { to, BASE; relative, 1.0 0.0; offset, 0 0; }
 	rel2 { to, RIGHT"border"; relative, 0.0 1.0; offset, -1 -1; } 
-	image { normal, "base_layer.png"; }
-	border, 6 6 6 6; fill { smooth, 1; } } }
+	image { normal, "base_layer.png"; border, 6 6 6 6; }
+	fill { smooth, 1; } } }
 
 	part { name, RIGHT"border"; mouse_events, 1;
 	description { state, "default" 0.0; min, 19 94; max, 19 94;
 	rel1 { to, BASE; relative, 2.0 0.0; offset, 145 0; }
 	rel2 { to, BASE; relative, 1.0 1.0; offset, 3 -1; }
-	image { normal, "bar_delay_right.png"; }
-	border, 0 0 7 8; }
+	image { normal, "bar_delay_right.png"; border, 0 0 7 8; } }
 
 	description { state, "slide" 0.0; min, 19 94; max, 19 94; 
 	rel1 { to, BASE; relative, 1.0 1.0; offset, -3 0; }
 	rel2 { to, BASE; relative, 0.0 0.0; offset, 145 -1; }
-	image { normal, "bar_delay_right.png"; }
-	border, 0 0 7 8; } }
+	image { normal, "bar_delay_right.png"; border, 0 0 7 8; } } }
 
 	part { name, RIGHT"border-slide"; type, RECT;
 	description { state, "default" 0.0; visible, 0; min, 0 94; max, 9999 9999;
@@ -42,8 +40,8 @@
 	description { state, "default" 0.0; min, 0 94; max, 145 94;
 	rel1 { to, LEFT"border"; relative, 1.0 0.0; offset, 0 0; }
 	rel2 { to, BASE; relative, 0.0 1.0; offset, -1 -1; } 
-	image { normal, "base_layer.png"; }
-	border, 6 6 6 6; fill { smooth, 1; } } }
+	image { normal, "base_layer.png"; border, 6 6 6 6; }
+	fill { smooth, 1; } } }
 
 	part { name, LEFT"border"; mouse_events, 1;
 	description { state, "default" 0.0; min, 19 94; max, 19 94; align, 0.0 0.0;       
@@ -71,14 +69,14 @@
 	description { state, "default" 0.0; min, 0 94; max, 142 94; 
 	rel1 { to, BASE; relative, 1.0  0.0; offset, -16 0; }
 	rel2 { to, RIGHT"border"; relative, 0.0 1.0; offset, -1 -1; }
-	image { normal, "lcd_window.png"; }
-	border, 9 9 9 9; fill { smooth, 0; } } 
+	image { normal, "lcd_window.png"; border, 9 9 9 9; }
+	fill { smooth, 0; } } 
 
 	description { state, "slide" 0.0; min, 0 94; max, 142 94; 
 	rel1 { to, BASE; relative, 1.0  0.0; offset, -8 0; }
 	rel2 { to, RIGHT"border"; relative, 0.0 1.0; offset, -1 -1; }
-	image { normal, "lcd_window.png"; }
-	border, 9 9 9 9; fill { smooth, 0; } } }
+	image { normal, "lcd_window.png"; border, 9 9 9 9; }
+	fill { smooth, 0; } } }
 
 //	part { name, "RpanelClipArea"; description {
 //	state, "default" 0.0; min, 0 94; max, 142 94;
@@ -90,14 +88,14 @@
 	description { state, "default" 0.0; min, 0 94; max, 142 94; align, 0.0 0.0; 
 	rel1 { to, LEFT"border"; relative, 1.0 0.0; offset, 0 0; }	       		
 	rel2 { to, BASE; relative, 0.0 1.0; offset, 16 0;  }
-	image { normal, "lcd_window.png"; }
-	border, 9 9 9 9; fill { smooth, 0; } }
+	image { normal, "lcd_window.png"; border, 9 9 9 9; }
+	fill { smooth, 0; } }
 
 	description { state, "slide" 0.0; min, 0 94; max, 142 94; align, 0.0 0.0; 
 	rel1 { to, LEFT"border"; relative, 1.0  0.0; offset, 0 0; }	       		
 	rel2 { to, BASE; relative, 0.0 1.0; offset, 7 0;  }
-	image { normal, "lcd_window.png"; }
-	border, 9 9 9 9; fill { smooth, 0; } } }
+	image { normal, "lcd_window.png"; border, 9 9 9 9; }
+	fill { smooth, 0; } } }
 //
 ///////////////////////////////////////////////////////////////////////
 	part { name, "CenterClipArea"; type, RECT;
@@ -178,20 +176,20 @@
 	description { state, "default" 0.0; min, 23 23; max, 23 23;       		
 	rel1 { relative, 0.0  0.0; offset, 0 0; to, "cc_align"; }
 	rel2 { relative, 1.0 1.0; offset, 0 0; to, "cc_align"; }			
-	image { normal, "play_button.png";	}		
-	border, 1 1 1 1; fill { smooth, 0; } }	
+	image { normal, "play_button.png"; border, 1 1 1 1; }
+	fill { smooth, 0; } }
 	
 	description { state, "hilited" 0.0; min, 23 23; max, 23 23;	       		
 	rel1 { relative, 0.0  0.0; offset, 0 0; to, "cc_align"; }
 	rel2 { relative, 1.0 1.0; offset, 0 0; to, "cc_align"; }	
-	image { normal, "play_button_hilited.png"; }
-	
-	border, 1 1 1 1; fill { smooth, 1; } }
+	image { normal, "play_button_hilited.png"; border, 1 1 1 1; }
+	fill { smooth, 1; } }
+
 	description { state, "clicked" 0.0; min, 23 23; max, 23 23;       		
 	rel1 { relative, 0.0  0.0; offset, 0 0; to, "cc_align"; }
 	rel2 { relative, 1.0 1.0; offset, 0 0; to, "cc_align"; }		
-	image { normal, "play_button_clicked.png"; }		
-	border, 1 1 1 1; fill { smooth, 0; } } }
+	image { normal, "play_button_clicked.png"; border, 1 1 1 1; }
+	fill { smooth, 0; } } }
 //
 	part { name, "next_button"; type, IMAGE; mouse_events, 1;	    
 	description { state, "default" 0.0; min, 13 39; max, 13 39;       		
@@ -314,15 +312,13 @@
 	description { state, "default" 0.0; visible, 1; min, 10 5; max, 9999 5;
 	rel1 { relative, 0.0 0.0; offset, 1 15; to, "trans_Rect"; }
 	rel2 { relative, 1.0 1.0; offset, -7 15; to, "trans_Rect"; }
-	image { normal, "seeker_trough.png"; }
-	border, 5 5 1 1; } }
+	image { normal, "seeker_trough.png"; border, 5 5 1 1; } } }
 //
 	part { name, "seekerBar"; clip_to, "trans_Rect";
 	description { state, "default" 0.0; visible, 1; min, 0 5; max, 9999 5;
 	rel1 { to, "seekerTrough"; relative, 0 0; offset, 0 0; }
 	rel2 { to_x, "seeker"; to_y, "seekerTrough"; relative, 0 1; offset, 0 -1; }
-	image { normal, "seeker_bar.png"; }
-	border, 5 5 1 1; } }
+	image { normal, "seeker_bar.png"; border, 5 5 1 1; } } }
 //
 	part { name, "seeker"; type, RECT; clip_to, "trans_Rect";
 	dragable { x, 1 1 1;  y, 0 0 0; confine, "seekerTrough"; }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/esmart_fd.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- esmart_fd.edc	15 May 2004 20:34:31 -0000	1.4
+++ esmart_fd.edc	23 Oct 2004 22:07:44 -0000	1.5
@@ -3,7 +3,7 @@
 	description { state, "default" 0.0; visible, 1;
 	rel1 { relative, 0.0 0.0; offset, 20 0; } 
 	rel2 { relative, 1.0 1.0; offset, -18 0; }
-	border, 0 0 12 12; image { normal, "base_layer.png"; } 
+	image { border, 0 0 12 12; normal, "base_layer.png"; } 
 	} 
 }
 
@@ -20,8 +20,7 @@
 	description { state, "default" 0.0; visible, 1; min, 11 85;
 	rel1 { relative, 0.5 0.5; offset, 0 0; } 
 	rel2 { relative, 0.5 0.5; offset, 0 0; }
-	image { normal, "v_scrollbar.png"; } 
-	border, 4 4 17 17;
+	image { normal, "v_scrollbar.png"; border, 4 4 17 17; }
 	color, 255 255 255 200; 
 	}
 }
@@ -30,7 +29,7 @@
 	description { state, "default" 0.0; visible, 1;
 	rel1 { relative, 0.0 0.0; offset, 0 0; } 
 	rel2 { relative, 0.0 1.0; offset, 19 0; }
-	border, 18 0 12 12; image { normal, "bar_delay_left.png"; }
+	image { border, 18 0 12 12; normal, "bar_delay_left.png"; }
 	}
 }
     
@@ -52,7 +51,7 @@
 	description { state, "default" 0.0; visible, 1;
 	rel1 { relative, 1.0 0.0; offset, -19 0; } 
 	rel2 { relative, 1.0 1.0; offset, 0 0; }
-	border, 0 18 12 12; image { normal, "bar_delay_right.png"; }
+	image { border, 0 18 12 12; normal, "bar_delay_right.png"; }
 	}
 }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/macros


Modified Files:
	vpanel.edc 


Log Message:
warning fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/macros/vpanel.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- vpanel.edc	4 May 2004 03:27:21 -0000	1.3
+++ vpanel.edc	23 Oct 2004 22:07:44 -0000	1.4
@@ -45,8 +45,8 @@
 	  }				\
 	  image {			\
 	      normal, "lcd_window.png"; \
+	      border, 9 9 14 10;		\
 	  }				\
-	  border, 9 9 14 10;		\
 	}				\
       }					\
       part {				\
@@ -69,8 +69,8 @@
 	  }				\
 	  image {			\
 	      normal, "v_scrollbar_base.png"; \
+	      border, 6 6 20 20;		\
 	  }				\
-	  border, 6 6 20 20;		\
 	}				\
       }					\
       part {				\

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/macros


Modified Files:
	macros.inc 


Log Message:
removed commas from argument lists
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/macros/macros.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- macros.inc	23 Oct 2004 20:47:06 -0000	1.3
+++ macros.inc	24 Oct 2004 01:26:03 -0000	1.4
@@ -77,7 +77,7 @@
         signal, "mouse,out";		\
         source, NAME;			\
         action, STATE_SET "default" 0.0;\
-        transition, DECELERATE, 0.5;	\
+        transition, DECELERATE 0.5;	\
         target, NAME;			\
       }					\
       program {				\
@@ -91,7 +91,7 @@
 	signal, "mouse,down,1";		\
 	source, NAME;			\
 	action, STATE_SET "down" 0.0;	\
-        transition, LINEAR, 0.0;	\
+        transition, LINEAR 0.0;	\
 	target, NAME;			\
       }					\
       program {				\
@@ -99,7 +99,7 @@
 	signal, "mouse,up,1";		\
 	source, NAME;			\
 	action, STATE_SET "over" 0.0;	\
-        transition, LINEAR, 0.0;	\
+        transition, LINEAR 0.0;	\
 	target, NAME;			\
       }					\
 
@@ -204,7 +204,7 @@
         signal, "mouse,in";		\
         source, NAME;			\
         action, STATE_SET "over" 0.0;	\
-        transition, DECELERATE, 0.25;	\
+        transition, DECELERATE 0.25;	\
         target, NAME;			\
       }					\
       program {				\
@@ -212,7 +212,7 @@
         signal, "mouse,out";		\
         source, NAME;			\
         action, STATE_SET "default" 0.0;\
-        transition, DECELERATE, 0.25;	\
+        transition, DECELERATE 0.25;	\
         target, NAME;			\
       }					\
       program {				\
@@ -226,7 +226,7 @@
 	signal, "mouse,down,1";		\
 	source, NAME;			\
 	action, STATE_SET "down" 0.0;	\
-        transition, LINEAR, 0.0;	\
+        transition, LINEAR 0.0;	\
 	target, NAME;			\
       }					\
       program {				\
@@ -234,7 +234,7 @@
 	signal, "mouse,up,1";		\
 	source, NAME;			\
 	action, STATE_SET "over" 0.0;	\
-        transition, LINEAR, 0.0;	\
+        transition, LINEAR 0.0;	\
 	target, NAME;			\
       }					\
 
@@ -319,7 +319,7 @@
         signal, "mouse,out";		\
         source, NAME;			\
         action, STATE_SET "default" 0.0;\
-        transition, DECELERATE, 0.5;	\
+        transition, DECELERATE 0.5;	\
         target, NAME;			\
       }					\
       program {				\
@@ -333,7 +333,7 @@
 	signal, "mouse,down,1";		\
 	source, NAME;			\
 	action, STATE_SET "down" 0.0;	\
-        transition, LINEAR, 0.0;	\
+        transition, LINEAR 0.0;	\
 	target, NAME;			\
       }					\
       program {				\
@@ -347,7 +347,7 @@
 	signal, "mouse,up,1";		\
 	source, NAME;			\
 	action, STATE_SET "over" 0.0;	\
-        transition, LINEAR, 0.0;	\
+        transition, LINEAR 0.0;	\
 	target, NAME;			\
       }					\

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/programs


Modified Files:
	playlist.edc 


Log Message:
removed commas from argument lists
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/programs/playlist.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- playlist.edc	22 Feb 2004 10:12:10 -0000	1.1
+++ playlist.edc	24 Oct 2004 01:26:03 -0000	1.2
@@ -3,7 +3,7 @@
 	signal, "mouse,up,1";		
 	source, "playlistOpenner";			
 	action, STATE_SET "open" 0.0;	
-        transition, DECELERATE, 0.5;	
+        transition, DECELERATE 0.5;	
 	target, "bottom";
 	target, "playlistOpenner";
 	target, "playlistCloser";
@@ -13,7 +13,7 @@
 	signal, "mouse,up,1";		
 	source, "playlistCloser";			
 	action, STATE_SET "default" 0.0;	
-        transition, DECELERATE, 0.5;	
+        transition, DECELERATE 0.5;	
 	target, "bottom";
 	target, "playlistOpenner";
 	target, "playlistCloser";

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/groups


Modified Files:
	euphoria.edc playlist_item.edc 


Log Message:
removed commas from argument lists
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/groups/euphoria.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- euphoria.edc	22 Feb 2004 10:12:08 -0000	1.1
+++ euphoria.edc	24 Oct 2004 01:26:02 -0000	1.2
@@ -1,7 +1,7 @@
     group {
         name, "euphoria";
-	min, 200, 300;
-	max, 99999, 99999;
+	min, 200 300;
+	max, 99999 99999;
 	parts {
 #include "../parts/main.edc"
 #include "../parts/playlist.edc"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/groups/playlist_item.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- playlist_item.edc	23 Oct 2004 16:16:46 -0000	1.2
+++ playlist_item.edc	24 Oct 2004 01:26:02 -0000	1.3
@@ -1,7 +1,7 @@
     group {
         name, "playlist_item";
-	min, 50, 15;
-	max, 9999, 15;
+	min, 50 15;
+	max, 9999 15;
 	parts {
             part {
               name, "bg";
@@ -115,7 +115,7 @@
 		signal, "PLAYLIST_ITEM_SELECTED";
 		source, "";
 		action, STATE_SET "selected" 0.0;
-		transition, DECELERATE, 0.5;
+		transition, DECELERATE 0.5;
 		target, "title";
 		target, "length";
 	    } 
@@ -124,7 +124,7 @@
 		signal, "PLAYLIST_ITEM_UNSELECTED";
 		source, "";
 		action, STATE_SET "default" 0.0;
-		transition, DECELERATE, 0.5;
+		transition, DECELERATE 0.5;
 		target, "title";
 		target, "length";
 	    }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/macros


Modified Files:
	vpanel.edc 


Log Message:
removed commas from argument lists
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/macros/vpanel.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- vpanel.edc	23 Oct 2004 22:07:44 -0000	1.4
+++ vpanel.edc	24 Oct 2004 01:28:04 -0000	1.5
@@ -286,7 +286,7 @@
         signal, "mouse,out";		\
         source, NAME"_back";		\
         action, STATE_SET "default" 0.0;\
-        transition, DECELERATE, 0.5;	\
+        transition, DECELERATE 0.5;	\
         target, NAME"_back";		\
       }					\
       program {				\
@@ -315,7 +315,7 @@
         signal, "mouse,out";		\
         source, NAME"_next";		\
         action, STATE_SET "default" 0.0;\
-        transition, DECELERATE, 0.5;	\
+        transition, DECELERATE 0.5;	\
         target, NAME"_next";		\
       }					\
       program {				\

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	controls_to.edc playlist.edc 


Log Message:
removed commas from argument lists
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/controls_to.edc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- controls_to.edc	23 Oct 2004 21:52:00 -0000	1.7
+++ controls_to.edc	24 Oct 2004 01:28:04 -0000	1.8
@@ -1,9 +1,9 @@
 program { 
 	name, "titlebar_click"; signal, "mouse,clicked,*"; source, BASE; 
-	action, SIGNAL_EMIT "RAISE", BASE; }
+	action, SIGNAL_EMIT "RAISE" BASE; }
 program {
 	name, "rslider_bar_click"; signal, "mouse,clicked,*"; source, "CenterClipArea"; 
-	action, SIGNAL_EMIT "RAISE", "CenterClipArea"; }
+	action, SIGNAL_EMIT "RAISE" "CenterClipArea"; }
 
 #define PB "PLAYBACK_STATE_"
 ///////////////////////////////////////////////////////////////////////
@@ -67,16 +67,16 @@
 // switch
 /*
 program { name, "switch_hi"; signal, "mouse,in"; source, "switch_stance";
-	action, STATE_SET "hilited" 0.0; transition, LINEAR, 0.1; target, "switch_stance";
+	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, "switch_stance";
 }
 program { name, "switch_unhilited"; signal, "mouse,out";  source, "switch_stance";
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, "switch_stance";
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, "switch_stance";
 }
 program { name, "switch_clicked"; signal, "mouse,down,*"; source, "switch_stance";
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 1.0; target, "switch_stance";
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 1.0; target, "switch_stance";
 }
 program { name, "switch_unclicked"; signal, "mouse,up,*"; source, "switch_stance";
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 1.0; target, "switch_stance";
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 1.0; target, "switch_stance";
 }
 program { name, "switch_exec"; signal,  "mouse,down,*"; source, "switch_stance";
 	action, SIGNAL_EMIT "SWITCH_GROUP" "alternate"; }
@@ -86,18 +86,18 @@
 #define PLAY "play_button"
 
 program { name, "play_hilited"; signal, "mouse,in"; source, PLAY;
-	action, STATE_SET "hilited" 0.0; transition, LINEAR, 0.1; target, PLAY;
+	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, PLAY;
 	after, "play_unhilited"; in, 0.15 0.0;
 }
 program { name, "play_unhilited"; signal, "mouse,out"; source, PLAY;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, PLAY;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, PLAY;
 }	
 program { name, "play_click"; signal, "mouse,down,*";source, PLAY;
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, PLAY;
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, PLAY;
 	after, "play_unclick"; in, 0.15 0.0;
 }	
 program { name, "play_unclick"; signal, "mouse,up,*"; source, PLAY;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, PLAY;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, PLAY;
 }
 program { name, "play_click_emission"; signal, "mouse,down,*"; source, PLAY;
 	action, SIGNAL_EMIT "PLAY" PLAY; }
@@ -105,18 +105,18 @@
 #define PREV "prev_button"
 
 program { name, "prev_button_hilited"; signal, "mouse,in"; source, PREV;
-	action, STATE_SET "hilited" 0.0; transition, LINEAR, 0.1; target, PREV;
+	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, PREV;
 	after, "prev_button_unhilited"; in, 0.15 0.0;
 }
 program { name, "prev_button_unhilited"; signal, "mouse,out"; source, PREV;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, PREV;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, PREV;
 }
 program { name, "prev_clicked"; signal, "mouse,down,*"; source, PREV;
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, PREV;
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, PREV;
 	after, "prev_unclicked"; in, 0.15 0.0;
 }
 program { name, "prev_unclicked"; signal, "mouse,up,*"; source, PREV;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, PREV;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, PREV;
 }
 program { name, "previous_click"; signal, "mouse,down,*"; source, PREV;
 	action, SIGNAL_EMIT "PLAY_PREVIOUS" PREV; }
@@ -124,18 +124,18 @@
 #define NEXT "next_button"
 
 program { name, "next_hilited"; signal, "mouse,in"; source, NEXT;
-	action, STATE_SET "hilited" 0.0; transition, LINEAR, 0.1; target, NEXT;
+	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, NEXT;
 	after, "next_unhilited"; in, 0.15 0.0;
 }
 program { name, "next_unhilited"; signal, "mouse,out"; source, NEXT;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, NEXT;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, NEXT;
 }
 program { name, "next_click"; signal, "mouse,down,*"; source, NEXT;
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, NEXT;
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, NEXT;
 	after, "next_unclick"; in, 0.15 0.0;
 }
 program { name, "next_unclick"; signal, "mouse,up,*"; source, NEXT;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, NEXT;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, NEXT;
 }
 program { name, "next_click_emission"; signal, "mouse,down,*"; source, NEXT;
 	action, SIGNAL_EMIT "PLAY_NEXT" NEXT; }
@@ -143,17 +143,17 @@
 #define PAUSE "pause_button"
 
 program { name, "pause_hilited"; signal, "mouse,in"; source, PAUSE;
-	action, STATE_SET "hilited" 0.0; transition, LINEAR, 0.1; target, PAUSE;
+	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, PAUSE;
 	after, "pause_unhilited"; in, 0.15 0.0;
 }
 program { name, "pause_unhilited"; signal, "mouse,out"; source, PAUSE;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, PAUSE;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, PAUSE;
 }
 program { name, "pause_click"; signal, "mouse,down,*"; source, PAUSE;
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, PAUSE;
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, PAUSE;
 }
 program { name, "pause_unclick"; signal, "mouse,up,*"; source, PAUSE;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, PAUSE;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, PAUSE;
 }
 program { name, "pause_click_emission"; signal, "mouse,down,*"; source, PAUSE;
 	action, SIGNAL_EMIT "PAUSE" PAUSE; }
@@ -161,18 +161,18 @@
 #define STOP "stop_button"
 
 program { name, "stop_hilited"; signal, "mouse,in"; source, STOP;
-	action, STATE_SET "hilited" 0.0; transition, LINEAR, 0.1; target, STOP;
+	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, STOP;
 	after, "stop_unhilited"; in, 0.15 0.0;
 } 
 program { name, "stop_unhilited"; signal, "mouse,out"; source, STOP;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, STOP;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, STOP;
 }	
 program { name, "stop_click"; signal, "mouse,down,*"; source, STOP;
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, STOP;
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, STOP;
 	after, "stop_unclick"; in, 0.15 0.0;
 }
 program { name, "stop_unclick"; signal, "mouse,up,*"; source, STOP;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, STOP;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, STOP;
 }
 program { name, "stop_click_emission"; signal, "mouse,down,*"; source, STOP;
 	action, SIGNAL_EMIT "STOP" STOP; }
@@ -183,46 +183,46 @@
 #define EDIT "edit_button"
 
 program { name, "addFile_hilited"; signal, "mouse,in"; source, ADD;
-	action, STATE_SET "hilited" 0.0; transition, LINEAR, 0.1; target, ADD;
+	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, ADD;
 }
 program { name, "addFile_unhilited"; signal, "mouse,out";  source, ADD;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, ADD;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, ADD;
 }
 program { name, "addFile_clicked"; signal, "mouse,down,1"; source, ADD;
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, ADD;
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, ADD;
 }
 program { name, "addFile_unclicked"; signal, "mouse,down"; source, ADD;
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, ADD;
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, ADD;
 }
 program { name, "AddFile"; signal,  "mouse,up,1"; source, ADD;
 	action, SIGNAL_EMIT "PLAYLIST_ADD" ADD; }
 //
 program { name, "deleteFile_hilited"; signal, "mouse,in"; source, DELETE;
-	action, STATE_SET "hilited" 0.0; transition, LINEAR, 0.1; target, DELETE;
+	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, DELETE;
 }
 program { name, "deleteFile_unhilited"; signal, "mouse,out";  source, DELETE;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, DELETE;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, DELETE;
 }
 program { name, "deleteFile_clicked"; signal, "mouse,down,1"; source, DELETE;
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, DELETE;
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, DELETE;
 }
 program { name, "deleteFile_unclicked"; signal, "mouse,down"; source, DELETE;
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, DELETE;
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, DELETE;
 }
 program { name, "deleteFile"; signal,  "mouse,up,1"; source, DELETE;
 	action, SIGNAL_EMIT "PLAYLIST_DEL" "*"; }
 //
 program { name, "editFile_hilited"; signal, "mouse,in"; source, EDIT;
-	action, STATE_SET "hilited" 0.0; transition, LINEAR, 0.1; target, EDIT;
+	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, EDIT;
 }
 program { name, "editFile_unhilited"; signal, "mouse,out";  source, EDIT;
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, EDIT;
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, EDIT;
 }
 program { name, "editFile_clicked"; signal, "mouse,down,1"; source, EDIT;
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, EDIT;
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, EDIT;
 }
 program { name, "editFile_unclicked"; signal, "mouse,down"; source, EDIT;
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 0.1; target, EDIT;
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, EDIT;
 }
 program { name, "editFile"; signal,  "mouse,up,1"; source, "*";
 	action, SIGNAL_EMIT "PLAYLIST_EDIT" EDIT; }
@@ -231,16 +231,16 @@
 // program: quit
 
 program { name, "quit_hilited"; signal, "mouse,in"; source, "quit";
-	action, STATE_SET "hilited" 0.0; transition, LINEAR, 0.1; target, "quit";
+	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, "quit";
 }
 program { name, "quit_unhilited"; signal, "mouse,out";  source, "quit";
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, "quit";
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, "quit";
 }
 program { name, "quit_clicked"; signal, "mouse,down,*"; source, "quit";
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 1.0; target, "quit";
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 1.0; target, "quit";
 }
 program { name, "quit_unclicked"; signal, "mouse,up,*"; source, "quit";
-	action, STATE_SET "clicked" 0.0; transition, LINEAR, 1.0; target, "quit";
+	action, STATE_SET "clicked" 0.0; transition, LINEAR 1.0; target, "quit";
 }
 program { name, "quit_exit"; signal,  "mouse,down,*"; source, "quit";
 	action, SIGNAL_EMIT "QUIT" "quit"; }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/playlist.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- playlist.edc	3 May 2004 03:16:35 -0000	1.5
+++ playlist.edc	24 Oct 2004 01:28:04 -0000	1.6
@@ -3,11 +3,11 @@
 	action, SIGNAL_EMIT "PLAYLIST_ITEM_SELECTED" ""; }
 
 program { name, "selected"; signal, "PLAYLIST_ITEM_SELECTED"; source, "";
-	action, STATE_SET "selected" 0.0; transition, LINEAR, 0.2; 
+	action, STATE_SET "selected" 0.0; transition, LINEAR 0.2; 
 	target, "title"; target, "length"; target, "background"; }
 
 program { name, "unselected"; signal, "PLAYLIST_ITEM_UNSELECTED"; source, "";
-	action, STATE_SET "default" 0.0; transition, LINEAR, 0.2; 
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.2; 
 	target, "title"; target, "length"; target, "background"; }
 
 program { name, "dbl_clicked"; signal, "mouse,down,1,double"; source, "*";

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/m4


Removed Files:
	.cvsignore Makefile.am ac_expand_dir.m4 ac_path_generic.m4 


Log Message:
removed old code

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/etc


Removed Files:
	.cvsignore Makefile.am 


Log Message:
removed old code

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Removed Files:
	INSTALL Makefile.am autogen.sh configure.ac 


Log Message:
removed old code

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Removed Files:
	.cvsignore Makefile.am callbacks.c callbacks.h euphoria.c 
	euphoria.h interface.c interface.h playlist.c playlist.h 
	playlist_item.c playlist_item.h utils.c utils.h 


Log Message:
removed old code

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data


Removed Files:
	Makefile.am README 


Log Message:
removed old code

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/lib added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin




Log Message:
Directory /cvsroot/enlightenment/e17/apps/euphoria/bin added to the repository

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Added Files:
	euphoria 


Log Message:
new code in. need to write a proper Make/Rakefile for installation etc. old themes need to be updated A LOT to work with this version (i.e., only multipass works atm)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Added Files:
	playback_status_handler.rb playlist.rb playlist_item.rb 
	playtime_updater.rb slider.rb 


Log Message:
new code in. need to write a proper Make/Rakefile for installation etc. old themes need to be updated A LOT to work with this version (i.e., only multipass works atm)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Added Files:
	Rakefile 


Log Message:
added Rakefile. run 'rake install' to install Euphoria

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	AUTHORS README 


Log Message:
documentation update
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- AUTHORS	22 Feb 2004 10:11:55 -0000	1.1
+++ AUTHORS	25 Apr 2005 12:27:21 -0000	1.2
@@ -1,8 +1 @@
-Owner:      Ben Rockwood <benr@...>
-Maintainer: Tilman Sauerbeck <tilman@...>
-            (ie: did most of the hard work)
-
-Other contributors:
-
-Brian Mattern <bmattern@...>
-DigitalFallout <digitalfallout@...>
+Tilman Sauerbeck (tilman at code-monkey de)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- README	27 May 2004 19:43:54 -0000	1.5
+++ README	25 Apr 2005 12:27:21 -0000	1.6
@@ -1,8 +1,8 @@
-$Id: README,v 1.5 2004/05/27 19:43:54 technikolor Exp $
+$Id: README,v 1.6 2005/04/25 12:27:21 tsauerbeck Exp $
 
 Euphoria v0.8.0
 
-Written by Ben Rockwood, Tilman Sauerbeck and various contributors.
+Written by Tilman Sauerbeck and various contributors.
 See AUTHORS for details/the complete list.
 
 
@@ -11,11 +11,13 @@
 
 Euphoria requires the following:
 
-EVAS CVS
-Ecore CVS with EVAS module
-Edje CVS
-Esmart CVS
-XMMS2 BK
+Evas
+Ecore
+Edje
+Esmart
+XMMS2
+Ruby-EFL
+Rake
 
 
 ABOUT
@@ -27,44 +29,13 @@
 INSTALLATION OF EUPHORIA & XMMS2
 --------------------------------
  
-To use build Euphoria you will need to first install XMMS2,
-to do so:
-1) Get the XMMS2 code from BitKeeper:
-	$ bk clone bk://genesis.xmms.se:5555/xmms2 
-2) Configure XMMS2. In the xmms2 top source directory run
-	the command: scons
-3) Build XMMS2. In the same directory run "scons" again.
-4) Install XMMS2.  In the same directory after the source
-	finished building use the command (probly as root):
-	# scons /usr/local
-	This assumes that you want to install in /usr/local,
-	change the patch accordingly.
-5) You must manually install the headers, do this by
-	copying the src/include/xmms and src/include/internal
-	directories to the proper header location (probly /usr/local/include)
-6) Done.  XMMS2 is ready to fly, start the daemon via "xmms2d"
-	and use the CLI interface with the "xmms2" command.
-
-Now you can build Euphoria.  Before you start make sure your
-EFL installation is current (Gentoo users only get updated
-every week, that may not be current enough).  If you have problems
-it is likely due to old EFL installs, remember this is live
-development code so even an hour can be too old.  Assuming
-everything has been done properly as outlined above Euphoria
-should build like you expect it to:
-1) Bootstrap the build enviroment using the command "./autogen.sh"
-2) Configure the build enviroment using "./configure".  Make sure
-	you look at the avalible build options ala "./configure --help"
-3) Build Euphoria ala "make".
-4) Install Euphoria ala "make install" as root most likely.
-	Note that Euphoria will not function if it is not installed.
+To use build Euphoria you will need to first install XMMS2.
+See http://wiki.xmms2.xmms.se for instructions.
 
+Now install Euphoria by running "rake install".
 
 At this point your ready to rock.  Start Euphoria but make sure
-the XMMS2 Daemon is running (start via: "xmms2d").  You may want
-to install the Euphoria config database by following the instructions
-in the following section (there is a sample/default euphoria.db in the etc/
-directory).
+the XMMS2 Daemon is running (start via: "xmms2d").
 
 RUNNING EUPHORIA
 ----------------

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	README 


Log Message:
multipass blurb
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- README	25 Apr 2005 12:27:21 -0000	1.6
+++ README	25 Apr 2005 12:30:53 -0000	1.7
@@ -1,4 +1,4 @@
-$Id: README,v 1.6 2005/04/25 12:27:21 tsauerbeck Exp $
+$Id: README,v 1.7 2005/04/25 12:30:53 tsauerbeck Exp $
 
 Euphoria v0.8.0
 
@@ -34,6 +34,18 @@
 
 Now install Euphoria by running "rake install".
 
+The only theme Euphoria currently works with is Multipass, which isn't
+shipped with the Euphoria sources.
+
+To build the Multipass theme:
+svn co http://code-monkey.de/svn/multipass-eu/trunk multipass-eu
+cd multipass-eu
+rake
+cp multipass.edj /usr/local/share/euphoria/themes
+
+If you didn't install Euphoria to /usr/local, you will have to change
+that path.
+
 At this point your ready to rock.  Start Euphoria but make sure
 the XMMS2 Daemon is running (start via: "xmms2d").

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	Rakefile 


Log Message:
create the libdir if it doesn't exist yet
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/Rakefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Rakefile	25 Apr 2005 12:19:40 -0000	1.1
+++ Rakefile	25 Apr 2005 15:29:25 -0000	1.2
@@ -1,4 +1,4 @@
-# $Id: Rakefile,v 1.1 2005/04/25 12:19:40 tsauerbeck Exp $
+# $Id: Rakefile,v 1.2 2005/04/25 15:29:25 tsauerbeck Exp $
 
 require "rbconfig"
 
@@ -11,5 +11,6 @@
 	FileUtils::Verbose.install("bin/euphoria", ddir, :mode => 0755)
 
 	ddir = destdir + sitelibdir + "/euphoria"
+	FileUtils::Verbose.mkdir(ddir) unless File.directory?(ddir)
 	FileUtils::Verbose.install(Dir["lib/*.rb"], ddir, :mode => 0644)
 end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playtime_updater.rb 


Log Message:
get current playtime in PlaytimeUpdater#initialize
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playtime_updater.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- playtime_updater.rb	24 Apr 2005 22:33:15 -0000	1.1
+++ playtime_updater.rb	25 Apr 2005 19:46:44 -0000	1.2
@@ -1,4 +1,4 @@
-# $Id: playtime_updater.rb,v 1.1 2005/04/24 22:33:15 tsauerbeck Exp $
+# $Id: playtime_updater.rb,v 1.2 2005/04/25 19:46:44 tsauerbeck Exp $
 
 class PlaytimeUpdater
 	INTERVAL = 0.5
@@ -7,6 +7,9 @@
 		@xmms = xmms
 		@block = block
 		@timer = nil
+		@current_pos = nil
+
+		on_timer
 	end
 
 	def enabled=(v)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	COPYING 


Log Message:
updated COPYING
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/COPYING,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- COPYING	22 Feb 2004 10:11:55 -0000	1.1
+++ COPYING	25 Apr 2005 21:50:55 -0000	1.2
@@ -1,4 +1,5 @@
-Copyright (C) 2003 Ben Rockwood and various contributors (see AUTHORS)
+Copyright (C) 2004 - 2005 Tilman Sauerbeck and various contributors
+                          (see AUTHORS)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
updated to new xmmsclient api
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- euphoria	24 Apr 2005 22:33:14 -0000	1.1
+++ euphoria	25 Apr 2005 21:52:30 -0000	1.2
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.1 2005/04/24 22:33:14 tsauerbeck Exp $
+# $Id: euphoria,v 1.2 2005/04/25 21:52:30 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -131,9 +131,8 @@
 	end
 
 	def init_xmms
-		@xmms = XmmsClient::XmmsClient.new
-
-		raise "xmms2d not running" unless @xmms.connect("Euphoria")
+		@xmms = XmmsClient::XmmsClient.new("Euphoria")
+		@xmms.connect
 		@xmms.setup_with_ecore
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
fixed a few potential crashes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- playlist.rb	24 Apr 2005 22:33:15 -0000	1.1
+++ playlist.rb	25 Apr 2005 21:53:28 -0000	1.2
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.1 2005/04/24 22:33:15 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.2 2005/04/25 21:53:28 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -19,7 +19,7 @@
 	end
 
 	def current_item
-		self[@current_pos]
+		@current_pos && self[@current_pos]
 	end
 
 	def show(eet)
@@ -82,7 +82,7 @@
 
 		each { |i| i.show(eet, @container) }
 
-		current_item.hilight
+		current_item && current_item.hilight
 	end
 
 	def <<(id)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
fixed a few potential crashes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- euphoria	25 Apr 2005 21:52:30 -0000	1.2
+++ euphoria	25 Apr 2005 21:53:28 -0000	1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.2 2005/04/25 21:52:30 tsauerbeck Exp $
+# $Id: euphoria,v 1.3 2005/04/25 21:53:28 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -282,8 +282,10 @@
 	end
 
 	def ui_fill_track_info(item)
-		buf = "%s - %s" % [item.artist, item.title]
-		@edje.send_message(Edje::StringMessage.new(buf))
+		unless item.nil?
+			buf = "%s - %s" % [item.artist, item.title]
+			@edje.send_message(Edje::StringMessage.new(buf))
+		end
 	end
 
 	def ui_refresh_time(time)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
more crash fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- playlist.rb	25 Apr 2005 21:53:28 -0000	1.2
+++ playlist.rb	25 Apr 2005 21:57:07 -0000	1.3
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.2 2005/04/25 21:53:28 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.3 2005/04/25 21:57:07 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -10,7 +10,12 @@
 		@ee = nil
 		@eet = nil
 		@container = nil
-		@current_pos = @xmms.playlist_current_pos.wait.value
+
+		begin
+			@current_pos = @xmms.playlist_current_pos.wait.value
+		rescue XmmsClient::ValueError
+			@current_pos = nil
+		end
 
 		@xmms.broadcast_playlist_current_pos.notifier do |res|
 			@current_pos = res.value

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
more crash fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- euphoria	25 Apr 2005 21:53:28 -0000	1.3
+++ euphoria	25 Apr 2005 21:57:06 -0000	1.4
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.3 2005/04/25 21:53:28 tsauerbeck Exp $
+# $Id: euphoria,v 1.4 2005/04/25 21:57:06 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -278,7 +278,12 @@
 =end
 
 	def handle_current_pos(res)
-		ui_fill_track_info(@playlist[res.value])
+		begin
+			pos = res.uint
+		rescue XmmsClient::ValueError
+		else
+			ui_fill_track_info(@playlist[pos])
+		end
 	end
 
 	def ui_fill_track_info(item)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
playlist is scrollable now
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- playlist.rb	25 Apr 2005 21:57:07 -0000	1.3
+++ playlist.rb	25 Apr 2005 21:58:26 -0000	1.4
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.3 2005/04/25 21:57:07 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.4 2005/04/25 21:58:26 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -85,6 +85,12 @@
 			@ee = nil
 		end
 
+		@edje.on_signal("drag", "playlist.scrollbar.handle") do
+			@container.scroll_percent =
+				@edje.part("playlist.scrollbar.handle").
+				get_drag_value.last
+		end
+
 		each { |i| i.show(eet, @container) }
 
 		current_item && current_item.hilight

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb playlist_item.rb 


Log Message:
don't try to hide a playlist item if it's not visible
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- playlist.rb	25 Apr 2005 21:58:26 -0000	1.4
+++ playlist.rb	26 Apr 2005 16:02:26 -0000	1.5
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.4 2005/04/25 21:58:26 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.5 2005/04/26 16:02:26 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -108,12 +108,12 @@
 			item = find { |i| i.id == item }
 		end
 
-		item.hide
+		item.hide if i.visible?
 		super(item)
 	end
 
 	def clear
-		each { |i| i.hide }
+		each { |i| i.hide if i.visible? }
 		super
 	end
 end
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- playlist_item.rb	24 Apr 2005 22:33:15 -0000	1.1
+++ playlist_item.rb	26 Apr 2005 16:02:27 -0000	1.2
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.1 2005/04/24 22:33:15 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.2 2005/04/26 16:02:27 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje
@@ -70,6 +70,12 @@
 		@edje.emit_signal("playlist_item.selected", "") unless @edje.nil?
 	end
 
+	def visible?
+		# since we don't actually hide the edje, but just delete it,
+		# we don't need to check @edje.visible? here
+		!@edje.nil?
+	end
+
 	def hide
 		@edje.delete
 		@edje = nil

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
added Playlist#push and made Playlist#<< call push
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- playlist.rb	26 Apr 2005 16:02:26 -0000	1.5
+++ playlist.rb	27 Apr 2005 18:03:04 -0000	1.6
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.5 2005/04/26 16:02:26 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.6 2005/04/27 18:03:04 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -97,10 +97,18 @@
 	end
 
 	def <<(id)
-		item = PlaylistItem.new(id, @xmms, self)
-		super(item)
+		push(id)
+	end
+
+	def push(*args)
+		args.each do |id|
+			item = PlaylistItem.new(id, @xmms, self)
+			super(item)
+
+			item.show(@eet, @container) unless @container.nil?
+		end
 
-		item.show(@eet, @container) unless @container.nil?
+		self
 	end
 
 	def delete(item)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
added Playlist#push and made Playlist#<< call push
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- euphoria	25 Apr 2005 21:57:06 -0000	1.4
+++ euphoria	27 Apr 2005 18:03:04 -0000	1.5
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.4 2005/04/25 21:57:06 tsauerbeck Exp $
+# $Id: euphoria,v 1.5 2005/04/27 18:03:04 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -225,9 +225,7 @@
 		end
 
 		@xmms.playlist_list.notifier do |res|
-			res.value.each do |id|
-				@playlist << id
-			end
+			@playlist.push(*res.value)
 		end
 
 		@xmms.broadcast_playlist_changed.notifier do |res|

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
update playlist entries on change
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- playlist.rb	27 Apr 2005 18:03:04 -0000	1.6
+++ playlist.rb	27 Apr 2005 20:05:14 -0000	1.7
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.6 2005/04/27 18:03:04 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.7 2005/04/27 20:05:14 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -21,6 +21,15 @@
 			@current_pos = res.value
 			current_item.hilight
 		end
+
+		@xmms.broadcast_medialib_entry_changed.notifier do |res|
+			@xmms.medialib_get_info(res.value).notifier do |res2|
+				props = res.value
+				find_all { |i| i.id == props[:id] }.each do |item|
+					item.properties = props
+				end
+			end
+		end
 	end
 
 	def current_item

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
move playlist_list and playlist_changed code to the playlist class
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- euphoria	27 Apr 2005 18:03:04 -0000	1.5
+++ euphoria	27 Apr 2005 20:09:17 -0000	1.6
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.5 2005/04/27 18:03:04 tsauerbeck Exp $
+# $Id: euphoria,v 1.6 2005/04/27 20:09:17 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -224,25 +224,6 @@
 			end
 		end
 
-		@xmms.playlist_list.notifier do |res|
-			@playlist.push(*res.value)
-		end
-
-		@xmms.broadcast_playlist_changed.notifier do |res|
-			type, id, arg = res.playlist_change
-
-			case type
-				when XmmsClient::Result::PLAYLIST_CHANGED_ADD
-					@playlist << id
-				when XmmsClient::Result::PLAYLIST_CHANGED_REMOVE
-					# the daemon sends the position of the song, not the
-					# unique mlib id
-					@playlist.delete(@playlist[id])
-				when XmmsClient::Result::PLAYLIST_CHANGED_CLEAR
-					@playlist.clear
-			end
-		end
-
 		@xmms.broadcast_playlist_current_pos.notifier do |res|
 			handle_current_pos(res)
 		end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
move playlist_list and playlist_changed code to the playlist class
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- playlist.rb	27 Apr 2005 20:05:14 -0000	1.7
+++ playlist.rb	27 Apr 2005 20:09:17 -0000	1.8
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.7 2005/04/27 20:05:14 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.8 2005/04/27 20:09:17 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -11,6 +11,8 @@
 		@eet = nil
 		@container = nil
 
+		@xmms.playlist_list.notifier { |res| push(*res.value) }
+
 		begin
 			@current_pos = @xmms.playlist_current_pos.wait.value
 		rescue XmmsClient::ValueError
@@ -22,6 +24,21 @@
 			current_item.hilight
 		end
 
+		@xmms.broadcast_playlist_changed.notifier do |res|
+			type, id, arg = res.playlist_change
+
+			case type
+				when XmmsClient::Result::PLAYLIST_CHANGED_ADD
+					self << id
+				when XmmsClient::Result::PLAYLIST_CHANGED_REMOVE
+					# the daemon sends the position of the song, not the
+					# unique mlib id
+					delete(self[id])
+				when XmmsClient::Result::PLAYLIST_CHANGED_CLEAR
+					clear
+			end
+		end
+
 		@xmms.broadcast_medialib_entry_changed.notifier do |res|
 			@xmms.medialib_get_info(res.value).notifier do |res2|
 				props = res.value

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
cleanups
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- euphoria	27 Apr 2005 20:09:17 -0000	1.6
+++ euphoria	27 Apr 2005 20:17:33 -0000	1.7
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.6 2005/04/27 20:09:17 tsauerbeck Exp $
+# $Id: euphoria,v 1.7 2005/04/27 20:17:33 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -295,13 +295,13 @@
 	end
 
 	def signal_playback_state
-		case @playback_state
+		sig = case @playback_state
 			when XmmsClient::XmmsClient::PAUSE
-				sig = "PLAYBACK_STATE_PAUSED"
+				"PLAYBACK_STATE_PAUSED"
 			when XmmsClient::XmmsClient::PLAY
-				sig = "PLAYBACK_STATE_PLAYING"
+				"PLAYBACK_STATE_PLAYING"
 			else
-				sig = "PLAYBACK_STATE_STOPPED"
+				"PLAYBACK_STATE_STOPPED"
 		end
 
 		@edje.emit_signal(sig, "Euphoria")

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playtime_updater.rb 


Log Message:
update playtime more often
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playtime_updater.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- playtime_updater.rb	25 Apr 2005 19:46:44 -0000	1.2
+++ playtime_updater.rb	27 Apr 2005 20:25:48 -0000	1.3
@@ -1,7 +1,7 @@
-# $Id: playtime_updater.rb,v 1.2 2005/04/25 19:46:44 tsauerbeck Exp $
+# $Id: playtime_updater.rb,v 1.3 2005/04/27 20:25:48 tsauerbeck Exp $
 
 class PlaytimeUpdater
-	INTERVAL = 0.5
+	INTERVAL = 0.25
 
 	def initialize(xmms, &block)
 		@xmms = xmms

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
tell the main window/app about playlist item updates
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- playlist.rb	27 Apr 2005 20:09:17 -0000	1.8
+++ playlist.rb	27 Apr 2005 20:28:33 -0000	1.9
@@ -1,12 +1,13 @@
-# $Id: playlist.rb,v 1.8 2005/04/27 20:09:17 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.9 2005/04/27 20:28:33 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
 class Playlist < Array
-	def initialize(xmms)
+	def initialize(xmms, on_cur_item_changed)
 		super()
 
 		@xmms = xmms
+		@on_cur_item_changed = on_cur_item_changed
 		@ee = nil
 		@eet = nil
 		@container = nil
@@ -44,6 +45,10 @@
 				props = res.value
 				find_all { |i| i.id == props[:id] }.each do |item|
 					item.properties = props
+
+					if current_item && current_item.id == item.id
+						@on_cur_item_changed.call(item)
+					end
 				end
 			end
 		end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
tell the main window/app about playlist item updates
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- euphoria	27 Apr 2005 20:17:33 -0000	1.7
+++ euphoria	27 Apr 2005 20:28:33 -0000	1.8
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.7 2005/04/27 20:17:33 tsauerbeck Exp $
+# $Id: euphoria,v 1.8 2005/04/27 20:28:33 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -36,7 +36,8 @@
 		init_xmms
 		init_gui
 
-		@playlist = Playlist.new(@xmms)
+		blk = lambda { |item| ui_fill_track_info(item) }
+		@playlist = Playlist.new(@xmms, blk)
 
 		setup_callbacks
 
@@ -227,34 +228,7 @@
 		@xmms.broadcast_playlist_current_pos.notifier do |res|
 			handle_current_pos(res)
 		end
-
-=begin
-		@xmms.broadcast_medialib_entry_changed.notifier do |res|
-			@xmms.medialib_get_info(res.uint).notifier do |res2|
-				on_mlib_info(res2)
-			end
-		end
-=end
-	end
-
-=begin
-	def on_mlib_info(res)
-		props = res.value
-
-		id = props[:id].to_i
-
-		item = @playlist[id]
-		unless item.nil?
-			item.properties = props
-
-			# hack: if this item is current item,
-			#       refresh the edje parts
-			if item == @playlist.current_item
-				ui_fill_track_info(item)
-			end
-		end
 	end
-=end
 
 	def handle_current_pos(res)
 		begin

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
how the FUCK could that have worked?
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- playlist.rb	27 Apr 2005 20:28:33 -0000	1.9
+++ playlist.rb	27 Apr 2005 20:38:15 -0000	1.10
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.9 2005/04/27 20:28:33 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.10 2005/04/27 20:38:15 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -42,7 +42,7 @@
 
 		@xmms.broadcast_medialib_entry_changed.notifier do |res|
 			@xmms.medialib_get_info(res.value).notifier do |res2|
-				props = res.value
+				props = res2.value
 				find_all { |i| i.id == props[:id] }.each do |item|
 					item.properties = props

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
look for themes in ~/.e/apps/euphoria/themes again
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- euphoria	27 Apr 2005 20:28:33 -0000	1.8
+++ euphoria	27 Apr 2005 22:44:06 -0000	1.9
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.8 2005/04/27 20:28:33 tsauerbeck Exp $
+# $Id: euphoria,v 1.9 2005/04/27 22:44:06 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -282,7 +282,13 @@
 	end
 
 	def find_theme(name)
-		DATA_DIR + "/themes/#{name}.edj"
+		dirs = [File.expand_path("~/.e/apps/euphoria"), DATA_DIR]
+		dirs.each do |dir|
+			tmp = File.join(dir, "/themes/#{name}.edj")
+			return tmp if File.exist?(tmp)
+		end
+
+		nil
 	end
 end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	README 


Log Message:
document re-enabled homedirthemethingblah
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/README,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- README	25 Apr 2005 12:30:53 -0000	1.7
+++ README	27 Apr 2005 22:45:40 -0000	1.8
@@ -1,4 +1,4 @@
-$Id: README,v 1.7 2005/04/25 12:30:53 tsauerbeck Exp $
+$Id: README,v 1.8 2005/04/27 22:45:40 tsauerbeck Exp $
 
 Euphoria v0.8.0
 
@@ -44,7 +44,8 @@
 cp multipass.edj /usr/local/share/euphoria/themes
 
 If you didn't install Euphoria to /usr/local, you will have to change
-that path.
+that path, or you can copy the edj file to ~/.e/apps/euphoria/themes
+instead.
 
 At this point your ready to rock.  Start Euphoria but make sure
 the XMMS2 Daemon is running (start via: "xmms2d").

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/parts


Modified Files:
	playlist.edc 


Log Message:
playlist -> playlist.container
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/parts/playlist.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- playlist.edc	23 Oct 2004 16:16:46 -0000	1.2
+++ playlist.edc	28 Apr 2005 07:17:39 -0000	1.3
@@ -22,8 +22,8 @@
 	    } //part
 
 	    part {
-	        name, "playlist";
-		type, RECT;
+	        name, "playlist.container";
+		type, SWALLOW;
 		mouse_events, 1;
 		repeat_events, 1;
 		clip_to, "playlistClip";
@@ -54,12 +54,12 @@
 	        state, "default" 0.0;
 		color, 0 0 0 0;
 	        rel1 {
-  	          to, "playlist";
+  	          to, "playlist.container";
 		  relative, 0 0;
 		  offset, 0 0;
 		}
 		rel2 {
-  	          to, "playlist";
+  	          to, "playlist.container";
 		  relative, 1 1;
 		  offset, -1 -1;
 		}

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/groups


Modified Files:
	euphoria.edc 


Log Message:
main window is shaped
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/groups/euphoria.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- euphoria.edc	24 Oct 2004 01:26:02 -0000	1.2
+++ euphoria.edc	28 Apr 2005 07:46:23 -0000	1.3
@@ -2,6 +2,11 @@
         name, "euphoria";
 	min, 200 300;
 	max, 99999 99999;
+
+	data {
+		item, "shaped" "hell yeah";
+	}
+
 	parts {
 #include "../parts/main.edc"
 #include "../parts/playlist.edc"

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/groups


Modified Files:
	playlist_item.edc 


Log Message:
length -> duration
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/groups/playlist_item.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- playlist_item.edc	24 Oct 2004 01:26:02 -0000	1.3
+++ playlist_item.edc	28 Apr 2005 07:46:48 -0000	1.4
@@ -25,7 +25,7 @@
 			offset, 5 0;
 		    }
 		    rel2 {
-		        to_x, "length";
+		        to_x, "duration";
 		        relative, 0.0 1.0;
 			offset, -5 0;
 		    }
@@ -44,7 +44,7 @@
 			offset, 5 0;
 		    }
 		    rel2 {
-		        to_x, "length";
+		        to_x, "duration";
 		        relative, 0.0 1.0;
 			offset, -5 0;
 		    }
@@ -57,7 +57,7 @@
 		}
 	    } //part
 	    part {
-	        name, "length";
+	        name, "duration";
 		type, TEXT;
 		mouse_events, 1;
 		description {
@@ -117,7 +117,7 @@
 		action, STATE_SET "selected" 0.0;
 		transition, DECELERATE 0.5;
 		target, "title";
-		target, "length";
+		target, "duration";
 	    } 
 	    program {
 	        name, "unselected";
@@ -126,7 +126,7 @@
 		action, STATE_SET "default" 0.0;
 		transition, DECELERATE 0.5;
 		target, "title";
-		target, "length";
+		target, "duration";
 	    } 
 	    program {
 	        name, "play_it";

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/programs


Modified Files:
	buttons.edc 


Log Message:
QUIT -> close
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/programs/buttons.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- buttons.edc	22 Feb 2004 10:12:10 -0000	1.1
+++ buttons.edc	28 Apr 2005 08:09:54 -0000	1.2
@@ -10,7 +10,7 @@
 
 
 BUTTON_PROG("pl", "")
-BUTTON_PROG("x", "QUIT")
+BUTTON_PROG("x", "close")
 
 
 BUTTON_PROG("plus", "PLAYLIST_ADD")

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/streamline


Modified Files:
	streamline_small_progs.edc 


Log Message:
QUIT -> close
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/streamline/streamline_small_progs.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- streamline_small_progs.edc	30 Oct 2004 03:15:59 -0000	1.3
+++ streamline_small_progs.edc	28 Apr 2005 08:09:53 -0000	1.4
@@ -122,7 +122,7 @@
                                 name,       "quit_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "quit_button";
-                                action,     SIGNAL_EMIT "QUIT" "quit";
+                                action,     SIGNAL_EMIT "close" "quit";
                         }
                         /* Volume Button Proggies */
                         /* Raise Volume */

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/default


Modified Files:
	default_progs.edc default_small_progs.edc 


Log Message:
QUIT -> close
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/default/default_progs.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- default_progs.edc	30 Oct 2004 03:15:58 -0000	1.3
+++ default_progs.edc	28 Apr 2005 08:09:53 -0000	1.4
@@ -22,7 +22,7 @@
                                 name, "quit_button_click";
                                 signal, "mouse,clicked,1";
                                 source, "quit";
-                                action, SIGNAL_EMIT "QUIT" "quit";
+                                action, SIGNAL_EMIT "close" "quit";
                         }
 
                         /* switch to "small" mode */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/default/default_small_progs.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- default_small_progs.edc	30 Oct 2004 03:15:58 -0000	1.3
+++ default_small_progs.edc	28 Apr 2005 08:09:53 -0000	1.4
@@ -123,7 +123,7 @@
                                 name,       "quit_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "quit_button";
-                                action,     SIGNAL_EMIT "QUIT" "quit";
+                                action,     SIGNAL_EMIT "close" "quit";
                         }
                         /* Volume Button Proggies */
                         /* Raise Volume */

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	controls_to.edc switch.edc 


Log Message:
QUIT -> close
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/controls_to.edc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- controls_to.edc	24 Oct 2004 01:28:04 -0000	1.8
+++ controls_to.edc	28 Apr 2005 08:09:53 -0000	1.9
@@ -243,4 +243,4 @@
 	action, STATE_SET "clicked" 0.0; transition, LINEAR 1.0; target, "quit";
 }
 program { name, "quit_exit"; signal,  "mouse,down,*"; source, "quit";
-	action, SIGNAL_EMIT "QUIT" "quit"; }
+	action, SIGNAL_EMIT "close" "quit"; }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/switch.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- switch.edc	3 May 2004 03:16:37 -0000	1.3
+++ switch.edc	28 Apr 2005 08:09:53 -0000	1.4
@@ -138,5 +138,5 @@
 	action, STATE_SET "clicked" 0.0; transition, LINEAR, 1.0; target, "_quit";
 }
 program { name, "_quit_exit"; signal, "mouse,down,1"; source, "_quit";
-	action, SIGNAL_EMIT "QUIT" "quit";
+	action, SIGNAL_EMIT "close" "quit";
 }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
theme compat work
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- playlist.rb	27 Apr 2005 20:38:15 -0000	1.10
+++ playlist.rb	28 Apr 2005 08:17:45 -0000	1.11
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.10 2005/04/27 20:38:15 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.11 2005/04/28 08:17:45 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -58,46 +58,19 @@
 		@current_pos && self[@current_pos]
 	end
 
-	def show(eet)
+	def show(eet, is_separate)
 		return unless @ee.nil?
 
 		@eet = eet
-		@ee = Ecore::Evas::SoftwareX11.new
-		@ee.title = "Euphoria Playlist"
-		@ee.borderless = true
-
-		@ee.on_pre_render { Edje::thaw }
-		@ee.on_post_render { Edje::freeze }
-
-		@ee.on_resize do
-			x, y, w, h = @ee.geometry
 
-			@edje.resize(w, h)
-			@dragger.resize(w, h)
+		if is_separate
+			setup_ee
+		else
+			@ee = Euphoria.instance.ee
+			@edje = Euphoria.instance.edje
 		end
 
-		@dragger = Esmart::Draggies.new(@ee)
-		@dragger.name = "dragger"
-		@dragger.button = 1
-		@dragger.show
-
-		@edje = Edje::Edje.new(@ee.evas)
-		@edje.load(eet, "playlist")
-		@edje.name = "edje"
-		@edje.show
-
-		w, h = @edje.get_size_max
-		@ee.set_size_max(w, h)
-
-		w, h = @edje.get_size_min
-		@ee.set_size_min(w, h)
-
-		@ee.resize(w, h)
-		@ee.show
-
-		@ee.shaped = !@edje.data("shaped").nil?
-
-		@container = Esmart::Container.new(@ee.evas)
+		@container = Esmart::Container.new(@edje.evas)
 		@container.name = "playlist"
 		@container.direction = Esmart::Container::VERTICAL
 		@container.spacing = 0
@@ -106,14 +79,16 @@
 
 		@edje.part("playlist.container").swallow(@container)
 
-		@edje.on_signal("close") do
-			each { |i| i.hide }
-
-			@edje = nil
-			@container = nil
-			@dragger = nil
-			@ee.delete
-			@ee = nil
+		if is_separate
+			@edje.on_signal("close") do
+				each { |i| i.hide }
+
+				@edje = nil
+				@container = nil
+				@dragger = nil
+				@ee.delete
+				@ee = nil
+			end
 		end
 
 		@edje.on_signal("drag", "playlist.scrollbar.handle") do
@@ -155,4 +130,42 @@
 		each { |i| i.hide if i.visible? }
 		super
 	end
+
+	private
+	def setup_ee
+		@ee = Ecore::Evas::SoftwareX11.new
+		@ee.title = "Euphoria Playlist"
+		@ee.borderless = true
+
+		@ee.on_pre_render { Edje::thaw }
+		@ee.on_post_render { Edje::freeze }
+
+		@ee.on_resize do
+			x, y, w, h = @ee.geometry
+
+			@edje.resize(w, h)
+			@dragger.resize(w, h)
+		end
+
+		@dragger = Esmart::Draggies.new(@ee)
+		@dragger.name = "dragger"
+		@dragger.button = 1
+		@dragger.show
+
+		@edje = Edje::Edje.new(@ee.evas)
+		@edje.load(@eet, "playlist")
+		@edje.name = "edje"
+		@edje.show
+
+		w, h = @edje.get_size_max
+		@ee.set_size_max(w, h)
+
+		w, h = @edje.get_size_min
+		@ee.set_size_min(w, h)
+
+		@ee.resize(w, h)
+		@ee.show
+
+		@ee.shaped = !@edje.data("shaped").nil?
+	end
 end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
theme compat work
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- euphoria	27 Apr 2005 22:44:06 -0000	1.9
+++ euphoria	28 Apr 2005 08:17:45 -0000	1.10
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.9 2005/04/27 22:44:06 tsauerbeck Exp $
+# $Id: euphoria,v 1.10 2005/04/28 08:17:45 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -23,7 +23,7 @@
 
 	include Singleton
 
-	attr_reader :xmms, :edje
+	attr_reader :xmms, :ee, :edje
 
 	def initialize
 		@edje = nil
@@ -85,6 +85,14 @@
 		handle_current_pos(@xmms.playlist_current_pos.wait)
 	end
 
+	def show
+		if @edje.data("has_separate_playlist").nil?
+			@playlist.show(@theme, false)
+		end
+
+		@ee.show
+	end
+
 private
 	def init_gui
 		@ee = Ecore::Evas::SoftwareX11.new
@@ -124,7 +132,6 @@
 		@ee.set_size_min(w, h)
 
 		@ee.resize(w, h)
-		@ee.show
 
 		@ee.shaped = !@edje.data("shaped").nil?
 
@@ -196,7 +203,7 @@
 			puts source
 		end
 
-		@edje.on_signal("playlist.open") { @playlist.show(@theme) }
+		@edje.on_signal("playlist.open") { @playlist.show(@theme, true) }
 
 		@edje.on_signal("TOGGLE_REPEAT_MODE") do |sig, source|
 			# don't react on our own emission
@@ -293,4 +300,5 @@
 end
 
 $x = Euphoria.instance
+Euphoria.instance.show
 Ecore::main_loop_begin

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	Rakefile 


Log Message:
theme compat work
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/Rakefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Rakefile	25 Apr 2005 15:29:25 -0000	1.2
+++ Rakefile	28 Apr 2005 08:17:45 -0000	1.3
@@ -1,4 +1,4 @@
-# $Id: Rakefile,v 1.2 2005/04/25 15:29:25 tsauerbeck Exp $
+# $Id: Rakefile,v 1.3 2005/04/28 08:17:45 tsauerbeck Exp $
 
 require "rbconfig"
 
@@ -6,6 +6,19 @@
 destdir = "#{ENV["DESTDIR"]}"
 prefix = ENV["PREFIX"] || "/usr/local"
 
+themes = ["default", "iio", "streamline", "winter"].map do |t|
+	"data/themes/#{t}/#{t}.edj"
+end
+
+task :themes => themes
+
+rule ".edj" => [".edc"] do |t|
+	Dir.chdir(File.dirname(t.source)) do
+		sh "edje_cc -id img -id images " +
+		   "-fd ../../fonts -fd fonts #{File.basename(t.source)}"
+	end
+end
+
 task :install do |t|
 	ddir = destdir + prefix + "/bin"
 	FileUtils::Verbose.install("bin/euphoria", ddir, :mode => 0755)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/collections


Modified Files:
	base_to.edc playlist.edc 


Log Message:
length -> duration. playlist -> playlist.container
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/base_to.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- base_to.edc	23 Oct 2004 22:07:44 -0000	1.6
+++ base_to.edc	28 Apr 2005 08:33:14 -0000	1.7
@@ -339,7 +339,7 @@
 	rel1 { to, RIGHT"lcd"; relative, 0 1; offset, 8 0; }
 	rel2 { to, RIGHT"border"; relative, 0 0; offset, -8 -1; } } }
 
-	part { name, "playlist"; type, RECT; mouse_events, 1; repeat_events, 1; clip_to, "playlistPanel";
+	part { name, "playlist.container"; type, RECT; mouse_events, 1; repeat_events, 1; clip_to, "playlistPanel";
 	description { state, "default" 0.0; min, 0 62; max, 120 62;
 	rel1 { to, "playlistPanel"; relative, 0.0 0.0; offset, 0 -10; }
 	rel2 { to, "playlistPanel"; relative, 1.0 1.0; offset, 0 1; }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/playlist.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- playlist.edc	23 Oct 2004 21:51:59 -0000	1.6
+++ playlist.edc	28 Apr 2005 08:33:23 -0000	1.7
@@ -17,7 +17,7 @@
 	rel2 { to, BG; relative, 1.0 1.0; offset, -25 2; } 
 	text { text, "title"; font, "Edje.visitor1"; size, 9; align, 0.0 0.0; } } }
 //	
-	part { name, "length"; type, TEXT; mouse_events, 1;
+	part { name, "duration"; type, TEXT; mouse_events, 1;
 	description { state, "default" 0.0; color,  31 31 55 128;
 	text { text, "00:00"; font, "Edje.visitor1"; size, 9; align, 1.0 1.0; } }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	playlist.edc 


Log Message:
length -> duration. playlist -> playlist.container
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/playlist.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- playlist.edc	24 Oct 2004 01:28:04 -0000	1.6
+++ playlist.edc	28 Apr 2005 08:33:24 -0000	1.7
@@ -4,11 +4,11 @@
 
 program { name, "selected"; signal, "PLAYLIST_ITEM_SELECTED"; source, "";
 	action, STATE_SET "selected" 0.0; transition, LINEAR 0.2; 
-	target, "title"; target, "length"; target, "background"; }
+	target, "title"; target, "duration"; target, "background"; }
 
 program { name, "unselected"; signal, "PLAYLIST_ITEM_UNSELECTED"; source, "";
 	action, STATE_SET "default" 0.0; transition, LINEAR 0.2; 
-	target, "title"; target, "length"; target, "background"; }
+	target, "title"; target, "duration"; target, "background"; }
 
 program { name, "dbl_clicked"; signal, "mouse,down,1,double"; source, "*";
 	action, SIGNAL_EMIT "PLAYLIST_ITEM_PLAY" ""; }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
cfg/misc path changed from ~/.e/apps/euphoria to ~/.xmms2/clients/euphoria
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- euphoria	28 Apr 2005 08:17:45 -0000	1.10
+++ euphoria	28 Apr 2005 10:50:18 -0000	1.11
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.10 2005/04/28 08:17:45 tsauerbeck Exp $
+# $Id: euphoria,v 1.11 2005/04/28 10:50:18 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -289,7 +289,7 @@
 	end
 
 	def find_theme(name)
-		dirs = [File.expand_path("~/.e/apps/euphoria"), DATA_DIR]
+		dirs = [File.expand_path("~/.xmms2/clients/euphoria"), DATA_DIR]
 		dirs.each do |dir|
 			tmp = File.join(dir, "/themes/#{name}.edj")
 			return tmp if File.exist?(tmp)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
config file added
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- euphoria	28 Apr 2005 10:50:18 -0000	1.11
+++ euphoria	28 Apr 2005 11:04:38 -0000	1.12
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.11 2005/04/28 10:50:18 tsauerbeck Exp $
+# $Id: euphoria,v 1.12 2005/04/28 11:04:38 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -11,6 +11,7 @@
 require "esmart_container"
 require "xmmsclient"
 require "singleton"
+require "yaml"
 
 require "euphoria/playlist"
 require "euphoria/playlist_item"
@@ -18,6 +19,8 @@
 require "euphoria/playtime_updater"
 require "euphoria/playback_status_handler"
 
+Config = Struct.new("Config", :ipc_path, :theme)
+
 class Euphoria
 	DATA_DIR = "/usr/local/share/euphoria"
 
@@ -30,9 +33,10 @@
 		@xmms = nil
 
 		# settings
-		@time_display_elapsed = true
-		@theme_name = "multipass"
+		@config_file =
+			File.expand_path("~/.xmms2/clients/euphoria/config.yaml")
 
+		load_config
 		init_xmms
 		init_gui
 
@@ -93,6 +97,10 @@
 		@ee.show
 	end
 
+	def save_config
+		File.open(@config_file, "w") { |fo| YAML.dump(@config, fo) }
+	end
+
 private
 	def init_gui
 		@ee = Ecore::Evas::SoftwareX11.new
@@ -117,8 +125,8 @@
 		@dragger.button = 1
 		@dragger.show
 
-		@theme = find_theme(@theme_name)
-		raise "Cannot find theme - #{edj}" if @theme.nil?
+		@theme = find_theme(@config.theme)
+		raise "Cannot find theme - #{@config.theme}" if @theme.nil?
 
 		@edje = Edje::Edje.new(@ee.evas)
 		@edje.load(@theme, "euphoria")
@@ -140,7 +148,7 @@
 
 	def init_xmms
 		@xmms = XmmsClient::XmmsClient.new("Euphoria")
-		@xmms.connect
+		@xmms.connect(@config.ipc_path)
 		@xmms.setup_with_ecore
 	end
 
@@ -196,7 +204,7 @@
 		end
 
 		@edje.on_signal("TOGGLE_TIME_DISPLAY_MODE") do
-			@time_display_elapsed = !@time_display_elapsed
+			@config.time_display_elapsed = !@config.time_display_elapsed
 		end
 
 		@edje.on_signal("DEBUG") do |sig, source|
@@ -258,7 +266,7 @@
 
 		fmt = "%i:%02i"
 
-		unless @time_display_elapsed
+		unless @config.time_display_elapsed
 			time = @playlist.current_item.duration - time
 			fmt = "-" + fmt
 		end
@@ -288,6 +296,21 @@
 		@edje.emit_signal(sig, "Euphoria")
 	end
 
+	def load_config
+		@config = nil
+
+		if File.exist?(@config_file)
+			File.open(@config_file) { |fo| @config = YAML.load(fo) }
+		end
+
+		if @config.nil? || !@config.is_a?(Config)
+			@config = Config.new
+			@config.ipc_path = nil
+			@config.theme = "multipass"
+			@config.time_display_elapsed = true
+		end
+	end
+
 	def find_theme(name)
 		dirs = [File.expand_path("~/.xmms2/clients/euphoria"), DATA_DIR]
 		dirs.each do |dir|
@@ -302,3 +325,4 @@
 $x = Euphoria.instance
 Euphoria.instance.show
 Ecore::main_loop_begin
+Euphoria.instance.save_config

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
init time_display_elapsed cfgval
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- euphoria	28 Apr 2005 11:04:38 -0000	1.12
+++ euphoria	28 Apr 2005 11:27:38 -0000	1.13
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.12 2005/04/28 11:04:38 tsauerbeck Exp $
+# $Id: euphoria,v 1.13 2005/04/28 11:27:38 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -19,7 +19,7 @@
 require "euphoria/playtime_updater"
 require "euphoria/playback_status_handler"
 
-Config = Struct.new("Config", :ipc_path, :theme)
+Config = Struct.new("Config", :ipc_path, :theme, :time_display_elapsed)
 
 class Euphoria
 	DATA_DIR = "/usr/local/share/euphoria"

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
updated to slightly changed ruby-edje api
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- euphoria	28 Apr 2005 11:27:38 -0000	1.13
+++ euphoria	28 Apr 2005 15:40:46 -0000	1.14
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.13 2005/04/28 11:27:38 tsauerbeck Exp $
+# $Id: euphoria,v 1.14 2005/04/28 15:40:46 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -257,7 +257,7 @@
 	def ui_fill_track_info(item)
 		unless item.nil?
 			buf = "%s - %s" % [item.artist, item.title]
-			@edje.send_message(Edje::StringMessage.new(buf))
+			@edje.send_message(Edje::Message.new(buf))
 		end
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
artist and title are now set separately. make sure to update multipass, too
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- euphoria	28 Apr 2005 15:40:46 -0000	1.14
+++ euphoria	29 Apr 2005 14:32:31 -0000	1.15
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.14 2005/04/28 15:40:46 tsauerbeck Exp $
+# $Id: euphoria,v 1.15 2005/04/29 14:32:31 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -256,8 +256,8 @@
 
 	def ui_fill_track_info(item)
 		unless item.nil?
-			buf = "%s - %s" % [item.artist, item.title]
-			@edje.send_message(Edje::Message.new(buf))
+			msg = Edje::Message.new(0, item.artist, item.title)
+			@edje.send_message(msg)
 		end
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
send album, too
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- euphoria	29 Apr 2005 14:32:31 -0000	1.15
+++ euphoria	29 Apr 2005 16:34:05 -0000	1.16
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.15 2005/04/29 14:32:31 tsauerbeck Exp $
+# $Id: euphoria,v 1.16 2005/04/29 16:34:05 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -256,7 +256,7 @@
 
 	def ui_fill_track_info(item)
 		unless item.nil?
-			msg = Edje::Message.new(0, item.artist, item.title)
+			msg = Edje::Message.new(0, item.artist, item.title, item.album)
 			@edje.send_message(msg)
 		end
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes


Added Files:
	common.inc 


Log Message:
winter supports the SET_SONGNAME message now

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/groups


Modified Files:
	euphoria.edc 


Log Message:
winter supports the SET_SONGNAME message now
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/groups/euphoria.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- euphoria.edc	28 Apr 2005 07:46:23 -0000	1.3
+++ euphoria.edc	29 Apr 2005 16:52:23 -0000	1.4
@@ -7,6 +7,29 @@
 		item, "shaped" "hell yeah";
 	}
 
+	script {
+		public message (Msg_Type:type, id, ...)
+		{
+			switch (id) {
+				case MSG_ID_SET_SONGNAME: {
+					new buf[128];
+
+					if (type != MSG_STRING_SET || numargs () < 5)
+						return;
+
+					getsarg (2, buf, 128);
+					set_text (PART:"artist_name", buf);
+
+					getsarg (3, buf, 128);
+					set_text (PART:"song_name", buf);
+
+					getsarg (4, buf, 128);
+					set_text (PART:"album_name", buf);
+				}
+			}
+		}
+	}
+
 	parts {
 #include "../parts/main.edc"
 #include "../parts/playlist.edc"

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter


Modified Files:
	winter.edc 


Log Message:
winter supports the SET_SONGNAME message now
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/winter.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- winter.edc	7 Mar 2004 18:15:28 -0000	1.2
+++ winter.edc	29 Apr 2005 16:52:23 -0000	1.3
@@ -4,6 +4,8 @@
 
 #define WINTER_COLOR WINTER_BLUE
 
+#include "../common.inc"
+
 #include "macros/macros.inc"
 #include "macros/toggle.inc"

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio


Modified Files:
	iio.edc 


Log Message:
iio supports the SET_SONGNAME message now
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/iio.edc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- iio.edc	26 Aug 2004 01:00:06 -0000	1.10
+++ iio.edc	29 Apr 2005 16:59:47 -0000	1.11
@@ -1,3 +1,5 @@
+#include "../common.inc"
+
 #include "macros/vpanel.edc"
 #include "macros/fd_entity.edc"
 
@@ -19,6 +21,30 @@
 
 	collections { 
 	group { name, "euphoria"; min, 413 94; max, 413 94;
+
+	script {
+		public message (Msg_Type:type, id, ...)
+		{
+			switch (id) {
+				case MSG_ID_SET_SONGNAME: {
+					new buf[128];
+
+					if (type != MSG_STRING_SET || numargs () < 5)
+						return;
+
+					getsarg (2, buf, 128);
+					set_text (PART:"artist_name", buf);
+
+					getsarg (3, buf, 128);
+					set_text (PART:"song_name", buf);
+
+					getsarg (4, buf, 128);
+					set_text (PART:"album_name", buf);
+				}
+			}
+		}
+	}
+
 	    parts { 
 #include "collections/base_to.edc" 
 	    }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/collections


Modified Files:
	base_to.edc 


Log Message:
fixed time display for winter and iio
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/collections/base_to.edc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- base_to.edc	28 Apr 2005 08:33:14 -0000	1.7
+++ base_to.edc	30 Apr 2005 13:41:59 -0000	1.8
@@ -243,7 +243,7 @@
 	image { normal, "h_arrow.png"; }
 	fill { smooth, 1; } } }
 
-	part { name, "time_text"; type, TEXT; mouse_events, 0; clip_to, "trans_Rect";	                  
+	part { name, "player.time"; type, TEXT; mouse_events, 0; clip_to, "trans_Rect";	                  
 	description { state, "default" 0.0; visible, 1;
 	rel1 { to, "trans_Rect"; relative, 0 0; offset, 10 14; }
 	rel2 { to, "trans_Rect"; relative, 0.5 0; offset, 0 0; }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/parts


Modified Files:
	text.edc 


Log Message:
fixed time display for winter and iio
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/parts/text.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- text.edc	23 Oct 2004 16:16:46 -0000	1.2
+++ text.edc	30 Apr 2005 13:41:59 -0000	1.3
@@ -83,7 +83,7 @@
       } //part
 
       part {
-        name, "time_text";
+        name, "player.time";
 	type, TEXT;
 	mouse_events, 1;
 	description {

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	README 


Log Message:
documentation fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- README	27 Apr 2005 22:45:40 -0000	1.8
+++ README	2 May 2005 11:47:52 -0000	1.9
@@ -1,4 +1,4 @@
-$Id: README,v 1.8 2005/04/27 22:45:40 tsauerbeck Exp $
+$Id: README,v 1.9 2005/05/02 11:47:52 tsauerbeck Exp $
 
 Euphoria v0.8.0
 
@@ -44,8 +44,8 @@
 cp multipass.edj /usr/local/share/euphoria/themes
 
 If you didn't install Euphoria to /usr/local, you will have to change
-that path, or you can copy the edj file to ~/.e/apps/euphoria/themes
-instead.
+that path, or you can copy the edj file to
+~/.xmms2/clients/euphoria/themes instead.
 
 At this point your ready to rock.  Start Euphoria but make sure
 the XMMS2 Daemon is running (start via: "xmms2d").
@@ -65,38 +65,6 @@
 	(now the playlist has stuff in it)
 3) Start Euphoria with no options.
 
-You can change themes using the euphoria.db explained below.
-
-
-CREATING A PERSONAL EUPHORIA CONFIG
------------------------------------
-
-Euphoria can get some configuration information from a personal
-configuration file thanks to EDB.  To create one follow 
-these sets:
-
- 1) Create the directory ~/.e/apps/euphoria
- 2) Using the EDB tool of choice create a euphoria.db
-	(ie: "edb_gtk_ed euphoria")
- 3) Add the following keys:
-	/euphoria/evas_engine
-	/euphoria/output_plugin
-	/euphoria/theme	
- 4) If you wish to use GL or FB: 
-  a)	Set evas_engine to a string type with the value "gl" or "fb".
- 5) If you wish to use a non-default theme:
-  a)    Create the directory: ~/.e/apps/euphoria/themes
-  b)    Copy the EETs for the themes you want to use there.
-  c)    Set theme to a string type with the name of the theme minus the .eet
-		(ie: iio.eet is put in the edb as just "iio")
-
-If you do not with to over-ride the default setting for Euphoria,
-simply don't create the key, or leave the type as int.
-
-You can also use the following directories:
- ~/.e/apps/euphoria/fonts      Fonts for use by Euphoria themes
-
-
 REPORTING BUGS
 ---------------

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist_item.rb playlist.rb 


Log Message:
nicer fix
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- playlist_item.rb	2 May 2005 14:39:09 -0000	1.3
+++ playlist_item.rb	2 May 2005 14:55:15 -0000	1.4
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.3 2005/05/02 14:39:09 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.4 2005/05/02 14:55:15 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje
@@ -21,7 +21,7 @@
 	end
 
 	def method_missing(method)
-		@props[method] || "unknown"
+		@props[method]
 	end
 
 	def duration
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- playlist.rb	28 Apr 2005 08:17:45 -0000	1.11
+++ playlist.rb	2 May 2005 14:55:15 -0000	1.12
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.11 2005/04/28 08:17:45 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.12 2005/05/02 14:55:15 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -43,6 +43,8 @@
 		@xmms.broadcast_medialib_entry_changed.notifier do |res|
 			@xmms.medialib_get_info(res.value).notifier do |res2|
 				props = res2.value
+				props.default = "unknown"
+
 				find_all { |i| i.id == props[:id] }.each do |item|
 					item.properties = props

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist_item.rb 


Log Message:
this should fix the crash Hisham reported *guess*
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- playlist_item.rb	26 Apr 2005 16:02:27 -0000	1.2
+++ playlist_item.rb	2 May 2005 14:39:09 -0000	1.3
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.2 2005/04/26 16:02:27 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.3 2005/05/02 14:39:09 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje
@@ -21,7 +21,7 @@
 	end
 
 	def method_missing(method)
-		@props[method]
+		@props[method] || "unknown"
 	end
 
 	def duration

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb playlist_item.rb 


Log Message:
even better fix
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- playlist.rb	2 May 2005 14:55:15 -0000	1.12
+++ playlist.rb	2 May 2005 17:07:32 -0000	1.13
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.12 2005/05/02 14:55:15 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.13 2005/05/02 17:07:32 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -43,7 +43,6 @@
 		@xmms.broadcast_medialib_entry_changed.notifier do |res|
 			@xmms.medialib_get_info(res.value).notifier do |res2|
 				props = res2.value
-				props.default = "unknown"
 
 				find_all { |i| i.id == props[:id] }.each do |item|
 					item.properties = props
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- playlist_item.rb	2 May 2005 14:55:15 -0000	1.4
+++ playlist_item.rb	2 May 2005 17:07:32 -0000	1.5
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.4 2005/05/02 14:55:15 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.5 2005/05/02 17:07:32 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje
@@ -83,6 +83,8 @@
 
 	def properties=(hash)
 		@props = hash || {}
+		@props.default = "unknown"
+
 		set_parts_text unless @edje.nil?
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
added a simple file dialog, based on the one from esmart. needs lots of tweaking yet
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- euphoria	29 Apr 2005 16:34:05 -0000	1.16
+++ euphoria	2 May 2005 17:49:13 -0000	1.17
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.16 2005/04/29 16:34:05 tsauerbeck Exp $
+# $Id: euphoria,v 1.17 2005/05/02 17:49:13 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -18,6 +18,7 @@
 require "euphoria/slider"
 require "euphoria/playtime_updater"
 require "euphoria/playback_status_handler"
+require "euphoria/file_dialog"
 
 Config = Struct.new("Config", :ipc_path, :theme, :time_display_elapsed)
 
@@ -213,6 +214,11 @@
 
 		@edje.on_signal("playlist.open") { @playlist.show(@theme, true) }
 
+		@edje.on_signal("file_dialog.open") do
+			fd = File.expand_path("~/.xmms2/clients/euphoria/themes/fd.eet")
+			FileDialog.open(fd) { |file| @xmms.playlist_add(file).wait }
+		end
+
 		@edje.on_signal("TOGGLE_REPEAT_MODE") do |sig, source|
 			# don't react on our own emission
 			next if source == "Euphoria"

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Added Files:
	file_dialog.rb 


Log Message:
added a simple file dialog, based on the one from esmart. needs lots of tweaking yet

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
support recursive directory selection in the file dialog \o/. sorting needs to be fixed though
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- euphoria	2 May 2005 17:49:13 -0000	1.17
+++ euphoria	2 May 2005 20:26:04 -0000	1.18
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.17 2005/05/02 17:49:13 tsauerbeck Exp $
+# $Id: euphoria,v 1.18 2005/05/02 20:26:04 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -12,6 +12,7 @@
 require "xmmsclient"
 require "singleton"
 require "yaml"
+require "find"
 
 require "euphoria/playlist"
 require "euphoria/playlist_item"
@@ -216,7 +217,15 @@
 
 		@edje.on_signal("file_dialog.open") do
 			fd = File.expand_path("~/.xmms2/clients/euphoria/themes/fd.eet")
-			FileDialog.open(fd) { |file| @xmms.playlist_add(file).wait }
+			FileDialog.open(fd) do |sel|
+				if File.directory?(sel)
+					Find.find(sel) do |f|
+						@xmms.playlist_add("file://" + f).wait
+					end
+				elsif File.exists?(sel)
+					@xmms.playlist_add("file://" + file).wait
+				end
+			end
 		end
 
 		@edje.on_signal("TOGGLE_REPEAT_MODE") do |sig, source|

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	file_dialog.rb 


Log Message:
support recursive directory selection in the file dialog \o/. sorting needs to be fixed though
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/file_dialog.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- file_dialog.rb	2 May 2005 17:49:14 -0000	1.1
+++ file_dialog.rb	2 May 2005 20:26:04 -0000	1.2
@@ -13,7 +13,7 @@
 			case op
 			when :ok
 				@fd.selections.each do |sel|
-					yield "file://" + File.join(@fd.current_directory, sel)
+					yield File.join(@fd.current_directory, sel)
 				end
 			when :cancel
 				close

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
default theme is winter for now. mental note: fix 'default' theme
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- euphoria	2 May 2005 20:26:04 -0000	1.18
+++ euphoria	4 May 2005 19:49:39 -0000	1.19
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.18 2005/05/02 20:26:04 tsauerbeck Exp $
+# $Id: euphoria,v 1.19 2005/05/04 19:49:39 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -321,7 +321,7 @@
 		if @config.nil? || !@config.is_a?(Config)
 			@config = Config.new
 			@config.ipc_path = nil
-			@config.theme = "multipass"
+			@config.theme = "winter"
 			@config.time_display_elapsed = true
 		end
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	README 


Log Message:
since multipass isn't strictly needed anymore, remove the multipass build notes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/README,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- README	2 May 2005 11:47:52 -0000	1.9
+++ README	4 May 2005 19:51:57 -0000	1.10
@@ -1,4 +1,4 @@
-$Id: README,v 1.9 2005/05/02 11:47:52 tsauerbeck Exp $
+$Id: README,v 1.10 2005/05/04 19:51:57 tsauerbeck Exp $
 
 Euphoria v0.8.0
 
@@ -34,21 +34,8 @@
 
 Now install Euphoria by running "rake install".
 
-The only theme Euphoria currently works with is Multipass, which isn't
-shipped with the Euphoria sources.
-
-To build the Multipass theme:
-svn co http://code-monkey.de/svn/multipass-eu/trunk multipass-eu
-cd multipass-eu
-rake
-cp multipass.edj /usr/local/share/euphoria/themes
-
-If you didn't install Euphoria to /usr/local, you will have to change
-that path, or you can copy the edj file to
-~/.xmms2/clients/euphoria/themes instead.
-
-At this point your ready to rock.  Start Euphoria but make sure
-the XMMS2 Daemon is running (start via: "xmms2d").
+At this point you're ready to rock.  Start Euphoria but make sure
+the XMMS2 Daemon is running.
 
 RUNNING EUPHORIA
 ----------------

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	Rakefile 


Log Message:
'rake install' install the themes, too
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/Rakefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Rakefile	28 Apr 2005 08:17:45 -0000	1.3
+++ Rakefile	6 May 2005 18:34:40 -0000	1.4
@@ -1,4 +1,4 @@
-# $Id: Rakefile,v 1.3 2005/04/28 08:17:45 tsauerbeck Exp $
+# $Id: Rakefile,v 1.4 2005/05/06 18:34:40 tsauerbeck Exp $
 
 require "rbconfig"
 
@@ -26,4 +26,8 @@
 	ddir = destdir + sitelibdir + "/euphoria"
 	FileUtils::Verbose.mkdir(ddir) unless File.directory?(ddir)
 	FileUtils::Verbose.install(Dir["lib/*.rb"], ddir, :mode => 0644)
+
+	ddir = destdir + prefix + "/share/euphoria"
+	FileUtils::Verbose.mkdir(ddir) unless File.directory?(ddir)
+	FileUtils::Verbose.install(themes, ddir, :mode => 0644)
 end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	Rakefile 


Log Message:
don't try to build/install the broken themes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/Rakefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Rakefile	6 May 2005 18:34:40 -0000	1.4
+++ Rakefile	6 May 2005 18:35:33 -0000	1.5
@@ -1,4 +1,4 @@
-# $Id: Rakefile,v 1.4 2005/05/06 18:34:40 tsauerbeck Exp $
+# $Id: Rakefile,v 1.5 2005/05/06 18:35:33 tsauerbeck Exp $
 
 require "rbconfig"
 
@@ -6,7 +6,7 @@
 destdir = "#{ENV["DESTDIR"]}"
 prefix = ENV["PREFIX"] || "/usr/local"
 
-themes = ["default", "iio", "streamline", "winter"].map do |t|
+themes = ["iio", "winter"].map do |t|
 	"data/themes/#{t}/#{t}.edj"
 end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	Rakefile 


Log Message:
use the right directory for themes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/Rakefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Rakefile	6 May 2005 18:35:33 -0000	1.5
+++ Rakefile	6 May 2005 19:50:19 -0000	1.6
@@ -1,4 +1,4 @@
-# $Id: Rakefile,v 1.5 2005/05/06 18:35:33 tsauerbeck Exp $
+# $Id: Rakefile,v 1.6 2005/05/06 19:50:19 tsauerbeck Exp $
 
 require "rbconfig"
 
@@ -27,7 +27,7 @@
 	FileUtils::Verbose.mkdir(ddir) unless File.directory?(ddir)
 	FileUtils::Verbose.install(Dir["lib/*.rb"], ddir, :mode => 0644)
 
-	ddir = destdir + prefix + "/share/euphoria"
+	ddir = destdir + prefix + "/share/euphoria/themes"
 	FileUtils::Verbose.mkdir(ddir) unless File.directory?(ddir)
 	FileUtils::Verbose.install(themes, ddir, :mode => 0644)
 end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
xmmsclient api update
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- euphoria	4 May 2005 19:49:39 -0000	1.19
+++ euphoria	6 May 2005 20:59:14 -0000	1.20
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.19 2005/05/04 19:49:39 tsauerbeck Exp $
+# $Id: euphoria,v 1.20 2005/05/06 20:59:14 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -10,6 +10,7 @@
 require "esmart_draggies"
 require "esmart_container"
 require "xmmsclient"
+require "xmmsclient_ecore"
 require "singleton"
 require "yaml"
 require "find"
@@ -151,7 +152,7 @@
 	def init_xmms
 		@xmms = XmmsClient::XmmsClient.new("Euphoria")
 		@xmms.connect(@config.ipc_path)
-		@xmms.setup_with_ecore
+		@xmms.add_to_ecore_mainloop
 	end
 
 	def setup_callbacks

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
workaround for Find.find's weirdness
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- euphoria	6 May 2005 20:59:14 -0000	1.20
+++ euphoria	7 May 2005 10:43:22 -0000	1.21
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.20 2005/05/06 20:59:14 tsauerbeck Exp $
+# $Id: euphoria,v 1.21 2005/05/07 10:43:22 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -220,7 +220,10 @@
 			fd = File.expand_path("~/.xmms2/clients/euphoria/themes/fd.eet")
 			FileDialog.open(fd) do |sel|
 				if File.directory?(sel)
-					Find.find(sel) do |f|
+					files = []
+					Find.find(sel) { |f| files.unshift(f) if File.file?(f) }
+
+					files.each do |f|
 						@xmms.playlist_add("file://" + f).wait
 					end
 				elsif File.exists?(sel)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	Rakefile 


Log Message:
support RUBYLIBDIR for them packagers
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/Rakefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Rakefile	6 May 2005 19:50:19 -0000	1.6
+++ Rakefile	7 May 2005 10:47:14 -0000	1.7
@@ -1,8 +1,8 @@
-# $Id: Rakefile,v 1.6 2005/05/06 19:50:19 tsauerbeck Exp $
+# $Id: Rakefile,v 1.7 2005/05/07 10:47:14 tsauerbeck Exp $
 
 require "rbconfig"
 
-sitelibdir = Config::CONFIG["sitelibdir"]
+sitelibdir = ENV["RUBYLIBDIR"] || Config::CONFIG["sitelibdir"]
 destdir = "#{ENV["DESTDIR"]}"
 prefix = ENV["PREFIX"] || "/usr/local"

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	Rakefile 


Log Message:
the default task depends on the themes task. added a clobber task that removes the themes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/Rakefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Rakefile	7 May 2005 10:47:14 -0000	1.7
+++ Rakefile	7 May 2005 11:17:59 -0000	1.8
@@ -1,6 +1,7 @@
-# $Id: Rakefile,v 1.7 2005/05/07 10:47:14 tsauerbeck Exp $
+# $Id: Rakefile,v 1.8 2005/05/07 11:17:59 tsauerbeck Exp $
 
 require "rbconfig"
+require "rake/clean"
 
 sitelibdir = ENV["RUBYLIBDIR"] || Config::CONFIG["sitelibdir"]
 destdir = "#{ENV["DESTDIR"]}"
@@ -10,6 +11,9 @@
 	"data/themes/#{t}/#{t}.edj"
 end
 
+CLOBBER.include(themes)
+
+task :default => :themes
 task :themes => themes
 
 rule ".edj" => [".edc"] do |t|

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
playlist might emit file_dialog.open, too
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- euphoria	7 May 2005 10:43:22 -0000	1.21
+++ euphoria	7 May 2005 16:15:24 -0000	1.22
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.21 2005/05/07 10:43:22 tsauerbeck Exp $
+# $Id: euphoria,v 1.22 2005/05/07 16:15:24 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -104,6 +104,22 @@
 		File.open(@config_file, "w") { |fo| YAML.dump(@config, fo) }
 	end
 
+	def show_file_dialog
+		fd = File.expand_path("~/.xmms2/clients/euphoria/themes/fd.eet")
+		FileDialog.open(fd) do |sel|
+			if File.directory?(sel)
+				files = []
+				Find.find(sel) { |f| files.unshift(f) if File.file?(f) }
+
+				files.each do |f|
+					@xmms.playlist_add("file://" + f).wait
+				end
+			elsif File.exists?(sel)
+				@xmms.playlist_add("file://" + file).wait
+			end
+		end
+	end
+
 private
 	def init_gui
 		@ee = Ecore::Evas::SoftwareX11.new
@@ -217,19 +233,7 @@
 		@edje.on_signal("playlist.open") { @playlist.show(@theme, true) }
 
 		@edje.on_signal("file_dialog.open") do
-			fd = File.expand_path("~/.xmms2/clients/euphoria/themes/fd.eet")
-			FileDialog.open(fd) do |sel|
-				if File.directory?(sel)
-					files = []
-					Find.find(sel) { |f| files.unshift(f) if File.file?(f) }
-
-					files.each do |f|
-						@xmms.playlist_add("file://" + f).wait
-					end
-				elsif File.exists?(sel)
-					@xmms.playlist_add("file://" + file).wait
-				end
-			end
+			show_file_dialog
 		end
 
 		@edje.on_signal("TOGGLE_REPEAT_MODE") do |sig, source|

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
playlist might emit file_dialog.open, too
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- playlist.rb	2 May 2005 17:07:32 -0000	1.13
+++ playlist.rb	7 May 2005 16:15:24 -0000	1.14
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.13 2005/05/02 17:07:32 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.14 2005/05/07 16:15:24 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -98,6 +98,10 @@
 				get_drag_value.last
 		end
 
+		@edje.on_signal("file_dialog.open") do
+			Euphoria.instance.show_file_dialog
+		end
+
 		each { |i| i.show(eet, @container) }
 
 		current_item && current_item.hilight

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
Find.find doesn't return stuff in any order, so we have to sort the entries ourselves
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- euphoria	7 May 2005 16:15:24 -0000	1.22
+++ euphoria	7 May 2005 16:18:45 -0000	1.23
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.22 2005/05/07 16:15:24 tsauerbeck Exp $
+# $Id: euphoria,v 1.23 2005/05/07 16:18:45 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -109,9 +109,9 @@
 		FileDialog.open(fd) do |sel|
 			if File.directory?(sel)
 				files = []
-				Find.find(sel) { |f| files.unshift(f) if File.file?(f) }
+				Find.find(sel) { |f| files << f if File.file?(f) }
 
-				files.each do |f|
+				files.sort.each do |f|
 					@xmms.playlist_add("file://" + f).wait
 				end
 			elsif File.exists?(sel)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	controls_to.edc 


Log Message:
themes: s/PLAYLIST_ADD/file_dialog.open/ not sure this is a good idea ;)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/controls_to.edc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- controls_to.edc	28 Apr 2005 08:09:53 -0000	1.9
+++ controls_to.edc	7 May 2005 16:27:44 -0000	1.10
@@ -195,7 +195,7 @@
 	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, ADD;
 }
 program { name, "AddFile"; signal,  "mouse,up,1"; source, ADD;
-	action, SIGNAL_EMIT "PLAYLIST_ADD" ADD; }
+	action, SIGNAL_EMIT "file_dialog.open" ADD; }
 //
 program { name, "deleteFile_hilited"; signal, "mouse,in"; source, DELETE;
 	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, DELETE;

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/programs


Modified Files:
	buttons.edc 


Log Message:
themes: s/PLAYLIST_ADD/file_dialog.open/ not sure this is a good idea ;)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/programs/buttons.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- buttons.edc	28 Apr 2005 08:09:54 -0000	1.2
+++ buttons.edc	7 May 2005 16:27:44 -0000	1.3
@@ -13,7 +13,7 @@
 BUTTON_PROG("x", "close")
 
 
-BUTTON_PROG("plus", "PLAYLIST_ADD")
+BUTTON_PROG("plus", "file_dialog.open")
 BUTTON_PROG("minus", "PLAYLIST_DEL")
 BUTTON_PROG("edit", "")

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/default


Modified Files:
	default_progs.edc 


Log Message:
themes: s/PLAYLIST_ADD/file_dialog.open/ not sure this is a good idea ;)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/default/default_progs.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- default_progs.edc	28 Apr 2005 08:09:53 -0000	1.4
+++ default_progs.edc	7 May 2005 16:27:43 -0000	1.5
@@ -386,7 +386,7 @@
                                 name,       "add_signal";
                                 signal,     "mouse,up,1";
                                 source,     "add_button";
-                                action,     SIGNAL_EMIT "PLAYLIST_ADD" "add_button";
+                                action,     SIGNAL_EMIT "file_dialog.open" "add_button";
                         }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
only add the playlists file_dialog.open handler if the playlist is a separate evas
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- playlist.rb	7 May 2005 16:15:24 -0000	1.14
+++ playlist.rb	7 May 2005 16:36:50 -0000	1.15
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.14 2005/05/07 16:15:24 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.15 2005/05/07 16:36:50 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -98,8 +98,10 @@
 				get_drag_value.last
 		end
 
-		@edje.on_signal("file_dialog.open") do
-			Euphoria.instance.show_file_dialog
+		if is_separate
+			@edje.on_signal("file_dialog.open") do
+				Euphoria.instance.show_file_dialog
+			end
 		end
 
 		each { |i| i.show(eet, @container) }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/programs


Modified Files:
	buttons.edc 


Log Message:
playback control button/signal fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/programs/buttons.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- buttons.edc	7 May 2005 16:27:44 -0000	1.3
+++ buttons.edc	7 May 2005 22:05:05 -0000	1.4
@@ -1,12 +1,12 @@
-BUTTON_PROG("prev", "PLAY_PREVIOUS")
+BUTTON_PROG("prev", "playback.prev")
 //BUTTON_PROG("rew", "SEEK_BACK")
 BUTTON_PROG3("rew", "SEEK_BACK_START", "SEEK_BACK_STOP")
-//BUTTON_PROG("play", "PLAY")
-//BUTTON_PROG("pause", "PAUSE")
-TOGGLE_BUTTON_PROG("play", "PLAY", "PAUSE")
+//BUTTON_PROG("play", "playback.play")
+//BUTTON_PROG("pause", "playback.pause")
+TOGGLE_BUTTON_PROG("play", "playback.play", "playback.pause")
 //BUTTON_PROG("ff", "SEEK_FORWARD")
 BUTTON_PROG3("ff", "SEEK_FORWARD_START", "SEEK_FORWARD_STOP")
-BUTTON_PROG("next", "PLAY_NEXT")
+BUTTON_PROG("next", "playback.next")
 
 
 BUTTON_PROG("pl", "")

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/default


Modified Files:
	default_progs.edc default_small_progs.edc 


Log Message:
playback control button/signal fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/default/default_progs.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- default_progs.edc	7 May 2005 16:27:43 -0000	1.5
+++ default_progs.edc	7 May 2005 22:05:04 -0000	1.6
@@ -57,8 +57,8 @@
                                 source,     "previous_button";
                                 /* Emit signal to handler "previous file", from part/sender "previous_button" */
                                 /* Catch with the following Edje code in your app */
-                                /* edje_object_signal_callback_add(edje, "PLAY_PREVIOUS", "previous_button", function) */
-                                action,     SIGNAL_EMIT "PLAY_PREVIOUS" "previous_button";
+                                /* edje_object_signal_callback_add(edje, "playback.prev", "previous_button", function) */
+                                action,     SIGNAL_EMIT "playback.prev" "previous_button";
                         }
 
                         program {
@@ -149,7 +149,7 @@
                                 name,       "play_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "play_button";
-                                action,     SIGNAL_EMIT "PLAY" "play_button";
+                                action,     SIGNAL_EMIT "playback.play" "play_button";
                         }
 
                         /**************** Pause ****************/
@@ -193,7 +193,7 @@
                                 name,       "pause_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "pause_button";
-                                action,     SIGNAL_EMIT "PAUSE" "pause_button";
+                                action,     SIGNAL_EMIT "playback.pause" "pause_button";
                         }
 
                         /**************** Seek Forward ********************/
@@ -251,7 +251,7 @@
                                 name,       "next_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "next_button";
-                                action,     SIGNAL_EMIT "PLAY_NEXT" "next_button";
+                                action,     SIGNAL_EMIT "playback.next" "next_button";
                         }
 
                         /* Volume Button Proggies */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/default/default_small_progs.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- default_small_progs.edc	28 Apr 2005 08:09:53 -0000	1.4
+++ default_small_progs.edc	7 May 2005 22:05:04 -0000	1.5
@@ -22,7 +22,7 @@
                                 name,       "previous_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "previous_button";
-                                action,     SIGNAL_EMIT "PLAY_PREVIOUS" "previous_button";
+                                action,     SIGNAL_EMIT "playback.previous" "previous_button";
                         }
 
                         /* Play */
@@ -47,7 +47,7 @@
                                 name,      "play_click_emission";
                                 signal,    "mouse,up,1";
                                 source,    "play_button";
-                                action,    SIGNAL_EMIT "PLAY" "play_button";
+                                action,    SIGNAL_EMIT "playback.play" "play_button";
                         }
 
                         /* Pause */
@@ -97,7 +97,7 @@
                                 name,       "next_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "next_button";
-                                action,     SIGNAL_EMIT "PLAY_NEXT" "next_button";
+                                action,     SIGNAL_EMIT "playback.next" "next_button";
                         }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/winter/groups


Modified Files:
	collapsed.edc 


Log Message:
playback control button/signal fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/winter/groups/collapsed.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- collapsed.edc	23 Oct 2004 16:16:46 -0000	1.3
+++ collapsed.edc	7 May 2005 22:05:05 -0000	1.4
@@ -235,11 +235,11 @@
     } //parts 
 
     programs {
-      BUTTON_PROG("prev", "PLAY_PREVIOUS")
+      BUTTON_PROG("prev", "playback.prev")
       BUTTON_PROG3("rew", "SEEK_BACK_START", "SEEK_BACK_STOP")
-      TOGGLE_BUTTON_PROG("play", "PLAY", "PAUSE")
+      TOGGLE_BUTTON_PROG("play", "playback.play", "playback.pause")
       BUTTON_PROG3("ff", "SEEK_FORWARD_START", "SEEK_FORWARD_STOP")
-      BUTTON_PROG("next", "PLAY_NEXT")
+      BUTTON_PROG("next", "playback.next")
 
       program {
         name, "switch";

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	controls_to.edc switch.edc 


Log Message:
playback control button/signal fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/controls_to.edc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- controls_to.edc	7 May 2005 16:27:44 -0000	1.10
+++ controls_to.edc	7 May 2005 22:05:05 -0000	1.11
@@ -100,7 +100,7 @@
 	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, PLAY;
 }
 program { name, "play_click_emission"; signal, "mouse,down,*"; source, PLAY;
-	action, SIGNAL_EMIT "PLAY" PLAY; }
+	action, SIGNAL_EMIT "playback.play" PLAY; }
 
 #define PREV "prev_button"
 
@@ -119,7 +119,7 @@
 	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, PREV;
 }
 program { name, "previous_click"; signal, "mouse,down,*"; source, PREV;
-	action, SIGNAL_EMIT "PLAY_PREVIOUS" PREV; }
+	action, SIGNAL_EMIT "playback.prev" PREV; }
 
 #define NEXT "next_button"
 
@@ -138,7 +138,7 @@
 	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, NEXT;
 }
 program { name, "next_click_emission"; signal, "mouse,down,*"; source, NEXT;
-	action, SIGNAL_EMIT "PLAY_NEXT" NEXT; }
+	action, SIGNAL_EMIT "playback.next" NEXT; }
 
 #define PAUSE "pause_button"
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/switch.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- switch.edc	28 Apr 2005 08:09:53 -0000	1.4
+++ switch.edc	7 May 2005 22:05:05 -0000	1.5
@@ -31,7 +31,7 @@
 	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, "_play_button";
 }
 program { name, "_play_click"; signal, "mouse,down,1"; source, "_play_button";
-	action, SIGNAL_EMIT "PLAY" "play_button"; 
+	action, SIGNAL_EMIT "playback.play" "play_button"; 
 }
 
 //
@@ -48,7 +48,7 @@
 	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, "_prev_button";
 }
 program { name, "_previous_click"; signal, "mouse,down,1"; source, "_prev_button";
-	action, SIGNAL_EMIT "PLAY_PREVIOUS" "previous_button";
+	action, SIGNAL_EMIT "playback.prev" "previous_button";
 }
 	
 //
@@ -65,7 +65,7 @@
 	action, STATE_SET "default" 0.0; transition, LINEAR, 0.1; target, "_next_button";
 }
 program { name, "_next_click"; signal, "mouse,down,1"; source, "_next_button";
-	action, SIGNAL_EMIT "PLAY_NEXT" "next_button";
+	action, SIGNAL_EMIT "playback.next" "next_button";
 }
 
 //

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/streamline


Modified Files:
	streamline_progs.edc streamline_small_progs.edc 


Log Message:
playback control button/signal fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/streamline/streamline_progs.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- streamline_progs.edc	30 Oct 2004 03:15:59 -0000	1.3
+++ streamline_progs.edc	7 May 2005 22:05:05 -0000	1.4
@@ -55,8 +55,8 @@
                                 source,     "previous_button";
                                 /* Emit signal to handler "previous file", from part/sender "previous_button" */
                                 /* Catch with the following Edje code in your app */
-                                /* edje_object_signal_callback_add(edje, "PLAY_PREVIOUS", "previous_button", function) */
-                                action,     SIGNAL_EMIT "PLAY_PREVIOUS" "previous_button";
+                                /* edje_object_signal_callback_add(edje, "playback.prev", "previous_button", function) */
+                                action,     SIGNAL_EMIT "playback.prev" "previous_button";
                         }
 
                         program {
@@ -146,7 +146,7 @@
                                 name,       "play_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "play_button";
-                                action,     SIGNAL_EMIT "PLAY" "play_button";
+                                action,     SIGNAL_EMIT "playback.play" "play_button";
                         }
                         /**************** Pause ****************/
                         program {
@@ -190,7 +190,7 @@
                                 name,       "pause_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "pause_button";
-                                action,     SIGNAL_EMIT "PAUSE" "pause_button";
+                                action,     SIGNAL_EMIT "playback.pause" "pause_button";
                         }
 
                         /**************** Seek Forward ********************/
@@ -247,7 +247,7 @@
                                 name,       "next_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "next_button";
-                                action,     SIGNAL_EMIT "PLAY_NEXT" "next_button";
+                                action,     SIGNAL_EMIT "playback.next" "next_button";
                         }
 
                         /* Volume Button Proggies */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/streamline/streamline_small_progs.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- streamline_small_progs.edc	28 Apr 2005 08:09:53 -0000	1.4
+++ streamline_small_progs.edc	7 May 2005 22:05:05 -0000	1.5
@@ -22,7 +22,7 @@
                                 name,       "previous_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "previous_button";
-                                action,     SIGNAL_EMIT "PLAY_PREVIOUS" "previous_button";
+                                action,     SIGNAL_EMIT "playback.prev" "previous_button";
                         }
 
                         /* Play */
@@ -47,7 +47,7 @@
                                 name,      "play_click_emission";
                                 signal,    "mouse,up,1";
                                 source,    "play_button";
-                                action,    SIGNAL_EMIT "PLAY" "play_button";
+                                action,    SIGNAL_EMIT "playback.play" "play_button";
                         }
 
                         /* Pause */
@@ -72,7 +72,7 @@
                                 name,      "pause_click_emission";
                                 signal,    "mouse,up,1";
                                 source,    "pause_button";
-                                action,    SIGNAL_EMIT "PAUSE" "pause_button";
+                                action,    SIGNAL_EMIT "playback.pause" "pause_button";
                         }
                         /* Next */
                         program {
@@ -96,7 +96,7 @@
                                 name,       "next_click_emission";
                                 signal,     "mouse,up,1";
                                 source,     "next_button";
-                                action,     SIGNAL_EMIT "PLAY_NEXT" "next_button";
+                                action,     SIGNAL_EMIT "playback.next" "next_button";
                         }

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	controls_to.edc 


Log Message:
this has got to be one of most funny edc bugs ever - emitting a signal any time the first mouse button is released :D
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/controls_to.edc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- controls_to.edc	7 May 2005 22:05:05 -0000	1.11
+++ controls_to.edc	8 May 2005 11:23:58 -0000	1.12
@@ -224,7 +224,7 @@
 program { name, "editFile_unclicked"; signal, "mouse,down"; source, EDIT;
 	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, EDIT;
 }
-program { name, "editFile"; signal,  "mouse,up,1"; source, "*";
+program { name, "editFile"; signal,  "mouse,up,1"; source, EDIT;
 	action, SIGNAL_EMIT "PLAYLIST_EDIT" EDIT; }
 
 ///////////////////////////////////////////////////////////////////////

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb playlist_item.rb 


Log Message:
need to explicitly remove elements from the container
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- playlist.rb	7 May 2005 16:36:50 -0000	1.15
+++ playlist.rb	8 May 2005 14:37:09 -0000	1.16
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.15 2005/05/07 16:36:50 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.16 2005/05/08 14:37:09 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -129,12 +129,12 @@
 			item = find { |i| i.id == item }
 		end
 
-		item.hide if i.visible?
+		item.hide(@container) if i.visible?
 		super(item)
 	end
 
 	def clear
-		each { |i| i.hide if i.visible? }
+		each { |i| i.hide(@container) if i.visible? }
 		super
 	end
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- playlist_item.rb	2 May 2005 17:07:32 -0000	1.5
+++ playlist_item.rb	8 May 2005 14:37:09 -0000	1.6
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.5 2005/05/02 17:07:32 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.6 2005/05/08 14:37:09 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje
@@ -76,8 +76,8 @@
 		!@edje.nil?
 	end
 
-	def hide
-		@edje.delete
+	def hide(container)
+		container.remove_element(@edje)
 		@edje = nil
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb playlist_item.rb 


Log Message:
api cleanup
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- playlist.rb	8 May 2005 14:37:09 -0000	1.16
+++ playlist.rb	8 May 2005 14:43:18 -0000	1.17
@@ -1,8 +1,10 @@
-# $Id: playlist.rb,v 1.16 2005/05/08 14:37:09 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.17 2005/05/08 14:43:18 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
 class Playlist < Array
+	attr_reader :container
+
 	def initialize(xmms, on_cur_item_changed)
 		super()
 
@@ -129,12 +131,12 @@
 			item = find { |i| i.id == item }
 		end
 
-		item.hide(@container) if i.visible?
+		item.hide if i.visible?
 		super(item)
 	end
 
 	def clear
-		each { |i| i.hide(@container) if i.visible? }
+		each { |i| i.hide if i.visible? }
 		super
 	end
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- playlist_item.rb	8 May 2005 14:37:09 -0000	1.6
+++ playlist_item.rb	8 May 2005 14:43:18 -0000	1.7
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.6 2005/05/08 14:37:09 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.7 2005/05/08 14:43:18 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje
@@ -76,8 +76,8 @@
 		!@edje.nil?
 	end
 
-	def hide(container)
-		container.remove_element(@edje)
+	def hide
+		@playlist.container.remove_element(@edje)
 		@edje = nil
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb playlist_item.rb 


Log Message:
api cleanup
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- playlist.rb	8 May 2005 14:43:18 -0000	1.17
+++ playlist.rb	8 May 2005 14:44:35 -0000	1.18
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.17 2005/05/08 14:43:18 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.18 2005/05/08 14:44:35 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -106,7 +106,7 @@
 			end
 		end
 
-		each { |i| i.show(eet, @container) }
+		each { |i| i.show(eet) }
 
 		current_item && current_item.hilight
 	end
@@ -120,7 +120,7 @@
 			item = PlaylistItem.new(id, @xmms, self)
 			super(item)
 
-			item.show(@eet, @container) unless @container.nil?
+			item.show(@eet) unless @container.nil?
 		end
 
 		self
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- playlist_item.rb	8 May 2005 14:43:18 -0000	1.7
+++ playlist_item.rb	8 May 2005 14:44:35 -0000	1.8
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.7 2005/05/08 14:43:18 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.8 2005/05/08 14:44:35 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje
@@ -28,8 +28,8 @@
 		@props[:duration].to_i / 1000
 	end
 
-	def show(eet, container)
-		@edje = Edje::Edje.new(container.evas)
+	def show(eet)
+		@edje = Edje::Edje.new(@playlist.container.evas)
 		@edje.load(eet, "playlist_item")
 		w, @height = @edje.get_size_min
 
@@ -38,7 +38,7 @@
 		w, h = @edje.get_size_min
 		@edje.resize(w, h)
 
-		container.append_element(@edje)
+		@playlist.container.append_element(@edje)
 
 		# if a playlist item gets hilighted, un-hilight all other items
 		@edje.on_signal("playlist_item.selected") do
@@ -57,11 +57,11 @@
 
 =begin
 		@edje.on_signal("PLAYLIST_SCROLL_UP", "") do
-			@container.scroll(@height * 3)
+			@playlist.container.scroll(@height * 3)
 		end
 
 		@edje.on_signal("PLAYLIST_SCROLL_DOWN", "") do
-			@container.scroll(@height * -3)
+			@playlist.container.scroll(@height * -3)
 		end
 =end
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist_item.rb 


Log Message:
enabled scrolling again
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- playlist_item.rb	8 May 2005 14:44:35 -0000	1.8
+++ playlist_item.rb	8 May 2005 14:45:56 -0000	1.9
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.8 2005/05/08 14:44:35 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.9 2005/05/08 14:45:56 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje
@@ -55,15 +55,13 @@
 			@xmms.playback_start.wait
 		end
 
-=begin
 		@edje.on_signal("PLAYLIST_SCROLL_UP", "") do
-			@playlist.container.scroll(@height * 3)
+			@playlist.container.scroll(h * 3)
 		end
 
 		@edje.on_signal("PLAYLIST_SCROLL_DOWN", "") do
-			@playlist.container.scroll(@height * -3)
+			@playlist.container.scroll(h * -3)
 		end
-=end
 	end
 
 	def hilight

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio


Modified Files:
	iio.edc 


Log Message:
iio is shaped
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/iio.edc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- iio.edc	29 Apr 2005 16:59:47 -0000	1.11
+++ iio.edc	8 May 2005 16:15:52 -0000	1.12
@@ -22,6 +22,10 @@
 	collections { 
 	group { name, "euphoria"; min, 413 94; max, 413 94;
 
+	data {
+		item, "shaped" "you bet";
+	}
+
 	script {
 		public message (Msg_Type:type, id, ...)
 		{

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
use the themes file dialog if it provides one. requires latest ruby-edje
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- euphoria	7 May 2005 16:18:45 -0000	1.23
+++ euphoria	8 May 2005 17:04:04 -0000	1.24
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.23 2005/05/07 16:18:45 tsauerbeck Exp $
+# $Id: euphoria,v 1.24 2005/05/08 17:04:04 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -26,6 +26,7 @@
 
 class Euphoria
 	DATA_DIR = "/usr/local/share/euphoria"
+	DATA_DIR_PRIV = File.expand_path("~/.xmms2/clients/euphoria")
 
 	include Singleton
 
@@ -36,8 +37,7 @@
 		@xmms = nil
 
 		# settings
-		@config_file =
-			File.expand_path("~/.xmms2/clients/euphoria/config.yaml")
+		@config_file = DATA_DIR_PRIV + "/config.yaml"
 
 		load_config
 		init_xmms
@@ -105,8 +105,7 @@
 	end
 
 	def show_file_dialog
-		fd = File.expand_path("~/.xmms2/clients/euphoria/themes/fd.eet")
-		FileDialog.open(fd) do |sel|
+		FileDialog.open(@file_dialog_theme) do |sel|
 			if File.directory?(sel)
 				files = []
 				Find.find(sel) { |f| files << f if File.file?(f) }
@@ -147,6 +146,12 @@
 		@theme = find_theme(@config.theme)
 		raise "Cannot find theme - #{@config.theme}" if @theme.nil?
 
+		if Edje.collections(@theme).include?("esmart.filedialog")
+			@file_dialog_theme = @theme
+		else
+			@file_dialog_theme = DATA_DIR_PRIV + "/themes/fd.eet"
+		end
+
 		@edje = Edje::Edje.new(@ee.evas)
 		@edje.load(@theme, "euphoria")
 		@edje.name = "edje"
@@ -335,9 +340,9 @@
 	end
 
 	def find_theme(name)
-		dirs = [File.expand_path("~/.xmms2/clients/euphoria"), DATA_DIR]
+		dirs = [DATA_DIR_PRIV, DATA_DIR]
 		dirs.each do |dir|
-			tmp = File.join(dir, "/themes/#{name}.edj")
+			tmp = File.join(dir, "themes/#{name}.edj")
 			return tmp if File.exist?(tmp)
 		end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/data/themes/iio/programs


Modified Files:
	controls_to.edc 


Log Message:
fixed button (un)hiliting
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/data/themes/iio/programs/controls_to.edc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- controls_to.edc	8 May 2005 11:23:58 -0000	1.12
+++ controls_to.edc	8 May 2005 18:00:24 -0000	1.13
@@ -87,9 +87,13 @@
 
 program { name, "play_hilited"; signal, "mouse,in"; source, PLAY;
 	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, PLAY;
-	after, "play_unhilited"; in, 0.15 0.0;
+	/*after, "play_unhilited";*/ in, 0.15 0.0;
 }
 program { name, "play_unhilited"; signal, "mouse,out"; source, PLAY;
+	action, ACTION_STOP; target, "play_hilited";
+	after, "play_unhilited_real";
+}	
+program { name, "play_unhilited_real";
 	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, PLAY;
 }	
 program { name, "play_click"; signal, "mouse,down,*";source, PLAY;
@@ -106,9 +110,13 @@
 
 program { name, "prev_button_hilited"; signal, "mouse,in"; source, PREV;
 	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, PREV;
-	after, "prev_button_unhilited"; in, 0.15 0.0;
+	/*after, "prev_button_unhilited";*/ in, 0.15 0.0;
 }
 program { name, "prev_button_unhilited"; signal, "mouse,out"; source, PREV;
+	action, ACTION_STOP; target, "prev_button_hilited";
+	after, "prev_button_unhilited_real";
+}
+program { name, "prev_button_unhilited_real";
 	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, PREV;
 }
 program { name, "prev_clicked"; signal, "mouse,down,*"; source, PREV;
@@ -125,9 +133,13 @@
 
 program { name, "next_hilited"; signal, "mouse,in"; source, NEXT;
 	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, NEXT;
-	after, "next_unhilited"; in, 0.15 0.0;
+	/*after, "next_unhilited";*/ in, 0.15 0.0;
 }
 program { name, "next_unhilited"; signal, "mouse,out"; source, NEXT;
+	action, ACTION_STOP; target, "next_hilited";
+	after, "next_unhilited_real";
+}
+program { name, "next_unhilited_real";
 	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, NEXT;
 }
 program { name, "next_click"; signal, "mouse,down,*"; source, NEXT;
@@ -144,9 +156,13 @@
 
 program { name, "pause_hilited"; signal, "mouse,in"; source, PAUSE;
 	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, PAUSE;
-	after, "pause_unhilited"; in, 0.15 0.0;
+	/*after, "pause_unhilited";*/ in, 0.15 0.0;
 }
 program { name, "pause_unhilited"; signal, "mouse,out"; source, PAUSE;
+	action, ACTION_STOP; target, "pause_hilited";
+	after, "pause_unhilited_real";
+}
+program { name, "pause_unhilited_real";
 	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, PAUSE;
 }
 program { name, "pause_click"; signal, "mouse,down,*"; source, PAUSE;
@@ -162,11 +178,15 @@
 
 program { name, "stop_hilited"; signal, "mouse,in"; source, STOP;
 	action, STATE_SET "hilited" 0.0; transition, LINEAR 0.1; target, STOP;
-	after, "stop_unhilited"; in, 0.15 0.0;
+	/*after, "stop_unhilited";*/ in, 0.15 0.0;
 } 
 program { name, "stop_unhilited"; signal, "mouse,out"; source, STOP;
-	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, STOP;
+	action, ACTION_STOP; target, "stop_hilited";
+	after, "stop_unhilited_real";
 }	
+program { name, "stop_unhilited_real";
+	action, STATE_SET "default" 0.0; transition, LINEAR 0.1; target, STOP;
+}
 program { name, "stop_click"; signal, "mouse,down,*"; source, STOP;
 	action, STATE_SET "clicked" 0.0; transition, LINEAR 0.1; target, STOP;
 	after, "stop_unclick"; in, 0.15 0.0;

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
oops, thought i already fixed this one
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- euphoria	8 May 2005 17:04:04 -0000	1.24
+++ euphoria	9 May 2005 16:08:07 -0000	1.25
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.24 2005/05/08 17:04:04 tsauerbeck Exp $
+# $Id: euphoria,v 1.25 2005/05/09 16:08:07 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -114,7 +114,7 @@
 					@xmms.playlist_add("file://" + f).wait
 				end
 			elsif File.exists?(sel)
-				@xmms.playlist_add("file://" + file).wait
+				@xmms.playlist_add("file://" + sel).wait
 			end
 		end
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
fd.eet -> file_dialog.edj. also looked for in /share/euphoria/themes now
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- euphoria	9 May 2005 16:08:07 -0000	1.25
+++ euphoria	9 May 2005 16:11:10 -0000	1.26
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.25 2005/05/09 16:08:07 tsauerbeck Exp $
+# $Id: euphoria,v 1.26 2005/05/09 16:11:10 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -149,7 +149,7 @@
 		if Edje.collections(@theme).include?("esmart.filedialog")
 			@file_dialog_theme = @theme
 		else
-			@file_dialog_theme = DATA_DIR_PRIV + "/themes/fd.eet"
+			@file_dialog_theme = find_theme("file_dialog")
 		end
 
 		@edje = Edje::Edje.new(@ee.evas)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	Rakefile 


Log Message:
mkdir -> mkdir_p. thanks atmos
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/Rakefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Rakefile	7 May 2005 11:17:59 -0000	1.8
+++ Rakefile	19 May 2005 17:01:07 -0000	1.9
@@ -1,4 +1,4 @@
-# $Id: Rakefile,v 1.8 2005/05/07 11:17:59 tsauerbeck Exp $
+# $Id: Rakefile,v 1.9 2005/05/19 17:01:07 tsauerbeck Exp $
 
 require "rbconfig"
 require "rake/clean"
@@ -28,10 +28,10 @@
 	FileUtils::Verbose.install("bin/euphoria", ddir, :mode => 0755)
 
 	ddir = destdir + sitelibdir + "/euphoria"
-	FileUtils::Verbose.mkdir(ddir) unless File.directory?(ddir)
+	FileUtils::Verbose.mkdir_p(ddir) unless File.directory?(ddir)
 	FileUtils::Verbose.install(Dir["lib/*.rb"], ddir, :mode => 0644)
 
 	ddir = destdir + prefix + "/share/euphoria/themes"
-	FileUtils::Verbose.mkdir(ddir) unless File.directory?(ddir)
+	FileUtils::Verbose.mkdir_p(ddir) unless File.directory?(ddir)
 	FileUtils::Verbose.install(themes, ddir, :mode => 0644)
 end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
shut down euphoria gracefully when the xmms2 daemon quits. requires latest xmms2 ruby bindings
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- euphoria	9 May 2005 16:11:10 -0000	1.26
+++ euphoria	19 May 2005 18:18:43 -0000	1.27
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.26 2005/05/09 16:11:10 tsauerbeck Exp $
+# $Id: euphoria,v 1.27 2005/05/19 18:18:43 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -174,6 +174,11 @@
 		@xmms = XmmsClient::XmmsClient.new("Euphoria")
 		@xmms.connect(@config.ipc_path)
 		@xmms.add_to_ecore_mainloop
+
+		@xmms.on_disconnect do
+			puts "daemon exited, shutting down"
+			Ecore.main_loop_quit
+		end
 	end
 
 	def setup_callbacks

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
fix a silly bug that would make euphoria crash when songs are removed from the playlist. i should add some unit tests
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- playlist.rb	8 May 2005 14:44:35 -0000	1.18
+++ playlist.rb	21 May 2005 08:36:41 -0000	1.19
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.18 2005/05/08 14:44:35 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.19 2005/05/21 08:36:41 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -131,7 +131,7 @@
 			item = find { |i| i.id == item }
 		end
 
-		item.hide if i.visible?
+		item.hide if item.visible?
 		super(item)
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	README 


Log Message:
removed first faq item, since it doesn't really apply anymore
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/README,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- README	4 May 2005 19:51:57 -0000	1.10
+++ README	21 May 2005 08:39:19 -0000	1.11
@@ -1,4 +1,4 @@
-$Id: README,v 1.10 2005/05/04 19:51:57 tsauerbeck Exp $
+$Id: README,v 1.11 2005/05/21 08:39:19 tsauerbeck Exp $
 
 Euphoria v0.8.0
 
@@ -61,15 +61,6 @@
 FAQ
 -------
 
-Q: Why another damned audio player?
-A: -> The purpose of Euphoria has always been to be used as a vehicle
-by which to better learn the EFL components.
-
-An audio player was chosen because it's interesting, the OggVorbis
-API is very simple and can easily drawn on Ecore's strengths
-(ie: idlers and timers) and provides a number of interesting interface
-possibilities.
-
 Q: Will you support WinAmp skins?
 A: -> Nope.... go use XMMS(1) if you want traditional skins.
 Refer to the first question.

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist_item.rb 


Log Message:
delete the edje when we remove it from the container
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- playlist_item.rb	8 May 2005 14:45:56 -0000	1.9
+++ playlist_item.rb	22 May 2005 17:51:18 -0000	1.10
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.9 2005/05/08 14:45:56 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.10 2005/05/22 17:51:18 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje
@@ -76,6 +76,7 @@
 
 	def hide
 		@playlist.container.remove_element(@edje)
+		@edje.delete
 		@edje = nil
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
silly cleanup
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- playlist.rb	21 May 2005 08:36:41 -0000	1.19
+++ playlist.rb	22 May 2005 17:52:17 -0000	1.20
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.19 2005/05/21 08:36:41 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.20 2005/05/22 17:52:17 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -132,7 +132,7 @@
 		end
 
 		item.hide if item.visible?
-		super(item)
+		super
 	end
 
 	def clear

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb playlist_item.rb 


Log Message:
when items are removed from the playlist, the position of the items after the one that was removed need to be adjusted
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- playlist.rb	22 May 2005 17:52:17 -0000	1.20
+++ playlist.rb	22 May 2005 20:48:33 -0000	1.21
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.20 2005/05/22 17:52:17 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.21 2005/05/22 20:48:33 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -133,6 +133,11 @@
 
 		item.hide if item.visible?
 		super
+
+		# fix up positions of the remaining items
+		self[item.position..-1].each do |item|
+			item.position -= 1
+		end
 	end
 
 	def clear
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- playlist_item.rb	22 May 2005 17:51:18 -0000	1.10
+++ playlist_item.rb	22 May 2005 20:48:33 -0000	1.11
@@ -1,7 +1,7 @@
-# $Id: playlist_item.rb,v 1.10 2005/05/22 17:51:18 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.11 2005/05/22 20:48:33 tsauerbeck Exp $
 
 class PlaylistItem
-	attr_reader :id, :edje
+	attr_reader :id, :edje, :position
 
 	def initialize(id, xmms, playlist)
 		@id = id
@@ -87,6 +87,11 @@
 		set_parts_text unless @edje.nil?
 	end
 
+	def position=(pos)
+		@position = pos
+		set_parts_text unless @edje.nil?
+	end
+
 	private
 	def set_parts_text
 		@edje.part("duration").text =

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist_item.rb 


Log Message:
theme api update
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- playlist_item.rb	22 May 2005 20:48:33 -0000	1.11
+++ playlist_item.rb	28 May 2005 20:02:01 -0000	1.12
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.11 2005/05/22 20:48:33 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.12 2005/05/28 20:02:01 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje, :position
@@ -41,10 +41,14 @@
 		@playlist.container.append_element(@edje)
 
 		# if a playlist item gets hilighted, un-hilight all other items
-		@edje.on_signal("playlist_item.selected") do
-			@playlist.each do |item|
-				if item != self
-					item.edje.emit_signal("playlist_item.unselected", "")
+		# same for selected/unselected
+		["selected", "hilighted"].each do |state|
+			@edje.on_signal("playlist_item.#{state}") do
+				@playlist.each do |item|
+					if item != self
+						sig = "playlist_item.un#{state}"
+						item.edje.emit_signal(sig, "")
+					end
 				end
 			end
 		end
@@ -65,7 +69,7 @@
 	end
 
 	def hilight
-		@edje.emit_signal("playlist_item.selected", "") unless @edje.nil?
+		@edje.emit_signal("playlist_item.hilighted", "") unless @edje.nil?
 	end
 
 	def visible?

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb playlist_item.rb 


Log Message:
added a 'selected' state to PlaylistItem that's controlled by the playlist_item.selected signal. The 'playlist_item.remove' signal makes the playlist remove selected entries
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- playlist.rb	22 May 2005 20:48:33 -0000	1.21
+++ playlist.rb	28 May 2005 20:13:33 -0000	1.22
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.21 2005/05/22 20:48:33 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.22 2005/05/28 20:13:33 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -106,6 +106,12 @@
 			end
 		end
 
+		@edje.on_signal("playlist_item.remove") do
+			find_all { |i| i.selected }.each do |i|
+				@xmms.playlist_remove(i.position)
+			end
+		end
+
 		each { |i| i.show(eet) }
 
 		current_item && current_item.hilight
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- playlist_item.rb	28 May 2005 20:02:01 -0000	1.12
+++ playlist_item.rb	28 May 2005 20:13:33 -0000	1.13
@@ -1,7 +1,7 @@
-# $Id: playlist_item.rb,v 1.12 2005/05/28 20:02:01 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.13 2005/05/28 20:13:33 tsauerbeck Exp $
 
 class PlaylistItem
-	attr_reader :id, :edje, :position
+	attr_reader :id, :edje, :position, :selected
 
 	def initialize(id, xmms, playlist)
 		@id = id
@@ -12,6 +12,7 @@
 
 		@edje = nil
 		@height = 0
+		@selected = false
 
 		@props = {}
 
@@ -53,6 +54,10 @@
 			end
 		end
 
+		@edje.on_signal("playlist_item.selected") do
+			@selected = !@selected
+		end
+
 		@edje.on_signal("playlist_item.play") do
 			@xmms.playlist_set_next(@position).wait
 			@xmms.playback_tickle.wait

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb playlist_item.rb 


Log Message:
select the first item in the playlist automatically
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- playlist.rb	28 May 2005 20:13:33 -0000	1.22
+++ playlist.rb	28 May 2005 21:06:36 -0000	1.23
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.22 2005/05/28 20:13:33 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.23 2005/05/28 21:06:36 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -127,6 +127,7 @@
 			super(item)
 
 			item.show(@eet) unless @container.nil?
+			item.select if size == 1
 		end
 
 		self
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- playlist_item.rb	28 May 2005 20:13:33 -0000	1.13
+++ playlist_item.rb	28 May 2005 21:06:36 -0000	1.14
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.13 2005/05/28 20:13:33 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.14 2005/05/28 21:06:36 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje, :position, :selected
@@ -41,6 +41,10 @@
 
 		@playlist.container.append_element(@edje)
 
+		if @selected
+			@edje.emit_signal("playlist_item.selected", "")
+		end
+
 		# if a playlist item gets hilighted, un-hilight all other items
 		# same for selected/unselected
 		["selected", "hilighted"].each do |state|
@@ -77,6 +81,14 @@
 		@edje.emit_signal("playlist_item.hilighted", "") unless @edje.nil?
 	end
 
+	def select
+		if @edje.nil?
+			@selected = true
+		else
+			@edje.emit_signal("playlist_item.selected", "")
+		end
+	end
+
 	def visible?
 		# since we don't actually hide the edje, but just delete it,
 		# we don't need to check @edje.visible? here

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb playlist_item.rb 


Log Message:
playlist item state fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- playlist.rb	28 May 2005 21:06:36 -0000	1.23
+++ playlist.rb	28 May 2005 21:24:33 -0000	1.24
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.23 2005/05/28 21:06:36 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.24 2005/05/28 21:24:33 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -24,7 +24,7 @@
 
 		@xmms.broadcast_playlist_current_pos.notifier do |res|
 			@current_pos = res.value
-			current_item.hilight
+			current_item.hilighted = true
 		end
 
 		@xmms.broadcast_playlist_changed.notifier do |res|
@@ -114,7 +114,7 @@
 
 		each { |i| i.show(eet) }
 
-		current_item && current_item.hilight
+		current_item && (current_item.hilighted = true)
 	end
 
 	def <<(id)
@@ -127,7 +127,7 @@
 			super(item)
 
 			item.show(@eet) unless @container.nil?
-			item.select if size == 1
+			(item.selected = true) if size == 1
 		end
 
 		self
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- playlist_item.rb	28 May 2005 21:06:36 -0000	1.14
+++ playlist_item.rb	28 May 2005 21:24:33 -0000	1.15
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.14 2005/05/28 21:06:36 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.15 2005/05/28 21:24:33 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje, :position, :selected
@@ -41,25 +41,22 @@
 
 		@playlist.container.append_element(@edje)
 
-		if @selected
-			@edje.emit_signal("playlist_item.selected", "")
-		end
+		self.selected = @selected
+
+		@edje.on_signal("playlist_item.selected") do |sig, src|
+			next if src == "Euphoria"
 
-		# if a playlist item gets hilighted, un-hilight all other items
-		# same for selected/unselected
-		["selected", "hilighted"].each do |state|
-			@edje.on_signal("playlist_item.#{state}") do
-				@playlist.each do |item|
-					if item != self
-						sig = "playlist_item.un#{state}"
-						item.edje.emit_signal(sig, "")
-					end
-				end
+			@playlist.each do |item|
+				item.selected = (item == self)
 			end
 		end
 
-		@edje.on_signal("playlist_item.selected") do
-			@selected = !@selected
+		@edje.on_signal("playlist_item.hilighted") do |sig, src|
+			next if src == "Euphoria"
+
+			@playlist.each do |item|
+				item.hilighted = (item == self)
+			end
 		end
 
 		@edje.on_signal("playlist_item.play") do
@@ -77,15 +74,19 @@
 		end
 	end
 
-	def hilight
-		@edje.emit_signal("playlist_item.hilighted", "") unless @edje.nil?
+	def hilighted=(b)
+		sig = b ? "hilighted" : "unhilighted"
+		unless @edje.nil?
+			@edje.emit_signal("playlist_item.#{sig}", "Euphoria")
+		end
 	end
 
-	def select
-		if @edje.nil?
-			@selected = true
-		else
-			@edje.emit_signal("playlist_item.selected", "")
+	def selected=(b)
+		@selected = b
+
+		sig = b ? "selected" : "unselected"
+		unless @edje.nil?
+			@edje.emit_signal("playlist_item.#{sig}", "Euphoria")
 		end
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
add 'hilighted' flag to PlaylistItem. when we get the current pos message, unhilight the current item and hilight the new one
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- euphoria	19 May 2005 18:18:43 -0000	1.27
+++ euphoria	29 May 2005 17:16:10 -0000	1.28
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.27 2005/05/19 18:18:43 tsauerbeck Exp $
+# $Id: euphoria,v 1.28 2005/05/29 17:16:10 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -14,6 +14,7 @@
 require "singleton"
 require "yaml"
 require "find"
+require "fileutils"
 
 require "euphoria/playlist"
 require "euphoria/playlist_item"
@@ -37,6 +38,10 @@
 		@xmms = nil
 
 		# settings
+		unless File.directory?(DATA_DIR_PRIV)
+			FileUtils.mkdir_p(DATA_DIR_PRIV)
+		end
+
 		@config_file = DATA_DIR_PRIV + "/config.yaml"
 
 		load_config

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb playlist_item.rb 


Log Message:
add 'hilighted' flag to PlaylistItem. when we get the current pos message, unhilight the current item and hilight the new one
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- playlist.rb	28 May 2005 21:24:33 -0000	1.24
+++ playlist.rb	29 May 2005 17:16:10 -0000	1.25
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.24 2005/05/28 21:24:33 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.25 2005/05/29 17:16:10 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -24,6 +24,7 @@
 
 		@xmms.broadcast_playlist_current_pos.notifier do |res|
 			@current_pos = res.value
+			find { |i| i.hilighted }.hilighted = false
 			current_item.hilighted = true
 		end
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- playlist_item.rb	28 May 2005 21:24:33 -0000	1.15
+++ playlist_item.rb	29 May 2005 17:16:10 -0000	1.16
@@ -1,7 +1,7 @@
-# $Id: playlist_item.rb,v 1.15 2005/05/28 21:24:33 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.16 2005/05/29 17:16:10 tsauerbeck Exp $
 
 class PlaylistItem
-	attr_reader :id, :edje, :position, :selected
+	attr_reader :id, :edje, :position, :selected, :hilighted
 
 	def initialize(id, xmms, playlist)
 		@id = id
@@ -13,6 +13,7 @@
 		@edje = nil
 		@height = 0
 		@selected = false
+		@hilighted = false
 
 		@props = {}
 
@@ -75,6 +76,8 @@
 	end
 
 	def hilighted=(b)
+		@hilighted = b
+
 		sig = b ? "hilighted" : "unhilighted"
 		unless @edje.nil?
 			@edje.emit_signal("playlist_item.#{sig}", "Euphoria")

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
if the environment variable XMMS_PATH is set, use that to connect to the daemon instead of config.ipc_path
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- euphoria	29 May 2005 17:16:10 -0000	1.28
+++ euphoria	29 May 2005 18:28:35 -0000	1.29
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.28 2005/05/29 17:16:10 tsauerbeck Exp $
+# $Id: euphoria,v 1.29 2005/05/29 18:28:35 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -177,7 +177,7 @@
 
 	def init_xmms
 		@xmms = XmmsClient::XmmsClient.new("Euphoria")
-		@xmms.connect(@config.ipc_path)
+		@xmms.connect(ENV["XMMS_PATH"] || @config.ipc_path)
 		@xmms.add_to_ecore_mainloop
 
 		@xmms.on_disconnect do

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
set window name and class
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- euphoria	29 May 2005 18:28:35 -0000	1.29
+++ euphoria	5 Jun 2005 19:47:00 -0000	1.30
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.29 2005/05/29 18:28:35 tsauerbeck Exp $
+# $Id: euphoria,v 1.30 2005/06/05 19:47:00 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -128,6 +128,7 @@
 	def init_gui
 		@ee = Ecore::Evas::SoftwareX11.new
 		@ee.title = "Euphoria"
+		@ee.name_class = ["Euphoria", "Euphoria"]
 		@ee.borderless = true
 
 		#@ee.evas.font_path_append("/usr/X11R6/lib/X11/fonts/TTF")

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria


Modified Files:
	Rakefile 


Log Message:
made the install task depend on the themes task
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/Rakefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Rakefile	19 May 2005 17:01:07 -0000	1.9
+++ Rakefile	14 Jun 2005 16:41:52 -0000	1.10
@@ -1,4 +1,4 @@
-# $Id: Rakefile,v 1.9 2005/05/19 17:01:07 tsauerbeck Exp $
+# $Id: Rakefile,v 1.10 2005/06/14 16:41:52 tsauerbeck Exp $
 
 require "rbconfig"
 require "rake/clean"
@@ -23,7 +23,7 @@
 	end
 end
 
-task :install do |t|
+task :install => :themes do |t|
 	ddir = destdir + prefix + "/bin"
 	FileUtils::Verbose.install("bin/euphoria", ddir, :mode => 0755)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
updated to new api. ie requires xmms2 > dr1.1
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- playlist.rb	4 Jun 2005 12:33:01 -0000	1.26
+++ playlist.rb	17 Jun 2005 12:19:34 -0000	1.27
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.26 2005/06/04 12:33:01 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.27 2005/06/17 12:19:34 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -32,15 +32,13 @@
 		end
 
 		@xmms.broadcast_playlist_changed.notifier do |res|
-			type, id, arg = res.playlist_change
-
-			case type
+			case res.value[:type].to_i
 				when XmmsClient::Result::PLAYLIST_CHANGED_ADD
-					self << id
+					self << res.value[:id]
 				when XmmsClient::Result::PLAYLIST_CHANGED_REMOVE
 					# the daemon sends the position of the song, not the
 					# unique mlib id
-					delete(self[id])
+					delete(self[res.value[:position].to_i])
 				when XmmsClient::Result::PLAYLIST_CHANGED_CLEAR
 					clear
 			end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
ducktyping goodness
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- euphoria	5 Jun 2005 19:47:00 -0000	1.30
+++ euphoria	7 Jul 2005 16:33:54 -0000	1.31
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.30 2005/06/05 19:47:00 tsauerbeck Exp $
+# $Id: euphoria,v 1.31 2005/07/07 16:33:54 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -74,7 +74,7 @@
 		end
 
 		# is repeat enabled?
-		s = @xmms.configval_get("playlist.repeat_all").wait.string
+		s = @xmms.configval_get("playlist.repeat_all").wait.value
 		@repeat = (s == "1")
 		@edje.emit_signal("TOGGLE_REPEAT_MODE", "Euphoria") if @repeat
 
@@ -286,7 +286,7 @@
 
 	def handle_current_pos(res)
 		begin
-			pos = res.uint
+			pos = res.value
 		rescue XmmsClient::ValueError
 		else
 			ui_fill_track_info(@playlist[pos])

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playtime_updater.rb slider.rb 


Log Message:
ducktyping goodness
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playtime_updater.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- playtime_updater.rb	27 Apr 2005 20:25:48 -0000	1.3
+++ playtime_updater.rb	7 Jul 2005 16:33:55 -0000	1.4
@@ -1,4 +1,4 @@
-# $Id: playtime_updater.rb,v 1.3 2005/04/27 20:25:48 tsauerbeck Exp $
+# $Id: playtime_updater.rb,v 1.4 2005/07/07 16:33:55 tsauerbeck Exp $
 
 class PlaytimeUpdater
 	INTERVAL = 0.25
@@ -29,7 +29,7 @@
 
 	private
 	def on_timer
-		pltime = @xmms.playback_playtime.wait.uint
+		pltime = @xmms.playback_playtime.wait.value
 		cur_pos = pltime / 1000
 
 		if @current_pos != cur_pos
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/slider.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- slider.rb	24 Apr 2005 22:33:15 -0000	1.1
+++ slider.rb	7 Jul 2005 16:33:56 -0000	1.2
@@ -1,4 +1,4 @@
-# $Id: slider.rb,v 1.1 2005/04/24 22:33:15 tsauerbeck Exp $
+# $Id: slider.rb,v 1.2 2005/07/07 16:33:56 tsauerbeck Exp $
 
 class Slider
 	def initialize(edje, xmms, part, config)
@@ -8,7 +8,7 @@
 		@config = config
 		@val = nil
 
-		self.value = @xmms.configval_get(config).wait.string
+		self.value = @xmms.configval_get(config).wait.value
 
 		@edje.on_signal("drag", @part) do
 			v = on_drag(@edje.part(@part).get_drag_value)

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
more ducktyping goodness
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- playlist.rb	17 Jun 2005 12:19:34 -0000	1.27
+++ playlist.rb	7 Jul 2005 19:59:22 -0000	1.28
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.27 2005/06/17 12:19:34 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.28 2005/07/07 19:59:22 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -32,13 +32,13 @@
 		end
 
 		@xmms.broadcast_playlist_changed.notifier do |res|
-			case res.value[:type].to_i
+			case res.value[:type]
 				when XmmsClient::Result::PLAYLIST_CHANGED_ADD
 					self << res.value[:id]
 				when XmmsClient::Result::PLAYLIST_CHANGED_REMOVE
 					# the daemon sends the position of the song, not the
 					# unique mlib id
-					delete(self[res.value[:position].to_i])
+					delete(self[res.value[:position]])
 				when XmmsClient::Result::PLAYLIST_CHANGED_CLEAR
 					clear
 			end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
don't use typed payload methods
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- euphoria	7 Jul 2005 16:33:54 -0000	1.31
+++ euphoria	17 Jul 2005 09:11:59 -0000	1.32
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.31 2005/07/07 16:33:54 tsauerbeck Exp $
+# $Id: euphoria,v 1.32 2005/07/17 09:11:59 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -263,7 +263,7 @@
 		end
 
 		@xmms.broadcast_configval_changed.notifier do |res|
-			k, v = res.stringlist
+			k, v = res.value
 
 			case k
 				when "playlist.repeat_all"

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
whoops, forgot to update this to the new api
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- euphoria	17 Jul 2005 09:11:59 -0000	1.32
+++ euphoria	14 Aug 2005 18:38:27 -0000	1.33
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.32 2005/07/17 09:11:59 tsauerbeck Exp $
+# $Id: euphoria,v 1.33 2005/08/14 18:38:27 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -263,7 +263,8 @@
 		end
 
 		@xmms.broadcast_configval_changed.notifier do |res|
-			k, v = res.value
+			k = res.value[:name]
+			v = res.value[:value]
 
 			case k
 				when "playlist.repeat_all"

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
late api update
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- playlist.rb	7 Jul 2005 19:59:22 -0000	1.28
+++ playlist.rb	26 Sep 2005 14:35:38 -0000	1.29
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.28 2005/07/07 19:59:22 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.29 2005/09/26 14:35:38 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -18,7 +18,7 @@
 
 		begin
 			@current_pos = @xmms.playlist_current_pos.wait.value
-		rescue XmmsClient::ValueError
+		rescue XmmsClient::Result::ValueError
 			@current_pos = nil
 		end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
late api update
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- euphoria	14 Aug 2005 18:38:27 -0000	1.33
+++ euphoria	26 Sep 2005 14:35:38 -0000	1.34
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.33 2005/08/14 18:38:27 tsauerbeck Exp $
+# $Id: euphoria,v 1.34 2005/09/26 14:35:38 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -288,7 +288,7 @@
 	def handle_current_pos(res)
 		begin
 			pos = res.value
-		rescue XmmsClient::ValueError
+		rescue XmmsClient::Result::ValueError
 		else
 			ui_fill_track_info(@playlist[pos])
 		end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist_item.rb 


Log Message:
propdict changes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist_item.rb,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- playlist_item.rb	29 May 2005 17:16:10 -0000	1.16
+++ playlist_item.rb	14 Dec 2005 20:02:14 -0000	1.17
@@ -1,4 +1,4 @@
-# $Id: playlist_item.rb,v 1.16 2005/05/29 17:16:10 tsauerbeck Exp $
+# $Id: playlist_item.rb,v 1.17 2005/12/14 20:02:14 tsauerbeck Exp $
 
 class PlaylistItem
 	attr_reader :id, :edje, :position, :selected, :hilighted
@@ -23,7 +23,9 @@
 	end
 
 	def method_missing(method)
-		@props[method]
+		tmp = @props[method]
+
+		tmp || @props[:server][method] || "default"
 	end
 
 	def duration
@@ -107,7 +109,6 @@
 
 	def properties=(hash)
 		@props = hash || {}
-		@props.default = "unknown"
 
 		set_parts_text unless @edje.nil?
 	end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
don't crash if file dialog edje not found
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- euphoria	26 Sep 2005 14:35:38 -0000	1.34
+++ euphoria	1 Jan 2006 19:17:40 -0000	1.35
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.34 2005/09/26 14:35:38 tsauerbeck Exp $
+# $Id: euphoria,v 1.35 2006/01/01 19:17:40 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -110,6 +110,11 @@
 	end
 
 	def show_file_dialog
+		if @file_dialog_theme.nil?
+			puts "file dialog edje not found"
+			return
+		end
+
 		FileDialog.open(@file_dialog_theme) do |sel|
 			if File.directory?(sel)
 				files = []

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
xmms loonies broke the ruby bindings. luckily, nobody uses euphoria anyway ;)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- euphoria	1 Jan 2006 19:17:40 -0000	1.35
+++ euphoria	11 Mar 2006 19:09:30 -0000	1.36
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.35 2006/01/01 19:17:40 tsauerbeck Exp $
+# $Id: euphoria,v 1.36 2006/03/11 19:09:30 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -70,7 +70,7 @@
 
 			signal_playback_state
 			@playtime_updater.enabled =
-				(@playback_state == XmmsClient::XmmsClient::PLAY)
+				(@playback_state == Xmms::Client::PLAY)
 		end
 
 		# is repeat enabled?
@@ -182,7 +182,7 @@
 	end
 
 	def init_xmms
-		@xmms = XmmsClient::XmmsClient.new("Euphoria")
+		@xmms = Xmms::Client.new("Euphoria")
 		@xmms.connect(ENV["XMMS_PATH"] || @config.ipc_path)
 		@xmms.add_to_ecore_mainloop
 
@@ -203,7 +203,7 @@
 
 		@edje.on_signal("playback.play") do
 			case @playback_state
-				when XmmsClient::XmmsClient::PLAY
+				when Xmms::Client::PLAY
 					@xmms.playback_stop.wait
 					sleep(0.5) # evil hack, fix xmms2d instead
 					@xmms.playback_start.wait
@@ -218,9 +218,9 @@
 
 		@edje.on_signal("playback.pause") do
 			case @playback_state
-				when XmmsClient::XmmsClient::PLAY
+				when Xmms::Client::PLAY
 					@xmms.playback_pause.wait
-				when XmmsClient::XmmsClient::PAUSE
+				when Xmms::Client::PAUSE
 					@xmms.playback_start.wait
 			end
 		end
@@ -229,7 +229,7 @@
 			@xmms.playlist_set_next_rel(1).wait
 			@xmms.playback_tickle.wait
 
-			if @playback_state != XmmsClient::XmmsClient::PLAY
+			if @playback_state != Xmms::Client::PLAY
 				@xmms.playback_start.wait
 			end
 		end
@@ -238,7 +238,7 @@
 			@xmms.playlist_set_next_rel(-1).wait
 			@xmms.playback_tickle.wait
 
-			if @playback_state != XmmsClient::XmmsClient::PLAY
+			if @playback_state != Xmms::Client::PLAY
 				@xmms.playback_start.wait
 			end
 		end
@@ -293,7 +293,7 @@
 	def handle_current_pos(res)
 		begin
 			pos = res.value
-		rescue XmmsClient::Result::ValueError
+		rescue Xmms::Result::ValueError
 		else
 			ui_fill_track_info(@playlist[pos])
 		end
@@ -330,9 +330,9 @@
 
 	def signal_playback_state
 		sig = case @playback_state
-			when XmmsClient::XmmsClient::PAUSE
+			when Xmms::Client::PAUSE
 				"PLAYBACK_STATE_PAUSED"
-			when XmmsClient::XmmsClient::PLAY
+			when Xmms::Client::PLAY
 				"PLAYBACK_STATE_PLAYING"
 			else
 				"PLAYBACK_STATE_STOPPED"

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/lib


Modified Files:
	playlist.rb 


Log Message:
xmms loonies broke the ruby bindings. luckily, nobody uses euphoria anyway ;)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/lib/playlist.rb,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- playlist.rb	26 Sep 2005 14:35:38 -0000	1.29
+++ playlist.rb	11 Mar 2006 19:09:32 -0000	1.30
@@ -1,4 +1,4 @@
-# $Id: playlist.rb,v 1.29 2005/09/26 14:35:38 tsauerbeck Exp $
+# $Id: playlist.rb,v 1.30 2006/03/11 19:09:32 tsauerbeck Exp $
 
 require "euphoria/playlist_item"
 
@@ -18,7 +18,7 @@
 
 		begin
 			@current_pos = @xmms.playlist_current_pos.wait.value
-		rescue XmmsClient::Result::ValueError
+		rescue Xmms::Result::ValueError
 			@current_pos = nil
 		end
 
@@ -33,13 +33,13 @@
 
 		@xmms.broadcast_playlist_changed.notifier do |res|
 			case res.value[:type]
-				when XmmsClient::Result::PLAYLIST_CHANGED_ADD
+				when Xmms::Result::PLAYLIST_CHANGED_ADD
 					self << res.value[:id]
-				when XmmsClient::Result::PLAYLIST_CHANGED_REMOVE
+				when Xmms::Result::PLAYLIST_CHANGED_REMOVE
 					# the daemon sends the position of the song, not the
 					# unique mlib id
 					delete(self[res.value[:position]])
-				when XmmsClient::Result::PLAYLIST_CHANGED_CLEAR
+				when Xmms::Result::PLAYLIST_CHANGED_CLEAR
 					clear
 			end
 		end

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/bin


Modified Files:
	euphoria 


Log Message:
another api update
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/bin/euphoria,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- euphoria	11 Mar 2006 19:09:30 -0000	1.36
+++ euphoria	16 Mar 2006 18:34:30 -0000	1.37
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -w
 
-# $Id: euphoria,v 1.36 2006/03/11 19:09:30 tsauerbeck Exp $
+# $Id: euphoria,v 1.37 2006/03/16 18:34:30 tsauerbeck Exp $
 
 require "ecore"
 require "ecore_x"
@@ -268,8 +268,8 @@
 		end
 
 		@xmms.broadcast_configval_changed.notifier do |res|
-			k = res.value[:name]
-			v = res.value[:value]
+			k = res.value.keys.first
+			v = res.value.values.first
 
 			case k
 				when "playlist.repeat_all"