From b95a51440b6378847c4ab5dd4cf9e96e18b5f241 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 19 Jan 2015 09:04:18 +0000 Subject: avoid aliasing global "spawn" method This makes debugging, grepping, and following code confusing at times and also unexpected breaks usage of the global "spawn" method. --- lib/dtas/source/av_ff_common.rb | 4 ++-- lib/dtas/source/cmd.rb | 4 ++-- lib/dtas/source/sox.rb | 4 ++-- lib/dtas/source/splitfx.rb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/dtas/source') diff --git a/lib/dtas/source/av_ff_common.rb b/lib/dtas/source/av_ff_common.rb index ea0c01a..89d762d 100644 --- a/lib/dtas/source/av_ff_common.rb +++ b/lib/dtas/source/av_ff_common.rb @@ -127,8 +127,8 @@ module DTAS::Source::AvFfCommon # :nodoc: raise "BUG: no audio stream in #@infile" end - def spawn(player_format, rg_state, opts) - raise "BUG: #{self.inspect}#spawn called twice" if @to_io + def src_spawn(player_format, rg_state, opts) + raise "BUG: #{self.inspect}#src_spawn called twice" if @to_io amap = nil # try to find an audio stream which matches our channel count diff --git a/lib/dtas/source/cmd.rb b/lib/dtas/source/cmd.rb index b2cd8e3..0f4c3f6 100644 --- a/lib/dtas/source/cmd.rb +++ b/lib/dtas/source/cmd.rb @@ -31,8 +31,8 @@ class DTAS::Source::Cmd # :nodoc: alias to_hsh to_hash - def spawn(format, rg_state, opts) - raise "BUG: #{self.inspect}#spawn called twice" if @to_io + def src_spawn(format, rg_state, opts) + raise "BUG: #{self.inspect}#src_spawn called twice" if @to_io e = format.to_env @pid = dtas_spawn(e.merge!(@env), command_string, opts) end diff --git a/lib/dtas/source/sox.rb b/lib/dtas/source/sox.rb index 7cfecc5..8e8e59e 100644 --- a/lib/dtas/source/sox.rb +++ b/lib/dtas/source/sox.rb @@ -75,8 +75,8 @@ class DTAS::Source::Sox # :nodoc: tmp end - def spawn(player_format, rg_state, opts) - raise "BUG: #{self.inspect}#spawn called twice" if @to_io + def src_spawn(player_format, rg_state, opts) + raise "BUG: #{self.inspect}#src_spawn called twice" if @to_io e = @env.merge!(player_format.to_env) e["INFILE"] = @infile diff --git a/lib/dtas/source/splitfx.rb b/lib/dtas/source/splitfx.rb index 80d8473..adfde61 100644 --- a/lib/dtas/source/splitfx.rb +++ b/lib/dtas/source/splitfx.rb @@ -60,8 +60,8 @@ class DTAS::Source::SplitFX < DTAS::Source::Sox # :nodoc: @ymlhash["command"] || super end - def spawn(player_format, rg_state, opts) - raise "BUG: #{self.inspect}#spawn called twice" if @to_io + def src_spawn(player_format, rg_state, opts) + raise "BUG: #{self.inspect}#src_spawn called twice" if @to_io e = @env.merge!(player_format.to_env) @sfx.infile_env(e, @sox.infile) -- cgit v1.2.3-24-ge0c7