changeset 2077:e074c9ba7072 trunk

[svn] - cleanup the declaration of PlaylistEntry, and add some initial structure for migrating to multiple playlists.
author nenolod
date Mon, 11 Dec 2006 01:53:05 -0800
parents c291952bf462
children 6ce74d8d2dee
files ChangeLog audacious/playlist.h
diffstat 2 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Dec 11 01:23:47 2006 -0800
+++ b/ChangeLog	Mon Dec 11 01:53:05 2006 -0800
@@ -1,3 +1,11 @@
+2006-12-11 09:23:47 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3155]
+  - exit gracefully on SIGINT/SIGTERM.
+  
+  trunk/audacious/main.c |    9 +++++++++
+  1 file changed, 9 insertions(+)
+
+
 2006-12-09 10:18:22 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [3153]
   - build fix
--- a/audacious/playlist.h	Mon Dec 11 01:23:47 2006 -0800
+++ b/audacious/playlist.h	Mon Dec 11 01:53:05 2006 -0800
@@ -1,5 +1,5 @@
 /*  Audacious - Cross-platform multimedia player
- *  Copyright (C) 2005-2006  William Pitcock, Tony Vroon, George Averill,
+ *  Copyright (C) 2005-2007  William Pitcock, Tony Vroon, George Averill,
  *                           Giacomo Lozito, Derek Pomery and Yoshiki Yazawa.
  *
  *  XMMS - Cross-platform multimedia player
@@ -54,16 +54,22 @@
 } PlaylistFormat;
 
 #define PLAYLIST_ENTRY(x)  ((PlaylistEntry*)(x))
-struct _PlaylistEntry {
+typedef struct _PlaylistEntry {
     gchar *filename;
     gchar *title;
     gint length;
     gboolean selected;
     InputPlugin *decoder;
     TitleInput *tuple;		/* cached entry tuple, if available */
-};
+} PlaylistEntry;
 
-typedef struct _PlaylistEntry PlaylistEntry;
+#define PLAYLIST(x)  ((Playlist *)(x))
+typedef struct _Playlist {
+    gchar *title;
+    gchar *filename;
+    gint   length;
+    GList *entries;
+} Playlist;
 
 PlaylistEntry *playlist_entry_new(const gchar * filename,
                                   const gchar * title, const gint len,