diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dtas/player.rb | 4 | ||||
| -rw-r--r-- | lib/dtas/splitfx.rb | 4 | ||||
| -rw-r--r-- | lib/dtas/tracklist.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/dtas/player.rb b/lib/dtas/player.rb index 8926e0b..5e78d8e 100644 --- a/lib/dtas/player.rb +++ b/lib/dtas/player.rb @@ -260,7 +260,7 @@ class DTAS::Player # :nodoc: end def _next - @queue.shift || @tl.next_track + @queue.shift || @tl.advance_track end def sink_death(sink, status) @@ -353,7 +353,7 @@ class DTAS::Player # :nodoc: # don't get stuck in an infinite loop if @tl.repeat==true and we can't # decode anything (FS errors, sox uninstalled, etc...) - while path = @tl.next_track(false) + while path = @tl.advance_track(false) @sources.each do |src| rv = src.try(path) and return rv end diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb index 02be3a3..39726de 100644 --- a/lib/dtas/splitfx.rb +++ b/lib/dtas/splitfx.rb @@ -14,8 +14,8 @@ class DTAS::SplitFX # :nodoc: include DTAS::XS class T < Struct.new(:env, :comments, :tstart, :fade_in, :fade_out) - def commit(next_track_samples) - tlen = next_track_samples - tstart + def commit(advance_track_samples) + tlen = advance_track_samples - tstart trimfx = "trim #{tstart}s #{tlen}s" if fade_in trimfx << " #{fade_in}" diff --git a/lib/dtas/tracklist.rb b/lib/dtas/tracklist.rb index a51db32..e0b00cb 100644 --- a/lib/dtas/tracklist.rb +++ b/lib/dtas/tracklist.rb @@ -65,7 +65,7 @@ class DTAS::Tracklist @list.map { |t| t.object_id } end - def next_track(repeat_ok = true) + def advance_track(repeat_ok = true) return if @list.empty? next_pos = @goto_pos || @pos + 1 @goto_pos = nil |