rtaglib 0.2.3 → 0.3.0

data/swig/make_doc.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/ruby
 #### Make docs
+require '../lib/rtaglib_mswin32'
+
 require 'rexml/document'
 require 'TagLib'
 require 'rbconfig'
@@ -9,6 +11,7 @@ if !fm.nil?
     brief_desc=fm[:brief_desc].gsub(/\s+/im,"").size>0 ? "<b>#{fm[:brief_desc]}</b>\n":""
     desc=(" # "+brief_desc+fm[:long_desc]+"\n").gsub("\n","\n # ")+"\n"
     params=fm[:param].join(",")
+    #p params
 else
     desc=""
     params=""
@@ -30,7 +33,6 @@ def print_methods(klass,functions,indent)
     methods=klass.instance_methods-Object.instance_methods
     methods.each{|m|
         dm=data_method(functions[m])
-
         out << dm[:desc]+indent+"def #{m}(#{dm[:params]})\n"+indent+"end\n"
     }
     out
@@ -53,11 +55,10 @@ def get_doxygen_description(xml_file)
             
             param=[]
             func.elements.each("param") {|xpar|
-                type=xpar.elements["type"].to_s.gsub(/<.+?>|const|\*|String|StringList|&amp;/,"").chomp
                 if xpar.elements["defval"]
-                    param.push(type+" "+xpar.elements["declname"].text+" = "+xpar.elements["defval"].to_s.gsub(/<.+?>/,""))
+                    param.push(xpar.elements["declname"].text+" = "+xpar.elements["defval"].to_s.gsub(/<.+?>/,""))
                 else
-                    param.push(type+" "+xpar.elements["declname"].text)
+                    param.push(xpar.elements["declname"].text)
                 end
             }
             funcs[name]={:param=>param,:brief_desc=>brief,:long_desc=>long}

data/swig/process_cxx.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 require 'fileutils'
-file="pre_taglib"
-out="taglib.cxx"
+file="pre_taglib_#{PLATFORM}"
+out="taglib_#{PLATFORM}.cxx"
 fo=File.open(out,"wb")
 swig_p={}
 File.open(file,"r") {|f| f.each_line {|l|

data/swig/rake_ext_conf.rb

@@ -0,0 +1,33 @@
+require 'mkmf'
+if(PLATFORM=~/mswin32/)
+	if(File.expand_path(File.dirname(__FILE__))=~/swig/)
+	package_dir=File.expand_path(File.dirname(__FILE__)+"/..")	
+	prefix=package_dir+"/ext/taglib/taglib-mswin32"
+	else
+	prefix="./taglib-mswin32"
+	end
+	puts "Building for MsWin32"
+	$CFLAGS+= " -I\"#{prefix}\\include\" -I\"#{prefix}\\include\\taglib\""
+        $LDFLAGS += " -link -libpath:\"#{prefix}\\lib\" "
+
+elsif(PLATFORM=~/mingw/)
+	puts "Building for MinGW"
+	$libs = append_library($libs, "stdc++")
+	$libs = append_library($libs, "supc++")
+	$CFLAGS= " -I/mingw/include/taglib"
+else
+    puts "Building for other architecture"
+    taglib_config = find_executable("taglib-config")
+    if taglib_config
+        prefix = `#{taglib_config} --prefix`.strip
+        $CFLAGS += " -I#{prefix}/include"
+        $LDFLAGS += " -L#{prefix}/lib"
+    else
+        prefix = "/usr"
+	end
+	$libs = append_library($libs, "supc++")
+    $CFLAGS += " -I#{prefix}/include/taglib"
+end
+if have_library("tag")
+    create_makefile("TagLib")
+end

data/swig/taglib.i

@@ -198,11 +198,11 @@ namespace TagLib {
 %typemap(out) String {
     $result = String2Ruby(&$1);
 };
-
+/**
 %typemap(in) String {
-    $1=new TagLib::String(StringValuePtr($input));
+    $1=new TagLib::String(StringValuePtr($input), TagLib::String::UTF8);
 };
-
+*/
 
 %apply String {String &, const String &};
 %typemap(in) ByteVector {
@@ -233,12 +233,12 @@ class AudioProperties {
     PROPERTIES_VIRTUALS()
 };
 class String {
-    
+    public:
     enum  	Type {
     Latin1 = 0, UTF16 = 1, UTF16BE = 2, UTF8 = 3,
     UTF16LE = 4
     };
-    public:
+    
     String();
     String(const char *s, Type t=Latin1);
     ~String();
@@ -739,6 +739,9 @@ class File {
 
             const FrameListMap& frameListMap() const;
             const FrameList& frameList() const;
+            void removeFrame(Frame * frame, bool del = true); 	
+            
+            
         };
     };
     

data/swig/test.rb

@@ -1,17 +1,12 @@
 #!/usr/bin/ruby
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'TagLib'
 require 'tmpdir'
-if File.exists? File.dirname(__FILE__)+"/TagLib.so"
-    require File.dirname(__FILE__)+'/TagLib'
-    BASE_DATA=File.dirname(__FILE__)+"/../test/data/"
-else
-    require File.dirname(__FILE__)+'/../ext/taglib/TagLib'
-    BASE_DATA=File.dirname(__FILE__)+"/data/"
-end
 require 'fileutils'
 require 'test/unit'
 class RtaglibReadTestCase < Test::Unit::TestCase
 	def setup
-        @data_dir=BASE_DATA
+        @data_dir=File.dirname(__FILE__)+"/../data/"
         @temp_dir=Dir::tmpdir+"/rtaglib"
         FileUtils.mkdir(@temp_dir) if !File.exists? @temp_dir
         FileUtils.chmod(0777, @temp_dir)
@@ -80,7 +75,6 @@ class RtaglibReadTestCase < Test::Unit::TestCase
     # - audioproperties: bitrate,channels,sampleRate and channels
     # - isNull (null?)
     def test_fileref
-        
         assert_equal(%w{ogg flac oga mp3 mpc wv spx tta}, TagLib::FileRef.defaultFileExtensions())
         bitrate={'flac'=>168,'wv'=>235,'mp3'=>48,'mpc'=>41,'ogg'=>80}
         channels={'flac'=>1,'wv'=>1,'mp3'=>1,'mpc'=>2,'ogg'=>1}
@@ -107,17 +101,17 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         mp3=@data_dir+"440Hz-5sec.mp3"
         copy=get_copy(mp3)
         fr2=TagLib::FileRef.new(copy)
-        fr2.tag().title="new title";
-        fr2.tag().artist="new artist";
-        fr2.tag().album="new album";
+        fr2.tag().title=TagLib::String.new("new title");
+        fr2.tag().artist=TagLib::String.new("new artist");
+        fr2.tag().album=TagLib::String.new("new album");
         fr2.tag().year=2000;
         fr2.tag().track=10;
-        fr2.tag().genre="Rock";
-        fr2.tag().comment="new comment";
+        fr2.tag().genre=TagLib::String.new("Rock");
+        fr2.tag().comment=TagLib::String.new("new comment");
         
         fr2.save()
         copy2=get_copy(copy)
-        fr2.tag().title="sfsd"
+        fr2.tag().title=TagLib::String.new("sfsd")
         fr2.save()
         fr3=TagLib::FileRef.new(copy2)
         assert_equal("new title",fr3.tag.title)
@@ -139,7 +133,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         fr=TagLib::FileRef.new(copy)
         utf8_string="大塚愛"
         expected="\345\244\247\345\241\232\346\204\233"
-        fr.tag().title=utf8_string
+        fr.tag().title=TagLib::String.new(utf8_string)
         fr.save
         fr=nil
         fr=TagLib::FileRef.new(copy)
@@ -149,18 +143,25 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         s=get_copy(mp3)
         d=get_copy(mp3)
         s_tag=TagLib::FileRef.new(s)
-        d_tag=TagLib::FileRef.new(d)
+        d_tag=TagLib::MPEG::File.new(d)
         artist="大塚愛"
 #        puts "artist = #{artist} => #{artist.inspect}"
         assert_equal(artist,s_tag.tag.artist)
-        assert_equal(artist,d_tag.tag.artist)
-        d_tag.tag.artist=s_tag.tag.artist        
-        assert_equal(d_tag.tag.artist, s_tag.tag.artist)
+        assert_equal(artist,d_tag.ID3v2Tag.artist)
+        d_tag.ID3v2Tag.artist=TagLib::String.new(s_tag.tag.artist)        
+        assert_equal(d_tag.ID3v2Tag.artist, s_tag.tag.artist)
         d_tag.save
+        d_tag=nil
         d_tag=TagLib::FileRef.new(d)
+        assert_equal(artist, d_tag.tag.artist)
         assert_equal(d_tag.tag.artist, s_tag.tag.artist)
-
-
+=begin
+        if(`which id3info`)
+            `id3info #{s}` =~ /^=== TPE1.+: (.+)$/
+            vc_out=$1
+            assert_equal(artist,vc_out,"id3info output (#{vc_out}) not equal to #{artist}")
+        end
+=end
 
         ogg=@data_dir+"test_jason.ogg"
         s=get_copy(ogg)
@@ -168,15 +169,22 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         s_tag=TagLib::FileRef.new(s)
         d_tag=TagLib::FileRef.new(d)
         artist="大塚愛"
-#        puts "artist = #{artist} => #{artist.inspect}"
         assert_equal(artist,s_tag.tag.artist)
         assert_equal(artist,d_tag.tag.artist)
-        d_tag.tag.artist=s_tag.tag.artist        
+        d_tag.tag.artist=TagLib::String.new(s_tag.tag.artist,TagLib::String::UTF8)        
         assert_equal(d_tag.tag.artist, s_tag.tag.artist)
         d_tag.save
         d_tag=TagLib::FileRef.new(d)
         assert_equal(d_tag.tag.artist, s_tag.tag.artist)
-        
+	if PLATFORM=~/mswin/
+		else
+        if(`which vorbiscomment`)
+            `vorbiscomment #{d}` =~ /^ARTIST=(.+)$/
+            vc_out=$1
+            assert_equal(artist,vc_out,"vorbiscomment output (#{vc_out}) not equal to #{artist}")
+	end
+	end
+ 
     end
     def test_flac
         original=@data_dir+"440Hz-5sec.flac"
@@ -199,7 +207,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         assert_equal(16,ap.sampleWidth)
         # comments
         xiph=flac_xiph.xiphComment()
-        xiph.setTitle("xiph")
+        xiph.setTitle(TagLib::String.new("xiph"))
         flac_xiph.save()
         assert_equal("xiph",flac_xiph.tag().title)
         assert_nil(flac_xiph.ID3v1Tag())
@@ -207,7 +215,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         
         id1=flac_id1.ID3v1Tag(true)
         
-        id1.setTitle("id1")
+        id1.setTitle(TagLib::String.new("id1"))
         flac_id1.save()
         assert_equal("id1",id1.title)
         
@@ -216,7 +224,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         
         
          id2=flac_id2.ID3v2Tag(true)
-         id2.setTitle("id2")
+         id2.setTitle(TagLib::String.new("id2"))
          flac_id2.save()
          assert_equal("id2",id2.title)
 
@@ -260,14 +268,14 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         original=@data_dir+"440Hz-5sec.mpc"
         copy=get_copy(original)
         fr=TagLib::FileRef.new(copy)
-        fr.tag.title="440Hz Sine Wave"
+        fr.tag.title=TagLib::String.new("440Hz Sine Wave")
         fr.save
         mpc=TagLib::MPC::File.new(copy)
         %w{tag APETag}.each {|f|
             assert_equal("440Hz Sine Wave",mpc.send(f).title, "#{f} tag")
         }
         mpc=TagLib::MPC::File.new(copy)
-        mpc.ID3v1Tag(true).title="440Hz Sine Wave - id3"
+        mpc.ID3v1Tag(true).title=TagLib::String.new("440Hz Sine Wave - id3")
         mpc.save
         mpc=nil
         mpc=TagLib::MPC::File.new(copy)
@@ -303,10 +311,10 @@ class RtaglibReadTestCase < Test::Unit::TestCase
     
     def test_fieldmap
         fl=TagLib::FieldListMap.new()
-        fl.insert("key",["val1","val2"])
-        assert_equal(["val1","val2"],fl["key"])
-        assert_nil(fl["2"])
-        fl.insert("key2",["val3","val4"])
+        fl.insert(TagLib::String.new("key"),["val1","val2"])
+        assert_equal(["val1","val2"],fl[TagLib::String.new("key")])
+        assert_nil(fl[TagLib::String.new("2")])
+        fl.insert(TagLib::String.new("key2"),["val3","val4"])
         assert_equal({'key'=>["val1","val2"],"key2"=>["val3","val4"]}, fl.hash)
         assert_equal(fl.size,fl.length)
     end
@@ -317,13 +325,13 @@ class RtaglibReadTestCase < Test::Unit::TestCase
          xc=flac_xiph.xiphComment
          fl=xc.fieldListMap
          fl.hash.each {|k,v|
-             xc.removeField(k)
+             xc.removeField(TagLib::String.new(k))
          }
          assert(xc.empty?)
-         xc.setTitle("T")
-         xc.setArtist("A")
-         xc.addField("c","C1",false)
-         xc.addField("c","C2",false)
+         xc.setTitle(TagLib::String.new("T"))
+         xc.setArtist(TagLib::String.new("A"))
+         xc.addField(TagLib::String.new("c"),TagLib::String.new("C1"),false)
+         xc.addField(TagLib::String.new("c"),TagLib::String.new("C2"),false)
          expected={"TITLE"=>["T"],"ARTIST"=>["A"],"C"=>["C1","C2"]}
          assert_equal(expected,fl.hash)
      end

data/test/test_read.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require File.dirname(__FILE__)+'/../ext/tagfile/tagfile'
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+$:.unshift(File.dirname(__FILE__)+"/../ext")
+require 'tagfile'
 require 'test/unit'
 class RTagFileReadTestCase < Test::Unit::TestCase
 	def setup
 
-	    @file=::TagFile::File.new(File.dirname(__FILE__)+"/data/440Hz-5sec.mp3")
+	    @file=::TagFile::File.new(File.dirname(__FILE__)+"/../data/440Hz-5sec.mp3")
 	end
 	def test_title()
 		assert_equal("440Hz Sine Wave",@file.title)

data/test/test_taglib.rb

@@ -1,17 +1,12 @@
 #!/usr/bin/ruby
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'TagLib'
 require 'tmpdir'
-if File.exists? File.dirname(__FILE__)+"/TagLib.so"
-    require File.dirname(__FILE__)+'/TagLib'
-    BASE_DATA=File.dirname(__FILE__)+"/../test/data/"
-else
-    require File.dirname(__FILE__)+'/../ext/taglib/TagLib'
-    BASE_DATA=File.dirname(__FILE__)+"/data/"
-end
 require 'fileutils'
 require 'test/unit'
 class RtaglibReadTestCase < Test::Unit::TestCase
 	def setup
-        @data_dir=BASE_DATA
+        @data_dir=File.dirname(__FILE__)+"/../data/"
         @temp_dir=Dir::tmpdir+"/rtaglib"
         FileUtils.mkdir(@temp_dir) if !File.exists? @temp_dir
         FileUtils.chmod(0777, @temp_dir)
@@ -80,7 +75,6 @@ class RtaglibReadTestCase < Test::Unit::TestCase
     # - audioproperties: bitrate,channels,sampleRate and channels
     # - isNull (null?)
     def test_fileref
-        
         assert_equal(%w{ogg flac oga mp3 mpc wv spx tta}, TagLib::FileRef.defaultFileExtensions())
         bitrate={'flac'=>168,'wv'=>235,'mp3'=>48,'mpc'=>41,'ogg'=>80}
         channels={'flac'=>1,'wv'=>1,'mp3'=>1,'mpc'=>2,'ogg'=>1}
@@ -107,17 +101,17 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         mp3=@data_dir+"440Hz-5sec.mp3"
         copy=get_copy(mp3)
         fr2=TagLib::FileRef.new(copy)
-        fr2.tag().title="new title";
-        fr2.tag().artist="new artist";
-        fr2.tag().album="new album";
+        fr2.tag().title=TagLib::String.new("new title");
+        fr2.tag().artist=TagLib::String.new("new artist");
+        fr2.tag().album=TagLib::String.new("new album");
         fr2.tag().year=2000;
         fr2.tag().track=10;
-        fr2.tag().genre="Rock";
-        fr2.tag().comment="new comment";
+        fr2.tag().genre=TagLib::String.new("Rock");
+        fr2.tag().comment=TagLib::String.new("new comment");
         
         fr2.save()
         copy2=get_copy(copy)
-        fr2.tag().title="sfsd"
+        fr2.tag().title=TagLib::String.new("sfsd")
         fr2.save()
         fr3=TagLib::FileRef.new(copy2)
         assert_equal("new title",fr3.tag.title)
@@ -139,7 +133,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         fr=TagLib::FileRef.new(copy)
         utf8_string="大塚愛"
         expected="\345\244\247\345\241\232\346\204\233"
-        fr.tag().title=utf8_string
+        fr.tag().title=TagLib::String.new(utf8_string)
         fr.save
         fr=nil
         fr=TagLib::FileRef.new(copy)
@@ -149,18 +143,25 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         s=get_copy(mp3)
         d=get_copy(mp3)
         s_tag=TagLib::FileRef.new(s)
-        d_tag=TagLib::FileRef.new(d)
+        d_tag=TagLib::MPEG::File.new(d)
         artist="大塚愛"
 #        puts "artist = #{artist} => #{artist.inspect}"
         assert_equal(artist,s_tag.tag.artist)
-        assert_equal(artist,d_tag.tag.artist)
-        d_tag.tag.artist=s_tag.tag.artist        
-        assert_equal(d_tag.tag.artist, s_tag.tag.artist)
+        assert_equal(artist,d_tag.ID3v2Tag.artist)
+        d_tag.ID3v2Tag.artist=TagLib::String.new(s_tag.tag.artist)        
+        assert_equal(d_tag.ID3v2Tag.artist, s_tag.tag.artist)
         d_tag.save
+        d_tag=nil
         d_tag=TagLib::FileRef.new(d)
+        assert_equal(artist, d_tag.tag.artist)
         assert_equal(d_tag.tag.artist, s_tag.tag.artist)
-
-
+=begin
+        if(`which id3info`)
+            `id3info #{s}` =~ /^=== TPE1.+: (.+)$/
+            vc_out=$1
+            assert_equal(artist,vc_out,"id3info output (#{vc_out}) not equal to #{artist}")
+        end
+=end
 
         ogg=@data_dir+"test_jason.ogg"
         s=get_copy(ogg)
@@ -168,15 +169,22 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         s_tag=TagLib::FileRef.new(s)
         d_tag=TagLib::FileRef.new(d)
         artist="大塚愛"
-#        puts "artist = #{artist} => #{artist.inspect}"
         assert_equal(artist,s_tag.tag.artist)
         assert_equal(artist,d_tag.tag.artist)
-        d_tag.tag.artist=s_tag.tag.artist        
+        d_tag.tag.artist=TagLib::String.new(s_tag.tag.artist,TagLib::String::UTF8)        
         assert_equal(d_tag.tag.artist, s_tag.tag.artist)
         d_tag.save
         d_tag=TagLib::FileRef.new(d)
         assert_equal(d_tag.tag.artist, s_tag.tag.artist)
-        
+	if PLATFORM=~/mswin/
+		else
+        if(`which vorbiscomment`)
+            `vorbiscomment #{d}` =~ /^ARTIST=(.+)$/
+            vc_out=$1
+            assert_equal(artist,vc_out,"vorbiscomment output (#{vc_out}) not equal to #{artist}")
+	end
+	end
+ 
     end
     def test_flac
         original=@data_dir+"440Hz-5sec.flac"
@@ -199,7 +207,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         assert_equal(16,ap.sampleWidth)
         # comments
         xiph=flac_xiph.xiphComment()
-        xiph.setTitle("xiph")
+        xiph.setTitle(TagLib::String.new("xiph"))
         flac_xiph.save()
         assert_equal("xiph",flac_xiph.tag().title)
         assert_nil(flac_xiph.ID3v1Tag())
@@ -207,7 +215,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         
         id1=flac_id1.ID3v1Tag(true)
         
-        id1.setTitle("id1")
+        id1.setTitle(TagLib::String.new("id1"))
         flac_id1.save()
         assert_equal("id1",id1.title)
         
@@ -216,7 +224,7 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         
         
          id2=flac_id2.ID3v2Tag(true)
-         id2.setTitle("id2")
+         id2.setTitle(TagLib::String.new("id2"))
          flac_id2.save()
          assert_equal("id2",id2.title)
 
@@ -260,14 +268,14 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         original=@data_dir+"440Hz-5sec.mpc"
         copy=get_copy(original)
         fr=TagLib::FileRef.new(copy)
-        fr.tag.title="440Hz Sine Wave"
+        fr.tag.title=TagLib::String.new("440Hz Sine Wave")
         fr.save
         mpc=TagLib::MPC::File.new(copy)
         %w{tag APETag}.each {|f|
             assert_equal("440Hz Sine Wave",mpc.send(f).title, "#{f} tag")
         }
         mpc=TagLib::MPC::File.new(copy)
-        mpc.ID3v1Tag(true).title="440Hz Sine Wave - id3"
+        mpc.ID3v1Tag(true).title=TagLib::String.new("440Hz Sine Wave - id3")
         mpc.save
         mpc=nil
         mpc=TagLib::MPC::File.new(copy)
@@ -303,10 +311,10 @@ class RtaglibReadTestCase < Test::Unit::TestCase
     
     def test_fieldmap
         fl=TagLib::FieldListMap.new()
-        fl.insert("key",["val1","val2"])
-        assert_equal(["val1","val2"],fl["key"])
-        assert_nil(fl["2"])
-        fl.insert("key2",["val3","val4"])
+        fl.insert(TagLib::String.new("key"),["val1","val2"])
+        assert_equal(["val1","val2"],fl[TagLib::String.new("key")])
+        assert_nil(fl[TagLib::String.new("2")])
+        fl.insert(TagLib::String.new("key2"),["val3","val4"])
         assert_equal({'key'=>["val1","val2"],"key2"=>["val3","val4"]}, fl.hash)
         assert_equal(fl.size,fl.length)
     end
@@ -317,13 +325,13 @@ class RtaglibReadTestCase < Test::Unit::TestCase
          xc=flac_xiph.xiphComment
          fl=xc.fieldListMap
          fl.hash.each {|k,v|
-             xc.removeField(k)
+             xc.removeField(TagLib::String.new(k))
          }
          assert(xc.empty?)
-         xc.setTitle("T")
-         xc.setArtist("A")
-         xc.addField("c","C1",false)
-         xc.addField("c","C2",false)
+         xc.setTitle(TagLib::String.new("T"))
+         xc.setArtist(TagLib::String.new("A"))
+         xc.addField(TagLib::String.new("c"),TagLib::String.new("C1"),false)
+         xc.addField(TagLib::String.new("c"),TagLib::String.new("C2"),false)
          expected={"TITLE"=>["T"],"ARTIST"=>["A"],"C"=>["C1","C2"]}
          assert_equal(expected,fl.hash)
      end