[xiph-commits] r17013 - trunk/vorbis-tools/ogg123

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-03-24 01:11:06 -0700 (Wed, 24 Mar 2010)
New Revision: 17013

Modified:
   trunk/vorbis-tools/ogg123/ogg123.c
   trunk/vorbis-tools/ogg123/remote.c
   trunk/vorbis-tools/ogg123/remote.h
Log:
Fixes Trac #1524


Modified: trunk/vorbis-tools/ogg123/ogg123.c
===================================================================
--- trunk/vorbis-tools/ogg123/ogg123.c	2010-03-24 07:37:36 UTC (rev 17012)
+++ trunk/vorbis-tools/ogg123/ogg123.c	2010-03-24 08:11:06 UTC (rev 17013)
@@ -295,10 +295,9 @@
   if (options.remote) {
 
     /* Display statistics via the remote interface */
-    remote_time(pstats_arg->decoder_statistics->current_time, 
-                pstats_arg->decoder_statistics->total_time,
-				pstats_arg->decoder_statistics->instant_bitrate);
-				
+    remote_time(pstats_arg->decoder_statistics->current_time,
+                pstats_arg->decoder_statistics->total_time);
+
   } else {
 
 	/* Disable/Enable statistics as needed */

Modified: trunk/vorbis-tools/ogg123/remote.c
===================================================================
--- trunk/vorbis-tools/ogg123/remote.c	2010-03-24 07:37:36 UTC (rev 17012)
+++ trunk/vorbis-tools/ogg123/remote.c	2010-03-24 08:11:06 UTC (rev 17013)
@@ -415,10 +415,10 @@
   return ((s == NEXT) || (s == STOP) || (s == QUIT));
 }
 
-void remote_time(double current, double total, long bitrate) {
+void remote_time(double current, double total) {
 
-  /* Send the frame (not implemented yet) the time and current bitrate */
-  send_msg("F 0 0 %.2f %.2f %li", current, (total-current), (bitrate/1024));
-  
+  /* Send the frame (not implemented yet) and the time */
+  send_msg("F 0 0 %.2f %.2f", current, (total-current));
+
   return;
 }

Modified: trunk/vorbis-tools/ogg123/remote.h
===================================================================
--- trunk/vorbis-tools/ogg123/remote.h	2010-03-24 07:37:36 UTC (rev 17012)
+++ trunk/vorbis-tools/ogg123/remote.h	2010-03-24 08:11:06 UTC (rev 17013)
@@ -7,7 +7,7 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS BEFORE DISTRIBUTING.                     *
  *                                                                  *
- * THE Ogg123 SOURCE CODE IS (C) COPYRIGHT 2000-2001                *
+ * THE Ogg123 SOURCE CODE IS (C) COPYRIGHT 2000-2010                *
  * by Kenneth C. Arnold <ogg at arnoldnet.net> AND OTHER CONTRIBUTORS  *
  * http://www.xiph.org/                                             *
  *                                                                  *
@@ -19,4 +19,4 @@
 
 void remote_mainloop(void);
 int remote_playloop(void);
-void remote_time(double current, double total, long bitrate);
+void remote_time(double current, double total);