Index: Slim/Music/Info.pm
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/Slim/Music/Info.pm,v
retrieving revision 1.6
diff -u -p -B -r1.6 Info.pm
--- Slim/Music/Info.pm	28 Jul 2004 20:42:19 -0000	1.6
+++ Slim/Music/Info.pm	3 Aug 2004 07:43:54 -0000
@@ -82,6 +82,7 @@ my @infoCacheItems = (
 	'ENDIAN', # 0 - little endian, 1 - big endian
 	'VALID', # 0 - entry not checked, 1 - entry checked and valid. Used to find stale entries in the cache
 	'TTL', # Time to Live for Cache Entry
+	'BPM', # Beats per minute
 );
 
 # Save the persistant DB cache every hour
@@ -352,6 +353,9 @@ sub init {
 	$MP3::Info::v2_to_v1_names{'TP3'} = 'CONDUCTOR';
 	$MP3::Info::v2_to_v1_names{'TPE3'} = 'CONDUCTOR';
 	
+	$MP3::Info::v2_to_v1_names{'TBP'} = 'BPM';
+	$MP3::Info::v2_to_v1_names{'TBPM'} = 'BPM';
+
 	#turn on unicode support
 #	if (!MP3::Info::use_mp3_utf8(1)) {	
 #		$::d_info && Slim::Utils::Misc::msg("Couldn't turn on unicode support.\n");
@@ -1370,6 +1374,8 @@ sub disc { return info(shift,'DISC'); }
 
 sub discCount { return info(shift,'DISCC'); }
 
+sub bpm { return info(shift,'BPM'); }
+
 sub comment {
 	my $file = shift;
 	my $comment;
Index: Slim/Web/Pages.pm
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/Slim/Web/Pages.pm,v
retrieving revision 1.6
diff -u -p -B -r1.6 Pages.pm
--- Slim/Web/Pages.pm	31 Jul 2004 22:43:57 -0000	1.6
+++ Slim/Web/Pages.pm	3 Aug 2004 07:43:55 -0000
@@ -1,6 +1,6 @@
 package Slim::Web::Pages;
 
-# $Id: Pages.pm,v 1.6 2004/07/31 22:43:57 titmuss Exp $
+# $Id: Pages.pm,v 1.4 2004/07/27 07:33:06 kdf Exp $
 # SlimServer Copyright (c) 2001-2004 Sean Adams, Slim Devices Inc.
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License, 
@@ -1042,6 +1042,7 @@ sub _addSongInfo {
 	$params->{'songtitle'}  = Slim::Music::Info::standardTitle(undef,$song);
 	$params->{'duration'}   = Slim::Music::Info::duration($song);
 	$params->{'disc'}       = Slim::Music::Info::disc($song);
+	$params->{'bpm'}        = Slim::Music::Info::bpm($song);
 	$params->{'track'}      = Slim::Music::Info::trackNumber($song);
 	$params->{'year'}       = Slim::Music::Info::year($song);
 	$params->{'type'}       = string(uc(Slim::Music::Info::contentType($song)));
Index: HTML/Fishbone/songinfo.html
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/HTML/Fishbone/songinfo.html,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 songinfo.html
--- HTML/Fishbone/songinfo.html	6 Jul 2004 13:44:53 -0000	1.1.1.1
+++ HTML/Fishbone/songinfo.html	3 Aug 2004 07:43:55 -0000
@@ -153,6 +153,16 @@
 			</td>
 		</tr>
 	[% END %]
+	[% IF bpm %]
+		<tr>
+			<td>
+				[% "BPM" | string %][% "COLON" | string %]
+			</td>
+			<td>
+				[% bpm %]
+			</td>
+		</tr>
+	[% END %]
 	[% IF tagversion %]
 		<tr>
 			<td>
Index: strings.txt
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/strings.txt,v
retrieving revision 1.8
diff -u -p -B -r1.8 strings.txt
--- strings.txt	28 Jul 2004 01:59:38 -0000	1.8
+++ strings.txt	3 Aug 2004 07:44:00 -0000
@@ -1,4 +1,4 @@
-# $Id: strings.txt,v 1.8 2004/07/28 01:59:38 kdf Exp $
+# $Id: strings.txt,v 1.7 2004/07/25 22:51:05 dean Exp $
 #
 # This tab-delimited file contains all the text strings used in the SlimServer
 # The format should be self explanatory. To submit a new language, or a better
@@ -5043,6 +5035,9 @@ BITRATE
 	PT	Bits por seg.
 	SE	Bithastighet
 
+BPM
+	EN	Beats Per Minute
+
 YEAR
 	DE	Jahr
 	DK	År
Index: HTML/Default/songinfo.html
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/HTML/Default/songinfo.html,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 songinfo.html
--- HTML/Default/songinfo.html	6 Jul 2004 13:43:33 -0000	1.1.1.1
+++ HTML/Default/songinfo.html	3 Aug 2004 07:48:01 -0000
@@ -116,6 +116,11 @@
         <td class="nowrap"> [% "BITRATE" | string %][% "COLON" | string %]</td>
         <td> [% bitrate | html %] </td>
       </tr>
+      [% END %] [% IF bpm %]
+      <tr>
+        <td class="nowrap"> [% "BPM" | string %][% "COLON" | string %] </td>
+        <td> [% bpm | html %] </td>
+      </tr>
       [% END %] [% IF tagversion %] 
       <tr> 
         <td class="nowrap"> [% "TAGVERSION" | string %][% "COLON" | string %]</td>