From 671f4c3f605c328037069b44f2be51688e7212aa Mon Sep 17 00:00:00 2001
From: Marcello Barnaba <vjt@openssl.it>
Date: Sat, 20 Mar 2010 17:46:52 +0100
Subject: [PATCH] Cleaned up requires

---
 Rakefile         |  3 +--
 lib/audioinfo.rb | 11 +++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Rakefile b/Rakefile
index d1fb74e..30795fd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,5 @@
 require 'rubygems'
-$: << 'lib'
-require 'audioinfo'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'lib', 'audioinfo')
 
 begin
   require 'jeweler'
diff --git a/lib/audioinfo.rb b/lib/audioinfo.rb
index fb15206..45cfb1b 100644
--- a/lib/audioinfo.rb
+++ b/lib/audioinfo.rb
@@ -1,18 +1,17 @@
-#!/usr/bin/env ruby
-
 require "iconv"
 require "stringio"
 
-$: << File.dirname(__FILE__)+"/audioinfo"
-
 require "mp3info"
 require "ogginfo"
-require "mpcinfo"
-require "apetag"
 require "wmainfo"
 require "mp4info"
 require "flacinfo"
 
+$: << File.expand_path(File.dirname(__FILE__))
+
+require "audioinfo/mpcinfo"
+require "audioinfo/apetag"
+
 class AudioInfoError < Exception ; end
 
 class AudioInfo