sensible-cinema 0.14.4 → 0.14.5

data/ChangeLog

@@ -1,3 +1,7 @@
+== 0.14.5 ==
+
+Make it distributable more easily.
+
 == 0.14.4 ==
 
 Add a progress bar.

data/LICENSE

@@ -1,6 +1,6 @@
-All files released under the GPLv3 license [1] unless otherwise specified.  Ping me if you need this changed.
+All files released under the GPLv3 license [1] unless otherwise specified.  Ping me if you want this changed.
 
-May contain some 3rd party libraries under their own (separate, open source) license.
+May contain some 3rd party libraries under their own (separate, open source) licenses.
 
 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]).
@@ -16,4 +16,24 @@ http://betterlogic.com/roger/?p=2618
 Enjoy!
 
 [1] http://www.gnu.org/licenses/gpl.html, also gplv3 file.
-[2] http://www.videolan.org/support/faq.html
+[2] http://www.videolan.org/support/faq.html
+
+
+honest about DMCA (we don't distribute the cracker, we don't redistribute, don't perform any acts, etc.)
+if you burn you'll eventually be using a DMCA compatible player :P
+long list of players...we're not alone :)
+the authors of the program might not be liable for damages.  We don't feel dishonest about it, as long as 
+we own the DVD and have it with us when we watch the edited version.
+
+
+not more unethical than ripping your DVD collection to hard drive so you can keep your DVD's all in one 
+place and don't have to worry about losing them.  Then you edit them manually to remove cruft, and watch them
+from there.
+
+note that you are watching it using only bits and pieces of the original, similar to said bill.  And the
+authors of the program might not be cupable of copyright infringement themselves, since they distribute no infringed materials.
+
+Not responsible for your actions. Don't redistribute. "You run the risk on your own"
+"should the courts someday rule..."  If DVD next to me...
+
+fair use may apply

data/README

@@ -1,5 +1,10 @@
-Sensible-cinema is a program that allows you to do pre-programmed scene selection (i.e. "mute out" 
-or "bleep out" scenes) on arbitrary media players like netflix online, vlc (for DVD's), etc.
+Sensible-cinema is a program that allows you to do pre-programmed edit decision lists (i.e. "mute out" 
+or "bleep out" scenes) for DVD's.
+An experimental player also works on arbitrary media players like netflix online, vlc, hulu, etc.
+
+Note that this README is outdated.  Currently just run sensible-cinema in jruby and the GUI will guide you :)
+
+== old Readme ==
 
 Currently it takes as input a list of "skippable" scenes, and a player description.
 It then tracks whichever player you are using, and mutes or blanks out the system appropriately, 
@@ -39,7 +44,7 @@ Next install the gem by either opening up the command window or hitting windows+
   It could theoretically be ported to MRI 1.9.2, if anybody wanted to do so.
   Also if anybody would be interested in porting this to Linux I'd be happy to collaborate.
   
-You can test that it's installed by running it (see above) and selecting the "example_scene_list.yml", and 
+You can test that it's installed by running it (see above) and selecting the "example_edit_decision_list.txt", and 
 choosing the hulu player.
 
 It will proceed do a few "demo" mutes and blank outs.
@@ -57,7 +62,7 @@ blank_outs:
 
 Here's one with more detail
 
-http://github.com/rdp/sensible-cinema/blob/master/zamples/scene_lists/example_scene_list.yml
+http://github.com/rdp/sensible-cinema/blob/master/zamples/edit_decision_lists/example_edit_decision_list.yml
 
 Basically your job is to save an appropriate file like that somewhere, 
 then start sensible-cinema and instruct it to use your new file.
@@ -70,9 +75,9 @@ So here is a way to create your scene descriptions file.
 First create a new file 
 
 The easiest way to do this is to start sensible-cinema, then instead of choosing an existing file,
-"right click" on the existing file "example_scene_list.yml" and choose "Copy"
+"right click" on the existing file "example_edit_decision_list.txt" and choose "Copy"
 now right click below the list of files and choose "paste"
-This will create the file "example_scene_list Copy.yml"
+This will create the file "example_edit_decision_list Copy.txt"
 Right click on it, choose rename, and give it a better name.
 Now open it.
 You can make changes to this file *on the fly* while the player is still playing.  It will notice 
@@ -131,7 +136,7 @@ A. This enables your player to keep its on-screen time tracker, which in turn al
 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
+     C:\> jruby -S sensible-cinema edit_decision_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.
@@ -158,18 +163,23 @@ The concept isn't too novel.  Some examples:
 Clean Flicks
 http://en.wikipedia.org/wiki/Linear_video_editing
 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/tt0091369/parentalguide) which you could use to translate into a sensible-cinema compatible list.
-Edited "on airplane" style movies.
+Edited "airplane edit" style movies.
+Normal movies versus "directors cut unedited" movies (one is sometimes preferable)
 http://en.wikipedia.org/wiki/Edit_decision_list (it's a linear editing tool, after all--so see the vast list of those)
 http://www.oreillynet.com/sysadmin/blog/2005/06/make_your_own_phantom_edit_wit.html (mplayer has had this ability for awhile).
 http://clearplay.com commercial (tracks DVD's while they play--closed source, costs money, no user contribution possible), and only for DVD's (uses its own DVD-player in its current incantation).
 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://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 contains links to some other editors)
+htp://dvdshrink.info "Re-author" mode: to make "movie-only" backups, compilations, combine "flippers",.... DvdShrink has always had the ability to "crop or cut parts of a title" etc.
+The VCR and the record button, coupled with the pause+rewind button (to edit out unwanted content).
 http://code.google.com/p/movie-content-editor (written in Python, controls VLC based on captions and scene lists)
 http://www.imdb.com/swiki/special?ParentalGuideHelp (search for "scene description")
 http://www.mythtv.org/wiki/Removing_Commercials
 The remote control with the pause, mute, stop, fast forward, and play buttons, along with previous knowledge of scene locations
 The scissors and old VHS tapes (Clean Flicks' origin, BTW).
+Windows Movie Maker allows for users to cut and copy scenes of movies to their heart's content.
+http://forum.videolan.org/viewtopic.php?f=7&t=56998 VLC Media Player can do it with playlists for quite awhile
 
 == Feedback ==
 

data/Rakefile

@@ -9,12 +9,13 @@ Jeweler::Tasks.new do |s|
     s.add_dependency 'sane', '>= 0.22.0'
     s.add_dependency 'rdp-win32screenshot', '>= 0.0.7.3'
     s.add_dependency 'mini_magick', '>= 3.1' # for ocr...
+    s.add_dependency 'whichr', '>= 0.3.6'
     s.add_dependency 'jruby-win32ole'
     s.add_dependency 'rdp-ruby-wmi'
     s.add_dependency 'ffi' # mouse, etc.
     s.add_development_dependency 'rspec' # prefer rspec 2 I guess...
     s.add_development_dependency 'jeweler'
-    s.add_development_dependency 'hitimes' # now jruby compat. yea!
+    s.add_development_dependency 'hitimes' # now jruby compat!
     s.extensions = ["ext/mkrf_conf.rb"]
 end
 
@@ -37,7 +38,69 @@ task 'spec' do
     
 end
 
-desc 'collect gem deps for distribution zip'
+def get_transitive_dependencies dependencies
+  new_dependencies = []
+  dependencies.each{|d|
+   gem d.name # make sure it's loaded so that it'll be in Gem.loaded_specs
+   dependency_spec = Gem.loaded_specs.select{|name, spec| name == d.name}[0][1]
+   transitive_deps = dependency_spec.runtime_dependencies
+   new_dependencies << transitive_deps
+  }
+  new_dependencies.flatten
+end
+
+desc 'collect binary and gem deps for distribution'
 task 'bundle_dependencies' => 'gemspec' do
+   require 'whichr'
+   require 'fileutils'
+   require 'net/http'
+  
    spec = eval File.read('sensible-cinema.gemspec')
-end
+   dependencies = spec.runtime_dependencies
+   dependencies = dependencies + get_transitive_dependencies(dependencies)
+   Gem.loaded_specs.select{|name, spec| name == 'os'}
+   FileUtils.rm_rf 'vendor/cache'
+   Dir.mkdir 'vendor/cache'
+   Dir.chdir 'vendor/cache' do
+     dependencies.each{|d|
+       system("gem unpack #{d.name}")
+     }
+     # add imagemagick
+     Dir.mkdir 'imagemagick'
+     im_dir = RubyWhich.new.which('identify').select{|dir| dir =~ /ImageMagick/}[0]
+     #  "d:\\installs\\ImageMagick-6.6.2-Q16\\identify.EXE",
+     Dir["#{File.dirname im_dir}/*"].each{|file|
+       FileUtils.cp(file, 'imagemagick') rescue nil # some fail for some odd reason
+     }
+      
+     # jruby complete .jar file
+     Net::HTTP.start("jruby.org.s3.amazonaws.com") { |http|
+       resp = http.get("/downloads/1.5.5/jruby-complete-1.5.5.jar")
+       open("jruby-complete-1.5.5.jar", "wb") { |file|
+         file.write(resp.body)
+       }
+     }
+     # create a shunt win32ole file, so that require 'win32ole' will work.
+     Dir.mkdir 'lib'
+     File.write('lib/win32ole.rb', 'require "jruby-win32ole"')
+  
+   end # chdir
+  
+end
+
+desc 'create distro zippable file'
+task 'create_distro_dir' do
+  raise 'need  bundle_dependencies first' unless File.directory? 'vendor/cache'
+  require 'fileutils'
+  spec = eval File.read('sensible-cinema.gemspec')
+  require 'ruby-debug'
+  #debugger
+  dir_out = spec.name + "-" + spec.version.version + '/sensible-cinema'
+  FileUtils.rm_rf dir_out + '/..' # in case it exists
+  existing = Dir['*']
+  FileUtils.mkdir_p dir_out
+  FileUtils.cp_r(existing, dir_out)
+  # this one belongs in the trunk
+  FileUtils.cp("#{dir_out}/run_sensible_cinema.bat", "#{dir_out}/..")
+  p 'created ' + dir_out
+end

data/TODO

@@ -12,6 +12,7 @@
 == slightly lower than that ==
 
   auto-select EDL
+    can even tell them a button "play movie x" or what not, has been detected
 
   can parse IMDB (require they put in the URL by hand fer now)
     add stuffs to imdb hmmm
@@ -29,24 +30,19 @@
     can lop off sections to save space (?)
     can burn the extra sections, too?
   easy editor for this style of edit
-  split the two projects cleanly (project, distribution)
+  split the two projects loosely, then cleanly (project, distribution)
   partner (Jon, Karlie if interested...give beta)
   survey/beta release
   a certified clean list (?)
+  better playlist names, like with the DVD title in there :)
 
-== DVD backlog (unordered) ==
+== DVD monetary backlog (unordered) ==
 
 some way to choose between x,y,z when auto-select sees several
 careful phrasing "if you can't afford it..."
 authorize instead of paypal?
-honest about DMCA (we don't distribute the cracker, we don't redistribute, don't perform any acts, etc.)
-if you burn you'll eventually be using a DMCA compatible player :P
-long list of players...we're not alone :)
-one part is probably not against copyright
-the authors of the program might not be liable for damages.  We don't feel dishonest about it, as long as 
-we own the DVD and have it with us when we watch the edited version.
 blu-ray support somehow (real-time? rip?)
-
+legal shtuff (LICENSE)
 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?)
@@ -55,6 +51,12 @@ auto-assignment of EDL's to media:
   DVD's (right click on DVD player, play with SC?)
 a real website (github-y?)
 instructions on how to do their own (private) or do one and submit it (public), or email their friends :P
+double buffering hard drive/copying might speed things, if your HD is fast.
+personalized copier might be faster than the "type" command.
+merge with preferences
+install VLC from .msi where needed.  Pretty low prio...
+For the monetized version: nothing but cut and paste, no merging et al
+mplayer EDL's
 
 == 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). ==
 
@@ -62,10 +64,9 @@ screencast of things helpful (use, creation...).
 tune up the levels...
 prototypes of the experimental stuff (overlay, track time while recording -> map file, specifiable levels, more?)
 
-the overlayer "freeze frames" in vista
-
-0:01:01.9 next will be at 0:01:02.0s (r [or q to quit]):
-0:01:04.0 next will be at 0:01:06.5s (blanked) (r [or q to quit]): "warning--unable to track screen time for some reason" # *of course you can't track it now!*
+fix:
+  0:01:01.9 next will be at 0:01:02.0s (r [or q to quit]):
+  0:01:04.0 next will be at 0:01:06.5s (blanked) (r [or q to quit]): "warning--unable to track screen time for some reason" # *of course you can't track it now!*
 
 byu.tv descriptor
 youtube non full screen: work with all browsers
@@ -76,20 +77,10 @@ a netflix player descriptor
 beep at them when not tracking [?]
   default on...hmm
 
-note that you are watching it using only bits and pieces of the original, similar to said bill.  And the
-authors of the program might not be cupable of copyright infringement themselves, since they distribute no infringed materials.
-
-Not responsible for your actions. Don't redistribute. "You run the risk on your own"
-"should the courts someday rule..."  If DVD next to me...
-
-install VLC from .msi where needed.  Pretty low prio...
-
 An 'edit preferences' button et al.
 
 Just fold if s....
 
-For the monetized version: nothing but cut and paste, no merging et al
-
 a descriptor for some closed source app player...
 
 when saving to hard drive, you can "insert" streams where desired (experimental version only)
@@ -123,25 +114,21 @@ advertise on ruby flow
 
 DRY up :levels--it's in the ocr spec as well as the others...
 
-unit tests pass with normal ruby
+unit tests run with normal ruby
 
-screen time change only detected... [unexpected] [rid myself of it]
-
-when polling for bmp changes, just use two lines (if needed speed-wise?)
-
-super duper VLC
+back off on mouse jerking...only every so often?
+  maybe increase timings as you get farther along, to accomodate for drift?
 
-try new GOCR version...
+screen time change only detected... [unexpected] [rid myself of it]
 
-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)
+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
+itunes video on demand player
 
 blockbuster "rent" on demand player
 
-
 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
@@ -160,25 +147,17 @@ an "online anybody can chat while watching this movie" (or anybody can edit this
 
 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'ers...
-
 code refactors: "screen time change", order should be swapped in bin/x output (just cleanup)
 
-easier installer for windows: release a zip file that they can just click on a .bat file to run it
-  later: it installs/uninstalls appropo
-    suggestion: self-extractor
+easier installation for windows: release a zip file that they can just click on a .bat file to run it
+  later: .msi?
 
 can blank overlay with added text like "and you are one awesome klingon"
 
 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?"
-
-add my stuff to imdb...? wiki?
-
-make youtube work if you have *several* open
+add my stuff to imdb...? make a wiki?
 
 user customizable levels...
   maybe even "I don't like ones that are x, y, z", or "boring level x"
@@ -215,8 +194,6 @@ control location programmatically (using mouse) on the player itself.
 
 compare VLC (and other) timings with a real DVD player, and with netflix online, etc.
 
-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
 
@@ -224,15 +201,15 @@ does my sweet heart have any suggestions? (make it work well for laymen)
 
 web browser plugin?
 
-Programmatically do all of the above, by driving VLC with its real API.
+Programmatically do all of the above, by driving VLC with libvlc (its API).
+  So this would be basically tracking VLC using its libvlc callbacks, instead of screen times
+  fork the Python project?
   VLC
     Allow it to record somehow (recordable)
     use VLC's web interface? telnet?
     optimize it with best appropriate iframes (LOL)
 
-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..
+integrate with google TV...bravia...maybe...somehow...boxxee? roku?
+  itunes TV? apple tv? ps3?
 
---server?  optionally higher prio?
+OCR the captioning as an auto profanity filter? (or perhaps download subtitles to be able to pre-screen), like the python fella does.

data/VERSION

@@ -1 +1 @@
-0.14.4
+0.14.5

data/bin/sensible-cinema

@@ -3,11 +3,20 @@
 puts 'Loading Sensible Cinema...'
 
 require 'rubygems'
+
+def add_any_bundled_gems
+  Dir['vendor/cache/**/lib'].each{|lib_dir|
+    $: << lib_dir
+  }
+end
+
+add_any_bundled_gems
+
 require 'sane' # File.write
-require File.dirname(__FILE__) + '/../lib/swing_helpers'
+require 'ruby-wmi'
+require_relative '../lib/swing_helpers'
 load File.dirname(__FILE__) +  '/sensible-cinema-cli'
 require 'tmpdir'
-require 'ruby-wmi'
 
 module SensibleSwing
  class MainWindow < JFrame
@@ -25,7 +34,7 @@ module SensibleSwing
      jlabel.set_bounds(44,44,136,14)
      panel.add jlabel
      b = JButton.new( "Play Hulu, Youtube, or a DVD (Tracking)" ).on_clicked {
-      Thread.new { go_sc } # needs to be in its own thread becuase it blocks,
+      Thread.new { go_sc([]) } # needs to be in its own thread becuase it blocks,
       # so "this thread" is the uni-swing thread, gets blocked, and the overlayer can't repaint
       self.close
      }
@@ -33,7 +42,7 @@ module SensibleSwing
      b.set_bounds(44,120,button_width,23)
      panel.add b
     
-     c=JButton.new( "Copy edited DVD to Hard Drive" )
+     c=JButton.new( "Copy edited copy of DVD to Hard Drive" )
      c.on_clicked {
        do_copy_dvd_to_hard_drive true
      }
@@ -54,26 +63,39 @@ module SensibleSwing
      @exit.set_bounds(44,320,button_width,23)
      panel.add @exit
     
-     reload = JButton.new( "reload code" ).on_clicked {
-      eval File.read(__FILE__), nil, __FILE__
-      p 're-evaled it'
-     }
-     reload.set_bounds(44,300,200,23)
-     panel.add reload if ARGV.find{|a| a == '--test'}
-     @p = JProgressBar.new(0, 100)
-     @p.set_value 0
-     @p.set_bounds(44,280,button_width,23)
-     panel.add @p
-     @buttons = [b,c,d,@exit]
-    
+     if ARGV.find{|a| a == '--test'}
+       reload = JButton.new( "reload code" ).on_clicked {
+        eval File.read(__FILE__), nil, __FILE__
+        p 're-evaled the code ...'
+       }
+       reload.set_bounds(20,300,20,20)
+       panel.add reload 
+     end
+     
+     @progress_bar = JProgressBar.new(0, 100)
+     @progress_bar.set_bounds(44,280,button_width,23)
+     @progress_bar.visible=false
+     panel.add @progress_bar
+     @buttons = [b,c,d,@exit]    
+   end
+  
+   def vlc_currently_installed?
+     if !system("vlc  --qt-start-minimized vlc://quit")
+       JOptionPane.showMessageDialog(nil, "Appears you do not yet have VLC Media Player installed. Click ok to download it.", "VLC Player not found", JOptionPane::ERROR_MESSAGE)
+       system("start http://www.videolan.org/")
+       false
+     else
+      true
+     end
    end
   
    def do_copy_dvd_to_hard_drive should_save_file
+      return unless vlc_currently_installed?
       drive = choose_dvd_drive
       fc = JFileChooser.new 
       fc.setFileSelectionMode(nil)
       fc.set_dialog_title "Please pick a DVD Edit List File"
-      fc.set_current_directory(JFile.new( __dir__  + "/../zamples/scene_lists/dvds"))
+      fc.set_current_directory(JFile.new( __dir__  + "/../zamples/edit_decision_lists/dvds"))
       edit_list_path = fc.go
       descriptors = YAML.load_file edit_list_path
       
@@ -81,7 +103,7 @@ module SensibleSwing
         fc = JFileChooser.new 
         # LODO allow for spaces in save to file
         fc.set_dialog_title "Pick where to save the file to"
-        save_to_file_name = ((descriptors["title"] || "my dvd") + ' edited').gsub(' ', '_').gsub( /\W/, '') # no punctuation for now...
+        save_to_file_name = ((descriptors["title"] || "my dvd") + ' edited copy').gsub(' ', '_').gsub( /\W/, '') # no punctuation for now...
         fc.setSelectedFile(JFile.new(get_drive_with_most_space_with_slash + save_to_file_name)) 
         save_to = fc.go
       else
@@ -100,8 +122,9 @@ module SensibleSwing
         temp_file = temp_dir + '/' + 'vlc.xspf'
         File.write(temp_file, bat_file_or_xspf)
         command = "vlc \"#{temp_file.to_filename}\" vlc://quit"
-        p 'running', command
-        system(commands) # blocks the current window while running...
+        p 'running playlist: ', command
+        system(command) # blocks the current window while running...
+        p 'done running playlist'
       end
       # TODO warn if they don't have VLC installed, with instructions...
       # LODO warn if they will overwrite a file in the end
@@ -116,15 +139,15 @@ module SensibleSwing
       success = true
       lines = batch_file.lines.to_a
       total_size = lines.length.to_f
+      @progress_bar.visible=true
+      @progress_bar.set_value(0)
       lines.each_with_index{|l, idx|
         if success
-          p 'running', l, 'percent', idx/total_size
-          success = system(l) unless ARGV.find{|a| a == '--test'} # doesn't seem to cancel out early for some reason..
-          @p.set_value(idx/total_size*100)
-          sleep 1
+          success = system(l) unless ARGV.find{|a| a == '--test'} # this doesn't seem to cancel out early for some reason..
+          @progress_bar.set_value(idx/total_size*100)
         end
-      }
-      @p.set_value(0)
+      }      
+      @progress_var.visible=false
       @buttons.each{|b| b.set_enabled true}
       popup.dispose
       if success
@@ -171,7 +194,6 @@ module SensibleSwing
 
  end
 
-
  class GetDisk < JDialog
    attr_reader :selected
    def initialize parent, options_array
@@ -198,16 +220,6 @@ module SensibleSwing
  
 end
 
-require 'os'
-class String
- def to_filename
-   if OS.windows?
-     self.gsub('/', "\\")
-   else
-    self
-  end
- end
-end
 
 SensibleSwing::MainWindow.new.set_visible true
 

data/bin/sensible-cinema-cli

@@ -25,7 +25,7 @@ def go_sc(args)
   
     puts <<-END
   
-    syntax: player_description.yml|test scene_descriptions_list.yml [-t -v --clear-cache] (or nothing to prompt for files)
+    syntax: [player_description.yml|test] edit_decision_list.txt [-t -v --clear-cache] (or nothing at all--it will prompt)
     END
       
     for file in Dir[__dir__ + '../zamples/mute*/*']
@@ -44,27 +44,27 @@ def go_sc(args)
       player_description = FileChooser.choose_file("     SELECT COMPUTER PLAYER", __dir__ + "/../zamples/players")
     end
   
-    scene_list = args.shift.to_s
+    edit_decision_list	 = args.shift.to_s
   
-    if scene_list == 'test'
+    if edit_decision_list	 == 'test'
       overlay = nil
       p 'got test...just doing screen dump'
       $VERBOSE=true # adds some extra output
     else
-      if !File.exist? scene_list
-        puts 'Select Scene Descriptions file'
-        scene_list = FileChooser.choose_file("     SELECT SCENE DESCRIPTIONS FILE", __dir__  + "/../zamples/scene_lists")
+      if !File.exist? edit_decision_list	
+        puts 'Select Edit Decision List'
+        edit_decision_list	 = FileChooser.choose_file("     SELECT EDIT DECISION LIST", __dir__  + "/../zamples/edit_decision_lists")
       end
       
-      if !scene_list
+      if !edit_decision_list	
         puts "error: have to specify a scene descriptions file\n    or specify \"test\" on the command line if you just want to snapshot your player"
         exit 1
       end
       
-      puts 'Selected scene descriptions file ' + File.basename(scene_list) + "\n\t(full path: #{scene_list})"
+      puts 'Selected scene descriptions file ' + File.basename(edit_decision_list) + "\n\t(full path: #{edit_decision_list})"
       Blanker.startup
       # todo start it late as it has an annoying startup blip
-      overlay = OverLayer.new(scene_list)    
+      overlay = OverLayer.new(edit_decision_list	)    
     end  
     
     if File.exist? player_description.to_s
@@ -88,7 +88,7 @@ def go_sc(args)
     
     OCR.unserialize_cache_from_disk # do this every time so we don't delete it if they don't have one...
   
-    puts "Opening the curtains... (please play in player now)"
+    puts "Opening the curtains... (please play in your other player now)"
     overlay.start_thread true
     key_input = KeyboardInput.new overlay
     key_input.start_thread # status thread
@@ -96,7 +96,7 @@ def go_sc(args)
       Blanker.shutdown # lodo move this and the 'q' key to within overlayer
       OCR.serialize_cache_to_disk
     }
-    puts 'syntax from command line: ' + player_description + ' ' + scene_list
+    puts "syntax from command line: #{player_description} #{edit_decision_list}"
     key_input.handle_keystrokes_forever # blocking...
     
   end

data/lib/ocr.rb

@@ -1,5 +1,13 @@
-im_path = File.expand_path(File.dirname(__FILE__) + "/../vendor/imagemagick") # convert.exe wants to only be chosen from here...
-#ENV['PATH'] = im_path + ';' + ENV['PATH']
+require 'sane' # gem
+require 'whichr' # gem
+require_relative 'swing_helpers' # to_filename lodo not have it there
+im_path = File.expand_path(File.dirname(__FILE__) + "/../vendor/cache/imagemagick") # convert.exe wants to only be chosen from here...
+ENV['PATH'] = im_path.to_filename + ';' + ENV['PATH']
+
+if RubyWhich.new.which('identify').length == 0 || RubyWhich.new.which('convert').length == 0
+ # for gem users, so I don't have to bundle it :P
+ raise 'appears you do not have imagemagick installed (or not in your path) -- please install it! http://www.imagemagick.org/script/binary-releases.php'
+end
 
 # helper for OCR'ing single digits that were screen captured
 module OCR

data/lib/overlayer.rb

@@ -106,7 +106,7 @@ class OverLayer
         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
+          p 'warning--possible error in the Edit Decision List 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