sensible-cinema 0.14.4 → 0.14.5

data/lib/screen_tracker.rb

@@ -160,25 +160,19 @@ class ScreenTracker
   
   def attempt_to_get_time_from_screen start_time
     out = {}
-    start = get_digits_as_bitmaps
-    dump_digits(start, 'started_as')
     # force it to have two matching snapshots in a row, to avoid race conditions grabbing the digits...
+    # allow youtube to update (sigh) lodo just for utube
     previous = nil 
-    current = start
-    until previous == (current)
+    sleep 0.05
+    current = get_digits_as_bitmaps
+    while previous != current
       previous = current
-      sleep 0.25 # allow youtube to update (sigh) lodo just for utube
+      sleep 0.05
       current = get_digits_as_bitmaps
-      p previous == current
-      dump_digits(current, 'current is')
       # lodo it should probably poll *before* calling this, not here...maybe?
     end
     assert previous == current
-    digits = current = previous
-    
-    if $DEBUG         
-      dump_digits(digits, 'using digits')
-    end
+    digits = current = previous    
     DIGIT_TYPES.each{|type|
       if digits[type]
         digit = identify_digit(digits[type])
@@ -211,7 +205,7 @@ class ScreenTracker
       end
     }
     out = "%d:%d%d:%d%d" % DIGIT_TYPES.map{ |type| out[type] }
-    puts '', 'got new screen time ' + out + " tracking delta:" + (Time.now - start_time).to_s if $VERBOSE
+    puts '', 'got new screen time ' + out + " (+ tracking delta:" + (Time.now - start_time).to_s  + ")" if $VERBOSE
     return out, Time.now-start_time
   end
   

data/lib/swing_helpers.rb

@@ -64,5 +64,16 @@ module SensibleSwing
   end
 end
 
+require 'os'
+class String
+ def to_filename
+   if OS.windows?
+     self.gsub('/', "\\")
+   else
+    self
+  end
+ end
+end
+
 # code examples
 # JOptionPane.showInputDialog(nil, "not implemented yet", "not implemented yet", JOptionPane::ERROR_MESSAGE)

data/lib/vlc_programmer.rb

@@ -111,7 +111,7 @@ class VLCProgrammer
       <location>#{loc}</location>
       </track>"
     else
-      "vlc.exe --qt-start-minimized #{loc} --start-time=#{start} --stop-time=#{stop} --sout=\"file/ps:#{@filename_or_playlist_if_nil}.ps.#{idx}\" #{"--no-sout-audio" if no_audio} vlc://quit\n" # + 
+      "vlc --qt-start-minimized #{loc} --start-time=#{start} --stop-time=#{stop} --sout=\"file/ps:#{@filename_or_playlist_if_nil}.ps.#{idx}\" #{"--no-sout-audio" if no_audio} vlc://quit\n" # + 
       #"call vlc #{@filename_or_playlist_if_nil}.ps.#{idx}.tmp  --sout=file/ps:go.ps
     end
   end

data/run_sensible_cinema.bat

@@ -0,0 +1,5 @@
+@setlocal
+@rem disable any local rubyopt settings...
+@set RUBYOPT=
+@echo This window will display lots of debug message output!
+@cd sensible-cinema && java -cp "./vendor/cache/jruby-complete-1.5.5.jar" org.jruby.Main bin\sensible-cinema || echo you need to install java first!

data/sensible-cinema.gemspec

@@ -1,182 +1,163 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.14.4"
+  s.version = "0.14.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
-  s.date = %q{2010-11-23}
+  s.date = %q{2010-11-24}
   s.email = %q{rogerdpack@gmail.com}
   s.executables = ["sensible-cinema", "sensible-cinema-cli"]
   s.extensions = ["ext/mkrf_conf.rb"]
   s.extra_rdoc_files = [
     "ChangeLog",
-    "LICENSE",
-    "README",
-    "TODO"
+     "LICENSE",
+     "README",
+     "TODO"
   ]
   s.files = [
     "ChangeLog",
-    "LICENSE",
-    "README",
-    "Rakefile",
-    "TODO",
-    "VERSION",
-    "bin/sensible-cinema",
-    "bin/sensible-cinema-cli",
-    "ext/mkrf_conf.rb",
-    "gplv3.txt",
-    "lib/blanker.rb",
-    "lib/fake_blanker.rb",
-    "lib/file_chooser.rb",
-    "lib/keyboard_input.rb",
-    "lib/mouse.rb",
-    "lib/mouse_forever.rb",
-    "lib/muter.rb",
-    "lib/ocr.rb",
-    "lib/overlayer.rb",
-    "lib/screen_tracker.rb",
-    "lib/swing_helpers.rb",
-    "lib/vlc_programmer.rb",
-    "never_do",
-    "sensible-cinema.gemspec",
-    "spec/blanker.spec.rb",
-    "spec/common.rb",
-    "spec/convert_image.rb",
-    "spec/images/black.bmp",
-    "spec/images/colon.bmp",
-    "spec/images/hulu_0.bmp",
-    "spec/images/hulu_2.bmp",
-    "spec/images/hulu_2_3.bmp",
-    "spec/images/hulu_2_4.bmp",
-    "spec/images/hulu_3.bmp",
-    "spec/images/hulu_3_4.bmp",
-    "spec/images/hulu_4.bmp",
-    "spec/images/hulu_4_4.bmp",
-    "spec/images/hulu_5.bmp",
-    "spec/images/hulu_7.bmp",
-    "spec/images/hulu_8.bmp",
-    "spec/images/hulu_slash.bmp",
-    "spec/images/vlc_0.bmp",
-    "spec/images/vlc_2_4.bmp",
-    "spec/images/vlc_2_6.bmp",
-    "spec/images/vlc_4.bmp",
-    "spec/images/vlc_5.bmp",
-    "spec/images/vlc_6.bmp",
-    "spec/images/vlc_9.bmp",
-    "spec/images/vlc_colon.bmp",
-    "spec/images/youtube_0.bmp",
-    "spec/images/youtube_1.bmp",
-    "spec/images/youtube_2_0.bmp",
-    "spec/images/youtube_2_5.bmp",
-    "spec/images/youtube_2_6.bmp",
-    "spec/images/youtube_3_0.bmp",
-    "spec/images/youtube_4.bmp",
-    "spec/images/youtube_4_0.bmp",
-    "spec/images/youtube_5.bmp",
-    "spec/images/youtube_6.bmp",
-    "spec/images/youtube_light_0.bmp",
-    "spec/images/youtube_light_1_3.bmp",
-    "spec/images/youtube_light_2_1.bmp",
-    "spec/images/youtube_light_2_3.bmp",
-    "spec/images/youtube_light_2_9.bmp",
-    "spec/images/youtube_light_4.bmp",
-    "spec/images/youtube_light_4_3.bmp",
-    "spec/images/youtube_light_5.bmp",
-    "spec/images/youtube_light_5_0.bmp",
-    "spec/images/youtube_light_8.bmp",
-    "spec/images/youtube_light_9.bmp",
-    "spec/images/youtube_small_0.bmp",
-    "spec/images/youtube_small_2.bmp",
-    "spec/images/youtube_small_2_0.bmp",
-    "spec/images/youtube_small_4.bmp",
-    "spec/keyboard_input.spec.rb",
-    "spec/mouse.spec.rb",
-    "spec/muter.spec.rb",
-    "spec/ocr.spec.rb",
-    "spec/overlayer.spec.rb",
-    "spec/screen_tracker.spec.rb",
-    "spec/silence.wav",
-    "spec/swing_helpers.spec.rb",
-    "spec/test_yaml.yml",
-    "spec/vlc_programmer.spec.rb",
-    "vendor/gocr049.exe",
-    "vendor/imagemagick/CORE_RL_Magick++_.dll",
-    "vendor/imagemagick/CORE_RL_bzlib_.dll",
-    "vendor/imagemagick/CORE_RL_jbig_.dll",
-    "vendor/imagemagick/CORE_RL_jp2_.dll",
-    "vendor/imagemagick/CORE_RL_jpeg_.dll",
-    "vendor/imagemagick/CORE_RL_lcms_.dll",
-    "vendor/imagemagick/CORE_RL_libxml_.dll",
-    "vendor/imagemagick/CORE_RL_magick_.dll",
-    "vendor/imagemagick/CORE_RL_png_.dll",
-    "vendor/imagemagick/CORE_RL_tiff_.dll",
-    "vendor/imagemagick/CORE_RL_ttf_.dll",
-    "vendor/imagemagick/CORE_RL_wand_.dll",
-    "vendor/imagemagick/CORE_RL_xlib_.dll",
-    "vendor/imagemagick/CORE_RL_zlib_.dll",
-    "vendor/imagemagick/X11.dll",
-    "vendor/imagemagick/Xext.dll",
-    "vendor/imagemagick/atl90.dll",
-    "vendor/imagemagick/convert.exe",
-    "vendor/imagemagick/identify.exe",
-    "vendor/imagemagick/mfc90.dll",
-    "vendor/imagemagick/msvcp90.dll",
-    "vendor/imagemagick/msvcr90.dll",
-    "vendor/imagemagick/vcomp90.dll",
-    "zamples/players/how_to_create_more_players.txt",
-    "zamples/players/hulu/total_length_over_an_hour.txt",
-    "zamples/players/vlc/full_screened_total_length_over_an_hour.txt",
-    "zamples/players/vlc/windowed_total_length_over_an_hour.txt",
-    "zamples/players/vlc/windowed_total_length_under_an_hour.txt",
-    "zamples/players/youtube/full_screened_1024x768.txt",
-    "zamples/players/youtube/full_screened_1152x864.txt",
-    "zamples/players/youtube/full_screened_1680x1050.txt",
-    "zamples/players/youtube/normal_in_youtube.com.chrome.txt",
-    "zamples/players/youtube/note_these_assume_less_than_10_minutes_length.txt",
-    "zamples/scene_lists/category descriptions.txt",
-    "zamples/scene_lists/dvds/White Christmas.txt",
-    "zamples/scene_lists/dvds/all_dogs_go_to_heaven_dvd.txt",
-    "zamples/scene_lists/dvds/bobs_big_plan.txt",
-    "zamples/scene_lists/dvds/cars_disney.txt",
-    "zamples/scene_lists/dvds/happy_feet_dvd.txt",
-    "zamples/scene_lists/dvds/labyrinth.txt",
-    "zamples/scene_lists/dvds/making marriage work.txt",
-    "zamples/scene_lists/example_scene_descriptions_list.txt",
-    "zamples/scene_lists/star_trek_generations_hulu.txt",
-    "zamples/scene_lists/youtube/gummy_bear_song_youtube.txt",
-    "zamples/scene_lists/youtube/nuki_song_youtube.txt"
+     "LICENSE",
+     "README",
+     "Rakefile",
+     "TODO",
+     "VERSION",
+     "bin/sensible-cinema",
+     "bin/sensible-cinema-cli",
+     "ext/mkrf_conf.rb",
+     "gplv3.txt",
+     "lib/blanker.rb",
+     "lib/fake_blanker.rb",
+     "lib/file_chooser.rb",
+     "lib/keyboard_input.rb",
+     "lib/mouse.rb",
+     "lib/mouse_forever.rb",
+     "lib/muter.rb",
+     "lib/ocr.rb",
+     "lib/overlayer.rb",
+     "lib/screen_tracker.rb",
+     "lib/swing_helpers.rb",
+     "lib/vlc_programmer.rb",
+     "never_do",
+     "run_sensible_cinema.bat",
+     "sensible-cinema.gemspec",
+     "spec/blanker.spec.rb",
+     "spec/common.rb",
+     "spec/convert_image.rb",
+     "spec/images/black.bmp",
+     "spec/images/colon.bmp",
+     "spec/images/hulu_0.bmp",
+     "spec/images/hulu_2.bmp",
+     "spec/images/hulu_2_3.bmp",
+     "spec/images/hulu_2_4.bmp",
+     "spec/images/hulu_3.bmp",
+     "spec/images/hulu_3_4.bmp",
+     "spec/images/hulu_4.bmp",
+     "spec/images/hulu_4_4.bmp",
+     "spec/images/hulu_5.bmp",
+     "spec/images/hulu_7.bmp",
+     "spec/images/hulu_8.bmp",
+     "spec/images/hulu_slash.bmp",
+     "spec/images/vlc_0.bmp",
+     "spec/images/vlc_2_4.bmp",
+     "spec/images/vlc_2_6.bmp",
+     "spec/images/vlc_4.bmp",
+     "spec/images/vlc_5.bmp",
+     "spec/images/vlc_6.bmp",
+     "spec/images/vlc_9.bmp",
+     "spec/images/vlc_colon.bmp",
+     "spec/images/youtube_0.bmp",
+     "spec/images/youtube_1.bmp",
+     "spec/images/youtube_2_0.bmp",
+     "spec/images/youtube_2_5.bmp",
+     "spec/images/youtube_2_6.bmp",
+     "spec/images/youtube_3_0.bmp",
+     "spec/images/youtube_4.bmp",
+     "spec/images/youtube_4_0.bmp",
+     "spec/images/youtube_5.bmp",
+     "spec/images/youtube_6.bmp",
+     "spec/images/youtube_light_0.bmp",
+     "spec/images/youtube_light_1_3.bmp",
+     "spec/images/youtube_light_2_1.bmp",
+     "spec/images/youtube_light_2_3.bmp",
+     "spec/images/youtube_light_2_9.bmp",
+     "spec/images/youtube_light_4.bmp",
+     "spec/images/youtube_light_4_3.bmp",
+     "spec/images/youtube_light_5.bmp",
+     "spec/images/youtube_light_5_0.bmp",
+     "spec/images/youtube_light_8.bmp",
+     "spec/images/youtube_light_9.bmp",
+     "spec/images/youtube_small_0.bmp",
+     "spec/images/youtube_small_2.bmp",
+     "spec/images/youtube_small_2_0.bmp",
+     "spec/images/youtube_small_4.bmp",
+     "spec/keyboard_input.spec.rb",
+     "spec/mouse.spec.rb",
+     "spec/muter.spec.rb",
+     "spec/ocr.spec.rb",
+     "spec/overlayer.spec.rb",
+     "spec/screen_tracker.spec.rb",
+     "spec/silence.wav",
+     "spec/swing_helpers.spec.rb",
+     "spec/test_yaml.yml",
+     "spec/vlc_programmer.spec.rb",
+     "todo_if_need_speed",
+     "vendor/gocr049.exe",
+     "zamples/edit_decision_lists/category descriptions.txt",
+     "zamples/edit_decision_lists/dvds/White Christmas.txt",
+     "zamples/edit_decision_lists/dvds/all_dogs_go_to_heaven_dvd.txt",
+     "zamples/edit_decision_lists/dvds/bobs_big_plan.txt",
+     "zamples/edit_decision_lists/dvds/cars_disney.txt",
+     "zamples/edit_decision_lists/dvds/happy_feet_dvd.txt",
+     "zamples/edit_decision_lists/dvds/labyrinth.txt",
+     "zamples/edit_decision_lists/dvds/making marriage work.txt",
+     "zamples/edit_decision_lists/example_edit_decision_list.txt",
+     "zamples/edit_decision_lists/star_trek_generations_hulu.txt",
+     "zamples/edit_decision_lists/youtube/gummy_bear_song_youtube.txt",
+     "zamples/edit_decision_lists/youtube/nuki_song_youtube.txt",
+     "zamples/players/how_to_create_more_players.txt",
+     "zamples/players/hulu/total_length_over_an_hour.txt",
+     "zamples/players/vlc/full_screened_total_length_over_an_hour.txt",
+     "zamples/players/vlc/windowed_total_length_over_an_hour.txt",
+     "zamples/players/vlc/windowed_total_length_under_an_hour.txt",
+     "zamples/players/youtube/full_screened_1024x768.txt",
+     "zamples/players/youtube/full_screened_1152x864.txt",
+     "zamples/players/youtube/full_screened_1680x1050.txt",
+     "zamples/players/youtube/normal_in_youtube.com.chrome.txt",
+     "zamples/players/youtube/note_these_assume_less_than_10_minutes_length.txt"
   ]
   s.homepage = %q{http://github.com/rdp}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{an EDL scene-selector/bleeper that works with online players like hulu}
   s.test_files = [
     "spec/blanker.spec.rb",
-    "spec/common.rb",
-    "spec/convert_image.rb",
-    "spec/keyboard_input.spec.rb",
-    "spec/mouse.spec.rb",
-    "spec/muter.spec.rb",
-    "spec/ocr.spec.rb",
-    "spec/overlayer.spec.rb",
-    "spec/screen_tracker.spec.rb",
-    "spec/swing_helpers.spec.rb",
-    "spec/vlc_programmer.spec.rb"
+     "spec/common.rb",
+     "spec/convert_image.rb",
+     "spec/keyboard_input.spec.rb",
+     "spec/mouse.spec.rb",
+     "spec/muter.spec.rb",
+     "spec/ocr.spec.rb",
+     "spec/overlayer.spec.rb",
+     "spec/screen_tracker.spec.rb",
+     "spec/swing_helpers.spec.rb",
+     "spec/vlc_programmer.spec.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sane>, [">= 0.22.0"])
       s.add_runtime_dependency(%q<rdp-win32screenshot>, [">= 0.0.7.3"])
       s.add_runtime_dependency(%q<mini_magick>, [">= 3.1"])
+      s.add_runtime_dependency(%q<whichr>, [">= 0.3.6"])
       s.add_runtime_dependency(%q<jruby-win32ole>, [">= 0"])
       s.add_runtime_dependency(%q<rdp-ruby-wmi>, [">= 0"])
       s.add_runtime_dependency(%q<ffi>, [">= 0"])
@@ -187,6 +168,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sane>, [">= 0.22.0"])
       s.add_dependency(%q<rdp-win32screenshot>, [">= 0.0.7.3"])
       s.add_dependency(%q<mini_magick>, [">= 3.1"])
+      s.add_dependency(%q<whichr>, [">= 0.3.6"])
       s.add_dependency(%q<jruby-win32ole>, [">= 0"])
       s.add_dependency(%q<rdp-ruby-wmi>, [">= 0"])
       s.add_dependency(%q<ffi>, [">= 0"])
@@ -198,6 +180,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sane>, [">= 0.22.0"])
     s.add_dependency(%q<rdp-win32screenshot>, [">= 0.0.7.3"])
     s.add_dependency(%q<mini_magick>, [">= 3.1"])
+    s.add_dependency(%q<whichr>, [">= 0.3.6"])
     s.add_dependency(%q<jruby-win32ole>, [">= 0"])
     s.add_dependency(%q<rdp-ruby-wmi>, [">= 0"])
     s.add_dependency(%q<ffi>, [">= 0"])

data/spec/swing_helpers.spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/common')
-
+require 'os'
 require_relative '../lib/swing_helpers'
 module SensibleSwing
 describe SensibleSwing do
@@ -13,6 +13,15 @@ describe SensibleSwing do
    #dialog.dispose # should get here :P
    # let them close it :P
   end
+  
+  it "should be able to convert filenames well" do
+    if OS.windows?
+      "a/b/c".to_filename.should == "a\\b\\c"
+    else
+      "a/b/c".to_filename.should == "a/b/c"
+    end
+  end
 
 end
-end
+end
+puts 'close the windows...'

data/spec/vlc_programmer.spec.rb

@@ -5,7 +5,7 @@ require_relative '../lib/vlc_programmer'
 describe 'VLC Programmer' do
 
   it "should be able to convert" do  
-    a = YAML.load_file "../zamples/scene_lists/dvds/happy_feet_dvd.txt"
+    a = YAML.load_file "../zamples/edit_decision_lists/dvds/happy_feet_dvd.txt"
     out = VLCProgrammer.convert_to_full_xspf(a)
     out.length.should_not == 0
     out.should include("<title>Playlist</title>")

data/todo_if_need_speed

@@ -0,0 +1,6 @@
+--server?  optionally higher process prio?
+convert to real java?
+when polling for bmp changes, just use two thin lines (if needed speed-wise?)
+call straight into GOCR [?]
+some funky video mirror so I can get bitmaps like in realtime [?]
+profile, optimize :P

data/zamples/{scene_lists → edit_decision_lists}/dvds/all_dogs_go_to_heaven_dvd.txt

@@ -6,4 +6,4 @@ blank_outs:
 
 title: All Dogs Go to Heaven
 source: DVD/vlc
-not_listed: a good quantity of name calling like "moron"
+not_yet_listed: a good quantity of name calling "moron", a scary dream where Charly is shown pergatory.

data/zamples/{scene_lists → edit_decision_lists}/dvds/bobs_big_plan.txt

@@ -1,9 +1,12 @@
 mutes:
   "1" : "1:06" # theme song is a bit raucous
   "48:46" : "49:08" # theme song again
+  "29:14" : "30:46" # theme song yikes.
 blank_outs:
   # none
 
 title: Bob's Big Plan
 source: DVD (vlc)
-dvd_title_track: 1
+dvd_title_track: 1
+
+other_notes: could use more differentiation, as I don't dislike *all* the music.

data/zamples/players/how_to_create_more_players.txt

@@ -6,7 +6,7 @@ Use the others are examples
   Some tips:
   
     use WinCheat to help with window names (under "Text") (alt+tab helps, too, since it displays titles).
-    run scene-skipper with 'test' for the scene description filename: it will dump a screenshot using the player description
+    run scene-skipper with 'test' for the Edit Decision List filename: it will dump a screenshot using the player description
     use Paint.net to examine the dumped graphic and get coords (invert it to get easy negative coords).
 
 NB that the clock coords can have negative start offsets, which mean "distance from the bottom right corner"