sensible-cinema 0.14.6 → 0.15.0

data/VERSION

@@ -1 +1 @@
-0.14.6
+0.15.0

data/bin/sensible-cinema

@@ -2,22 +2,21 @@
 
 puts 'Loading Sensible Cinema...'
 
-require 'rubygems'
+require File.dirname(__FILE__) + "/../lib/add_any_bundled_gems_to_load_path.rb"
+require 'sane'
 
-def add_any_bundled_gems
-  Dir['vendor/cache/**/lib'].each{|lib_dir|
-    $: << lib_dir
-  }
+for file in ['vlc_programmer']
+  require_relative '../lib/' + file
 end
 
-add_any_bundled_gems
-
-require 'sane' # File.write
 require 'ruby-wmi'
+require 'tmpdir'
 require_relative '../lib/swing_helpers'
 require_relative '../lib/drive_info'
-load File.dirname(__FILE__) +  '/sensible-cinema-cli'
-require 'tmpdir'
+
+# add some common locations for vlc.exe to the path...
+# lodo use the registry to pull out the 'right' path...
+ENV['PATH'] = ENV['PATH'] + ";C:\\Program Files\\VideoLAN\\VLC"+ ";D:\\Program Files\\VideoLAN\\VLC" + ";E:\\Program Files\\VideoLAN\\VLC"
 
 module SensibleSwing
  class MainWindow < JFrame
@@ -35,6 +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 {
+      load File.dirname(__FILE__) +  '/sensible-cinema-cli'
       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
@@ -119,7 +119,7 @@ module SensibleSwing
       if should_save_file
         fc = JFileChooser.new 
         # LODO allow for spaces in the save to file
-        fc.set_dialog_title "Pick where to save the file to"
+        fc.set_dialog_title "Pick where to save #{dvd_title || "the file"} edited to"
         save_to_file_name = ((dvd_title || "my dvd") + ' edited copy').gsub(' ', '_').gsub( /\W/, '') # no punctuation for now...
         fc.setSelectedFile(JFile.new(DriveInfo.get_drive_with_most_space_with_slash + save_to_file_name)) 
         save_to = fc.go
@@ -128,25 +128,28 @@ module SensibleSwing
       end
       dvd_title_track = descriptors["dvd_title_track"]
       bat_file_or_xspf = VLCProgrammer.convert_to_full_xspf(descriptors, save_to, drive, dvd_title_track, dvd_title)
+ 
+      temp_dir = Dir.tmpdir
+      temp_file = temp_dir + '/' + 'vlc.temp.xspf'
+      File.write(temp_file, bat_file_or_xspf)
+      puts bat_file_or_xspf
       if should_save_file
-        
-        popup = ModeLessDialog.new("Running edit list #{File.basename edit_list_path} against #{drive} (#{dvd_title})...\n" +
-          "Copying to #{save_to}.\n" + 
+        popup = ModeLessDialog.new(          "Copying to #{save_to}.\n" + 
+          "Running edit list #{File.basename edit_list_path} against \n" +
+           "    #{drive} (#{dvd_title})...\n" +
           "This could take quite awhile, and will prompt you when it is done.\n" +
           "It may also cause small popup ballon dialogs to appear.\n" +
           "You can close this window and continue working while it runs.",
-          "OK")
+          "OK")      
         
         # this allows our popups to still be serviced while it is running
         Thread.new {
           run_copy_commands bat_file_or_xspf, save_to
+          popup.dispose
         }
       else
-       temp_dir = Dir.tmpdir
-        temp_file = temp_dir + '/' + 'vlc.temp.xspf'
-        File.write(temp_file, bat_file_or_xspf)
         command = "vlc \"#{temp_file.to_filename}\" vlc://quit"
-        p 'running playlist for DVD: ', command
+        puts 'running playlist for DVD: ', command
         system(command) # blocks the current window while running...
         p 'done playing DVD'
       end
@@ -169,14 +172,13 @@ module SensibleSwing
       }
       @progress_bar.visible=false
       @buttons.each{|b| b.set_enabled true}
-      popup.dispose
       if success
         JOptionPane.showMessageDialog(nil, " Done--you may now watch file #{save_to}.ps in VLC player", "Done!", JOptionPane::INFORMATION_MESSAGE)
         show_file = "explorer /e,/select,\"#{File.expand_path(save_to).to_filename}.ps\""
         system show_file
         self.close
       else
-        JOptionPane.showMessageDialog(nil, " Failed--please examine #{temp_file} and screen output and report back!", "Failed", JOptionPane::ERROR_MESSAGE)
+        JOptionPane.showMessageDialog(nil, " Failed--please examine screen output and report back!", "Failed", JOptionPane::ERROR_MESSAGE)
       end
    end
   

data/bin/sensible-cinema-cli

@@ -1,15 +1,14 @@
 #!/usr/bin/ruby
 
-require 'rubygems'
+require File.dirname(__FILE__) + "/../lib/add_any_bundled_gems_to_load_path.rb"
 require 'sane'
 
-Thread.abort_on_exception=true #gah
+Thread.abort_on_exception=true # gah
 
 for file in ['overlayer', 'keyboard_input', 'screen_tracker', 'mouse', 'file_chooser', 'ocr', 'vlc_programmer']
   require_relative '../lib/' + file
 end
 
-
 def go_sc(args)
   
   $VERBOSE = 1 if args.delete('-v')
@@ -96,7 +95,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} #{edit_decision_list}"
+    puts "syntax from command line: \"#{player_description}\" \"#{edit_decision_list}\""
     key_input.handle_keystrokes_forever # blocking...
     
   end

data/experimental_readme.txt

@@ -0,0 +1,83 @@
+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, 
+during the scenes specified.
+
+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 etc.
+
+== How to Use ==
+
+Start playing your movie in its respective player, then startup sensible-cinema by running the file
+run_sensible_cinema.bat
+
+It prompts you for an EDL (Edit decision List) file (ex: bambi.txt), 
+and also for a player file (ex: hulu_full_screen.txt).
+
+Sensible-cinema will now run in a console window, screen tracking the player to monitor its position,
+and react'ing appropriately.
+
+It is presumed that you'll then minimize sensible-cinema and proceed to enjoy the movie.
+
+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.
+
+== How to install ==
+
+You'll need to install imagemagick first: http://www.imagemagick.org/script/binary-releases.php
+
+Next go and get the program: http://rogerdpack.t28.net
+  
+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 show you a few "demo" mutes and blank outs.
+
+== FAQ ==
+
+Q. Can I watch movies this way on my TV, not just on my computer?
+
+A. Maybe.  Or possible not yet, depending on your current hardware.
+   Currently you'll either need to attach your computer to your TV
+   (buy some long cables, or a new graphics card that matches your cables, etc.) 
+   or get some computer that you can move closer to the TV to do the same 
+   (ex: buy a used older laptop with s-video out, use that, or a laptop with DVI/HDMI would
+   work with an HDMI TV).  If you're really aggressive you could run an ethernet cable from your computer, as well [1].
+   I'd be happy to do a linux port of sensible-cinema if anybody requests it, for use with 
+   their dedicated TV computer.
+   There has also been some work toward getting ones computer to stream "live" to your existing wii/ps3/xbox.
+   Message me if you're interested in trying it out (testers wanted--plus I'll only work on it if there's demand)!   
+
+Q. What movies does this work with?
+
+A. Any that you program it for :) (Assuming the computer player is compatible, which most probably are.)
+
+Q. What movies are freely available to watch online?
+
+A. Not many are available free (hulu, youtube have a few). Netflix has quite a few with its default subscription.  
+   You can of course use it with any existing DVD, or rent or borrow DVD's and watch them using sensible-cinema.
+
+Q. Why does my mouse bounce up and down while sensible-cinema is going?
+
+A. This enables your player to keep its on-screen time tracker, which in turn allows sensible-cinema to track where 
+   you're at.  Message me if this bugs you too much and we'll see what we can do about it.
+
+[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:
+
+first install jruby, then
+
+C:\> jruby -S gem install sensible-cinema (double check if that gives you the latest version)
+
+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.
+
+== Thanks ==
+
+Thanks to Jarmo for the win32-screenshot gem, mini_magick gem authors, jruby guys, etc.  
+The combination made programming this actually something of a pleasure.

data/ext/mkrf_conf.rb

@@ -1,6 +1,7 @@
 raise 'must be using jruby to be able to run this...at least for now' unless RUBY_PLATFORM =~ /java/
 
 # reset the OCR cache...
+require 'rubygems'
 require File.dirname(__FILE__) +  '/../lib/ocr'
 OCR.clear_cache!
 

data/lib/add_any_bundled_gems_to_load_path.rb

@@ -0,0 +1,14 @@
+
+def add_any_bundled_gems_to_load_path
+  raise 'no vendor dir?' unless File.directory? 'vendor'
+  if File.directory? 'vendor/cache'
+    Dir['vendor/cache/**/lib'].each{|lib_dir|
+      $: << lib_dir
+    }
+  else
+    require 'rubygems'
+    # they'll need imagemagick installed, as well, currently
+  end
+end
+
+add_any_bundled_gems_to_load_path

data/lib/mencoder_wrapper.rb

@@ -0,0 +1,98 @@
+if $0 == __FILE__
+  require 'rubygems'
+  require 'sane'
+end
+
+require_relative 'vlc_programmer'
+
+class MencoderWrapper
+
+  class << self
+  
+    def get_header this_drive
+      if File.exist?(@big_temp) && File.exist?(@big_temp + '.done')
+        ''
+      else
+        "call mencoder dvd:// -oac copy -lavcopts keyint=1 -ovc lavc -o #{@big_temp} -dvd-device #{this_drive} && echo got_file > #{@big_temp}.done\n"
+      end
+    end
+    
+    def get_bat_commands these_mutes, this_drive, to_here_final_file, start_here = nil, end_here = nil
+      combined = VLCProgrammer.convert_incoming_to_split_sectors these_mutes
+      
+      if start_here || end_here
+        raise 'need both' unless end_here && start_here
+        start_here = OverLayer.translate_string_to_seconds(start_here)
+        end_here   = OverLayer.translate_string_to_seconds(end_here)
+        combined.select!{|start, endy, type| start > start_here && endy < end_here }
+        # it's relative now, since we rip from not the beginning
+        raise Exception.new('unable to find any edit decisions to do within that range') unless combined.length > 0
+        previous_end = start_here
+      else
+        previous_end = 0
+      end
+      @big_temp = to_here_final_file + ".fulli.tmp.avi"
+      out = get_header this_drive
+      @idx = 0
+      combined.each {|start, endy, type|
+        if start > previous_end
+          out += get_section previous_end, start, false, to_here_final_file
+        end
+        # type is either mute or :blank or :mute
+        if type == :blank
+         # do nothing... clip will be skipped
+        else
+          out += get_section start, endy, true, to_here_final_file
+        end
+        previous_end = endy
+      }
+      out += get_section previous_end, end_here || 1_000_000, false, to_here_final_file
+      partials = (1..@idx).map{|n| "#{to_here_final_file}.#{n}.avi"}
+      
+      out += "del #{to_here_final_file}\n"
+      # ridiculous
+      out += "call mencoder #{partials.join(' ')} -o #{to_here_final_file}.smplayer_or_vlc.avi -ovc copy -oac copy\n"
+      # LODO only do this if they want to watch it on their computer, with something other than smplayer, or want to make it smaller, as it takes *forever* longer
+      # LODO the "insta play" mode, or the "faster rip" mode (related...)
+      # out += "call mencoder -oac lavc -ovc lavc -of mpeg -mpegopts format=dvd:tsaf -vf scale=720:480,harddup -srate 48000 -af lavcresample=48000 -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=18:vstrict=0:acodec=ac3:abitrate=192:aspect=16/9 -ofps 30000/1001  #{partials.join(' ')} -o #{to_here_final_file}\n"
+
+      out += "@rem del #{@big_temp}\n" # LODO      
+      out += "@rem del " + partials.join(' ') + "\n"# LODO
+      out += "echo wrote to #{to_here_final_file}.smplayer_or_vlc.avi"
+      out
+    end
+    
+    def get_section start, endy, should_mute, to_here_final_file    
+      raise if start == endy # should never actually happen...
+      # delete 0.001 as per wiki's suggestion.
+      endy = endy - start - 0.001
+      # very decreased volume is like muting :)
+      # LODO can we copy more here? ntsc-dvd supposedly remuxes...
+      codecs = should_mute ? "-vcodec copy -acodec ac3 -vol 0 " : "-vcodec copy -acodec copy " # LODO not have the ac3...hmm...
+      # ffmpeg -i from_here.avi   -vcodec copy -acodec copy -ss 1:00 -t 1:00 out.avi
+      partial_filename = to_here_final_file + '.' + (@idx += 1).to_s + '.avi'
+      "del #{partial_filename}\ncall ffmpeg -i #{@big_temp} #{codecs} -ss #{start} -t #{endy} #{partial_filename}\n"
+    end
+  
+  end
+
+end
+
+if $0 == __FILE__
+  require 'rubygems'
+  require 'sane'
+  puts 'syntax: yaml_file_name d:\ output (00:15 00:25) (--run)'
+  a = YAML.load_file ARGV.shift
+  drive = ARGV.shift
+  raise 'wrong drive' unless File.exist?(drive + "AUDIO_TS")
+  execute = ARGV.delete('--run')
+  commands =MencoderWrapper.get_bat_commands(a, drive, *ARGV)
+  if ARGV.length > 2
+    write_to = 'range.bat'
+  else
+    write_to = 'all.bat'
+  end
+  File.write(write_to, commands)
+  print 'wrote ' + write_to
+  system(write_to) if execute
+end

data/lib/ocr.rb

@@ -6,7 +6,8 @@ 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'
+ puts 'appears you do not have imagemagick installed (or not in your path) -- please install it first! http://www.imagemagick.org/script/binary-releases.php'
+ sleep 100
 end
 
 # helper for OCR'ing single digits that were screen captured

data/lib/overlayer.rb

@@ -192,7 +192,7 @@ class OverLayer
       end
     end
     check_reload_yaml
-    time + state + "(r [or ctrl+c to quit]): "
+    time + state + "(r [ctrl+c or q to quit]): "
   end
 
   def keyboard_input char

data/lib/screen_tracker.rb

@@ -1,7 +1,7 @@
 require 'win32/screenshot'
 require 'sane'
 require 'yaml'
-require_relative 'ocr'
+require File.dirname(__FILE__)+ '/ocr'
 
 class ScreenTracker
   
@@ -34,7 +34,7 @@ class ScreenTracker
     @height = height
     @x = x; @y = y; @x2 = x+width; @y2 = y+height; @callback = callback    
     @max_x = max_x
-    raise 'poor width or wrong window' if @x2 > max_x  || @x2 == x
+    raise "poor width or wrong window #{@x2} #{max_x} #{x}" if @x2 > max_x  || @x2 == x
     if @y2 > max_y || @y2 == y
       raise 'poor height or wrong window' 
     end

data/lib/vlc_programmer.rb

@@ -1,21 +1,13 @@
 require_relative 'overlayer'
 
-# add some common locations for vlc.exe to the path...
-ENV['PATH'] = ENV['PATH'] + ";C:\\Program Files\\VideoLAN\\VLC"+ ";D:\\Program Files\\VideoLAN\\VLC" + ";E:\\Program Files\\VideoLAN\\VLC"
-
 class VLCProgrammer
 
   def self.to_english s
     @overlayer ||= OverLayer.allocate
     @overlayer.translate_time_to_human_readable s
   end
-
-  def self.convert_to_full_xspf incoming, filename = nil, drive_with_slash = nil, dvd_title_track = nil, dvd_title_name = nil
   
-    @drive = drive_with_slash || "e:\\"
-    @filename_or_playlist_if_nil = filename
-    @dvd_title_track = dvd_title_track || "1"
-    @dvd_title_name = dvd_title_name
+  def self.convert_incoming_to_split_sectors incoming
     mutes = incoming["mutes"] || {}
     blanks = incoming["blank_outs"] || {}
     mutes = mutes.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v), :mute]}
@@ -59,23 +51,39 @@ class VLCProgrammer
         raise 'unexpected'
       end
     }
+    
+    combined.select{|start, endy, type|
+     (start != nil) && (endy > start) # ignore mutes wholly contained within blanks...
+    }
+  end
 
+  def self.convert_to_full_xspf incoming, filename = nil, drive_with_slash = nil, dvd_title_track = nil, dvd_title_name = nil
+  
+    @drive = drive_with_slash || "e:\\"
+    @filename_or_playlist_if_nil = filename
+    @dvd_title_track = dvd_title_track || "1"
+    @dvd_title_name = dvd_title_name
+    combined = convert_incoming_to_split_sectors incoming
+    
     out = get_header
 
     previous_end = 0
     idx = 0
 
     combined.each{|start, endy, type|
-      next unless start
-      next if endy <= start # ignore mutes wholly contained within blanks
-
+     # next unless start
+      #next if endy <= start 
+      real_start = start # NB that this fails with VLC or mplayer, because of i-frame difficulties (google mencoder start time)
       if previous_end != start
-        # play up to next "questionable section"
-        out += get_section("#{@dvd_title_name} : #{to_english previous_end} to #{to_english start} (clean)", previous_end, start, idx += 1)
+        # play 'uncut' up to next "questionable section"
+        out += get_section("#{@dvd_title_name} : #{to_english previous_end} to #{to_english start} (clean)", previous_end, real_start, idx += 1)
+      else
+        # immediately let it do the next action
       end
+      
       # now play through the muted section...
       if type == :mute
-        out += get_section "#{@dvd_title_name} : #{to_english start}s to #{to_english endy}s muted", start, endy, idx += 1, true
+        out += get_section "#{@dvd_title_name} : #{to_english start}s to #{to_english endy}s muted", real_start, endy, idx += 1, true
       end
       previous_end = endy
     }
@@ -100,7 +108,7 @@ class VLCProgrammer
   end
   
   def self.get_section title, start, stop, idx, no_audio = false
-    loc = "dvd://#{@drive}@#{@dvd_title_track}"
+    loc = "dvdsimple://#{@drive}@#{@dvd_title_track}"
     if @filename_or_playlist_if_nil == nil
       "<track>
       <title>#{title}</title>
@@ -125,9 +133,9 @@ class VLCProgrammer
     filename = @filename_or_playlist_if_nil
     files = (1..idx).map{|n| "#{filename}.ps.#{n}"}
     # concat
-    line = 'type ' + files.join(' ')
-    line += " > #{@filename_or_playlist_if_nil}.ps\n"    
-    line += "rm " + files.join(' ') + "\n"
+    line = 'copy /b ' + files.join('+')
+    line += " #{@filename_or_playlist_if_nil}.ps\n"    
+    line += "@rem del " + files.join(' ') + "\n" # LODO!
     line += "echo Done--you may now watch file #{filename}.ps in VLC player"
    end