Index: audio_theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/audio/audio_theme.inc,v
retrieving revision 1.5
diff -u -r1.5 audio_theme.inc
--- audio_theme.inc	20 Feb 2007 18:35:26 -0000	1.5
+++ audio_theme.inc	30 Jul 2007 18:31:00 -0000
@@ -69,37 +69,46 @@
 }
 
 /**
- * Return a string describing the node's size and length.
+ * Return a string describing the node's file size and play time.
  *
- * @param $audio_fileinfo
- *   node's fileinfo array
+ * @param $fileinfo
+ *   Audio node's audio_fileinfo array.
  */
-function theme_audio_format_filelength($audio_fileinfo) {
-  $output = t('!playtime minutes (!filesize)',
-    array(
-      '!playtime' => $audio_fileinfo['playtime'],
-      '!filesize' => format_size($audio_fileinfo['filesize']),
-    )
-  );
-  return check_plain($output);
+function theme_audio_format_filelength($fileinfo) {
+  $format = !empty($fileinfo['playtime']) ? '@playtime minutes (@filesize)' : '@filesize';
+  $args = array('@playtime' => check_plain($fileinfo['playtime']), '@filesize' => format_size($fileinfo['filesize'])); 
+  return strtr($format, $args);
 }
 
 /**
  * Return a string describing the node's file information.
  *
- * @param $audio_fileinfo
- *   node's fileinfo array
+ * @param $fileinfo
+ *   Audio node's audio_fileinfo array.
  */
-function theme_audio_format_fileformat($audio_fileinfo) {
-  $output = t('!fileformat !channel_mode !sampleratekHz !bitrateKbps (!bitrate_mode)',
-    array(
-      '!fileformat' => strtoupper($audio_fileinfo['fileformat']),
-      '!samplerate' => (integer) ($audio_fileinfo['sample_rate'] / 1000),
-      '!channel_mode' => ucfirst($audio_fileinfo['channel_mode']),
-      '!bitrate' => (integer) ($audio_fileinfo['bitrate'] / 1000),
-      '!bitrate_mode' => strtoupper($audio_fileinfo['bitrate_mode']),
-    )
-  );
-  return check_plain($output);
+function theme_audio_format_fileformat($fileinfo) {
+  $format = '';
+  if (!empty($fileinfo['file_format'])) {
+    $format .= '@fileformat ';
+    $args['@fileformat'] = check_plain(strtoupper($fileinfo['fileformat']));
+  }
+  if (!empty($fileinfo['channel_mode'])) {
+    $format .= '@channel_mode ';
+    $args['@channel_mode'] = check_plain(ucfirst($fileinfo['channel_mode']));
+  }
+  if (!empty($fileinfo['sample_rate'])) {
+    $format .= '@sampleratekHz ';
+    $args['@samplerate'] = (integer) ($fileinfo['sample_rate'] / 1000);
+  }
+  if (!empty($fileinfo['bitrate'])) {
+    $format .= '@bitrateKbps ';
+    $args['@bitrate'] = (integer) ($fileinfo['bitrate'] / 1000);
+
+    if (!empty($fileinfo['bitrate_mode'])) {
+      $format .= '(@bitrate_mode)';
+      $args['@bitrate_mode'] = check_plain(strtoupper($fileinfo['bitrate_mode']));
+    }
+  }
+  return strtr($format, $args);
 }