Permalink
Browse files

merge with 0.2rc1 branch

  • Loading branch information...
1 parent ecb0863 commit c961125c0962f07764b209f85551b947d6edf15a @HendrikLouw HendrikLouw committed Apr 16, 2012
Showing with 5 additions and 6 deletions.
  1. +1 −1 bin/voyeur.rb
  2. +1 −2 lib/Voyeur/converter.rb
  3. +2 −2 lib/Voyeur/media.rb
  4. +1 −1 spec/video_spec.rb
View
@@ -11,7 +11,7 @@
puts "Converting #{file_to_convert} to #{format}"
-video = Voyeur::Video.new(filename: "#{file_to_convert}")
+video = Voyeur::Media.new(filename: "#{file_to_convert}")
video.convert(to: format.to_sym) do |time|
View
@@ -19,8 +19,7 @@ def self.create(options)
def convert(options)
@input_media = options[:media]
raise Voyeur::Exceptions::NoMediaPresent unless @input_media
- output_filename = self.output_path( options[:output_path] )
- @output_video = Media.new(filename: output_file(options[:output_path], options[:output_filename]))
+ @output_media = Media.new(filename: output_file(options[:output_path], options[:output_filename]))
if block_given?
self.call_external_converter do |time|
yield time
View
@@ -20,13 +20,13 @@ def convert(options)
converter = Voyeur::Converter.create(format: options[:to])
if block_given?
- converter.convert(video: self,
+ converter.convert(media: self,
output_filename: options[:output_filename],
output_path: options[:output_path]) do |time|
yield time
end
else
- converter.convert(video: self,
+ converter.convert(media: self,
output_filename: options[:output_filename],
output_path: options[:output_path])
end
View
@@ -8,7 +8,7 @@
end
it 'should get duration of a media object from a filename' do
- video = Voyeur::Video.new( filename: valid_mpeg_file_path )
+ video = Voyeur::Media.new( filename: valid_mpeg_file_path )
video.raw_duration.should_not be_nil
video.raw_duration.should_not == ''
end

0 comments on commit c961125

Please sign in to comment.