Use the modern Ki/Mi/Gi prefixes to clarify that 1024 is the base.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@668 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/polyp/sample.c b/src/polyp/sample.c
index d587170..668a485 100644 (file)
--- a/src/polyp/sample.c
+++ b/src/polyp/sample.c
@@ -115,11 +115,11 @@ char *pa_sample_spec_snprint(char *s, size_t l, const pa_sample_spec *spec) {
 
 void pa_bytes_snprint(char *s, size_t l, unsigned v) {
     if (v >= ((unsigned) 1024)*1024*1024)
-        snprintf(s, l, "%0.1f GB", ((double) v)/1024/1024/1024);
+        snprintf(s, l, "%0.1f GiB", ((double) v)/1024/1024/1024);
     else if (v >= ((unsigned) 1024)*1024)
-        snprintf(s, l, "%0.1f MB", ((double) v)/1024/1024);
+        snprintf(s, l, "%0.1f MiB", ((double) v)/1024/1024);
     else if (v >= (unsigned) 1024)
-        snprintf(s, l, "%0.1f KB", ((double) v)/1024);
+        snprintf(s, l, "%0.1f KiB", ((double) v)/1024);
     else
         snprintf(s, l, "%u B", (unsigned) v);
 }

diff --git a/src/polyp/sample.h b/src/polyp/sample.h
index a7abdc3..284b428 100644 (file)
--- a/src/polyp/sample.h
+++ b/src/polyp/sample.h
@@ -91,7 +91,7 @@
  * \li pa_parse_sample_format() - Parse a text string into a sample format.
  * \li pa_sample_spec_snprint() - Create a textual description of a complete
  *                                 sample format specification.
- * \li pa_bytes_snprint() - Pretty print a byte value (e.g. 2.5 MB).
+ * \li pa_bytes_snprint() - Pretty print a byte value (e.g. 2.5 MiB).
  */
 
 /** \file
@@ -178,7 +178,7 @@ pa_sample_format_t pa_parse_sample_format(const char *format);
 /** Pretty print a sample type specification to a string */
 char* pa_sample_spec_snprint(char *s, size_t l, const pa_sample_spec *spec);
 
-/** Pretty print a byte size value. (i.e. "2.5 MB") */
+/** Pretty print a byte size value. (i.e. "2.5 MiB") */
 void pa_bytes_snprint(char *s, size_t l, unsigned v);
 
 PA_C_DECL_END