ramekin 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7b36dbfb523fcdcfc98705488675f16c06ce0aed6ad2a93abe69d3ff5818eff
-  data.tar.gz: 81c0bdc600590ed5f1a552ecd8eed52901d52b558820c9c53e69bac0cdc13053
+  metadata.gz: c8ecaeee8d7551d229bd4d659e37db4fb7ce51b8c8b02db5951afe2889c5766d
+  data.tar.gz: 306dd97179707ab87cbf615c0740495f230a5be78476c89855c5e65c3cbc8d54
 SHA512:
-  metadata.gz: fcdf3d5540e3cbcaf92f37235a7d778c4d4389fe4d791777e849db2d40076d839a618ba7333af29878390375130963be0e98b0d232f7c6557a90b2787bec0c19
-  data.tar.gz: 8bd4df95943b9e05ec1a849dedefdfd5c277ce53b7019098562881ec7f892532bc2fa623e0e368b5a3f817970f94e1c671f79a3a5bfa750f240e93a1cdc41e37
+  metadata.gz: f6496a57a0d10da8cb22d3c0da7593fc8db6949f36fa78b6bf124b39bb727f9b05176fff29961111f510029c7ec93e7d4b8edad2ee0704e312bff82b2d5b02e0
+  data.tar.gz: 494634f3636b32f99fd77c3337b7981021f39850aee811cbe15e6b8154fe5d1474ca51659bce91fe46e09ec4e64e7d5344488ba171523b5036ca7e53713cfcf5

data/README.md

@@ -42,7 +42,8 @@ ramekin compile -i filename.rmk [flags]
         -i filename.rmk
             set the input file
         --txt filename.txt
-            output amk txt to this file
+            output amk txt to this file.
+            use a single dash (-) to print txt to stdout.
         --spc filename.spc
             attempt to invoke AddmusicK to output an SPC
             requires ADDMUSICK_DIR and ASAR_COMMAND

data/lib/ramekin/cli.rb

@@ -29,7 +29,8 @@ module Ramekin
       $stderr.puts "        -i filename.rmk"
       $stderr.puts "            set the input file"
       $stderr.puts "        --txt filename.txt"
-      $stderr.puts "            output amk txt to this file"
+      $stderr.puts "            output amk txt to this file."
+      $stderr.puts "            use a single dash (-) to print txt to stdout."
       $stderr.puts "        --spc filename.spc"
       $stderr.puts "            attempt to invoke AddmusicK to output an SPC"
       $stderr.puts "            requires ADDMUSICK_DIR and ASAR_COMMAND"
@@ -199,7 +200,9 @@ module Ramekin
         WARN
       end
 
-      if @output_txt
+      if @output_txt == '-'
+        $stdout.puts(txt)
+      elsif @output_txt
         File.write(@output_txt, txt)
       end
 

data/lib/ramekin/meta.rb

@@ -21,6 +21,33 @@ module Ramekin
       @options = {}
     end
 
+    def echo_channel_bits
+      (@echo_channels ||= Set.new).map { |x| 1 << x }.inject(&:|)
+    end
+
+    def echo_volumes
+      [(@echo_volume_l || 0) & 0xFF, (@echo_volume_r || 0) & 0xFF]
+    end
+
+    def echo_delay
+      @echo_delay || 0
+    end
+
+    def echo_feedback
+      (@echo_feedback || 0) & 0xFF
+    end
+
+    def echo_fir
+      @echo_fir || 0
+    end
+
+    def echo_hex
+      sprintf("$ef$%02x$%02x$%02x $f1$%02x$%02x$%02x",
+        echo_channel_bits, *echo_volumes,
+        echo_delay, echo_feedback, echo_fir
+      )
+    end
+
     def parse
       loop do
         break if @elements.empty?
@@ -40,6 +67,8 @@ module Ramekin
       @sample_groups << 'default' if @sample_groups.empty?
     end
 
+    SURROUND_R = (-0x7f..0x80)
+
     def parse_directive
       @current_directive = @current
       case @current.value
@@ -65,6 +94,64 @@ module Ramekin
 
       # TODO: real echo syntax
       when 'echo' then @echo = expect_args(*([:hex] * 8))
+      when 'echo/channels'
+        channels = @current_directive.values[1]
+        if channels == 'all'
+          @echo_channels = Set.new(0..7)
+          return
+        end
+
+        unless channels && channels =~ /\A\d(,\d)+\z/
+          error! 'invalid echo channels (list of single digit numbers separated by comma)'
+        end
+
+        @echo_channels = Set.new(channels.split(',').map(&:to_i))
+        unless @echo_channels.all? { |c| (0..7).include?(c) }
+          error! 'invalid echo channels (must be 0-7)'
+        end
+      when 'echo/volume'
+        vols = @current_directive.values[1]
+
+        unless vols && vols =~ /\A-?\h\h?(,\h\h?)?/
+          error! 'invalid echo volume (one or two hex numbers)'
+        end
+
+        vols = vols.split(',').map { |v| v.to_i(16) }
+        if vols.size == 1
+          @echo_volume_l = @echo_volume_r = vols[0]
+        else
+          @echo_volume_l, @echo_volume_r = vols
+        end
+
+        unless SURROUND_R.include?(@echo_volume_l) && SURROUND_R.include?(@echo_volume_r)
+          error! 'invalid echo volume (-7f to 80, use negative for surround)'
+        end
+
+      when 'echo/delay'
+        delay = @current_directive.values[1]
+        unless delay && delay =~ /\A[0-7]\z/
+          error! 'invalid echo delay (single digit 0-7)'
+        end
+
+        @echo_delay = delay.to_i
+      when 'echo/feedback'
+        feedback = @current_directive.values[1]
+        unless feedback && feedback =~ /\A-?\h\h?\z/
+          error! 'invalid echo feedback (one or two hex digits)'
+        end
+
+        @echo_feedback = feedback.to_i(16)
+
+        unless SURROUND_R.include?(@echo_feedback)
+          error! 'invalid echo feedback (-7F to 80, use negative for surround)'
+        end
+      when 'echo/fir'
+        fir = @current_directive.values[1]
+        unless fir && fir =~ /\A\h\h?\z/
+          error! 'invalid echo FIR setting (one or two hex digits)'
+        end
+
+        @echo_fir = fir.to_i(16)
       else
         error! 'invalid directive in header'
       end

data/lib/ramekin/renderer.rb

@@ -99,7 +99,10 @@ module Ramekin
 
       yield "t#{tempo_of(m.tempo)} ; main tempo (0-60)\n" if m.tempo
       yield "w#{m.volume.value} ; main volume (0-255)\n" if m.volume
-      yield "l16"
+      yield "l16\n\n"
+
+      yield "; echo settings\n"
+      yield m.echo_hex
       # binding.pry
     end
 
@@ -274,6 +277,8 @@ module Ramekin
         @octave = note.octave
       when 'legato'
         yield '$f4$01'
+      when 'echo/toggle'
+        yield '$f4$03'
       else
         error! "unexpected directive ##{token.value}"
       end

data/lib/ramekin/tokenizer.rb

@@ -217,7 +217,8 @@ module Ramekin
       return [:amk, m(1)] if match /#amk\s*(\d+)/
       return [:option, m(1)] if match /#option (\w+)/
       return [:channel, m(1)] if match /#(\d+)/
-      return [:directive, m(1)] if match /#([\w-]+)/
+      return [:directive, m(1), m(2)] if match /#([\w\/-]+):(\S+)/
+      return [:directive, m(1)] if match /#([\w\/-]+)/
       return [:lbrace] if match /[{]/
       return [:rbrace] if match /[}]/
       return [:v, m(1), m(2)] if match /v(\d+)(?:,(\d+))?/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ramekin
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - jneen