sensible-cinema 0.9.7 → 0.10.1

data/README

@@ -162,16 +162,15 @@ which you could use to translate into a sensible-cinema compatible list.
 
 The concept isn't too novel:
 
-http://en.wikipedia.org/wiki/Edit_decision_list (it's linear editing tool)
-http://www.imdb.com/swiki/special?ParentalGuideHelp and search for "scene description"
-http://www.oreillynet.com/sysadmin/blog/2005/06/make_your_own_phantom_edit_wit.html
+Edited "for airplane" movies
+http://en.wikipedia.org/wiki/Edit_decision_list (it's a linear editing tool, after all)
+http://www.oreillynet.com/sysadmin/blog/2005/06/make_your_own_phantom_edit_wit.html mplayer has had this ability for awhile.
 http://forum.bsplayer.com/feature-requests-feedback-suggestions/7157-chapter-playlist-scene-cut-3.html
 http://www.inmatrix.com/ "scene cut editor" of the zoom player
-http://wiki.xbmc.org/?title=EDL_(commercial_skipping)_and_SceneMarker_support (XBMC's scene cut support--also links to more others)
+http://wiki.xbmc.org/?title=EDL_(commercial_skipping)_and_SceneMarker_support (XBMC's scene cut support--also contains links to some others)
 http://code.google.com/p/movie-content-editor (same thing, but in Python and only for VLC)
-http://clearplay.com similar, but commercial (closed source, costs money, no user contribution), and only for DVD's (uses its own DVD-player).
-
-though none of them are universal like this one is :)
+http://www.imdb.com/swiki/special?ParentalGuideHelp and search for "scene description"
+http://clearplay.com similar, but commercial (closed source, costs money, no user contribution), and only for DVD's (uses its own DVD-player in its current incantation).
 
 == Feedback ==
 

data/Rakefile

@@ -21,6 +21,7 @@ task 'spec' do
   failed = []
   Dir.chdir 'spec' do
     for file in Dir['*spec*.rb'] do
+      puts "Running " + file
       if !system(OS.ruby_bin + " " + file)
         failed << file
       end

data/TODO

@@ -1,51 +1,80 @@
 == medium ==
 
-  make all players actually play again
 
-== low but actually want to do eventually (me) low prio: just do these...==
+== probably next up/low prio ==
 
+  back off on mouse jerking if they're movin' it
+  screencast of things helpful (use, creation).
   youtube non full screen: work with other browsers
-  slightly more accurate timestamp...
-  can parse IMDB (require they put in the URL by hand)
-  try the new GOCR sources...
-  PISH
+  speed up unit tests
+  can parse IMDB (require they put in the URL by hand fer now)
+  PISH, then
     add stuffs to imdb hmmm
-  more often yell at them "not working"
+  a netflix player descriptor
+  advertise on ruby flow
+  "just choose VLCx55" LOL
+    beep at them when not tracking [?]
+      default on...hmm
 
-== random backlog ... based on user request..remember:  just local files for my own needs...==
+== random backlog ... note: just plow forward, to "grab" available ideas...except that for now, just what *I* plan on needing for myself (filters for what I need/want). ==
 
-"just choose VLCx55" LOL
+run it off a normal person (hulu, DVD). rinse and repeat
 
-itunes video on demand
+check that youtube is working well again for all...
 
-blockbuster "rent" on demand, online
+easier "here's how on the command line, BTW"
 
-beep at them when not tracking [?]
+DRY up the levels--it's in the ocr spec as well as the others...
 
-note: just plow forward, to "grab" available ideas...except that for now, just what *I* 
-  plan on needing for myself (filters for what I need/want).
+unit tests pass with normal ruby
 
-re-advertise on ruby talk
+test every player with different screen resolutions...
 
-a real website
+add unit tests for each player for "make all players actually play again"
+
+screen time change only detected... [unexpected] [rid myself of it]
+
+stabilization on seconds -> 00 -> minutes++: make optional [?]
+
+when polling for bmp changes, just use two lines (?)
+
+try new GOCR version...
+
+Do I *need* that other window always up or not? (Get rid of it...only do this after have a real window of my own though, that's always up)
+
+preference for beeping at them, et al
+
+itunes video on demand
+
+blockbuster "rent" on demand, online
 
-advertise on ruby flow
+a real website
 
 no money making for now...all volunteer...more respectful.
   or make it so it can work with an editor of some kind...like a "save here" command line snip this tuck that.
     probably only possible after creating the desktop streamer hmm
 
+no popularizing it for now, I guess
+
 integrate with librivox' audio so you can avoid profanity in classics.  Somehow.  This would be nice for portable players.
+  You know, for static things like this, a 'pre-cutter' would sure be convenient...
+  provide download of edited mp3's for people.  ahhh.
+  
+some type of static 'ok grab it using x, then apply y' oh yeah.  That would rock for the DVD market, really.  Just not the online market.
 
 itunes player for profanity (music)?
 
+make a list of "known clean" movies or what not...hmm...
+
 an "online anybody can chat while watching this movie" (or anybody can edit this wav and listen to it as overlay...) prefer the latter.
 
 an online applet web runnable? Why not?
   click here to watch your favorite film edited on hulu! Just click! [* yea!]
   a chrome plugin with imdb/community backing :)
+  
+a known list of "compatible" imdb oners...
 
-code refactors: "screen time change", order should be swapped in bin/x output
+code refactors: "screen time change", order should be swapped in bin/x output (just cleanup)
 
 auto-play on detect youtube url access...
 
@@ -53,17 +82,13 @@ easier installer for windows: release a zip file that they can just click on a .
   later: it installs/uninstalls appropo
     suggestion: self-extractor
 
-make it able to use both windowed and maximized VLC (and full screen) seamlessly
+can blank overlay with added text like "and you are one awesome klingon"
 
-can blank overlay with text like "and you are one awesome klingon"
-
-screencast of things helpful (use, creation).
+ability to record it from online/live, then apply edits.
 
 TSR that monitors "oh you're opening a VLC? you're playing the E drive? That's bob's big plan? You're maximized? Full screened? watching x on hulu? y on youtube?"
 
-a netflix online player descriptor
-  
-add my stuff to imdb...? wiki ?
+add my stuff to imdb...? wiki?
 
 make youtube work if you have *several* open
 
@@ -76,13 +101,16 @@ hulu non full screened descriptor
 
 can overlay with wav file (would work already for VLC [?], could also "click to mute" for others...hmm...)
 
+the muting currently is so togglesy...if VLC ever fixes itself, fix this! 
+
 fix any/all pending tests...
 
-can permanently black out certain coords to keep things prettier...
+can permanently black out certain coords to keep things prettier...et al
+  remove black when they really move the mouse?
 
 Linux port (call that good enough for usability on TV's...), should be...
 
-blank out with specifiable color
+blanker outer with user specifiable color
   better default color?
 
 Auto mute/blank commercials?
@@ -90,25 +118,24 @@ Auto mute/blank commercials?
 transfer ownership to an LLC
   new github username
 
-replay certain film sections :P
-
 overlay/replace current playback with some url of audio or video
-  user editable overlays (like a wiki...)
+  user editable joke overlays (like a wiki...)
   realtime overlays (like group chat for those watching the film...)
 
 control volume programmatically (using mouse) on the player itself.
 control mute programmatically (using mouse) on the player itself.
 control location programmatically (using mouse) on the player itself.
 
-compare VLC (and other) timings with a real DVD player...
+compare VLC (and other) timings with a real DVD player, and with netflix online, etc.
 
-overlay with an alpha transparent pic
+overlay with an alpha transparent pic (?)
 
 Have a "list of all known movies (url's)" and be able to open (IE et al) to the correct part, and start playing them, and they work...
+  or known parseable imdb's
 
 does my sweet heart have any suggestions? (make it work well for laymen)
 
-some type of installer that can setup the registry...
+some type of one click installer that can setup the registry...
 
 auto-assignment of EDL's to media:
   auto-play option for DVD's (auto-start?)
@@ -126,14 +153,13 @@ Programmatically do all of the above, by driving VLC with its real API.
 
 star trek: generations first profanidade...
 
-"Showing EDL Information During Playback"
-
-integrate with google TV/bravia...maybe...somehow...boxxee?
-  itunes TV, too?
+integrate with google TV/bravia...maybe...somehow...boxxee? roku?
+  itunes TV? apple tv?
 
 OCR the captioning as an auto profanity filter? (or perhaps download subtitles to be able to pre-screen), like the python fella does..
-  what else does python do that we can learn from? can we combine projects somehow, perhaps? 
 
 make an index of watchable on imdb based on stars (?)
 
-http://en.wikipedia.org/wiki/RiffTrax
+--server?  optionally higher prio?
+
+http://en.wikipedia.org/wiki/RiffTrax (possible?)

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.10.1

data/bin/sensible-cinema

@@ -39,7 +39,7 @@ else
   player_description = ARGV.shift.to_s
   if !File.exist?(player_description)    
     puts 'Please Select Computer Player'
-    player_description = FileChooser.choose_file("    SELECT COMPUTER PLAYER", __dir__ + "/../zamples/players")
+    player_description = FileChooser.choose_file("     SELECT COMPUTER PLAYER", __dir__ + "/../zamples/players")
   end
 
   scene_list = ARGV.shift.to_s
@@ -51,7 +51,7 @@ else
   else
     if !File.exist? scene_list
       puts 'Select Scene Descriptions file'
-      scene_list = FileChooser.choose_file("    SELECT SCENE DESCRIPTIONS FILE", __dir__  + "/../zamples/scene_lists/dvds")
+      scene_list = FileChooser.choose_file("     SELECT SCENE DESCRIPTIONS FILE", __dir__  + "/../zamples/scene_lists")
     end
     
     if !scene_list

data/lib/blanker.rb

@@ -12,9 +12,13 @@ else
       @fr = JFrame.new("Sensible Cinema blanker-outer overlay window")
       @fr.default_close_operation = JFrame::EXIT_ON_CLOSE
       @fr.set_size(2000, 2000) # ltodo better size ?
+      cp = @fr.getContentPane
+      cp.setBackground(java.awt.Color.black);
+      
       
       @label = JLabel.new
       @fr.add(@label)
+      @label.setForeground(java.awt.Color.white);
       @label.repaint
       @label.revalidate
       

data/lib/ocr.rb

@@ -40,6 +40,7 @@ module OCR
 
     previous = nil
     p options if $DEBUG
+    raise 'you must pass in OCR levels in the player description' unless options[:levels]
     for level in options[:levels]
       a = `#{GOCR} -l #{level} #{image.path} 2>NUL`
       if a =~ /[0-9]/
@@ -72,7 +73,7 @@ module OCR
   
   def unserialize_cache_from_disk  
     if File.exist? CACHE_FILE
-      CACHE.merge!(Marshal.load File.binread(CACHE_FILE))
+      CACHE.merge!(Marshal.load(File.binread(CACHE_FILE)))
     end
     
   end

data/lib/overlayer.rb

@@ -97,8 +97,8 @@ class OverLayer
   def self.translate_yaml raw_yaml
     begin
       all = YAML.load(raw_yaml) || {}      
-    rescue NoMethodError
-      p 'appears your file has a syntax error in it--perhaps missing quotation marks'
+    rescue NoMethodError, ArgumentError
+      p 'appears your file has a syntax error in it--perhaps missing quotation marks?'
       return
     end
     # now it's like {:mutes => {"1:02.0" => "1:3.0"}}
@@ -151,7 +151,7 @@ class OverLayer
       # ignore it, since it was probably just caused by the screen blipping
       # at worse this will put us 1s behind...hmm.
       @just_unblanked = false
-      p 'ignoring timestamp update ' + to_this_exact_string_might_be_nil if $VERBOSE
+      p 'ignoring timestamp update ' + to_this_exact_string_might_be_nil.to_s if $VERBOSE
     else
       set_seconds OverLayer.translate_string_to_seconds(to_this_exact_string_might_be_nil) + delta if to_this_exact_string_might_be_nil
     end

data/lib/screen_tracker.rb

@@ -40,6 +40,7 @@ class ScreenTracker
     end
     @digits = digits
     @displayed_warning = false
+    @dump_digit_count = 1
     pps 'using x',@x, 'from x', x, 'y', @y, 'from y', y,'x2',@x2,'y2',@y2,'digits', @digits if $VERBOSE
   end
   
@@ -56,7 +57,7 @@ class ScreenTracker
     # allow ourselves the 'found it message' selectively
     unless @hwnd
       until @hwnd
-        print 'perhaps not running yet? [%s]' % @name_or_regex.inspect
+        print 'unable to find the player window currently [%s] (maybe need to start program or move mouse over it)' % @name_or_regex.inspect
         sleep 1
         STDOUT.flush
         @hwnd = Win32::Screenshot::BitmapMaker.hwnd(@name_or_regex, @use_class_name)
@@ -85,12 +86,11 @@ class ScreenTracker
   end
   
   def dump_digits digits
-      @digit_count ||= 1
       for type, bitmap in get_digits_as_bitmaps
-        File.binwrite type.to_s + '.' + @digit_count.to_s + '.bmp', bitmap
+        File.binwrite type.to_s + '.' + @dump_digit_count.to_s + '.bmp', bitmap
       end
-      print 'debug dumped digits that Im about to parse:', @digit_count, "\n"
-      @digit_count += 1
+      print 'debug dumped digits that Im about to parse:', @dump_digit_count, "\n"
+      @dump_digit_count += 1
   end
   
   DIGIT_TYPES = [:hours, :minute_tens, :minute_ones, :second_tens, :second_ones]
@@ -120,14 +120,18 @@ class ScreenTracker
     OCR.identify_digit(bitmap, @digits)
   end
   
+  # we have to wait until the next change, because when we start, it might be half-way through
+  # the current second...
   def wait_till_next_change
     original = get_bmp
-    time_since_last = Time.now
+    time_since_last_screen_change = Time.now
     loop {
+      # save away the current time to try and be most accurate...
+      time_before_scan = Time.now
       current = get_bmp
       if current != original
         if @digits
-          got = attempt_to_get_time_from_screen
+          got = attempt_to_get_time_from_screen time_before_scan
           if @displayed_warning && got
             # reassure user :)
             p 'tracking it successfully again' 
@@ -138,29 +142,32 @@ class ScreenTracker
           puts 'screen time change only detected... [unexpected]'
           return
         end
-      end
-      sleep 0.02
-      if(Time.now - time_since_last > 5)
-        p 'warning--unable to track screen time for some reason' unless @displayed_warning
-        time_since_last = Time.now
-        @displayed_warning = true
-        # reget window, just in case that's the problem...
-        get_hwnd
+      else
+        # no screen change detected ...
+        sleep 0.02
+        if(Time.now - time_since_last_screen_change > 2)
+          # display a warning
+          p 'warning--unable to track screen time for some reason'
+          @displayed_warning = true
+          time_since_last_screen_change = Time.now        
+          # also reget window hwnd, just in case that's the problem...(can be with VLC)
+          get_hwnd
+        end
       end
     }
   end
   
-  def attempt_to_get_time_from_screen
+  def attempt_to_get_time_from_screen start
     out = {}
-    # force it to have two matching in a row, to avoid race conditions grabbing the digits...
+    # force it to have two matching snapshots in a row, to avoid race conditions grabbing the digits...
     previous = nil # 0.08s [!] not too accurate...ltodo
-    start = Time.now
     until previous == (temp = get_digits_as_bitmaps)
       previous = temp
-      sleep 0.05 # allow youtube to update (sigh)
-      # lodo it should probably poll *before* this, not here...maybe?
+      sleep 0.05 # allow youtube to update (sigh) lodo just for utube
+      # lodo it should probably poll *before* calling this, not here...maybe?
     end
-    digits = previous
+    assert previous == temp
+    digits = temp
     
     dump_digits(digits) if $DEBUG            
     DIGIT_TYPES.each{|type|
@@ -172,7 +179,7 @@ class ScreenTracker
             @a += 1
             @already_wrote ||= {}
             unless @already_wrote[digits[type]]
-              p 'unable to identify capture!' + type.to_s + @a.to_s + ' capture no:' + @digit_count.to_s
+              p 'unable to identify capture!' + type.to_s + @a.to_s + ' capture no:' + @dump_digit_count.to_s
               File.binwrite("bad_digit#{@a}#{type}.bmp", digits[type]) unless type == :hours
               @already_wrote[digits[type]] = true
             end
@@ -184,7 +191,7 @@ class ScreenTracker
             return
           end
         else
-          p " got digit #{type} as #{digit} which was captured as #{@digit_count} " if $DEBUG
+          p " got digit #{type} as #{digit} which was captured as #{@dump_digit_count} " if $DEBUG
         end
         out[type] = digit
       else

data/spec/common.rb

@@ -13,6 +13,9 @@ require 'benchmark'
 Thread.abort_on_exception = true
 require 'timeout'
 require 'fileutils'
+require 'pathname'
+
+Dir.chdir File.dirname(__FILE__) # always run from the right dir...
 
 begin
   require 'hitimes'
@@ -32,7 +35,7 @@ rescue LoadError
       end
     }
   else
-      puts 'no hitimes available...'
+    puts 'no hitimes available...'
   end
     
 end
@@ -43,65 +46,19 @@ end
 #end
 
 require 'ffi'
-require 'ffi-inliner'
 
 module GetPid
   extend FFI::Library
-  extend Inliner
   ffi_lib 'user32', 'kernel32'
   ffi_convention :stdcall
   attach_function :get_process_id_old, :GetProcessId, [ :ulong ], :uint
   
   attach_function :GetWindowThreadProcessId, [:ulong, :pointer], :uint
 
-
   def self.get_process_id_from_window hwnd
     out = FFI::MemoryPointer.new(:uint)
     GetWindowThreadProcessId(hwnd, out) # does translation automatically to ptr for us
     out.get_uint32(0) # read_uint
   end
   
-  inline <<-CODE
-  #include <windows.h>
-  //#include <strsafe.h> // not available in mingw...
-
-  void ErrorExit() 
-  { 
-    // Retrieve the system error message for the last-error code
-    LPTSTR lpszFunction = "abcdef"; 
-    LPVOID lpMsgBuf;
-    LPVOID lpDisplayBuf;
-    DWORD dw = GetLastError(); 
-
-    FormatMessage(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-        FORMAT_MESSAGE_FROM_SYSTEM |
-        FORMAT_MESSAGE_IGNORE_INSERTS,
-        NULL,
-        dw,
-        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        (LPTSTR) &lpMsgBuf,
-        0, NULL );
-
-    // Display the error message and exit the process
-    printf("here1");
-    lpDisplayBuf = (LPVOID)LocalAlloc(LMEM_ZEROINIT, 
-        (lstrlen((LPCTSTR)lpMsgBuf) + lstrlen((LPCTSTR)lpszFunction) + 40) * sizeof(TCHAR)); 
-    printf("here2");
-    snprintf((LPTSTR)lpDisplayBuf, 
-        LocalSize(lpDisplayBuf) / sizeof(TCHAR),
-        TEXT("%s failed with error %d: %s"), 
-        lpszFunction, dw, lpMsgBuf); 
-            printf("here3");
-            MessageBox(NULL, (LPCTSTR)lpDisplayBuf, TEXT("Error"), MB_OK); 
-    printf("here4 ");
-
-    LocalFree(lpMsgBuf);
-    LocalFree(lpDisplayBuf);
-  //  ExitProcess(dw); 
-  }
-  
-  
-  CODE
-  
 end

data/spec/ocr.spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/common'
+require File.expand_path(File.dirname(__FILE__) + '/common')
 require_relative "../lib/ocr"
 require 'benchmark'
 
@@ -18,7 +18,7 @@ describe OCR do
       options[:sharpen] = true if file =~ /youtube/
       
       # 130 for vlc, 100 for hulu, 0 for some youtube full screen
-      # 200, 250 for youtube "light"
+      # 200, 250 for youtube "light" (windowed after awhile)
       degrees = {'vlc' => [130], 'hulu' => [100], 'youtube' => [0], 'youtube_light' => [200, 250]}
       file =~ /(vlc|hulu|youtube_light|youtube)/
       options[:levels] = degrees[$1]
@@ -74,10 +74,10 @@ describe OCR do
       new_time.should be < original_time
     end
     
-    it "should not cache results for failed reads" do
+    it "should not results for failed reads (at least for now)" do
       original_time = Benchmark.realtime { read_all_black }
       new_time = Benchmark.realtime { 3.times { read_all_black} }
-      new_time.should be > original_time
+      new_time.should be < original_time
     end    
     
     it "should serialize creating a cache file" do

data/spec/overlayer.spec.rb

@@ -409,7 +409,8 @@ describe OverLayer do
 
     it "should not fail with verbose on, after it's past next states" do
       at(500_000) do
-        @o.status.should == "Current time: 138:53:20.0 no more actions after this point...(r,d,v, or q to quit): "
+        @o.status.should include("138:53:20")
+        @o.status.should include("q") # for quit
       end
     end
 

data/spec/screen_tracker.spec.rb

@@ -1,124 +1,124 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
 require_relative '../lib/overlayer'
 require_relative '../lib/screen_tracker'
-require 'pathname'
 
 describe ScreenTracker do
 
-    SILENCE = /silence.*VLC/
-   
-    def start_vlc
-      # unfortunately this is run before every context [bug] with rspec 1.3...
-      unless $pid1
-        assert !$pid1
-        # enforce we only have at most one running...
-        begin
-          Win32::Screenshot.window(SILENCE, 0) {}
-          raise Exception.new('must close existing vlcs first')
-        rescue
-          silence = File.expand_path("./silence.wav").gsub("/", "\\")
-          Dir.chdir("/program files/VideoLan/VLC") do; IO.popen("vlc.exe #{silence}").pid; end # includes a work around for jruby...
-          until $pid1
-            $pid1 = GetPid.get_process_id_from_window(Win32::Screenshot::Util.window_hwnd(SILENCE)) rescue nil
-          end
+  SILENCE = /silence.*VLC/
+
+  def start_vlc
+    # unfortunately this is run before every context [bug] with rspec 1.3...
+    unless $pid1
+      assert !$pid1
+      # enforce we only have at most one running...
+      begin
+        Win32::Screenshot.window(SILENCE, 0) {}
+        raise Exception.new('must close existing vlcs first')
+      rescue
+        silence = File.expand_path("./silence.wav").gsub("/", "\\")
+        Dir.chdir("/program files/VideoLan/VLC") do; IO.popen("vlc.exe #{silence}").pid; end # includes a work around for jruby...
+        until $pid1
+          $pid1 = GetPid.get_process_id_from_window(Win32::Screenshot::Util.window_hwnd(SILENCE)) rescue nil
+          sleep 0.01
         end
       end
     end
-    
-    before(:all) do
-      start_vlc
-    end
+  end
 
-    before do
-      @a = ScreenTracker.new(SILENCE,10,10,20,20)
-    end
+  before(:all) do
+    start_vlc
+  end
 
-    it "can take a regex or string" do
-      ScreenTracker.new(SILENCE,10,10,20,20)
-      ScreenTracker.new("silence",10,10,20,20)
-    end
+  before do
+    @a = ScreenTracker.new(SILENCE,10,10,20,20)
+  end
 
-    it "should be able to grab a picture from screen coords...probably from the current active window" do
-      @a.get_bmp.should_not be_nil
-    end
+  it "can take a regex or string" do
+    ScreenTracker.new(SILENCE,10,10,20,20)
+    ScreenTracker.new("silence",10,10,20,20)
+  end
 
-    it "should loop if unable to find the right window" do
-      proc {
-        Timeout::timeout(1) do
-          ScreenTracker.new("this is supposed to be not running",10,10,20,20)
-        end
-      }.should raise_error(Timeout::Error)
-    end
+  it "should be able to grab a picture from screen coords...probably from the current active window" do
+    @a.get_bmp.should_not be_nil
+  end
 
-    it "should be at least somewhat fast" do
-      Benchmark.realtime { @a.get_bmp }.should be < 0.3
-    end
+  it "should loop if unable to find the right window" do
+    proc {
+      Timeout::timeout(1) do
+        ScreenTracker.new("this is supposed to be not running",10,10,20,20)
+      end
+    }.should raise_error(Timeout::Error)
+  end
 
-    it "should not allow for negative widths" do
-      proc {ScreenTracker.new("VLC",10,10,-20,20)}.should raise_error
-    end
+  it "should be at least somewhat fast" do
+    Benchmark.realtime { @a.get_bmp }.should be < 0.3
+  end
 
-    it "should disallow size 0 widths" do
-      proc {ScreenTracker.new("VLC",10,10,0,0)}.should raise_error
-    end
+  it "should not allow for negative widths" do
+    proc {ScreenTracker.new("VLC",10,10,-20,20)}.should raise_error
+  end
 
-    it "should have different bmp if sizes different" do
-      a = ScreenTracker.new("VLC",10,10,5,5)
-      assert a.get_relative_coords == [10,10,15,15]
-      b = ScreenTracker.new("VLC",10,10,50,50)
-      assert a.get_bmp != b.get_bmp
-    end
+  it "should disallow size 0 widths" do
+    proc {ScreenTracker.new("VLC",10,10,0,0)}.should raise_error
+  end
 
-    it "should allow for straight desktop if they specify Desktop or desktop" do
-      a = ScreenTracker.new("desktop",0,0,100,100)
-    end
+  it "should have different bmp if sizes different" do
+    a = ScreenTracker.new("VLC",10,10,5,5)
+    assert a.get_relative_coords == [10,10,15,15]
+    b = ScreenTracker.new("VLC",10,10,50,50)
+    assert a.get_bmp != b.get_bmp
+  end
 
-    context "negative numbers should result in an offset" do
+  it "should allow for straight desktop if they specify Desktop or desktop" do
+    a = ScreenTracker.new("desktop",0,0,100,100)
+  end
 
-      it "should allow for negative sizes" do
-        a = ScreenTracker.new("VLC",-10,10,5,5)
-        a.get_bmp
-        a = ScreenTracker.new("VLC",-10,-10,10,10) # right to the edge
-        a.get_bmp
-        a = ScreenTracker.new("VLC",10,-10,5,5)
-        a.get_bmp
-      end
+  context "negative numbers should be interpreted as an offset" do
 
-      it "should assign right coords" do
-        a = ScreenTracker.new("VLC",-10,-10,5,5)
-        a.get_bmp
-        x,y,x2,y2=a.get_relative_coords
-        hwnd = Win32::Screenshot::BitmapMaker.hwnd("VLC")
-        max_x, max_y = Win32::Screenshot::Util.dimensions_for(hwnd)
-        x.should == max_x-10
-        y.should == max_y-10
-        x2.should == x+5
-        y2.should == y+5
-      end
+    it "should allow for negative size parameter" do
+      a = ScreenTracker.new("VLC",-10,10,5,5)
+      a.get_bmp
+      a = ScreenTracker.new("VLC",-10,-10,10,10) # right to the edge
+      a.get_bmp
+      a = ScreenTracker.new("VLC",10,-10,5,5)
+      a.get_bmp
+    end
 
-      it "should look different with negative than with positive" do
-        a = ScreenTracker.new("VLC",10,10,50,50)
-        b = ScreenTracker.new("VLC",10,10,50,50)
-        c = ScreenTracker.new("VLC",-99,-99,50,50)
-        assert a.get_bmp == b.get_bmp
-        assert c.get_relative_coords != b.get_relative_coords
-        cb = c.get_bmp
-        bb = b.get_bmp
-        c.get_bmp.length == b.get_bmp.length
-        assert c.get_bmp != b.get_bmp
-      end
+    it "should assign right offsets" do
+      a = ScreenTracker.new("VLC",-10,-10,5,5)
+      a.get_bmp
+      x,y,x2,y2=a.get_relative_coords
+      hwnd = Win32::Screenshot::BitmapMaker.hwnd("VLC")
+      max_x, max_y = Win32::Screenshot::Util.dimensions_for(hwnd)
+      x.should == max_x-10
+      y.should == max_y-10
+      x2.should == x+5
+      y2.should == y+5
+    end
 
-      it "should fail with out of bounds or zero sizes" do
-        proc { a = ScreenTracker.new(SILENCE,-10,10,20,20) }.should raise_error
-        proc { a = ScreenTracker.new(SILENCE,10,-10,20,20) }.should raise_error
-        proc { a = ScreenTracker.new(SILENCE,-10,10,0,2) }.should raise_error
-        proc { a = ScreenTracker.new(SILENCE,10,10,2,0) }.should raise_error
-      end
+    it "should take negative coords and appear to use them" do
+      a = ScreenTracker.new("VLC",10,10,50,50)
+      b = ScreenTracker.new("VLC",10,10,50,50)
+      c = ScreenTracker.new("VLC",-99,-99,50,50)
+      assert a.get_bmp == b.get_bmp
+      assert c.get_relative_coords != b.get_relative_coords
+      cb = c.get_bmp
+      bb = b.get_bmp
+      c.get_bmp.length == b.get_bmp.length
+      assert c.get_bmp != b.get_bmp
+    end
 
+    it "should fail with out of bounds or zero sizes" do
+      proc { a = ScreenTracker.new(SILENCE,-10,10,20,20) }.should raise_error
+      proc { a = ScreenTracker.new(SILENCE,10,-10,20,20) }.should raise_error
+      proc { a = ScreenTracker.new(SILENCE,-10,10,0,2)   }.should raise_error
+      proc { a = ScreenTracker.new(SILENCE,10,10,2,0)    }.should raise_error
     end
 
-    # lodo: this 7 looks rather redundant...
-    it "should parse yaml appropro" do
+  end
+
+  # lodo: this 7 looks rather redundant...
+  it "should parse yaml appropro" do
       yaml = <<-YAML
       name: VLC
       x: 32
@@ -126,142 +126,160 @@ describe ScreenTracker do
       width: 100
       height: 20
       digits:
-        :hours:
-        :minute_tens:
-        - -90
-        - 7
-        :minute_ones:
-        - -82
-        - 7
-        :second_tens:
-        - -72
-        - 7
-        :second_ones:
-        - -66
-        - 7      
-      YAML
-      a = ScreenTracker.new_from_yaml(yaml,nil)
-      a.get_relative_coords.should == [32,34,132,54]
+      :hours:
+      :minute_tens:
+      - -90
+      - 7
+      :minute_ones:
+      - -82
+      - 7
+      :second_tens:
+      - -72
+      - 7
+      :second_ones:
+      - -66
+      - 7
+    YAML
+    a = ScreenTracker.new_from_yaml(yaml,nil)
+    a.get_relative_coords.should == [32,34,132,54]
+  end
+
+  it "should be able to dump images it uses" do
+    @a.dump_bmp
+    assert File.exist?('dump.bmp') && File.exist?('all.dump.bmp')
+  end
+
+  context "tracking a real player that is moving" do
+
+    before do
+      @a = ScreenTracker.new(SILENCE, -111, -16, 86, 13)
     end
 
-    it "should be able to dump its contents" do
-      @a.dump_bmp
-      assert File.exist?('dump.bmp') && File.exist?('all.dump.bmp')
+    it "should be able to poll the screen to know when something changes" do
+      @a.wait_till_next_change
+      # it updates every 1 second...
+      Benchmark.realtime { @a.wait_till_next_change }.should be > 0.2
+      @a.dump_bmp # for debugging...
     end
 
-    context "given a real player that is moving" do
+    it "should be able to track via class_name" do
+      a = ScreenTracker.new(SILENCE,10,10,20,20)
+      b = ScreenTracker.new(/qwidget/i,10,10,20,20, true, {:second_ones => [-66, 7]})
+      a.hwnd.should == b.hwnd
+    end
 
-      before do
-        @a = ScreenTracker.new(SILENCE, -111, -16, 86, 13)
-      end
+  end
 
-      it "should be able to poll the screen to know when something changes" do
-        @a.wait_till_next_change
-        # it updates every 1 second...
-        Benchmark.realtime { @a.wait_till_next_change }.should be > 0.2
-        @a.dump_bmp # for debugging...
-      end
+  context "using hulu" do
+    it "should be able to parse all digits" do
+      pending "completion"
+      a = ScreenTracker.new_from_yaml File.read("../zamples/players/hulu/total_length_over_an_hour.yml"), nil
+    end
+    
+  end
+  
+  context "using youtube" do
+    it "should be able to parse"
+  end
+  
+  context "using a digit capable setting" do
 
-      context "using OCR" do
+    before do
+      @a = ScreenTracker.new_from_yaml File.read("../zamples/players/vlc/windowed_total_length_under_an_hour.yml"), nil
+    end
 
-        before do
-          @a = ScreenTracker.new_from_yaml File.read("../zamples/players/vlc/non_full_screened_total_length_under_an_hour.yml"), nil
-        end
+    it "should use OCR against the changes appropriately" do
+      sleep 1.1 # sleep until it should show something for sure
+      output = @a.wait_till_next_change # grab a real change
+      output[0].should be_a(String)
+      output[0].should include("00:") # like 00:09 or what not...
+      output[0].should match(/[1-9]/)
+      output[1].should be_a(Float)
+    end
 
-        it "should be able to disk dump snapshotted digits" do
-          @a.dump_bmp
-          # what is the right number here?
-          Pathname.new('minute_tens.1.bmp').should exist
-          Pathname.new('minute_tens.1.bmp').size.should be > 0
-          Pathname.new('hours.1.bmp').should_not exist
-        end
+    it "should be able to scan for/identify new windows, since VLC creates entirely new windows when it transition
+    from menu -> player" do
+      
+      output = @a.wait_till_next_change
+      output[0].should_not be_nil
+      old_handle = @a.hwnd
+      kill_vlc
+      start_vlc
+      output = @a.wait_till_next_change
+      output[0].should_not be_nil
+      old_handle.should_not == @a.hwnd
+    end
 
-        it "should use OCR against the changes appropriately" do
-          output = @a.wait_till_next_change # grab a real change
-          output[0].should be_a(String)
-          output[0].should include("00:") # like 00:09 or what not...
-          output[0].should match(/[1-9]/)
-          output[1].should be_a Float
-        end
-        
-        it "should be ok with a non-existent hours image" do
-          @a.stub!(:get_digits_as_bitmaps) do
-            four = File.binread('images/vlc_4.bmp')
-            black = File.binread('images/black.bmp')
-            {:minute_tens=>four,:second_tens => four, :second_ones => four, :minute_ones => four,
-              :hours => black}
-          end
-          @a.attempt_to_get_time_from_screen[0].should == "0:44:44"
-        end
-        
-        it "should track the screen until it stabilizes" do
-          time_through = 0
-          four = File.binread('images/vlc_4.bmp')
-          black = File.binread('images/black.bmp')
-          times_read=0
-          @a.stub!(:get_digits_as_bitmaps) do
-            time_through += 1
-            if time_through == 1
-              {:minute_tens=>four}
-            elsif time_through == 2
-              {:minute_tens=>black}
-            else
-             times_read += 1
-              {:minute_tens=>four,:second_tens => four, :second_ones => four, :minute_ones => four,
-                :hours => four}              
-            end
-          end
-          
-          @a.attempt_to_get_time_from_screen[0].should == "4:44:44"
-          times_read.should == 2
-        
-        end
-        
-        context "with an OCR that can change from hour to minutes during ads" do
-          it "should detect this change"
-        end
+    it "should be able to disk dump its digit images" do
+      @a.dump_bmp
+      # what is the right number here?
+      Pathname.new('minute_tens.1.bmp').should exist
+      Pathname.new('minute_tens.1.bmp').size.should be > 0
+      # doesn't have hours
+      Pathname.new('hours.1.bmp').should_not exist
+    end
 
-        it "should be able to use invert on captured images" do
-          @a = ScreenTracker.new(SILENCE, 100, 100, 10, 10, false,
-            {:should_invert => true, :second_ones => [-66, 7]} )
-          got_it = nil
-          OCR.stub!(:identify_digit) {|*args|
-            got_it = args
-          }
-          @a.identify_digit('some binary bitmap data')
-          got_it[1][:should_invert].should be_true
-        end
-        
-        it "should be able to scan for/identify new windows, since VLC changes signatures" do
-          output = @a.wait_till_next_change 
-          output[0].should_not be_nil
-          old_handle = @a.hwnd
-          kill_vlc
-          start_vlc
-          output = @a.wait_till_next_change 
-          output[0].should_not be_nil
-          old_handle.should_not == @a.hwnd
-        end
-        
-        it "should be able to track via class_name" do
-            a = ScreenTracker.new(SILENCE,10,10,20,20)
-            b = ScreenTracker.new(/qwidget/i,10,10,20,20, true, {:second_ones => [-66, 7]})
-            a.hwnd.should == b.hwnd
-        end
-        
+    it "should be ok with a non-existent (non-returned) hours image" do
+      @a.stub!(:get_digits_as_bitmaps) do
+        four = File.binread('images/vlc_4.bmp')
+        black = File.binread('images/black.bmp')
+        {:minute_tens=>four,:second_tens => four, :second_ones => four, :minute_ones => four,
+        :hours => black}
       end
+      @a.attempt_to_get_time_from_screen(Time.now)[0].should == "0:44:44" # hour is zero
+    end
 
-      def kill_vlc
-        assert $pid1
-        # jruby...
-        system("taskkill /pid #{$pid1}")
-        Process.kill 9, $pid1 # MRI...sigh.
-        FileUtils.rm_rf Dir['*.bmp']
-        $pid1 = nil
-      end
-      
-      after(:all) do
-        kill_vlc
+    it "should track the screen until it stabilizes, as VLC has a slight lag when seconds turn but minutes don't for a tidge" do
+      time_through = 0
+      four = File.binread('images/vlc_4.bmp')
+      black = File.binread('images/black.bmp')
+      times_read=0
+      @a.stub!(:get_digits_as_bitmaps) do
+        time_through += 1
+        if time_through == 1
+          {:minute_tens=>four}
+        elsif time_through == 2
+          {:minute_tens=>black}
+        else
+          times_read += 1
+          {:minute_tens=>four,:second_tens => four, :second_ones => four, :minute_ones => four,
+          :hours => four}
+        end
       end
+
+      # these assert the same thing
+      @a.attempt_to_get_time_from_screen(Time.now)[0].should == "4:44:44"
+      times_read.should == 2
+
+    end
+
+    context "with an OCR that can change from hour to minutes during ads" do
+      it "should detect this change and act appropriately"
+    end
+
+    it "should be able to pass through the option to invert images" do
+      @a = ScreenTracker.new(SILENCE, 100, 100, 10, 10, false,
+      {:should_invert => true, :second_ones => [-66, 7]} )
+      got_it = nil
+      OCR.stub!(:identify_digit) {|*args|
+        got_it = args
+      }
+      @a.identify_digit('some binary bitmap data')
+      got_it[1][:should_invert].should be_true
     end
   end
+  
+
+  def kill_vlc
+    assert $pid1
+    # jruby...<sigh>
+    system("taskkill /pid #{$pid1}")
+    Process.kill 9, $pid1 # MRI...sigh.
+    FileUtils.rm_rf Dir['*.bmp']
+    $pid1 = nil
+  end
+
+  after(:all) do
+    kill_vlc
+  end
+end

data/zamples/players/hulu/total_length_over_an_hour.yml

@@ -20,4 +20,6 @@ digits:
       - 46
       - 7
       :should_invert: true
+      :levels:
+      - 100
     

data/zamples/players/youtube/full_screened_1024x768.yml

@@ -16,5 +16,4 @@ digits:
       - 96
       - 8
       :levels:
-      - 200
-      - 250
+      - 0

data/zamples/players/youtube/full_screened_1152x864.yml

@@ -15,3 +15,5 @@ digits:
       :second_ones:
       - 108
       - 9 
+      :levels:
+      - 0

data/zamples/players/youtube/full_screened_1680x1050.yml

@@ -15,3 +15,5 @@ digits:
       :second_ones:
       - 158
       - 11   
+      :levels:
+      - 0

data/zamples/players/youtube/{normal_in_youtube.com.yml → normal_in_youtube.com.chrome.yml}

@@ -19,4 +19,5 @@ digits:
       :levels:
       - 200
       - 250
+      - 0
       :sharpen: true

data/zamples/players/youtube/note_these_assume_less_than_10_minutes_length.txt

@@ -0,0 +1,2 @@
+These players all require that the youtube you're watching be less than 10 minutes total length, otherwise it 
+might not catch the digits right.  Ping me if you're interested in this being fixed.

data/zamples/scene_lists/dvds/cars_disney.yml

@@ -0,0 +1,21 @@
+name: cars widescreen 2006
+player: VLC
+mutes:
+  "0:17:22" : "0:17:23.5" # you could see his [rusty] undercarriage
+  "0:17:40.1" : "0:17:41" # rust your bolts and freeze your... (implied nuts)
+  "0:27:30.0" : "0:27:33.75" # turn on yer lights fer dang sake...moron
+  "31:48.5" : "31:50.25" # is it true that McQueen is going to pose for Car-Girl [magazine]?
+  "0:32:31"  : "0:32:32" # McQueen "Oh L..." (mumbled)
+  "0:34:36" : "0:34:38" # "may doc have mercy on your soul"
+  "36:09" : "36:11" # likes me for muh body
+  "37:05" : "37:06" # Mater makes a fart noise when discussing gas
+  "40:16" : "40:18" # ...good look at that sexy hot-rod
+  "44:24" : "44:46" # hill billy hxxx
+  "54:25" : "54:30" # crazy grandpa car what an idiot
+  "55:24" : "55:25" # mater "oh L....."
+  "57:06" : "57:07" # hill billy hxxx
+  "57:12" : "57:18" # sally: wait not spend the night "with me"...
+  "1:10:34.5" : "1:10:35.75" # he did what in his cup?
+  "1:30:02" : "1:30:04" # thank the manufacturer...
+  "1:55:39" : "1:55:40" # for the "love of Chrysler" please....
+  

data/zamples/scene_lists/{nuki_song_youtube.yml → youtube/nuki_song_youtube.yml}

@@ -2,7 +2,7 @@ mutes:
   # none
 blank_outs:
   # bum wigglin'
-  "00:46.5" : "00:49" 
+  "00:46.4" : "00:48.5" 
   "02:18.5" : "02:20"
 title: Nuki Song
 source: youtube

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 9
-  - 7
-  version: 0.9.7
+  - 10
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Roger Pack
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -06:00
+date: 2010-10-14 00:00:00 -06:00
 default_executable: sensible-cinema
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -231,19 +231,19 @@ files:
 - zamples/players/youtube/full_screened_1024x768.yml
 - zamples/players/youtube/full_screened_1152x864.yml
 - zamples/players/youtube/full_screened_1680x1050.yml
-- zamples/players/youtube/normal_in_youtube.com.yml
+- zamples/players/youtube/normal_in_youtube.com.chrome.yml
 - zamples/players/youtube/note_these_assume_less_than_10_minutes_length.txt
 - zamples/scene_lists/category descriptions.yml
 - zamples/scene_lists/dvds/White Christmas.yml
 - zamples/scene_lists/dvds/all_dogs_go_to_heaven_dvd.yml
-- zamples/scene_lists/dvds/disney_cars.yml
+- zamples/scene_lists/dvds/cars_disney.yml
 - zamples/scene_lists/dvds/happy_feet_dvd.yml
 - zamples/scene_lists/dvds/labyrinth.yml
 - zamples/scene_lists/dvds/making marriage work.yml
 - zamples/scene_lists/example_scene_descriptions_list.yml
-- zamples/scene_lists/gummy_bear_song_youtube.yml
-- zamples/scene_lists/nuki_song_youtube.yml
 - zamples/scene_lists/star_trek_generations_hulu.yml
+- zamples/scene_lists/youtube/gummy_bear_song_youtube.yml
+- zamples/scene_lists/youtube/nuki_song_youtube.yml
 has_rdoc: true
 homepage: http://github.com/rdp
 licenses: []

data/zamples/scene_lists/dvds/disney_cars.yml

@@ -1,15 +0,0 @@
-name: cars widescreen 2006
-player: VLC
-mutes:
-  # one hour one minute and a half second to one hour one minute and 1.5s
-  "0:34:35" : "0:34:35" # "may doc have mercy on your soul"
-  "36:09" : "36:11" # likes me for muh body
-  "37:05" : "37:06" # Mater makes a fart noise when discussing gas
-  "40:16" : "40:18" # ...good look at that sexy hot-rod
-  "44:24" : "44:46" # hill billy hxxx
-  "54:25" : "54:30" # crazy grandpa car what an idiot
-  "55:24" : "55:25" # mater "oh L....."
-  "57:06" : "57:07" # hill billy hxxx
-  "57:12" : "57:18" # sally: wait not spend the night "with me"...
-  "1:55:39" : "1:55:40" # for the "love of Chrysler" please....
-