vcs_ruby 1.1.8 → 1.1.9

data/lib/FFmpeg/ffmpeg_meta_info.rb

@@ -1,37 +1,37 @@
-#
-# Implementes MetaInfo Interface for FFmpeg
-#
-
-# MetaInformation = Struct.new(:duration, :bit_rate, :size, :format, :extension, :raw)
-
-require_relative '../time_index'
-
-module VCSRuby
-  class FFmpegMetaInfo
-    attr_reader :raw
-
-    def initialize meta_info
-      @raw = meta_info
-    end
-
-    def duration
-      TimeIndex.new(@raw['duration'].to_f)
-    end
-
-    def bit_rate
-      @raw['bit_rate'].to_i
-    end
-
-    def size
-      @raw['size'].to_i
-    end
-
-    def format
-      @raw['format_long_name']
-    end
-
-    def extension
-      @raw['format_name']
-    end
-  end
+#
+# Implementes MetaInfo Interface for FFmpeg
+#
+
+# MetaInformation = Struct.new(:duration, :bit_rate, :size, :format, :extension, :raw)
+
+require_relative '../time_index'
+
+module VCSRuby
+  class FFmpegMetaInfo
+    attr_reader :raw
+
+    def initialize meta_info
+      @raw = meta_info
+    end
+
+    def duration
+      TimeIndex.new(@raw['duration'].to_f)
+    end
+
+    def bit_rate
+      @raw['bit_rate'].to_i
+    end
+
+    def size
+      @raw['size'].to_i
+    end
+
+    def format
+      @raw['format_long_name']
+    end
+
+    def extension
+      @raw['format_name']
+    end
+  end
 end

data/lib/FFmpeg/ffmpeg_video_stream.rb

@@ -1,56 +1,62 @@
-#
-# Implementes VideoStream Interface for FFmpeg
-#
-
-# VideoStream = Struct.new(:width, :height, :codec, :color_space, :bit_rate, :frame_rate, :aspect_ratio, :raw)
-
-module VCSRuby
-  class FFmpegVideoStream
-    attr_reader :raw
-
-    def initialize video_stream
-      @raw = video_stream
-    end
-
-    def width
-      @raw['width'].to_i
-    end
-
-    def height
-      @raw['height'].to_i
-    end
-
-    def codec short = false
-      if short
-        @raw['codec_name']
-      else
-        @raw['codec_long_name']
-      end
-    end
-
-    def color_space
-      if ["unknown", "", nil].include? @raw['color_space']
-        @raw['pix_fmt']
-      else
-        @raw['color_space']
-      end
-    end
-
-    def bit_rate
-      @raw['bit_rate'].to_i
-    end
-
-
-    def frame_rate
-      if @raw['r_frame_rate']
-        @raw['r_frame_rate'].to_r
-      elsif @raw['avg_frame_rate']
-        @raw['avg_frame_rate'].to_r
-      end
-    end
-
-    def aspect_ratio
-      @raw['display_aspect_ratio']
-    end
-  end
-end
+#
+# Implementes VideoStream Interface for FFmpeg
+#
+
+# VideoStream = Struct.new(:width, :height, :codec, :color_space, :bit_rate, :frame_rate, :aspect_ratio, :raw)
+
+module VCSRuby
+  class FFmpegVideoStream
+    attr_reader :raw
+
+    def initialize video_stream
+      @raw = video_stream
+    end
+
+    def width
+      @raw['width'].to_i
+    end
+
+    def height
+      @raw['height'].to_i
+    end
+
+    def codec short = false
+      if short
+        @raw['codec_name']
+      else
+        @raw['codec_long_name']
+      end
+    end
+
+    def color_space
+      if ["unknown", "", nil].include? @raw['color_space']
+        @raw['pix_fmt']
+      else
+        @raw['color_space']
+      end
+    end
+
+    def bit_rate
+      @raw['bit_rate'].to_i
+    end
+
+
+    def frame_rate
+      if @raw['r_frame_rate']
+        @raw['r_frame_rate'].to_r
+      elsif @raw['avg_frame_rate']
+        @raw['avg_frame_rate'].to_r
+      end
+    end
+
+    def aspect_ratio
+      colon = ":"
+      if @raw['display_aspect_ratio'].include? colon
+        w,h = @raw['display_aspect_ratio'].split(colon)
+        Rational(w,h)
+      else
+        @raw['display_aspect_ratio'].to_f
+      end
+    end
+  end
+end

data/lib/MPlayer/mplayer.rb

@@ -1,101 +1,101 @@
-#
-# MPlayer Abstraction
-#
-
-require 'capturer'
-require 'command'
-
-module VCSRuby
-  class MPlayer < Capturer
-
-    HEADER = 2
-
-    attr_reader :info, :video_streams, :audio_streams
-    def initialize video
-      @video = video
-      @mplayer = Command.new :mplayer, 'mplayer'
-
-      detect_version if available?
-    end
-
-    def file_valid?
-      return probe_meta_information
-    end
-
-    def name
-      :mplayer
-    end
-
-    def available?
-      @mplayer.available?
-    end
-
-    def detect_version
-      info = @mplayer.execute('')
-      match = /MPlayer (.*),/.match(info)
-      @version = match[1] if match
-    end
-
-    def grab time, image_path
-      @mplayer.execute "-vo png -ss #{time.total_seconds} -endpos 0 \"#{@video.full_path}\""
-      FileUtils.mv(file_pattern(1), image_path)
-    end
-
-    def available_formats
-      # Ordered by priority
-      image_formats = ['png', 'jpeg']
-      formats = []
-
-      list = @mplayer.execute("-vo help", 0, true)
-      list.lines.drop(HEADER).each do |codec|
-        name = format_split(codec)
-        formats << name if image_formats.include?(name)
-      end
-
-      image_formats.select{ |format| formats.include?(format) }.map(&:to_sym)
-    end
-
-    def to_s
-      "MPlayer #{@version}"
-    end
-
-  private
-    def format_split line
-      name = line.strip.split(' ', 2).first
-    end
-
-    def check_cache
-      unless @cache
-        @cache = @mplayer.execute("-ao null -vo null -identify -frames 0 -really-quiet \"#{@video.full_path}\"")
-      end
-    end
-
-    def parse_format
-      mplayer_hash = get_hash(@cache)
-      @info = MPlayerMetaInfo.new(mplayer_hash, File.size(@video.full_path))
-      return true
-    end
-
-    def parse_audio_streams
-      @audio_streams = []
-      mplayer_hash = get_hash(@cache)
-      @audio_streams << MPlayerAudioStream.new(mplayer_hash)
-      return true
-    end
-
-    def parse_video_streams
-      @video_streams = []
-      mplayer_hash = get_hash(@cache)
-      @video_streams << MPlayerVideoStream.new(mplayer_hash)
-      return true
-    end
-
-    def file_pattern n
-      if format == :jpeg
-        "#{"%08d" % n}.jpg"
-      else
-        "#{"%08d" % n}.#{format.to_s}"
-      end
-    end
-  end
-end
+#
+# MPlayer Abstraction
+#
+
+require 'capturer'
+require 'command'
+
+module VCSRuby
+  class MPlayer < Capturer
+
+    HEADER = 2
+
+    attr_reader :info, :video_streams, :audio_streams
+    def initialize video
+      @video = video
+      @mplayer = Command.new :mplayer, 'mplayer'
+
+      detect_version if available?
+    end
+
+    def file_valid?
+      return probe_meta_information
+    end
+
+    def name
+      :mplayer
+    end
+
+    def available?
+      @mplayer.available?
+    end
+
+    def detect_version
+      info = @mplayer.execute('')
+      match = /MPlayer (.*),/.match(info)
+      @version = match[1] if match
+    end
+
+    def grab time, image_path
+      @mplayer.execute "-vo png -ss #{time.total_seconds} -endpos 0 \"#{@video.full_path}\""
+      FileUtils.mv(file_pattern(1), image_path)
+    end
+
+    def available_formats
+      # Ordered by priority
+      image_formats = ['png', 'jpeg']
+      formats = []
+
+      list = @mplayer.execute("-vo help", 0, true)
+      list.lines.drop(HEADER).each do |codec|
+        name = format_split(codec)
+        formats << name if image_formats.include?(name)
+      end
+
+      image_formats.select{ |format| formats.include?(format) }.map(&:to_sym)
+    end
+
+    def to_s
+      "MPlayer #{@version}"
+    end
+
+  private
+    def format_split line
+      name = line.strip.split(' ', 2).first
+    end
+
+    def check_cache
+      unless @cache
+        @cache = @mplayer.execute("-ao null -vo null -identify -frames 0 -really-quiet \"#{@video.full_path}\"")
+      end
+    end
+
+    def parse_format
+      mplayer_hash = get_hash(@cache)
+      @info = MPlayerMetaInfo.new(mplayer_hash, File.size(@video.full_path))
+      return true
+    end
+
+    def parse_audio_streams
+      @audio_streams = []
+      mplayer_hash = get_hash(@cache)
+      @audio_streams << MPlayerAudioStream.new(mplayer_hash)
+      return true
+    end
+
+    def parse_video_streams
+      @video_streams = []
+      mplayer_hash = get_hash(@cache)
+      @video_streams << MPlayerVideoStream.new(mplayer_hash)
+      return true
+    end
+
+    def file_pattern n
+      if format == :jpeg
+        "#{"%08d" % n}.jpg"
+      else
+        "#{"%08d" % n}.#{format.to_s}"
+      end
+    end
+  end
+end

data/lib/MPlayer/mplayer_audio_stream.rb

@@ -1,34 +1,34 @@
-#
-# Implementes AudioStream Interface for MPlayer
-#
-
-# AudioStream = Struct.new(:codec, :channels, :channel_layout, :sample_rate, :bit_rate, :raw)
-module VCSRuby
-  class MPlayerAudioStream
-    attr_reader :raw
-
-    def initialize audio_stream
-      @raw = audio_stream
-    end
-
-    def codec short = false
-      @raw['ID_AUDIO_CODEC']
-    end
-
-    def channels
-      @raw['ID_AUDIO_NCH'].to_i
-    end
-
-    def channel_layout
-      ''
-    end
-
-    def sample_rate
-      @raw['ID_AUDIO_RATE'].to_i
-    end
-
-    def bit_rate
-      @raw['ID_AUDIO_BITRATE'].to_i
-    end
-  end
+#
+# Implementes AudioStream Interface for MPlayer
+#
+
+# AudioStream = Struct.new(:codec, :channels, :channel_layout, :sample_rate, :bit_rate, :raw)
+module VCSRuby
+  class MPlayerAudioStream
+    attr_reader :raw
+
+    def initialize audio_stream
+      @raw = audio_stream
+    end
+
+    def codec short = false
+      @raw['ID_AUDIO_CODEC']
+    end
+
+    def channels
+      @raw['ID_AUDIO_NCH'].to_i
+    end
+
+    def channel_layout
+      ''
+    end
+
+    def sample_rate
+      @raw['ID_AUDIO_RATE'].to_i
+    end
+
+    def bit_rate
+      @raw['ID_AUDIO_BITRATE'].to_i
+    end
+  end
 end

data/lib/MPlayer/mplayer_meta_info.rb

@@ -1,40 +1,40 @@
-#
-# Implementes MetaInfo Interface for MPlayer
-#
-
-# MetaInformation = Struct.new(:duration, :bit_rate, :size, :format, :extension, :raw)
-
-require_relative '../time_index'
-
-module VCSRuby
-  class MPlayerMetaInfo
-    attr_reader :raw
-
-    def initialize meta_info, filesize
-      @raw = meta_info
-      @filesize = filesize
-    end
-
-    def duration
-      TimeIndex.new(@raw['ID_LENGTH'].to_f)
-    end
-
-    def bit_rate
-      @raw['ID_AUDIO_BITRATE'].to_i + @raw['ID_VIDEO_BITRATE'].to_i
-    end
-
-    def size
-      @filesize
-    end
-
-    def format
-      extension
-    end
-
-    def extension
-      ext = File.extname(@raw['ID_FILENAME'])
-      ext[0] = ''
-      ext
-    end
-  end
+#
+# Implementes MetaInfo Interface for MPlayer
+#
+
+# MetaInformation = Struct.new(:duration, :bit_rate, :size, :format, :extension, :raw)
+
+require_relative '../time_index'
+
+module VCSRuby
+  class MPlayerMetaInfo
+    attr_reader :raw
+
+    def initialize meta_info, filesize
+      @raw = meta_info
+      @filesize = filesize
+    end
+
+    def duration
+      TimeIndex.new(@raw['ID_LENGTH'].to_f)
+    end
+
+    def bit_rate
+      @raw['ID_AUDIO_BITRATE'].to_i + @raw['ID_VIDEO_BITRATE'].to_i
+    end
+
+    def size
+      @filesize
+    end
+
+    def format
+      extension
+    end
+
+    def extension
+      ext = File.extname(@raw['ID_FILENAME'])
+      ext[0] = ''
+      ext
+    end
+  end
 end

data/lib/MPlayer/mplayer_video_stream.rb

@@ -1,44 +1,44 @@
-#
-# Implementes VideoStream Interface for MPlayer
-#
-
-# VideoStream = Struct.new(:width, :height, :codec, :color_space, :bit_rate, :frame_rate, :aspect_ratio, :raw)
-
-module VCSRuby
-  class MPlayerVideoStream
-    attr_reader :raw
-
-    def initialize video_stream
-      @raw = video_stream
-    end
-
-    def width
-      @raw['ID_VIDEO_WIDTH'].to_i
-    end
-
-    def height
-      @raw['ID_VIDEO_HEIGHT'].to_i
-    end
-
-    def codec short = false
-      @raw['ID_VIDEO_FORMAT']
-    end
-
-    def color_space
-      ''
-    end
-
-    def bit_rate
-      @raw['ID_VIDEO_BITRATE'].to_i
-    end
-
-
-    def frame_rate
-      @raw['ID_VIDEO_FPS'].to_f
-    end
-
-    def aspect_ratio
-      ''
-    end
-  end
-end
+#
+# Implementes VideoStream Interface for MPlayer
+#
+
+# VideoStream = Struct.new(:width, :height, :codec, :color_space, :bit_rate, :frame_rate, :aspect_ratio, :raw)
+
+module VCSRuby
+  class MPlayerVideoStream
+    attr_reader :raw
+
+    def initialize video_stream
+      @raw = video_stream
+    end
+
+    def width
+      @raw['ID_VIDEO_WIDTH'].to_i
+    end
+
+    def height
+      @raw['ID_VIDEO_HEIGHT'].to_i
+    end
+
+    def codec short = false
+      @raw['ID_VIDEO_FORMAT']
+    end
+
+    def color_space
+      ''
+    end
+
+    def bit_rate
+      @raw['ID_VIDEO_BITRATE'].to_i
+    end
+
+
+    def frame_rate
+      @raw['ID_VIDEO_FPS'].to_f
+    end
+
+    def aspect_ratio
+      ''
+    end
+  end
+end

data/lib/black.yml

@@ -1,12 +1,12 @@
-style:
-  header:
-    color: White
-    background: Black
-  title:
-    color: White
-    background: Black
-  contact:
-    background: Black
-  signature:
-    color: White
-    background: Black
+style:
+  header:
+    color: White
+    background: Black
+  title:
+    color: White
+    background: Black
+  contact:
+    background: Black
+  signature:
+    color: White
+    background: Black