changeset 552:91bc67e7800b trunk

[svn] - adapted plugin to use new formatter (without xmms_ prefix)
author mf0102
date Sat, 27 Jan 2007 06:10:29 -0800
parents c0f69d57483b
children 269841b8fb31
files ChangeLog src/song_change/song_change.c
diffstat 2 files changed, 29 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 25 22:52:52 2007 -0800
+++ b/ChangeLog	Sat Jan 27 06:10:29 2007 -0800
@@ -1,3 +1,16 @@
+2007-01-26 06:52:52 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1188]
+  - change some references for long to int, reported by and patch by 
+    Kazuki Oikawa, closes #769.
+  
+  trunk/src/tta/crc32.h   |   10 ++--
+  trunk/src/tta/filters.h |   16 +++----
+  trunk/src/tta/ttadec.c  |  104 ++++++++++++++++++++++++------------------------
+  trunk/src/tta/ttadec.h  |   40 +++++++++---------
+  trunk/src/tta/ttalib.h  |   26 ++++++------
+  5 files changed, 98 insertions(+), 98 deletions(-)
+
+
 2007-01-26 06:27:29 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1186]
   - who the fuck put that there
--- a/src/song_change/song_change.c	Thu Jan 25 22:52:52 2007 -0800
+++ b/src/song_change/song_change.c	Sat Jan 27 06:10:29 2007 -0800
@@ -135,52 +135,52 @@
 
 	if (cmd && strlen(cmd) > 0)
 	{
-		formatter = xmms_formatter_new();
+		formatter = formatter_new();
 		str = xmms_remote_get_playlist_title(sc_gp.xmms_session, pos);
 		if (str)
 		{
 			temp = escape_shell_chars(str);
-			xmms_formatter_associate(formatter, 's', temp);
-			xmms_formatter_associate(formatter, 'n', temp);
+			formatter_associate(formatter, 's', temp);
+			formatter_associate(formatter, 'n', temp);
 			g_free(str);
 			g_free(temp);
 		}
 		else
 		{
-			xmms_formatter_associate(formatter, 's', "");
-			xmms_formatter_associate(formatter, 'n', "");
+			formatter_associate(formatter, 's', "");
+			formatter_associate(formatter, 'n', "");
 		}
 
 		if (current_file)
 		{
 			temp = escape_shell_chars(current_file);
-			xmms_formatter_associate(formatter, 'f', temp);
+			formatter_associate(formatter, 'f', temp);
 			g_free(temp);
 		}
 		else
-			xmms_formatter_associate(formatter, 'f', "");
+			formatter_associate(formatter, 'f', "");
 		sprintf(numbuf, "%02d", pos + 1);
-		xmms_formatter_associate(formatter, 't', numbuf);
+		formatter_associate(formatter, 't', numbuf);
 		length = xmms_remote_get_playlist_time(sc_gp.xmms_session, pos);
 		if (length != -1)
 		{
 			sprintf(numbuf, "%d", length);
-			xmms_formatter_associate(formatter, 'l', numbuf);
+			formatter_associate(formatter, 'l', numbuf);
 		}
 		else
-			xmms_formatter_associate(formatter, 'l', "0");
+			formatter_associate(formatter, 'l', "0");
 		xmms_remote_get_info(sc_gp.xmms_session, &rate, &freq, &nch);
 		sprintf(numbuf, "%d", rate);
-		xmms_formatter_associate(formatter, 'r', numbuf);
+		formatter_associate(formatter, 'r', numbuf);
 		sprintf(numbuf, "%d", freq);
-		xmms_formatter_associate(formatter, 'F', numbuf);
+		formatter_associate(formatter, 'F', numbuf);
 		sprintf(numbuf, "%d", nch);
-		xmms_formatter_associate(formatter, 'c', numbuf);
+		formatter_associate(formatter, 'c', numbuf);
 		playing = xmms_remote_is_playing(sc_gp.xmms_session);
 		sprintf(numbuf, "%d", playing);
-		xmms_formatter_associate(formatter, 'p', numbuf);
-		shstring = xmms_formatter_format(formatter, cmd);
-		xmms_formatter_destroy(formatter);
+		formatter_associate(formatter, 'p', numbuf);
+		shstring = formatter_format(formatter, cmd);
+		formatter_destroy(formatter);
 
 		if (shstring)
 		{