# HG changeset patch
# User giacomo
# Date 1175244726 25200
# Node ID 1820b4026fe2581f1adaad54789c5c80beae2e5b
# Parent  877a3725b51e0c1b007142e9970d3d4df6cf1a99
[svn] - flac: when bitrate update is disabled, always display VBR instead of a useless value

diff -r 877a3725b51e -r 1820b4026fe2 ChangeLog
--- a/ChangeLog	Thu Mar 29 03:14:36 2007 -0700
+++ b/ChangeLog	Fri Mar 30 01:52:06 2007 -0700
@@ -1,3 +1,10 @@
+2007-03-29 10:14:36 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [1904]
+  Fix MOD title read by not permanently byteswapping the stream in the PSM loader. Patch by Joseph Jezak <josejx@gentoo.org>.
+  trunk/src/modplug/load_psm.cxx |   11 ++++++-----
+  1 file changed, 6 insertions(+), 5 deletions(-)
+
+
 2007-03-26 21:44:46 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [1902]
   - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
diff -r 877a3725b51e -r 1820b4026fe2 src/flac/plugin.c
--- a/src/flac/plugin.c	Thu Mar 29 03:14:36 2007 -0700
+++ b/src/flac/plugin.c	Fri Mar 30 01:52:06 2007 -0700
@@ -165,7 +165,10 @@
 void set_track_info(const char* title, int length_in_msec)
 {
 	if (stream_data_.is_playing) {
-		flac_ip.set_info((char*) title, length_in_msec, stream_data_.sample_rate * stream_data_.channels * stream_data_.bits_per_sample, stream_data_.sample_rate, stream_data_.channels);
+	   if ( !flac_cfg.title.disable_bitrate_update )
+		   flac_ip.	set_info((char*) title, length_in_msec, stream_data_.sample_rate * stream_data_.channels * stream_data_.bits_per_sample, stream_data_.sample_rate, stream_data_.channels);
+		else
+		   flac_ip.	set_info((char*) title, length_in_msec, -1, stream_data_.sample_rate, stream_data_.channels);
 	}
 }
 
@@ -333,7 +336,10 @@
 	}
 
 	stream_data_.title = flac_format_song_title(filename);
-	flac_ip.set_info(stream_data_.title, stream_data_.length_in_msec, stream_data_.sample_rate * stream_data_.channels * stream_data_.bits_per_sample, stream_data_.sample_rate, stream_data_.channels);
+   if ( !flac_cfg.title.disable_bitrate_update )
+	   flac_ip.set_info(stream_data_.title, stream_data_.length_in_msec, stream_data_.sample_rate * stream_data_.channels * stream_data_.bits_per_sample, stream_data_.sample_rate, stream_data_.channels);
+	else
+	   flac_ip.set_info(stream_data_.title, stream_data_.length_in_msec, -1, stream_data_.sample_rate, stream_data_.channels);
 
 	stream_data_.seek_to_in_sec = -1;
 	stream_data_.play_thread_open = true;