diff options
author | Eric Wong <e@80x24.org> | 2016-12-07 07:48:22 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-12-07 07:48:22 +0000 |
commit | f77befb947a41d9ce939ad4a624bd820eac6245a (patch) | |
tree | 108d0a118582ffa64bb83d1433836833e2ddd02b /lib | |
parent | 5e65897053f20fc6d09ab22448c43d7103c779f2 (diff) | |
download | dtas-f77befb947a41d9ce939ad4a624bd820eac6245a.tar.gz |
No reason to generate the command in a different place than fade_out.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/dtas/splitfx.rb | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb index 57dc7ea..9a67aeb 100644 --- a/lib/dtas/splitfx.rb +++ b/lib/dtas/splitfx.rb @@ -38,7 +38,14 @@ class DTAS::SplitFX # :nodoc: tlen = advance_track_samples - tbeg trimfx = "trim #{tbeg}s #{tlen}s".dup if fade_in - trimfx << " #{fade_in}" + # generate fade-in effect + # $1 = "t 4" => "fade t 4 0 0" + tmp = fade_in.dup + fade_in_len = tmp.pop or + raise ArgumentError, 'fade_in needs a time value' + fade_type = tmp.pop # may be nil + fade = " fade #{fade_type} #{fade_in_len} 0 0" + trimfx << fade end if fade_out tmp = fade_out.dup @@ -287,10 +294,8 @@ class DTAS::SplitFX # :nodoc: argv.each do |arg| case arg - when %r{\Afade_in=(.+)\z} - # generate fade-in effect - # $1 = "t 4" => "fade t 4 0 0" - t.fade_in = "fade #$1 0 0" + when %r{\Afade_in=(.+)\z} # $1 = "t 4" or just "4" + t.fade_in = $1.split(/\s+/) when %r{\Afade_out=(.+)\z} # $1 = "t 4" or just "4" t.fade_out = $1.split(/\s+/) when %r{\A\.(\w+)=(.+)\z} then t.comments[$1] = $2 |