Skip to content

add extra options to just return samples array without saving file #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
casiodk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add extra options to just return samples array without saving file #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions lib/waveform.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ class Waveform
:background_color => "#666666",
:color => "#00ccff",
:force => false,
:logger => nil
:logger => nil,
:return_samples => false,
:save_file => true
}

TransparencyMask = "#00ff00"
Expand Down Expand Up @@ -98,20 +100,24 @@ def generate(source, filename, options={})
samples = frames(source, options[:width], options[:method]).collect do |frame|
frame.inject(0.0) { |sum, peak| sum + peak } / frame.size
end

unless options[:save_file] == false
@log.timed("\nDrawing...") do
# Don't remove the file even if force is true until we're sure the
# source was readable
if File.exists?(filename) && options[:force] === true
@log.out("Output file #{filename} encountered. Removing.")
File.unlink(filename)
end

@log.timed("\nDrawing...") do
# Don't remove the file even if force is true until we're sure the
# source was readable
if File.exists?(filename) && options[:force] === true
@log.out("Output file #{filename} encountered. Removing.")
File.unlink(filename)
image = draw samples, options
image.save filename
end

image = draw samples, options
image.save filename
end

@log.done!("Generated waveform '#{filename}'")

samples if options[:return_samples] == true
end

private
Expand Down