Index: trunk/mbz
===================================================================
--- trunk/mbz	(revision 17)
+++ 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";
     }
 }