changeset 1395:b7250d516b62 trunk

[svn] - revert botched patch
author nenolod
date Wed, 12 Jul 2006 08:19:01 -0700
parents 65490480559e
children b63b5c47efd9
files ChangeLog Plugins/Input/console/Audacious_Driver.cpp Plugins/Input/console/Spc_Emu.h
diffstat 3 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jul 11 18:02:24 2006 -0700
+++ b/ChangeLog	Wed Jul 12 08:19:01 2006 -0700
@@ -1,3 +1,12 @@
+2006-07-12 01:02:24 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1702]
+  - install the amidi-plug plugins to ${libdir}/amidi-plug.
+  
+
+  Changes:        Modified:
+  +1 -1           trunk/configure.ac  
+
+
 2006-07-11 23:49:16 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [1700]
   - make cdaudio access cddb via protocol level 6 for utf-8 reply.
--- a/Plugins/Input/console/Audacious_Driver.cpp	Tue Jul 11 18:02:24 2006 -0700
+++ b/Plugins/Input/console/Audacious_Driver.cpp	Wed Jul 12 08:19:01 2006 -0700
@@ -252,9 +252,10 @@
 		track_info_t* out )
 {
 	// decode length (can be in text or binary format)
-	unsigned const char s [4] = { h.len_secs [0], h.len_secs [1], h.len_secs [2], 0 };
+	char s [4] = { h.len_secs [0], h.len_secs [1], h.len_secs [2], 0 };
 	int len_secs = (unsigned char) s [1] * 0x100 + s [0];
-
+	if ( s [1] >= ' ' || (!s [1] && isdigit( s [0] )) )
+		len_secs = atoi( s );
 	if ( len_secs )
 		out->length = len_secs * 1000;
 	
--- a/Plugins/Input/console/Spc_Emu.h	Tue Jul 11 18:02:24 2006 -0700
+++ b/Plugins/Input/console/Spc_Emu.h	Wed Jul 12 08:19:01 2006 -0700
@@ -35,7 +35,7 @@
 		char dumper [16];
 		char comment [32];
 		byte date [11];
-		unsigned char len_secs [3];
+		char len_secs [3];
 		byte fade_msec [5];
 		char author [32];
 		byte mute_mask;