lame 0.0.4 → 0.0.5

data/lame.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "pry"
   gem.add_development_dependency "wavefile"
   gem.add_development_dependency "ruby-mp3info"
-  gem.add_development_dependency "coveralls"
+  gem.add_development_dependency "simplecov", "~> 0.22"
+  gem.add_development_dependency "simplecov-lcov", "~> 0.8"
 end

data/lib/lame/encoding/interleaved_int_buffer_encoder.rb

@@ -0,0 +1,15 @@
+module LAME
+  module Encoding
+    class InterleavedIntBufferEncoder < InterleavedBufferEncoder
+
+      def data_type
+        :int
+      end
+
+      def lame_function
+        :lame_encode_buffer_interleaved_int
+      end
+
+    end
+  end
+end

data/lib/lame/ffi/functions.rb

@@ -75,22 +75,22 @@ module LAME
         attach_function :lame_get_strict_ISO,         [:global_flags],               :int
 
         # quantization/noise shaping
-        attach_function :lame_set_disable_reservoir, [:global_flags, :int],    :int
-        attach_function :lame_get_disable_reservoir, [:global_flags],          :int
-        attach_function :lame_set_quant_comp,        [:global_flags, :int],    :int
-        attach_function :lame_get_quant_comp,        [:global_flags],          :int
-        attach_function :lame_set_quant_comp_short,  [:global_flags, :int],    :int
-        attach_function :lame_get_quant_comp_short,  [:global_flags],          :int
-        attach_function :lame_set_experimentalX,     [:global_flags, :int],    :int
-        attach_function :lame_get_experimentalX,     [:global_flags],          :int
-        attach_function :lame_set_experimentalY,     [:global_flags, :int],    :int
-        attach_function :lame_get_experimentalY,     [:global_flags],          :int
-        attach_function :lame_set_experimentalZ,     [:global_flags, :int],    :int
-        attach_function :lame_get_experimentalZ,     [:global_flags],          :int
-        attach_function :lame_set_exp_nspsytune,     [:global_flags, :int],    :int
-        attach_function :lame_get_exp_nspsytune,     [:global_flags],          :int
-        attach_function :lame_set_msfix,             [:global_flags, :double], :void
-        attach_function :lame_get_msfix,             [:global_flags],          :float
+        attach_function :lame_set_disable_reservoir,             [:global_flags, :int],    :int
+        attach_function :lame_get_disable_reservoir,             [:global_flags],          :int
+        attach_function :lame_set_quant_comp,                    [:global_flags, :int],    :int
+        attach_function :lame_get_quant_comp,                    [:global_flags],          :int
+        attach_function :lame_set_quant_comp_short,              [:global_flags, :int],    :int
+        attach_function :lame_get_quant_comp_short,              [:global_flags],          :int
+        attach_function :lame_set_experimentalX,                 [:global_flags, :int],    :int
+        attach_function :lame_get_experimentalX,                 [:global_flags],          :int
+        attach_function :lame_set_experimentalY,                 [:global_flags, :int],    :int
+        attach_function :lame_get_experimentalY,                 [:global_flags],          :int
+        attach_function :lame_set_experimentalZ,                 [:global_flags, :int],    :int
+        attach_function :lame_get_experimentalZ,                 [:global_flags],          :int
+        attach_function :lame_set_exp_nspsytune,                 [:global_flags, :int],    :int
+        attach_function :lame_get_exp_nspsytune,                 [:global_flags],          :int
+        attach_function :native_lame_set_msfix, :lame_set_msfix, [:global_flags, :double], :void
+        attach_function :lame_get_msfix,                         [:global_flags],          :float
 
         # VBR
         attach_function :lame_set_VBR,                   [:global_flags, :vbr_mode], :int
@@ -174,7 +174,7 @@ module LAME
         attach_function :get_lame_url,                [], :string
         attach_function :get_lame_os_bitness,         [], :string
 
-        attach_function :get_lame_version_numerical,  [:global_flags], FFI::Version.by_value
+        attach_function :get_lame_version_numerical,  [:global_flags], :void
 
         # TODO: test when we have implemented lame_set_msgf
         attach_function :lame_print_config,    [:global_flags], :void
@@ -191,6 +191,7 @@ module LAME
         attach_function :lame_encode_buffer_long,                    [:global_flags, :buffer_in, :buffer_in, :int, :buffer_out, :int], :int
         attach_function :lame_encode_buffer_long2,                   [:global_flags, :buffer_in, :buffer_in, :int, :buffer_out, :int], :int
         attach_function :lame_encode_buffer_int,                     [:global_flags, :buffer_in, :buffer_in, :int, :buffer_out, :int], :int
+        attach_function :lame_encode_buffer_interleaved_int,         [:global_flags, :buffer_in,             :int, :buffer_out, :int], :int
 
         # flushing
         attach_function :lame_encode_flush,       [:global_flags, :pointer, :int], :int
@@ -233,27 +234,27 @@ module LAME
 
         # id3
         callback :genre_callback, [:int, :string, :pointer], :void
-        attach_function :id3tag_genre_list, [:genre_callback, :pointer], :void
-        attach_function :id3tag_init,                     [:global_flags], :void
-        attach_function :id3tag_add_v2,                   [:global_flags], :void
-        attach_function :id3tag_v1_only,                  [:global_flags], :void
-        attach_function :id3tag_v2_only,                  [:global_flags], :void
-        attach_function :id3tag_space_v1,                 [:global_flags], :void
-        attach_function :id3tag_pad_v2,                   [:global_flags], :void
-        attach_function :id3tag_set_pad,                  [:global_flags, :size_t], :void
-        attach_function :id3tag_set_title,                [:global_flags, :pointer], :void
-        attach_function :id3tag_set_artist,               [:global_flags, :pointer], :void
-        attach_function :id3tag_set_album,                [:global_flags, :pointer], :void
-        attach_function :id3tag_set_year,                 [:global_flags, :pointer], :void
-        attach_function :id3tag_set_comment,              [:global_flags, :pointer], :void
-        attach_function :id3tag_set_track,                [:global_flags, :pointer], :int
-        attach_function :id3tag_set_genre,                [:global_flags, :pointer], :int
-        attach_function :id3tag_set_fieldvalue,           [:global_flags, :pointer], :int
-        attach_function :id3tag_set_albumart,             [:global_flags, :buffer_in, :size_t], :int
-        attach_function :lame_get_id3v1_tag,              [:global_flags, :buffer_out, :size_t], :size_t
-        attach_function :lame_get_id3v2_tag,              [:global_flags, :buffer_out, :size_t], :size_t
-        attach_function :lame_set_write_id3tag_automatic, [:global_flags, :int], :void
-        attach_function :lame_get_write_id3tag_automatic, [:global_flags], :int
+        attach_function :id3tag_genre_list,                              [:genre_callback, :pointer], :void
+        attach_function :native_id3tag_init,        :id3tag_init,        [:global_flags], :void
+        attach_function :native_id3tag_add_v2,      :id3tag_add_v2,      [:global_flags], :void
+        attach_function :native_id3tag_v1_only,     :id3tag_v1_only,     [:global_flags], :void
+        attach_function :native_id3tag_v2_only,     :id3tag_v2_only,     [:global_flags], :void
+        attach_function :native_id3tag_space_v1,    :id3tag_space_v1,    [:global_flags], :void
+        attach_function :native_id3tag_pad_v2,      :id3tag_pad_v2,      [:global_flags], :void
+        attach_function :native_id3tag_set_pad,     :id3tag_set_pad,     [:global_flags, :size_t], :void
+        attach_function :native_id3tag_set_title,   :id3tag_set_title,   [:global_flags, :pointer], :void
+        attach_function :native_id3tag_set_artist,  :id3tag_set_artist,  [:global_flags, :pointer], :void
+        attach_function :native_id3tag_set_album,   :id3tag_set_album,   [:global_flags, :pointer], :void
+        attach_function :native_id3tag_set_year,    :id3tag_set_year,    [:global_flags, :pointer], :void
+        attach_function :native_id3tag_set_comment, :id3tag_set_comment, [:global_flags, :pointer], :void
+        attach_function :id3tag_set_track,                               [:global_flags, :pointer], :int
+        attach_function :id3tag_set_genre,                               [:global_flags, :pointer], :int
+        attach_function :id3tag_set_fieldvalue,                          [:global_flags, :pointer], :int
+        attach_function :id3tag_set_albumart,                            [:global_flags, :buffer_in, :size_t], :int
+        attach_function :lame_get_id3v1_tag,                             [:global_flags, :buffer_out, :size_t], :size_t
+        attach_function :lame_get_id3v2_tag,                             [:global_flags, :buffer_out, :size_t], :size_t
+        attach_function :native_lame_set_write_id3tag_automatic, :lame_set_write_id3tag_automatic, [:global_flags, :int], :void
+        attach_function :lame_get_write_id3tag_automatic,  [:global_flags], :int
         # experimental id3:
         # attach_function :id3tag_set_textinfo_latin1,      [:global_flags, :string, :string], :int
         # attach_function :id3tag_set_comment_latin1,       [:global_flags, :string, :string, :string], :int
@@ -264,6 +265,66 @@ module LAME
         # tables
         attach_function :lame_get_bitrate,    [:int, :int], :int
         attach_function :lame_get_samplerate, [:int, :int], :int
+      end
+
+      # for truffleruby compatibility, return nil explicitly
+      base.singleton_class.class_eval do
+        def lame_set_msfix(global_flags, double)
+          native_lame_set_msfix(global_flags, double)
+          nil
+        end
+        def id3tag_init(global_flags)
+          native_id3tag_init(global_flags)
+          nil
+        end
+        def id3tag_add_v2(global_flags)
+          native_id3tag_add_v2(global_flags)
+          nil
+        end
+        def id3tag_v1_only(global_flags)
+          native_id3tag_v1_only(global_flags)
+          nil
+        end
+        def id3tag_v2_only(global_flags)
+          native_id3tag_v2_only(global_flags)
+          nil
+        end
+        def id3tag_space_v1(global_flags)
+          native_id3tag_space_v1(global_flags)
+          nil
+        end
+        def id3tag_pad_v2(global_flags)
+          native_id3tag_pad_v2(global_flags)
+          nil
+        end
+        def id3tag_set_pad(global_flags, size_t)
+          native_id3tag_set_pad(global_flags, size_t)
+          nil
+        end
+        def id3tag_set_title(global_flags, pointer)
+          native_id3tag_set_title(global_flags, pointer)
+          nil
+        end
+        def id3tag_set_artist(global_flags, pointer)
+          native_id3tag_set_artist(global_flags, pointer)
+          nil
+        end
+        def id3tag_set_album(global_flags, pointer)
+          native_id3tag_set_album(global_flags, pointer)
+          nil
+        end
+        def id3tag_set_year(global_flags, pointer)
+          native_id3tag_set_year(global_flags, pointer)
+          nil
+        end
+        def id3tag_set_comment(global_flags, pointer)
+          native_id3tag_set_comment(global_flags, pointer)
+          nil
+        end
+        def lame_set_write_id3tag_automatic(global_flags, int)
+          native_lame_set_write_id3tag_automatic(global_flags, int)
+          nil
+        end
 
       end
     end

data/lib/lame/version.rb

@@ -1,3 +1,3 @@
 module LAME
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/lame.rb

@@ -14,6 +14,7 @@ require "lame/encoding/long_buffer_encoder"
 require "lame/encoding/interleaved_buffer_encoder"
 require "lame/encoding/interleaved_short_buffer_encoder"
 require "lame/encoding/interleaved_float_buffer_encoder"
+require "lame/encoding/interleaved_int_buffer_encoder"
 require "lame/encoding/flusher"
 require "lame/encoding/id3"
 require "lame/encoding/vbr_info"

data/spec/encoding/interleaved_buffer_encoder_spec.rb

@@ -77,5 +77,12 @@ module LAME
         let(:lame_function) { :lame_encode_buffer_interleaved_ieee_float }
       end
     end
+
+    describe InterleavedIntBufferEncoder do
+      it_should_behave_like "a interleaved buffer encoder" do
+        let(:data_type) { :int }
+        let(:lame_function) { :lame_encode_buffer_interleaved_int }
+      end
+    end
   end
 end

data/spec/ffi/global_flags_spec.rb

@@ -97,7 +97,7 @@ module LAME
         expect(LAME).to be_able_to_set(:decode_only).to(1).for(@flags_pointer)
       end
 
-      it "has a quality" do
+      it "has a quality", skip: "setting quality should now be done with lame_set_quality" do
         expect(LAME).to have_flag(:quality).with_value(3).for(@flags_pointer)
         expect(LAME).to be_able_to_set(:quality).to(1).for(@flags_pointer)
       end
@@ -146,7 +146,7 @@ module LAME
         expect(LAME).to be_able_to_set(:brate).to(192).for(@flags_pointer)
       end
 
-      it "has a compression ratio" do
+      it "has a compression ratio", skip: "setting compression ratio should now be done ewith lame_set_compression_ratio" do
         expect(LAME).to have_flag(:compression_ratio).with_value(1).for(@flags_pointer)
         #expect(LAME).to be_able_to_set(:compression_ratio).to(11.025).for(@flags_pointer) # can't set it..?
       end
@@ -411,15 +411,15 @@ module LAME
 
       context "version" do
         it "has a version" do
-          expect(LAME.get_lame_version).to match /3\.\d\d\.\d/
+          expect(LAME.get_lame_version).to match /3\.\d{2,3}( \(beta \d, [^)]+\))?/
         end
 
         it "has a short version" do
-          expect(LAME.get_lame_short_version).to match /3\.\d\d\.\d/
+          expect(LAME.get_lame_short_version).to match /3\.\d{2,3}( beta \d\(\))?/
         end
 
         it "has a very short version" do
-          expect(LAME.get_lame_very_short_version).to match /LAME3\.\d\dr\d/
+          expect(LAME.get_lame_very_short_version).to match /LAME3\.\d{2,3}[rb]\d/
         end
 
         it "has a psy version" do
@@ -427,7 +427,7 @@ module LAME
         end
 
         it "has a url" do
-          expect(LAME.get_lame_url).to eql "http://lame.sf.net"
+          expect(LAME.get_lame_url).to eql "https://lame.sourceforge.io"
         end
 
         it "has os bitness" do
@@ -436,13 +436,17 @@ module LAME
 
         context "numerical version" do
 
-          let(:version) { LAME.get_lame_version_numerical(@flags_pointer) }
+          let(:version) {
+            version = LAME::FFI::Version.new
+            LAME.get_lame_version_numerical(version)
+            version
+          }
           it "has a major version" do
             expect(version[:major]).to eql 3
           end
 
           it "has a minor version" do
-            expect(version[:minor]).to eql 99
+            expect(version[:minor]).to eql 101
           end
 
           it "has a alpha version" do
@@ -450,7 +454,7 @@ module LAME
           end
 
           it "has a beta version" do
-            expect(version[:beta]).to eql 0
+            expect(version[:beta]).to eql 3
           end
 
           it "has a psy_major version" do

data/spec/ffi/id3tag_spec.rb

@@ -100,8 +100,8 @@ module LAME
 
       # fake JPG image
       buffer = ::FFI::MemoryPointer.new(:char, buffer_size)
-      buffer.put_char(0, 0xff)
-      buffer.put_char(1, 0xd8)
+      buffer.put_uint8(0, 0xff)
+      buffer.put_uint8(1, 0xd8)
 
       expect(LAME.id3tag_set_albumart(@flags_pointer, buffer, buffer_size)).to eql 0
     end

data/spec/spec_helper.rb

@@ -1,13 +1,18 @@
-if RUBY_DESCRIPTION =~ /\Aruby 1.9/
+if RUBY_DESCRIPTION =~ /\Aruby 3.4/
   require 'simplecov'
-  require 'coveralls'
-
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-  SimpleCov.start do
-    add_filter "/spec/"
+  require 'simplecov-lcov'
+
+  # Configure simplecov-lcov to generate a single lcov.info file
+  SimpleCov::Formatter::LcovFormatter.config do |config|
+    config.report_with_single_file = true
+    config.single_report_path = 'coverage/lcov.info'
+  end
+
+  # Set SimpleCov to use the LCOV formatter
+  SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
+
+  SimpleCov.start do "test"
+    add_filter '/spec/' # Exclude spec files from coverage statistics
   end
 end
 

metadata

@@ -1,113 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: lame
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Roel van Dijk
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wavefile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-mp3info
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: FFI powered library for the LAME MP3 encoder.
 email:
 - roel@rustradio.org
@@ -115,15 +128,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
-- .travis.yml
+- ".github/workflows/ci.yml"
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - docs/id3v2.4.0-structure.txt
+- docs/lame-3.101.h
 - docs/lame-3.99.5.h
 - lame.gemspec
 - lib/lame.rb
@@ -144,6 +159,7 @@ files:
 - lib/lame/encoding/id3.rb
 - lib/lame/encoding/interleaved_buffer_encoder.rb
 - lib/lame/encoding/interleaved_float_buffer_encoder.rb
+- lib/lame/encoding/interleaved_int_buffer_encoder.rb
 - lib/lame/encoding/interleaved_short_buffer_encoder.rb
 - lib/lame/encoding/long_buffer_encoder.rb
 - lib/lame/encoding/short_buffer_encoder.rb
@@ -191,24 +207,21 @@ files:
 homepage: http://github.com/rdvdijk/lame
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Easily encode MP3 files using the LAME MP3 encoder.
 test_files: