sidtool 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee52c07a7f399012cf4f38f0be369570784e54086f7bc0c1bb52664b8cbe01b6
-  data.tar.gz: e5652d2922c9a8b52df256ac1a45074849c81ff256bfdf672bdbdef3c16113ff
+  metadata.gz: 5c9e6e4a8741217ee0274bdb1b6fedb7f9c170bf89466b801ad8a1857a7cc59b
+  data.tar.gz: f2c57a83771df5654ae6c5e257eeff3ec0d94ae1d9a8db94da58f5eed2e7dee8
 SHA512:
-  metadata.gz: 8695db8b9e68e83c550bf4eba49eafbe4f4eef09c2c409eea568365a708d8d7446da573b854c126c2b88fe84d6711c5448ad8b1441272d47c205ef467ec3480b
-  data.tar.gz: 0f828663808f36e37f20866699fe0abd7c015a87d803c19a994a9589318ad5ba34a91ba0cdbe821d0cae058f7639f5e96f650a8fdbad718f932ec0a1eb7f1f2f
+  metadata.gz: bf153ba88e818359ee5df8b32de316959c9215142416a29997b204cc4545210ae33efb01e0a60155c81b1251a398cfe81736e6e1dc08392cfec0396005a3278a
+  data.tar.gz: 8533881bb398f17eb54ef530fe3bb23f24fe8bde3214c87ec994da8c35faaa10d4e372fffc99ffab3b23add8f15ce2e268150d1cfa4736afffc159c5b32d44c0

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog
+
+## 0.0.2
+* Process 15000 frames (10 minutes) instead of 1500 (half a minute) by default.
+* Only release a synth once. This fixes various sound effects that would just end up with a
+  permanently released synth. It will probably make "normal" tunes sound a bit crisper too.
+* Ensuring that existing synth gets properly cut off before starting the next sync for a voice.
+  This fixes songs like `Commando.sid` that sounded just weird before.
+
+## 0.0.1
+Just getting started... A lot of mess...

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sidtool (0.0.1)
+    sidtool (0.0.2)
       mos6510 (~> 0.1.0)
 
 GEM

data/bin/sidtool

@@ -3,20 +3,22 @@ require 'sidtool'
 require 'mos6510'
 require 'optparse'
 
+DEFAULT_FRAMES_TO_PROCESS = 15000
+
 params = {}
 OptionParser.new do |parser|
   parser.banner = 'Usage: sidtool [options] <intputfile.sid>'
 
   parser.on('-i', '--info', 'Show file information')
   parser.on('-o', '--out FILENAME', 'Output file (Ruby array)')
-  parser.on('-s', '--song NUMBER', Integer, 'Song number to process')
-  parser.on('-f', '--frames NUMBER', Integer, 'Number of frames to process')
+  parser.on('-s', '--song NUMBER', Integer, 'Song number to process (defaults to the start song in the file)')
+  parser.on('-f', '--frames NUMBER', Integer, "Number of frames to process (default #{DEFAULT_FRAMES_TO_PROCESS})")
   parser.on_tail('-h', '--help', 'Show this message') do
     puts parser
     exit
   end
   parser.on_tail('--version', 'Show version') do
-    puts Sidtool::Version
+    puts Sidtool::VERSION
     exit
   end
 end.parse!(into: params)
@@ -34,7 +36,7 @@ song = params[:song] || sid_file.start_song
 raise 'Song must be at least 1' if song < 1
 raise "File only has #{sid_file.songs} songs" if song > sid_file.songs
 
-frames = params[:frames] || 1500
+frames = params[:frames] || DEFAULT_FRAMES_TO_PROCESS
 
 if show_info
   puts "Read #{sid_file.format} version #{sid_file.version} file."

data/lib/sidtool/synth.rb

@@ -19,6 +19,9 @@ module Sidtool
     end
 
     def release!
+      return if released?
+
+      @released_at = STATE.current_frame
       length_of_attack_decay_sustain = (STATE.current_frame - @start_frame) / FRAMES_PER_SECOND
       if length_of_attack_decay_sustain < @attack
         @attack = length_of_attack_decay_sustain
@@ -31,14 +34,22 @@ module Sidtool
       end
     end
 
+    def released?
+      !!@released_at
+    end
+
     def stop!
-      # TODO: Should also cut off any remaining release
-      release!
+      if released?
+        @release = [@release, (STATE.current_frame - @released_at) / FRAMES_PER_SECOND].min
+      else
+        @release = 0
+        release!
+      end
     end
 
     def to_a
       tone = sid_frequency_to_nearest_midi(@frequency)
-      [@start_frame, tone, @waveform, @attack.round(3), @decay.round(3), @sustain_length, @release.round(3), @controls]
+      [@start_frame, tone, @waveform, @attack.round(3), @decay.round(3), @sustain_length.round(3), @release.round(3), @controls]
     end
 
     private

data/lib/sidtool/version.rb

@@ -1,3 +1,3 @@
 module Sidtool
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/sidtool/voice.rb

@@ -18,8 +18,13 @@ module Sidtool
 
     def finish_frame
       if gate
+        if @synth&.released?
+          @synth.stop!
+          @synth = nil
+        end
+
         if frequency > 0
-          unless @synth
+          if !@synth
             @synth = Synth.new(STATE.current_frame)
             STATE.synths << @synth
           end
@@ -31,7 +36,6 @@ module Sidtool
         end
       else
         @synth&.release!
-        @synth = nil
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidtool
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ole Friis Østergaard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mos6510
@@ -90,6 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt