1 files changed, 26 insertions, 7 deletions
diff --git a/libjava/classpath/javax/sound/sampled/AudioFormat.java b/libjava/classpath/javax/sound/sampled/AudioFormat.java
index 6296784426c..7b6ebc4b03b 100644
--- a/libjava/classpath/javax/sound/sampled/AudioFormat.java
+++ b/libjava/classpath/javax/sound/sampled/AudioFormat.java
@@ -330,16 +330,35 @@ public class AudioFormat
   public String toString()
   {
     StringBuffer result = new StringBuffer();
+    
+    // usually at least encoding should be somewhat specified
     result.append(encoding);
-    result.append(" ");
-    result.append(sampleRate);
-    result.append(" Hz ");
-    result.append(sampleSizeInBits);
-    result.append(" bits ");
-    result.append(channels);
-    result.append(" channels");
+    
+    if (sampleRate != AudioSystem.NOT_SPECIFIED)
+      {
+        result.append(" ");
+        result.append(sampleRate);
+        result.append(" Hz");
+      }
+    
+    if (sampleSizeInBits != AudioSystem.NOT_SPECIFIED)
+      {
+        result.append(" ");
+        result.append(sampleSizeInBits);
+        result.append(" bits");
+      }
+    
+    if (channels != AudioSystem.NOT_SPECIFIED)
+      {
+        result.append(" ");
+        result.append(channels);
+        result.append(" channel");
+        if (channels > 1) result.append("s");
+      }
+    
     if (sampleSizeInBits > 8)
       result.append(bigEndian ? " big endian" : " little endian");
+    
     return result.toString();
   }
 }