ruby-mp3info 0.6.6 → 0.6.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.6.7 / 2008-06-26
+
+* Mp3Info#header hash now gives access to additional mpeg attributes (thanks to Andrew Kuklewicz)
+
 === 0.6.6 / 2008-05-27
 
 * avoid reading tag that are too big (> 50Mb)

data/lib/mp3info.rb

@@ -1,5 +1,5 @@
 # coding:utf-8
-# $Id: mp3info.rb 88 2008-05-26 22:22:31Z moumar $
+# $Id: mp3info.rb 90 2008-06-26 09:49:38Z moumar $
 # License:: Ruby
 # Author:: Guillaume Pierronnet (mailto:moumar_AT__rubyforge_DOT_org)
 # Website:: http://ruby-mp3info.rubyforge.org/
@@ -18,7 +18,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = [
@@ -120,6 +120,17 @@ class Mp3Info
   # only used in vbr mode
   attr_reader(:samples_per_frame)
 
+  # Hash representing values in the MP3 frame header. Keys are one of the following:
+  # - :private (boolean)
+  # - :copyright (boolean)
+  # - :original (boolean)
+  # - :padding (boolean)
+  # - :error_protection (boolean)
+  # - :mode_extension (integer in the 0..3 range)
+  # - :emphasis (integer in the 0..3 range)
+  # detailled explanation can be found here: http://www.mp3-tech.org/programmer/frame_header.html
+  attr_reader(:header)
+
   # length in seconds as a Float
   attr_reader(:length)
 
@@ -141,9 +152,6 @@ class Mp3Info
   # the original filename
   attr_reader(:filename)
 
-  # Moved hastag1? and hastag2? to be booleans
-  attr_reader(:hastag1, :hastag2)
-  
   # Test the presence of an id3v1 tag in file +filename+
   def self.hastag1?(filename)
     File.open(filename) { |f|
@@ -186,6 +194,8 @@ class Mp3Info
   # reload (or load for the first time) the file from disk
   def reload
     raise(Mp3InfoError, "empty file") unless File.size?(@filename)
+
+    @header = {}
     
     @tag1 = {}
     @tag1.extend(HashKeys)
@@ -239,13 +249,16 @@ class Mp3Info
 	@mpeg_version = [2, 1][head[19]]
 	@layer = LAYER[bits(head, 18,17)]
 	next if @layer.nil?
+	@header[:error_protection] = head[16] == 0 ? true : false
 	@bitrate = BITRATE[@mpeg_version-1][@layer-1][bits(head, 15,12)-1]
-	@error_protection = head[16] == 0 ? true : false
 	@samplerate = SAMPLERATE[@mpeg_version-1][bits(head, 11,10)]
-	@padding = (head[9] == 1 ? true : false)
+	@header[:padding] = (head[9] == 1 ? true : false)
+	@header[:private] = head[8] == 0 ? true : false
 	@channel_mode = CHANNEL_MODE[@channel_num = bits(head, 7,6)]
-	@copyright = (head[3] == 1 ? true : false)
-	@original = (head[2] == 1 ? true : false)
+	@header[:mode_extension] = bits(head, 5,4)
+	@header[:copyright] = (head[3] == 1 ? true : false)
+	@header[:original] = (head[2] == 1 ? true : false)
+	@header[:emphasis] = bits(head, 1,0)
 	@vbr = false
 	found = true
 	break
@@ -459,7 +472,7 @@ class Mp3Info
 
   # inspect inside Mp3Info
   def to_s
-    s = "MPEG #{@mpeg_version} Layer #{@layer} #{@vbr ? "VBR" : "CBR"} #{@bitrate} Kbps #{@channel_mode} #{@samplerate} Hz length #{@length} sec. error protection #{@error_protection} "
+    s = "MPEG #{@mpeg_version} Layer #{@layer} #{@vbr ? "VBR" : "CBR"} #{@bitrate} Kbps #{@channel_mode} #{@samplerate} Hz length #{@length} sec. header #{@header.inspect} "
     s << "tag1: "+@tag1.inspect+"\n" if hastag1?
     s << "tag2: "+@tag2.inspect+"\n" if hastag2?
     s

data/test/test_ruby-mp3info.rb

@@ -87,14 +87,20 @@ class Mp3InfoTest < Test::Unit::TestCase
   
   def test_detected_info
     Mp3Info.open(TEMP_FILE) do |info|
-      assert_equal(info.mpeg_version, 1)
-      assert_equal(info.layer, 3)
-      assert_equal(info.vbr, false)
-      assert_equal(info.bitrate, 128)
-      assert_equal(info.channel_mode, "JStereo")
-      assert_equal(info.samplerate, 44100)
-      assert_equal(info.error_protection, false)
-      assert_equal(info.length, 0.1305625)
+      assert_equal(1, info.mpeg_version)
+      assert_equal(3, info.layer)
+      assert_equal(false, info.vbr)
+      assert_equal(128, info.bitrate)
+      assert_equal("JStereo", info.channel_mode)
+      assert_equal(44100, info.samplerate)
+      assert_equal(0.1305625, info.length)
+      assert_equal({:original => true, 
+                    :error_protection => false, 
+                    :padding => false, 
+                    :emphasis => 0, 
+                    :private => true, 
+                    :mode_extension => 2, 
+                    :copyright => false}, info.header)
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mp3info
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - Guillaume Pierronnet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-27 00:00:00 +02:00
+date: 2008-06-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.3
+        version: 1.6.0
     version: 
 description: "* written in pure ruby  * read low-level informations like bitrate, length, samplerate, etc... * read, write, remove id3v1 and id3v2 tags * only 2.3 version is supported for writings id3v2 tags  == SYNOPSIS:  a good exercise is to read the test.rb to understand how the library works deeper  require \"mp3info\" # read and display infos & tags Mp3Info.open(\"myfile.mp3\") do |mp3info| puts mp3info end  # read/write tag1 and tag2 with Mp3Info#tag attribute # when reading tag2 have priority over tag1 # when writing, each tag is written. Mp3Info.open(\"myfile.mp3\") do |mp3| puts mp3.tag.title    puts mp3.tag.artist    puts mp3.tag.album puts mp3.tag.tracknum mp3.tag.title = \"track title\" mp3.tag.artist = \"artist name\" end  Mp3Info.open(\"myfile.mp3\") do |mp3| # you can access four letter v2 tags like this puts mp3.tag2.TIT2 mp3.tag2.TIT2 = \"new TIT2\" # or like that mp3.tag2[\"TIT2\"] # at this time, only COMM tag is processed after reading and before writing # according to ID3v2#options hash mp3.tag2.options[:lang] = \"FRE\" mp3.tag2.COMM = \"my comment in french, correctly handled when reading and writing\" end"
 email: moumar@rubyforge.org