Index: /trunk/lib/MusicBrainz.pm
===================================================================
--- /trunk/lib/MusicBrainz.pm	(revision 30)
+++ /trunk/lib/MusicBrainz.pm	(revision 31)
@@ -108,8 +108,4 @@
         @info{"$prefix.ARTIST", "$prefix.ARTISTSORT"} = get_artist_credits($xpath, $recording);
 
-        $info{TRACKS}[$tracknum]{TITLE} = $info{"$prefix.TITLE"};
-        $info{TRACKS}[$tracknum]{ARTIST} = $info{"$prefix.ARTIST"};
-        $info{TRACKS}[$tracknum]{ARTISTSORT} = $info{"$prefix.ARTISTSORT"};
-
         #my $uri = URI->new("http://musicbrainz.org/ws/2/recording/$recording_mbid");
         #$uri->query_form(inc => 'artists');
Index: /trunk/lib/Tracks.pm
===================================================================
--- /trunk/lib/Tracks.pm	(revision 30)
+++ /trunk/lib/Tracks.pm	(revision 31)
@@ -120,5 +120,5 @@
     my ($self, $file) = @_;
 
-    my $flac = Audio::FLAC::Header->new($file);
+    my $flac = ref $file ? $file : Audio::FLAC::Header->new($file);
     my $cuesheet_lines = $flac->cuesheet;
     my $CUE = IO::Lines->new($cuesheet_lines);
Index: /trunk/mbz
===================================================================
--- /trunk/mbz	(revision 30)
+++ /trunk/mbz	(revision 31)
@@ -9,4 +9,5 @@
 use Getopt::Long;
 use MusicBrainz;
+use DiscFlacFile;
 
 GetOptions(
@@ -19,7 +20,5 @@
 
 if ($FLAC_FILE) {
-    require Audio::FLAC::Header;
-    my $flac = Audio::FLAC::Header->new($FLAC_FILE) or die "Can't read FLAC header from $FLAC_FILE\n";
-    $discid = $flac->tags('MUSICBRAINZ_DISCID') or die "No MUSICBRAINZ_DISCID tag in $FLAC_FILE\n";
+    $discid = DiscFlacFile->new({ file => $FLAC_FILE })->discid;
 } else {
     $discid = shift;
@@ -44,5 +43,5 @@
 } else {
     for my $key (sort keys %{ $info }) {
-        print "$key=$$info{$key}\n" unless ref $info->{$key};
+        print "$key=$$info{$key}\n";
     }
 }