Mercurial > audlegacy
changeset 2593:65073812a5cf trunk
[svn] - custom field support for audacious_get_tuple_field_data()
| author | nhjm449 |
|---|---|
| date | Wed, 28 Feb 2007 16:07:21 -0800 |
| parents | 6f7be3702c5f |
| children | f6e7400a5c1f |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/controlsocket.c src/audacious/titlestring.h src/audtool/audtool.c |
| diffstat | 5 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 28 09:52:22 2007 -0800 +++ b/ChangeLog Wed Feb 28 16:07:21 2007 -0800 @@ -1,3 +1,14 @@ +2007-02-28 17:52:22 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [4194] + - revert the penalty-based "find something to play" logic of 1.2. it's + mostly irrelevant now, because entries should have a decoder mapped to + them by the time we get here now, and if they don't, + playback_play_file() can handle it. + + trunk/src/audacious/playback.c | 29 +---------------------------- + 1 file changed, 1 insertion(+), 28 deletions(-) + + 2007-02-28 15:44:30 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [4192] - there was a missing delimeter in the patch credits
--- a/src/audacious/build_stamp.c Wed Feb 28 09:52:22 2007 -0800 +++ b/src/audacious/build_stamp.c Wed Feb 28 16:07:21 2007 -0800 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070228-4192"; +const gchar *svn_stamp = "20070228-4194";
--- a/src/audacious/controlsocket.c Wed Feb 28 09:52:22 2007 -0800 +++ b/src/audacious/controlsocket.c Wed Feb 28 16:07:21 2007 -0800 @@ -600,6 +600,8 @@ ctrl_write_string(pkt->fd, tuple->album_name); } else if (!strcasecmp(ptr, "formatter")) { ctrl_write_string(pkt->fd, tuple->formatter); + } else if (!strcasecmp(ptr, "custom")) { + ctrl_write_string(pkt->fd, tuple->custom); } else if (!strcasecmp(ptr, "mtime")) { ctrl_write_gint(pkt->fd, tuple->mtime); }
--- a/src/audacious/titlestring.h Wed Feb 28 09:52:22 2007 -0800 +++ b/src/audacious/titlestring.h Wed Feb 28 16:07:21 2007 -0800 @@ -42,6 +42,7 @@ * @file_path: The path that the media is in. * @length: The length of the media. * @formatter: The format string that should be used. + * @custom: A custom field for miscellaneous information. * @mtime: The last modified time of the file. * * Tuple which is passed to xmms_get_titlestring(). An input tuple
--- a/src/audtool/audtool.c Wed Feb 28 09:52:22 2007 -0800 +++ b/src/audtool/audtool.c Wed Feb 28 16:07:21 2007 -0800 @@ -265,7 +265,8 @@ g_print("%s: syntax: %s current-song-tuple-data <fieldname>\n", argv[0], argv[0]); g_print("%s: - fieldname example choices: performer, album_name,\n", argv[0]); g_print("%s: track_name, track_number, year, date, genre, comment,\n", argv[0]); - g_print("%s: file_name, file_ext, file_path, length, formatter, mtime\n", argv[0]); + g_print("%s: file_name, file_ext, file_path, length, formatter,\n", argv[0]); + g_print("%s: custom, mtime\n", argv[0]); return; } @@ -701,7 +702,8 @@ g_print("%s: syntax: %s playlist-tuple-data <fieldname> <position>\n", argv[0], argv[0]); g_print("%s: - fieldname example choices: performer, album_name,\n", argv[0]); g_print("%s: track_name, track_number, year, date, genre, comment,\n", argv[0]); - g_print("%s: file_name, file_ext, file_path, length, formatter, mtime\n", argv[0]); + g_print("%s: file_name, file_ext, file_path, length, formatter,\n", argv[0]); + g_print("%s: custom, mtime\n", argv[0]); return; }