--- Begin Message ---
Package: xmms
Version: 1.2.9-1
Severity: wishlist
Hi, the attached (quite trivial) patch adds a field showing the average
bitrate for .ogg files in the fileinfo window. Please apply to the debian
package (I haven't got the time / am too lazy to submit this directly to
upstream myself).
With best regards,
Vincent
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.2-mm0
Locale: LANG=C, LC_CTYPE=fr_FR.ISO-8859-1
Versions of packages xmms depends on:
ii libc6 2.3.2.ds1-11 GNU C Library: Shared libraries an
ii libglib1.2 1.2.10-9 The GLib library of C routines
ii libgtk1.2 1.2.10-16 The GIMP Toolkit set of widgets fo
ii xlibs 4.3.0-0pre1v5 X Window System client libraries m
-- no debconf information
--- Input/vorbis/fileinfo.c.orig 2003-11-20 14:35:34.000000000 +0100
+++ Input/vorbis/fileinfo.c 2004-02-04 22:20:04.000000000 +0100
@@ -429,7 +429,7 @@
gchar *location;
gchar *rg_track_gain, *rg_album_gain, *rg_track_peak, *rg_album_peak;
- gint time, minutes, seconds, bitrate, rate, channels, filesize, i;
+ gint time, minutes, seconds, bitrate, avg_bitrate, rate, channels,
filesize, i;
OggVorbis_File vf;
vorbis_info *vi;
@@ -437,7 +437,7 @@
FILE *fh;
gboolean clear_vf = FALSE;
- static GtkWidget *info_frame, *info_box, *bitrate_label, *rate_label;
+ static GtkWidget *info_frame, *info_box, *avg_bitrate_label,
*bitrate_label, *rate_label;
static GtkWidget *channel_label, *length_label, *filesize_label;
static GtkWidget *replaygain_label, *audiophilegain_label, *peak_label;
static GtkWidget *filename_entry, *tag_frame;
@@ -715,6 +715,13 @@
gtk_container_set_border_width(GTK_CONTAINER(info_box), 10);
gtk_box_set_spacing(GTK_BOX(info_box), 0);
+ avg_bitrate_label = gtk_label_new("");
+ gtk_misc_set_alignment(GTK_MISC(avg_bitrate_label), 0, 0);
+ gtk_label_set_justify(GTK_LABEL(avg_bitrate_label),
+ GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(info_box), avg_bitrate_label, FALSE,
+ FALSE, 0);
+
bitrate_label = gtk_label_new("");
gtk_misc_set_alignment(GTK_MISC(bitrate_label), 0, 0);
gtk_label_set_justify(GTK_LABEL(bitrate_label),
@@ -779,6 +786,7 @@
else
gtk_widget_set_sensitive(tag_frame, TRUE);
+ gtk_label_set_text(GTK_LABEL(avg_bitrate_label), "");
gtk_label_set_text(GTK_LABEL(bitrate_label), "");
gtk_label_set_text(GTK_LABEL(rate_label), "");
gtk_label_set_text(GTK_LABEL(channel_label), "");
@@ -794,7 +802,8 @@
comment = ov_comment(&vf, -1);
if ((vi = ov_info(&vf, 0)) != NULL)
{
- bitrate = vi->bitrate_nominal/1000;
+ avg_bitrate = ov_bitrate(&vf, -1)/1000;
+ bitrate = vi->bitrate_nominal/1000;
rate = vi->rate;
channels = vi->channels;
g_message("version: %d", vi->version);
@@ -802,7 +811,8 @@
}
else
{
- bitrate = 0;
+ avg_bitrate = 0;
+ bitrate = 0;
rate = 0;
channels = 0;
}
@@ -813,6 +823,7 @@
fseek(fh, 0, SEEK_END);
filesize = ftell(fh);
+ label_set_text(avg_bitrate_label, _("Average bitrate:
%d kbps"), avg_bitrate);
label_set_text(bitrate_label, _("Nominal bitrate: %d
kbps"), bitrate);
label_set_text(rate_label, _("Samplerate: %d Hz"),
rate);
label_set_text(channel_label, _("Channels: %d"),
channels);
--- End Message ---
