Merge lp:~cmiller/ubuntuone-android-music/hide-meaningless-bitrate-and-filetype into lp:ubuntuone-android-music

[Chad Miller]

[Tim Cole (tcole)]

If we're to be consistent with Ubuntu/Debian generally, shouldn't it be "kib" (base-2/"kibi") rather than "kb" (base-10/"kilo")?

[Chad Miller (cmiller)]

On 10/01/2010 10:25 AM, Tim Cole wrote:
> If we're to be consistent with Ubuntu/Debian generally, shouldn't it be "kib" (base-2/"kibi") rather than "kb" (base-10/"kilo")?

Maybe. I'm merely copying the nomenclature of the coding systems.

This isn't a storage system, where the difference would matter for
deciding capacity and being disappointed, so I need to be convinced that
the cost of "kib" confusion is worth this proposed accuracy.

Since it's a function of time, it may really be thousands. I've never
heard "kibihertz", evar.

oggenc man page:
  target bitrate to n (in kb/s).

lame man page:
  bitrate of n kbits

same for mencoder and all of its related codecs
cmiller@zippy:~$ man mencoder |grep kib
cmiller@zippy:~$ man mencoder |grep -c kb
30

[Stuart Langridge (sil)]

https://wiki.ubuntu.com/UnitsPolicy says:
Use base-10 for: network bandwidth (for example, 6 Mbit/s or 50 kB/s)

This does mean that we should do the calculation of bitrate with dividers of 1000, not dividers of 1024.

=== modified file 'src/net/sourceforge/subsonic/androidapp/util/SongView.java'
--- src/net/sourceforge/subsonic/androidapp/util/SongView.java	2010-09-23 20:16:28 +0000
+++ src/net/sourceforge/subsonic/androidapp/util/SongView.java	2010-10-01 14:20:35 +0000
@@ -78,18 +78,27 @@
         MusicDirectory.Entry song = downloadFile.getSong();
 
         StringBuilder text = new StringBuilder(40);
-        text.append(song.getArtist()).append(" (");
-        if (song.getBitRate() != null) {
-            text.append(song.getBitRate()).append("k ");
+        text.append(song.getArtist());
+
+        StringBuilder additional = new StringBuilder(40);
+        if ((song.getBitRate() != null) && (song.getBitRate() != 0)) {
+            additional.append(song.getBitRate()).append("kb");
         }
-        text.append(song.getSuffix());
+        if (song.getSuffix() != null) {
+			if (additional.length() != 0)
+				additional.append(" ");
+            additional.append(song.getSuffix());
+		}
         if (song.getTranscodedSuffix() != null && !song.getTranscodedSuffix().equals(song.getSuffix())) {
-            text.append(" > ").append(song.getTranscodedSuffix());
+            additional.append(" > ").append(song.getTranscodedSuffix());
         }
-        text.append(")");
 
         textView1.setText(song.getTitle());
-        textView2.setText(text);
+        if (additional.length() != 0) {
+            textView2.setText(text + " (" + additional + ")");
+        } else {
+            textView2.setText(text);
+        }
         textView3.setText(Util.formatDuration(song.getDuration()));
         checkedTextView.setVisibility(checkable ? View.VISIBLE : View.GONE);