Enlightenment CVS committal

Author  : atmosphere
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


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


Log Message:
hopefully trill won't have to reformat this, fix the "Dummy" entries where
the mediainfo wasn't getting set properly.


===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- callbacks.c 27 Feb 2004 22:18:19 -0000      1.6
+++ callbacks.c 27 Feb 2004 23:11:28 -0000      1.7
@@ -1,5 +1,5 @@
 /*
- * $Id: callbacks.c,v 1.6 2004/02/27 22:18:19 tsauerbeck Exp $
+ * $Id: callbacks.c,v 1.7 2004/02/27 23:11:28 atmosphere Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -529,10 +529,8 @@
                }
        }
 
-       if (id >= 1) {
+       if (id > 0) 
                playlist_set_current(e->playlist, id);
-               xmmsc_playlist_get_mediainfo(e->xmms, id);
-       }
 
        hilight_current_track(e);
 }
@@ -557,6 +555,13 @@
                ui_fill_track_info(e, pli);
 }
 
+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;
        
@@ -571,7 +576,6 @@
        unsigned int id = (unsigned int) arg;
 
        playlist_item_add(e->playlist, id);
-       xmmsc_playlist_get_mediainfo(e->xmms, id);
 }
 
 XMMS_CB(playlist_remove) {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/callbacks.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- callbacks.h 27 Feb 2004 21:55:31 -0000      1.3
+++ callbacks.h 27 Feb 2004 23:11:28 -0000      1.4
@@ -2,7 +2,7 @@
 #define __CALLBACKS_H
 
 /*
- * $Id: callbacks.h,v 1.3 2004/02/27 21:55:31 tsauerbeck Exp $
+ * $Id: callbacks.h,v 1.4 2004/02/27 23:11:28 atmosphere Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -65,6 +65,7 @@
 XMMS_CB(playback_playtime);
 XMMS_CB(playback_currentid);
 XMMS_CB(playlist_mediainfo);
+XMMS_CB(playlist_mediainfo_id);
 XMMS_CB(playlist_list);
 XMMS_CB(playlist_add);
 XMMS_CB(playlist_remove);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- euphoria.c  27 Feb 2004 21:55:31 -0000      1.4
+++ euphoria.c  27 Feb 2004 23:11:28 -0000      1.5
@@ -1,5 +1,5 @@
 /*
- * $Id: euphoria.c,v 1.4 2004/02/27 21:55:31 tsauerbeck Exp $
+ * $Id: euphoria.c,v 1.5 2004/02/27 23:11:28 atmosphere Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -91,6 +91,8 @@
                           (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,
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/euphoria.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- euphoria.h  27 Feb 2004 21:55:31 -0000      1.3
+++ euphoria.h  27 Feb 2004 23:11:28 -0000      1.4
@@ -2,14 +2,14 @@
 #define __EUPHORIA_H
 
 /*
- * $Id: euphoria.h,v 1.3 2004/02/27 21:55:31 tsauerbeck Exp $
+ * $Id: euphoria.h,v 1.4 2004/02/27 23:11:28 atmosphere Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
 #include <Ecore.h>
+#include <Ecore_X.h>
 #include <Ecore_Evas.h>
 #include <Ecore_Fb.h>
-#include <Ecore_X.h>
 #include <xmms/xmmsclient.h>
 #include "playlist.h"
 




-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to