Mercurial > audlegacy

changeset 2933:7be518cc8e60 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Transition to audtool_report()/audtool_whine().
author William Pitcock <nenolod@atheme.org>
date Fri, 29 Jun 2007 08:33:09 -0500
parents fe27b67d8c37
children c32036aa4b4d
files src/audtool/audtool_handlers_playback.c src/audtool/audtool_handlers_playqueue.c
diffstat 2 files changed, 29 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/src/audtool/audtool_handlers_playback.c	Fri Jun 29 08:28:36 2007 -0500
+++ b/src/audtool/audtool_handlers_playback.c	Fri Jun 29 08:33:09 2007 -0500
@@ -97,17 +97,17 @@
 {
 	if (audacious_remote_is_paused(dbus_proxy))
 	{
-		g_print("paused\n");
+		audtool_report("paused");
 		return;
 	}
 	else if (audacious_remote_is_playing(dbus_proxy))
 	{
-		g_print("playing\n");
+		audtool_report("playing");
 		return;
 	}
 	else
 	{
-		g_print("stopped\n");
+		audtool_report("stopped");
 		return;
 	}
 }
@@ -116,8 +116,8 @@
 {
 	if (argc < 2)
 	{
-		g_print("%s: invalid parameters for playback-seek.\n", argv[0]);
-		g_print("%s: syntax: %s playback-seek <position>\n", argv[0], argv[0]);
+		audtool_whine("invalid parameters for %s.", argv[0]);
+		audtool_whine("syntax: %s <position>", argv[0]);
 		return;
 	}
 
@@ -130,8 +130,8 @@
 
 	if (argc < 2)
 	{
-		g_print("%s: invalid parameters for playback-seek-relative.\n", argv[0]);
-		g_print("%s: syntax: %s playback-seek <position>\n", argv[0], argv[0]);
+		audtool_whine("invalid parameters for %s.", argv[0]);
+		audtool_whine("syntax: %s <position>", argv[0]);
 		return;
 	}
 
--- a/src/audtool/audtool_handlers_playqueue.c	Fri Jun 29 08:28:36 2007 -0500
+++ b/src/audtool/audtool_handlers_playqueue.c	Fri Jun 29 08:33:09 2007 -0500
@@ -43,8 +43,8 @@
 
 	if (argc < 2)
 	{
-		g_print("%s: invalid parameters for playqueue-add.\n", argv[0]);
-		g_print("%s: syntax: %s playqueue-add <position>\n", argv[0], argv[0]);
+		audtool_whine("invalid parameters for %s.", argv[0]);
+		audtool_whine("syntax: %s <position>", argv[0]);
 		return;
 	}
 
@@ -52,7 +52,7 @@
 
 	if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy))
 	{
-		g_print("%s: invalid playlist position %d\n", argv[0], i);
+		audtool_whine("invalid playlist position %d", i);
 		return;
 	}
 
@@ -66,8 +66,8 @@
 
 	if (argc < 2)
 	{
-		g_print("%s: invalid parameters for playqueue-remove.\n", argv[0]);
-		g_print("%s: syntax: %s playqueue-remove <position>\n", argv[0], argv[0]);
+		audtool_whine("invalid parameters for %s.", argv[0]);
+		audtool_whine("syntax: %s <position>", argv[0]);
 		return;
 	}
 
@@ -75,7 +75,7 @@
 
 	if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy))
 	{
-		g_print("%s: invalid playlist position %d\n", argv[0], i);
+		audtool_whine("invalid playlist position %d", i);
 		return;
 	}
 
@@ -89,8 +89,8 @@
 
 	if (argc < 2)
 	{
-		g_print("%s: invalid parameters for playqueue-is-queued.\n", argv[0]);
-		g_print("%s: syntax: %s playqueue-is-queued <position>\n", argv[0], argv[0]);
+		audtool_whine("invalid parameters for playqueue-is-queued.", argv[0]);
+		audtool_whine("syntax: %s playqueue-is-queued <position>", argv[0]);
 		return;
 	}
 
@@ -98,7 +98,7 @@
 
 	if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy))
 	{
-		g_print("%s: invalid playlist position %d\n", argv[0], i);
+		audtool_whine("invalid playlist position %d", i);
 		return;
 	}
 
@@ -111,8 +111,8 @@
 
 	if (argc < 2)
 	{
-		g_print("%s: invalid parameters for playqueue-get-position.\n", argv[0]);
-		g_print("%s: syntax: %s playqueue-get-position <position>\n", argv[0], argv[0]);
+		audtool_whine("invalid parameters for %s.", argv[0]);
+		audtool_whine("syntax: %s <position>", argv[0]);
 		return;
 	}
 
@@ -120,7 +120,7 @@
 
 	if (i < 1 || i > audacious_remote_get_playlist_length(dbus_proxy))
 	{
-		g_print("%s: invalid playlist position %d\n", argv[0], i);
+		audtool_whine("invalid playlist position %d", i);
 		return;
 	}
 
@@ -129,7 +129,7 @@
 	if (pos < 1)
 		return;
 
-	g_print("%d\n", pos);
+	audtool_report("%d", pos);
 }
 
 void playqueue_get_qposition(gint argc, gchar **argv)
@@ -138,8 +138,8 @@
 
 	if (argc < 2)
 	{
-		g_print("%s: invalid parameters for playqueue-get-qposition.\n", argv[0]);
-		g_print("%s: syntax: %s playqueue-get-qposition <position>\n", argv[0], argv[0]);
+		audtool_whine("invalid parameters for %s.", argv[0]);
+		audtool_whine("syntax: %s <position>", argv[0]);
 		return;
 	}
 
@@ -147,7 +147,7 @@
 
 	if (i < 1 || i > audacious_remote_get_playqueue_length(dbus_proxy))
 	{
-		g_print("%s: invalid playlist position %d\n", argv[0], i);
+		audtool_whine("invalid playlist position %d", i);
 		return;
 	}
 
@@ -156,7 +156,7 @@
 	if (pos < 1)
 		return;
 
-	g_print("%d\n", pos);
+	audtool_report("%d", pos);
 }
 
 void playqueue_display(gint argc, gchar **argv)
@@ -168,7 +168,7 @@
 	
 	i = audacious_remote_get_playqueue_length(dbus_proxy);
 
-	g_print("%d queued tracks.\n", i);
+	audtool_report("%d queued tracks.", i);
 
 	total = 0;
 
@@ -201,12 +201,12 @@
 			}
 		}
 
-		fmt = g_strdup_printf("%%4d | %%4d | %%-%ds | %%d:%%.2d\n", column);
-		g_print(fmt, ii + 1, position + 1, songname, length / 60, length % 60);
+		fmt = g_strdup_printf("%%4d | %%4d | %%-%ds | %%d:%%.2d", column);
+		audtool_report(fmt, ii + 1, position + 1, songname, length / 60, length % 60);
 		g_free(fmt);
 	}
 
-	g_print("Total length: %d:%.2d\n", total / 60, total % 60);
+	audtool_report("Total length: %d:%.2d", total / 60, total % 60);
 }
 
 void playqueue_length(gint argc, gchar **argv)
@@ -215,7 +215,7 @@
 
 	i = audacious_remote_get_playqueue_length(dbus_proxy);
 
-	g_print("%d\n", i);
+	audtool_report("%d", i);
 }
 
 void playqueue_clear(gint argc, gchar **argv)