sensible-cinema 0.7.5 → 0.7.7

data/LICENSE

@@ -1,12 +1,15 @@
 All files released under the GPLv3 license [1] unless otherwise specified.  Ping me if you need this changed.
 
-May contain some 3rd party libraries under their own (separate, open source) licenses.
+May contain some 3rd party libraries under their own (separate, open source) license.
 
-Note that this software should be legal at least in the EU, 
+Note that this software should be legal in the EU, 
 as it is only software and therefore theoretically not subject to patents (see "What about patent licenses?" in [2]).
 
 If it's not legal in your country, don't use it!
 
+http://en.wikipedia.org/wiki/Family_Entertainment_and_Copyright_Act describes a recent US law that appears related, 
+in its favor.
+
 A history of various related thoughts can be found here: http://betterlogic.com/roger/?p=2618
 
 [1] http://www.gnu.org/licenses/gpl.html, also gplv3 file.

data/README

@@ -2,35 +2,27 @@ Sensible-cinema is a program that allows you to do pre-programmed scene selectio
 or "bleep out" scenes) on arbitrary media players like netflix online, vlc, etc.
 
 Currently it takes as input a list of known "skip-worthy" scenes.
-It then tracks the player you are using, and mutes or blanks out the system screen appropriately, 
+It then tracks whichever player you are using, and mutes or blanks out the system appropriately, 
 during the scenes specified.
 
-Currently it works out of the box with the hulu and VLC players on windows.  It isn't hard to 
-add new players,and probably wouldn't be too hard to add more operating systems.
-
-The concept isn't novel:
-
-http://www.imdb.com/swiki/special?ParentalGuideHelp "scene description"
-http://en.wikipedia.org/wiki/Edit_decision_list
+It works out of the box with the hulu and VLC players on windows.  It isn't hard to 
+add new players, and probably wouldn't be too hard to add more operating systems.
 
 == How to use ==
 
-Start playing your movie in its player, then startup sensible-cinema thus:
+Start playing your movie in its respective player, then startup sensible-cinema from
+the command line thus:
 
      C:\> jruby -S sensible-cinema
 
-It prompts you for a scene description file (ex: bambi.yml), 
-and also for a player description file (ex: hulu_full_screen_with_total_length_over_an_hour.yml).
+It prompts you for a scene descriptions file (ex: bambi.yml), 
+and then for a player description file (ex: hulu_full_screen.yml).
 
 Sensible-cinema will now run in a console window, screen tracking the player to monitor its position,
 and react appropriately.
 
 It is presumed that you'll then minimize the console window and proceed to enjoy the movie.
 
-You could also specify those same two filenames on the command-line, if desired, ex:
-
-     C:\> jruby -S sensible-cinema mute_list.yml player_description.yml
-
 You'll know that it's working if, when you change the time of your player (ex: dragging it to a new spot 
 in the playback), the screen output in sensible-cinema's console should change to match the new time.
 
@@ -52,7 +44,7 @@ choosing the hulu player.
 
 It will proceed do a few "demo" mutes and blank outs.
 
-== Programming Your Own Scene Description File ==
+== Programming Your Own Scene Descriptions File ==
 
 To program sensible-cinema, you create a scene description list it can use.
 
@@ -73,7 +65,7 @@ then start sensible-cinema and instruct it to use your new file.
 To create it, basically you notice something you want to add to the list, add it, then go back a few seconds 
 in your media player, and it should now be muted/blanked out automatically.
 
-So here is a way to create your scene description file.
+So here is a way to create your scene descriptions file.
 First create a new file [2], and select it in sensible-cinema (even though it's still blank).
 Now use sensible-cinema and select the new file you just created.
 Now "preview" the movie, and as you do, you're going scenes to the file, and then test your additions.
@@ -82,11 +74,11 @@ controls.  When you encounter the scene again, track its beginning and ending ti
 is to, just before and just after the scene, hit the space bar *in the sensible-cinema window*.  
 Hitting the space bar outputs the current time.  If you hit it twice, once before and once after, 
 you should now have two reasonably accurate "timestamps" displayed.
-Add the beginning and ending times to your scene description file (changes will be automatically picked up), 
+Add the beginning and ending times to your scene descriptions file (changes will be automatically picked up), 
 then review your additions by rewinding your player and letting it play through the scene in question again.
 It should now skip it appropriately.  If not, adjust your timestamps and try again.
 
-Once you're done then you can contribute your scene description file if desired, back to the project [1].
+Once you're done then you can contribute your scene descriptions file if desired, back to the project [1].
 
 [1] http://github.com/rdp/sensible-cinema/issues
 [2] The easiest way to do this is to start sensible-cinema, then instead of choosing an existing file,
@@ -126,17 +118,33 @@ A. It takes it awhile to warm up its digit detection.  Ping me if you would like
 
 [1] http://ps3mediaserver.org/forum/viewtopic.php?f=6&t=5731#p34279
 
+== Advanced Usage ==
+
+You could specify the scene descriptions list and player list on the command-line, if you don't want to have
+to pick them each time, like:
+
+     C:\> jruby -S sensible-cinema scene_descriptions_list.yml player_description.yml
+
+Also if you specify "test" for the scene descriptions file, it will pause 4s, take a snapshot of the player, then exit.
+You can also specify -v or -t if you want to enable more verbose (chatty) output.
+
 == Thanks ==
 
-Thanks to Jarmo for the win32-screenshot gem, the mini_magick gem authors, jruby guys, etc.  
-Made programming this actually somewhat a pleasure.
+Thanks to Jarmo for the win32-screenshot gem, mini_magick gem authors, jruby guys, etc.  
+The combination made programming this actually somewhat of a pleasure.
 
 == License ==
 
-See the LICENSE file for licensing, usage terms (gplv3).
+See the LICENSE file for licensing, usage terms (basically gplv3).
 
 == Related ==
 
+The concept isn't too novel:
+
+http://en.wikipedia.org/wiki/Edit_decision_list (linear editing tool)
+http://www.imdb.com/swiki/special?ParentalGuideHelp search for "scene description"
+http://www.oreillynet.com/sysadmin/blog/2005/06/make_your_own_phantom_edit_wit.html
+
 http://imdb.com tends to have reasonably good lists of what occurs in movies (find a movie, click on "parent's guide" on the left).
 Sometimes it even lists the time signatures for events (ex: "Labyrinth" http://www.imdb.com/title/tt0047673/parentalguide)
 which you could use to translate into a sensible-cinema compatible list.
@@ -145,5 +153,4 @@ which you could use to translate into a sensible-cinema compatible list.
 
 Feedback, including feature requests, welcome.
 
-http://github.com/rdp/sensible-cinema
-http://github.com/rdp me
+http://github.com/rdp/sensible-cinema

data/Rakefile

@@ -6,13 +6,13 @@ Jeweler::Tasks.new do |s|
     s.email = "rogerdpack@gmail.com"
     s.homepage = "http://github.com/rdp"
     s.authors = ["Roger Pack"]
+    s.add_dependency 'sane', '>= 0.22.0'
+    s.add_dependency 'rdp-win32screenshot', '>= 0.0.6.3'
+    s.add_dependency 'mini_magick' # for ocr...
     s.add_development_dependency 'rspec' # prefer rspec 2 I guess...
     s.add_development_dependency 'jeweler'
     s.add_development_dependency 'rdp-rmagick'
-    s.add_dependency 'mini_magick' # ocr
     s.add_development_dependency 'hitimes' # now jruby compat. yea!
-    s.add_dependency 'sane', '>= 0.22.0'
-    s.add_dependency 'win32screenshot', '>= 0.0.6'
     s.extensions = ["ext/mkrf_conf.rb"]
 end
 

data/TODO

@@ -4,26 +4,32 @@
 
   release ruby-y-y why not, it's interesting
     "Linux compat anyone?"
-  utube nuki (xp?)
-  generations first profanidade...
+  utube nuki (somewhere with a real sound card...which would be the home comp)
+  generations the first profanidade...
   
 == random backlog ... based on user request..remember:  just local files for my own needs...==
 
-blank overlay "and you are one awesome klingon"
+just plow forward, to "grab" available ideas...
 
-bump win32-screenshot version
+make it "quieter" at certain parts, arbitrarily...
 
-screencast of something helpful.
+release a zip file that they can just click on something to run it...self-extractor yeah.
 
-optimize imdb: http://www.imdb.com/board/bd0000042/thread/58361958?d=58361958, english friendlier url's
+snag the close captioning for a profanity filter?
 
-bundle fewer imagemagick binaries
+make it able to use multiple players so I can maximize VLC...
 
-TSR that monitors "oh you're opening VLC? you're playing the E drive? That's bob's big plan? You're maximized? Full screened? watching x on hulu?"
+blank overlay "and you are one awesome klingon"
 
-just plow forward, to "grab" available ideas...
+screencast of something helpful (use, creation).
+
+optimize (tell them) imdb: http://www.imdb.com/board/bd0000042/thread/58361958?d=58361958, english friendlier url's
 
-netflix
+bundle fewer imagemagick binaries
+
+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?"
+
+netflix player
   
 add my own stuff to imdb...
 antz to imdb...
@@ -32,6 +38,8 @@ imdb parser...somehow
 
 make it into a real live full functional app...like fully fully functional and good (for use, not editing), mostly with the drop down lists uh guess.
 
+make a redcar installer for their use...
+
 PISH
 
 can overlay with a "fuzzer-outer" for specific coordinates somehow or other...
@@ -70,7 +78,9 @@ 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.
 
-overlay alpha transparent pic
+compare labyrinth timings with a real DVD player...
+
+overlay with 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...
 

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.7.7

data/lib/muter.rb

@@ -35,7 +35,8 @@ module Muter
     #unmute! # just in case
     hit_mute_key
   end
-  # TODO better for 7...
+
+  # TODO better for doze 7...
   def unmute!
     hit_mute_key # Windows XP...
     hit_volume_down_key

data/lib/overlayer.rb

@@ -4,7 +4,7 @@ require 'timeout'
 require 'yaml'
 require_relative 'muter'
 require_relative 'blanker'
-require 'pp' # pretty_inspect
+require 'pp' # for pretty_inspect
 
 class Time
   def self.now_f
@@ -25,13 +25,13 @@ class OverLayer
   def mute!
     @am_muted = true
     puts 'muting!' if $VERBOSE
-    Muter.mute!
+    Muter.mute! unless defined?($AM_IN_UNIT_TEST)
   end
   
   def unmute!
     @am_muted = false
     puts 'unmuting!' if $VERBOSE
-    Muter.unmute!
+    Muter.unmute! unless defined?($AM_IN_UNIT_TEST)
   end
   
   def blank!
@@ -58,8 +58,7 @@ class OverLayer
   
   def reload_yaml!
     @all_sequences = OverLayer.translate_yaml(File.read(@filename))
-    # LTODO... @all_sequences = @all_sequences.map{|k, v| v.sort!} etc. and validate...
-    puts '(re) loaded mute sequences from ' + File.basename(@filename) + ' as', pretty_sequences.pretty_inspect, "" unless $DEBUG && !$VERBOSE # I hate these during unit tests...      
+    puts '(re) loaded mute sequences from ' + File.basename(@filename) + ' as', pretty_sequences.pretty_inspect, "" unless $AM_IN_UNIT_TEST
     signal_change
   end  
   
@@ -82,7 +81,7 @@ class OverLayer
     OverLayer.new('temp.yml')
   end
   
-  def initialize filename, minutes = nil 
+  def initialize filename
     @filename = filename
     @am_muted = false
     @am_blanked = false
@@ -91,36 +90,41 @@ class OverLayer
     @file_mtime = nil
     check_reload_yaml
     @start_time = Time.now_f # assume they want to start immediately...
-    if minutes
-      self.set_seconds self.class.translate_string_to_seconds(minutes)
-    end
   end
   
   def self.translate_yaml raw_yaml
     begin
-      all = YAML.load(raw_yaml) || {}
-      
+      all = YAML.load(raw_yaml) || {}      
     rescue NoMethodError
       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"}}
     # translate to floats like 62.0 => 63.0
+
     for type in [:mutes, :blank_outs]
       maps = all[type] || all[type.to_s] || {}
       new = {}
       maps.each{|start,endy|
         # both are like 1:02.0
-        start = translate_string_to_seconds(start)
-        endy = translate_string_to_seconds(endy)
-        if start == 0 || endy == 0
-          p 'warning--possible error in the scene descriptions file some line not parsed! (NB if you want one to start at time 0 please use 0.0001)', start, endy unless $DEBUG
-          # drop it in bitbucket...
-        else
-          new[start] = endy
+        start2 = translate_string_to_seconds(start) if start
+        endy2 = translate_string_to_seconds(endy) if endy
+        if start2 == 0 || endy2 == 0 || start == nil || endy == nil
+          p 'warning--possible error in the scene descriptions file some line not parsed! (NB if you want one to start at time 0 please use 0.0001)', start, endy unless $AM_IN_UNIT_TEST
+          # drop this line into the bitbucket...
+          next
+        end
+        
+        if start2 == endy2 || endy2 < start2
+          p 'warning--found a line that had poor interval', start, endy, type unless $AM_IN_UNIT_TEST
+          next
+        end
+        if(endy2 > 60*60*3)
+          p 'warning--found setting past 3 hours [?]', start, endy, type unless $AM_IN_UNIT_TEST
         end
+        new[start2] = endy2
       }
-      all.delete(type.to_s)
+      all.delete(type.to_s) # cleanup
       all[type] = new.sort
     end
     all
@@ -270,7 +274,9 @@ class OverLayer
       return [nil, nil, :done]
   end
   
-  # returns [true, false, next_moment_of_importance|:done]
+  #
+  # returns [true, false, next_moment_of_importance|:done] ( true, false for if it should be currently muted, blanked )
+  #
   def get_current_state
     all = []
     time = cur_time
@@ -279,7 +285,6 @@ class OverLayer
     end
     output = []
     # all is [[start, end, active]...] or [:done, :done]
-    # so create [true, false, next_moment]
     earliest_moment = 1_000_000
     all.each{|start, endy, active|
       if active == :done

data/lib/screen_tracker.rb

@@ -48,11 +48,11 @@ class ScreenTracker
     else
       @hwnd = Win32::Screenshot::BitmapMaker.hwnd(@name_or_regex)
     end
+
     unless @hwnd
-      print 'perhaps not running yet? [%s] START IT FAST' % @name_or_regex
       until @hwnd
-        sleep 4
-        print ' trying again .'
+        print 'perhaps not running yet? [%s]' % @name_or_regex
+        sleep 1
         STDOUT.flush
         @hwnd = Win32::Screenshot::BitmapMaker.hwnd(@name_or_regex)
       end
@@ -112,7 +112,6 @@ class ScreenTracker
   end
   
   def wait_till_next_change
-    # dies in jruby currently...sigh...get_hwnd # reget it, just in case...
     original = get_bmp
     time_since_last = Time.now
     loop {
@@ -129,6 +128,8 @@ class ScreenTracker
       if(Time.now - time_since_last > 5)
         p 'warning--unable to track for some reason--may need to restart sensible-cinema'
         time_since_last = Time.now
+        # reget it, just in case...
+        get_hwnd
       end
     }
   end

data/spec/common.rb

@@ -40,4 +40,68 @@ end
 #for file in Dir[File.dirname(__FILE__) + "/../lib/*"] do
   # don't load them here in case one or other fails...
   # require file
-  #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/overlayer.spec.rb

@@ -1,14 +1,13 @@
 # avoid full loading if testing impossible
 if RUBY_VERSION < '1.9.2' && RUBY_PLATFORM !~ /java/
   puts 'not compatible to MRI < 1.9.2'
-  exit 0 # this isn't a real error...
+  exit 0 # this isn't a really real failure...
 end
 
 require File.expand_path(File.dirname(__FILE__) + '/common')
 require_relative '../lib/overlayer'
 
-# tell it not to actually mute during testing...
-$DEBUG = true
+$AM_IN_UNIT_TEST = true
 
 def start_good_blank
   assert !@o.blank?
@@ -18,7 +17,6 @@ def start_bad_blank
   assert @o.blank?
 end
 
-
 describe OverLayer do
 
   before do
@@ -61,7 +59,7 @@ describe OverLayer do
     start_good
   end
   
-  it 'should unmute after the ending scene' do
+  it 'should unmute after the ending scene, and also be able to go past the end of scenes at all' do
     File.write 'temp.yml', YAML.dump({:mutes => {0.5 => 1.0}})
     @o = OverLayer.new 'temp.yml'
     @o.start_thread true
@@ -89,14 +87,13 @@ describe OverLayer do
     # but by the time you check again, you just passed it, so you wait till the next one in an errant state
   end
 
-  it 'should be able to mute teeny sequences' do
+  it 'should be able to mute teeny timed sequences' do
     # it once failed on this...
     File.write 'temp.yml', YAML.dump({:mutes => {0.0001 => 0.0002, 1.0 => 1.0001}})
     o = OverLayer.new 'temp.yml'
     o.continue_until_past_all false
   end
 
-  it 'should be able to go past the end' # ??
 
   it 'should allow you to change the current time' do
     @o.start_thread
@@ -137,9 +134,7 @@ describe OverLayer do
     @o.status.should include("r,d,v,q to quit")
   end
 
-  it 'should accept h for console help'
-
-  it 'should allow for yaml input and parse it well' do
+  it 'should allow for yaml input and parse it appropo' do
     # 2 - 3 , 4-5 should be muted
     @o = OverLayer.new 'test_yaml.yml'
     @o.start_thread
@@ -152,15 +147,15 @@ describe OverLayer do
   end
 
   def write_yaml yaml
-    File.write 'temp.yml', yaml
+   File.write 'temp.yml', yaml
+   @o = OverLayer.new 'temp.yml'
   end
 
   it 'should allow for 1:00.0 minute style input' do
     write_yaml <<-YAML
-    :mutes:
+    mutes:
       "0:02.0" : "0:03.0"
     YAML
-    @o = OverLayer.new 'temp.yml'
     @o.start_thread
     start_good
     start_good
@@ -172,14 +167,13 @@ describe OverLayer do
   it "should reload the YAML file on the fly to allow for editing it" do
     # start it with one set to mute far later
     write_yaml <<-YAML
-    :mutes:   
+    mutes: 
       "0:11.0" : "0:12.0"
     YAML
-    @o = OverLayer.new 'temp.yml'
     @o.start_thread
     start_good
-    write_yaml <<-YAML
-    :mutes:
+    File.write 'temp.yml',  <<-YAML
+    mutes:
       "0:00.0001" : "0:01.5"
     YAML
     @o.status # cause it to refresh from the file
@@ -188,45 +182,66 @@ describe OverLayer do
     start_good
   end
   
-  it "should not accept the input when you pass it poor yaml" do
-    write_yaml  <<-YAML
-    :mutes:
+  it "should not accept any of the input when you pass it any poor yaml" do
+    write_yaml <<-YAML
+    mutes:
        a : 08:56.0 # first one there is invalid
     YAML
     out = OverLayer.new 'temp.yml'
     out.all_sequences[:mutes].should be_blank    
     write_yaml <<-YAML
-    :mutes:
+    mutes:
        01 : 02
     YAML
     out.reload_yaml!
-    out.all_sequences[:mutes].should_not be_blank    
+    out.all_sequences[:mutes].should == [[1,2]]
     write_yaml <<-YAML
-    :mutes:
-       01 : # failure
+    mutes:
+       05 : # failure
     YAML
     # should have kept the old
-    out.all_sequences[:mutes].should_not be_blank
+    out.all_sequences[:mutes].should == [[1,2]]
   end
   
-  it "should not accept zero start input" do
+  it "should not accept any zero start input" do
     yaml = <<-YAML
-    :mutes:
-       0 : 1 # we don't like zeroes...for now at least
+    mutes:
+       0 : 1 # we don't like zeroes...for now at least, as they can mean parsing failure...
+       3 : 4
     YAML
     out = OverLayer.translate_yaml yaml
-    out[:mutes].should be_blank        
+    out[:mutes].should == [[3,4]]
+  end
+  
+  it "should disallow zero or less length intervals" do
+    yaml = <<-YAML
+    mutes:
+       1 : 1
+    YAML
+    out = OverLayer.translate_yaml yaml
+    out[:mutes].should == []  
+  end
+
+  
+  it "should sort yaml input" do
+    yaml = <<-YAML
+    mutes:
+      3 : 4
+      1 : 2
+    YAML
+    out = OverLayer.translate_yaml yaml
+    out[:mutes].should == [[1,2], [3,4]]
   end
   
   it "should handle non quoted style numbers in yaml" do
     yaml = <<-YAML
-    :mutes:
+    mutes:
        08:55 : 08:56.0 # valid, will return large Fixnum's
     YAML
     out = OverLayer.translate_yaml yaml
     out[:mutes].should == [[535, 536]]
     yaml = <<-YAML
-    :mutes:
+    mutes:
        01:08:55 : 01:09:55 # actually valid
     YAML
     out = OverLayer.translate_yaml yaml
@@ -235,16 +250,16 @@ describe OverLayer do
 
   it "should translate yaml with the two different types in it" do
     yaml = <<-YAML
-    :mutes:
+    mutes:
        "0:02.0" : "0:03.0"
-    :blank_outs:
+    blank_outs:
        "0:02.0" : "0:03.0"  
     YAML
     out = OverLayer.translate_yaml yaml
     out[:mutes].should == [[2.0, 3.0]]
     out[:blank_outs].should == [[2.0, 3.0]]
     yaml = <<-YAML
-    :mutes:
+    mutes:
        "1:02.11" : "1:03.0"
     YAML
     out = OverLayer.translate_yaml yaml
@@ -253,7 +268,7 @@ describe OverLayer do
 
   it "should accept fixnum 56 => 57 style input" do
     yaml = <<-YAML
-    :mutes:
+    mutes:
       "0:02" : "0:03"
       3 : 4
     YAML
@@ -261,11 +276,21 @@ describe OverLayer do
     out[:mutes].should == [[2.0, 3.0], [3, 4]]
   end
   
+  it "should accept numbers that are unreasonably large" do
+    yaml = <<-YAML
+    mutes:
+      1000000 : 1000001
+    YAML
+    out = OverLayer.translate_yaml yaml
+    out[:mutes].should == [[1_000_000, 1_000_001]]
+  end
+  
   it "should accept blank yaml" do
     out = OverLayer.translate_yaml ""
     out[:mutes].should be_blank
-  end
+  end  
   
+  it "should not translate symbols"
   
   it "should translate strings as well as symbols" do
     yaml = <<-YAML
@@ -274,19 +299,15 @@ describe OverLayer do
     YAML
     out = OverLayer.translate_yaml yaml
     out[:mutes].should == [[1, 3]]
+  end  
 
-  end
-
-  it "should disallow zero or less length intervals"
-  it "should disallow non-sorted intervals"
-  it 'should reject overlapping settings...I guess'
+  it 'should reject overlapping settings...maybe?'
   
   it "should allow for 1:01:00.0 (double colon) style yaml input" do
     write_yaml <<-YAML
-    :mutes:
+    mutes:
       "1:00.11" : "1:03.0"
     YAML
-    @o = OverLayer.new 'temp.yml'
     @o.start_thread
     start_good
     @o.set_seconds 61
@@ -361,11 +382,23 @@ describe OverLayer do
           @o.get_current_state.should == [true, true, 3.5]
         end
 
+        at(4) do
+          @o.get_current_state.should == [false, false, :done]
+        end
+        
+        # now a bit more complex...
+        
+        @o = OverLayer.new_raw({:mutes => {2.0 => 3.5, 5 => 6}, :blank_outs => {3.0 => 4.0}})
+        
         at(3.75) do
           @o.get_current_state.should == [false, true, 4.0]
         end
-
-        at(4) do
+        
+        at(5) do
+          @o.get_current_state.should == [true, false, 6]
+        end
+        
+        at(6) do
           @o.get_current_state.should == [false, false, :done]
         end
 
@@ -385,13 +418,10 @@ describe OverLayer do
       @o.translate_time_to_human_readable(3661).should == "1:01:01.0"
     end
 
-    it "should accept human readable style as input" do
-      o = OverLayer.new 'temp.yml', "01:01.5"
-      o.cur_time.should be >= 61.5
-      # somewhere in there
-      o.cur_time.should be <= 62
+    it "should no longer accept human readable style as starting seconds" do
+      proc { OverLayer.new 'temp.yml', "01:01.5" }.should raise_error(ArgumentError)
     end
 
   end
 
-end
+end

data/spec/screen_tracker.spec.rb

@@ -5,19 +5,22 @@ require 'pathname'
 
 describe ScreenTracker do
 
-  if RUBY_PLATFORM =~ /java/
-    it "is pending several java bugs..." # ffi, AND popen#pid...
-  else
-    
+    SILENCE = /silence.*VLC/
+   
     def start_vlc
+      # unfortunately this is run before every context with rspec 1.3...
       unless $pid1
+        assert !$pid1
+        # enforce we only have at most one running at a time...
         begin
-          Win32::Screenshot.window(/silence.wav/, 0) {}
+          Win32::Screenshot.window(SILENCE, 0) {}
           raise Exception.new('must kill old vlcs first')
         rescue
-          # this way we'll only have one up...
-          $pid1 = IO.popen('"/program files/VideoLan/VLC/vlc.exe" silence.wav').pid # jruby can't open it directly yet, too...
-          sleep 2
+          silence = File.expand_path("./silence.wav").gsub("/", "\\")
+          Dir.chdir("/program files/VideoLan/VLC") do; IO.popen("vlc.exe #{silence}").pid; end # work around for jruby...
+          sleep 4
+          
+          $pid1 = GetPid.get_process_id_from_window(Win32::Screenshot::Util.window_hwnd(SILENCE)) # more jruby work-arounds...
         end
       end
     end
@@ -27,11 +30,11 @@ describe ScreenTracker do
     end
 
     before do
-      @a = ScreenTracker.new(/silence.*VLC/,10,10,20,20)
+      @a = ScreenTracker.new(SILENCE,10,10,20,20)
     end
 
     it "can take a regex or string" do
-      ScreenTracker.new(/silence.*VLC/,10,10,20,20)
+      ScreenTracker.new(SILENCE,10,10,20,20)
       ScreenTracker.new("silence",10,10,20,20)
     end
 
@@ -106,10 +109,10 @@ describe ScreenTracker do
       end
 
       it "should fail with out of bounds or zero sizes" do
-        proc { a = ScreenTracker.new(/silence.*VLC/,-10,10,20,20) }.should raise_error
-        proc { a = ScreenTracker.new(/silence.*VLC/,10,-10,20,20) }.should raise_error
-        proc { a = ScreenTracker.new(/silence.*VLC/,-10,10,0,2) }.should raise_error
-        proc { a = ScreenTracker.new(/silence.*VLC/,10,10,2,0) }.should raise_error
+        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
 
     end
@@ -149,7 +152,7 @@ describe ScreenTracker do
     context "given a real player that is moving" do
 
       before do
-        @a = ScreenTracker.new("silence.wav", -111, -16, 86, 13)
+        @a = ScreenTracker.new(SILENCE, -111, -16, 86, 13)
       end
 
       it "should be able to poll the screen to know when something changes" do
@@ -162,7 +165,7 @@ describe ScreenTracker do
       context "using OCR" do
 
         before do
-          @a = ScreenTracker.new_from_yaml File.read("../zamples/players/vlc_non_full_screened_and_total_length_under_an_hour.yml"), nil
+          @a = ScreenTracker.new_from_yaml File.read("../zamples/players/total_length_under_an_hour/vlc_non_full_screened.yml"), nil
         end
 
         it "should be able to disk dump snapshotted digits" do
@@ -190,11 +193,11 @@ describe ScreenTracker do
         end
         
         context "with an OCR that can change from hour to minutes during ads" do
-          it "should detect"
+          it "should detect this change"
         end
 
         it "should be able to use invert on images" do
-          @a = ScreenTracker.new("silence.wav", -111, -16, 86, 13,
+          @a = ScreenTracker.new(SILENCE, -111, -16, 86, 13,
             {:should_invert => true, :hours => nil, :minute_tens => [-90,7], :minute_ones => [-82, 7], :second_tens => [-72, 7], :second_ones => [-66, 7]} )
           got_it = nil
           OCR.stub!(:identify_digit) {|*args|
@@ -205,7 +208,6 @@ describe ScreenTracker do
         end
         
         it "should be able to scan for/identify new windows, since VLC changes signatures" do
-          fail "not possible yet, so hangs"
           output = @a.wait_till_next_change 
           output[0].should_not be_nil
           old_handle = @a.hwnd
@@ -220,12 +222,9 @@ describe ScreenTracker do
 
       def kill_vlc
         assert $pid1
-        # bring redcar to the foreground
-        # this seg faults on windows 7 for me for some reason when run inside the editor itself...swt bug?
-        unless Socket.gethostname == "PACKRD-1GK7V"
-          Win32::Screenshot.window(/universal/, 0) rescue nil
-        end
-        Process.kill 9, $pid1 # need this process re-started each time or the screen won't change for the screen changing test
+        # jruby...
+        system("taskkill /pid #{$pid1}")
+        Process.kill 9, $pid1 # MRI...sigh.
         FileUtils.rm_rf Dir['*.bmp']
         $pid1 = nil
       end
@@ -235,4 +234,3 @@ describe ScreenTracker do
       end
     end
   end
-end

data/zamples/scene_lists/categories.yml

@@ -0,0 +1,23 @@
+"profanity categories, so you don't have to write them":
+
+ religious exclamation weak:
+    oh my gosh, etc. (anything euphemized)
+
+ religious exclamation:
+    da**...
+    he**
+ religious exclamation deity:
+    oh my **** 
+    g** d*** ***
+    
+ bodily function slang:
+    poop, crap, crud, suck
+ bodily function strong:
+    s***
+    
+ innuendo:
+   language that has sexual overtones  
+ sexual profanity:
+   f***
+ body parts:
+   dick, etc.

data/zamples/scene_lists/labyrinth.yml

@@ -1,16 +1,17 @@
 mutes:
-  3:08.5 : 3:13 	# hurts like heck
-  #4:00 : 4:02 # dang
-  #0:33:00 : 0:33:01 # damg
-  0:39:45 : 0:39:46 # crap 37:21 check
-  54:36 : 54:37 # oh my gosh
-  1:04:33 : 1:04:36 # durn durn check   #1:04:00 : 1:04:10 # dang
-  #1:33:00 : 1:33:02 # dang
-  1:32:46 : 1:32:47 # dang
+  3:08.5 : 3:13	# religious exclamation
+  #4:00 : 4:02 # "
+  #0:33:00 : 0:33:01 # "
+  0:39:45 : 0:39:46 # bodily functionslang 37:21 check
+  54:36 : 54:37 # religious exclamation deity
+  1:04:33 : 1:04:36 # religious exclamation
+  #1:04:00 : 1:04:10 # "
+  #1:33:00 : 1:33:02 # "
+  1:32:46 : 1:32:47 # "
 blank_outs:
-  11:50:00 : 12:00 # creature (Hoggle) standing and urinating (seen from behind) check
-  26:14 : 26:28 # she falls through scary hands check  
+  11:50:00 : 12:00:00 # creature (Hoggle) standing and urinating (seen from behind) check
+  26:14 : 26:28 # she falls through scary hands check
 title: Labyrinth
-source: DVD/VLC
-missing: lots of fart noises in the swamp, some odd body parts from the red people, goblin violence, some swearing in credits song
-idea: quieter at parts...
+source: DVD played with VLC
+not_yet_edited_out: "lots of fart noises in the swamp, some odd body parts flying all over from the red goblin dancing people, 
+goblin violence, some swearing in credits song, though the rest is reasonably complete"

data/zamples/scene_lists/star_trek_generations_hulu.yml

@@ -1,9 +1,8 @@
 source: "hulu"
 mutes:
-  # these aren't actually accurate yet, except for Data's one
-  # oh my ... at beginning
-  08:54.5 : 08:56 # what the he...
-  10:46.5 : 10:48 # durn
-  11:21 : 11:24.5 # the he...
-  19:45 : 19:50 # religious "...have mercy"
-  "01:15:38.5" : "01:15:41.5" # Data "oh s...."
+  08:54.5 : 08:56 # religious exclamation
+  10:46.5 : 10:48 # religious exclamation
+  11:21 : 11:24.5 # re
+  19:45 : 19:50 # religious exclamation weak "may *** have mercy on your soul"
+  "01:15:38.5" : "01:15:41.5" # "scatalogical" Data when they are about to plummet to earth
+missing: "religious exclamation strong near beginning"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
-  hash: 9
   prerelease: false
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Roger Pack
@@ -15,110 +14,104 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -06:00
+date: 2010-08-16 00:00:00 -06:00
 default_executable: sensible-cinema
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sane
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 22
+        - 0
+        version: 0.22.0
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rdp-win32screenshot
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 0
+        - 6
+        - 3
+        version: 0.0.6.3
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rdp-rmagick
+  name: mini_magick
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mini_magick
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hitimes
+  name: jeweler
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sane
+  name: rdp-rmagick
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 71
         segments: 
         - 0
-        - 22
-        - 0
-        version: 0.22.0
-  type: :runtime
+        version: "0"
+  type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: win32screenshot
+  name: hitimes
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
-        - 0
-        - 6
-        version: 0.0.6
-  type: :runtime
+        version: "0"
+  type: :development
   version_requirements: *id007
 description: 
 email: rogerdpack@gmail.com
@@ -176,7 +169,7 @@ files:
 - spec/mouse.spec.rb
 - spec/mouse_forever.rb
 - spec/muter.spec.rb
-- spec/ocr.spec.orb
+- spec/ocr.spec.rb
 - spec/open.bat
 - spec/overlayer.spec.rb
 - spec/screen_tracker.spec.rb
@@ -206,18 +199,13 @@ files:
 - vendor/imagemagick/msvcr90.dll
 - vendor/imagemagick/vcomp90.dll
 - zamples/players/how_to_create_a_new_player_description.txt
-- zamples/players/hulu_full_screen_total_length_over_an_hour.yml
-- zamples/players/sample_snapshots/hulu full screen non hour.jpg
-- zamples/players/sample_snapshots/hulu full screen over hour.jpg
-- zamples/players/sample_snapshots/silence.bmp
 - zamples/players/sample_snapshots/utube.JPG
-- zamples/players/sample_snapshots/vlc grab over one hour file over one hour play.bmp
-- zamples/players/sample_snapshots/vlc2.bmp
-- zamples/players/sample_snapshots/vlc_full_screen_slider under one hour.bmp
 - zamples/players/sample_snapshots/youtube full screen big screen.jpg
-- zamples/players/vlc_full_screened_total_length_over_an_hour.yml
-- zamples/players/vlc_non_full_screened_and_total_length_over_an_hour.yml
-- zamples/players/vlc_non_full_screened_and_total_length_under_an_hour.yml
+- zamples/players/total_length_over_an_hour/hulu_full_screened.yml
+- zamples/players/total_length_over_an_hour/vlc_full_screened.yml
+- zamples/players/total_length_over_an_hour/vlc_windowed.yml
+- zamples/players/total_length_under_an_hour/vlc_non_full_screened.yml
+- zamples/scene_lists/categories.yml
 - zamples/scene_lists/disney_cars.yml
 - zamples/scene_lists/example_scene_list.yml
 - zamples/scene_lists/happy_feet_dvd.yml
@@ -237,7 +225,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -246,7 +233,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -265,5 +251,6 @@ test_files:
 - spec/mouse.spec.rb
 - spec/mouse_forever.rb
 - spec/muter.spec.rb
+- spec/ocr.spec.rb
 - spec/overlayer.spec.rb
 - spec/screen_tracker.spec.rb