sensible-cinema 0.18.4 → 0.19.0

data/ChangeLog

@@ -1,3 +1,9 @@
+== 0.19.0 ==
+
+Add working EDL playback with mplayer, cleanup interfaces.
+Also add ability to arbitrarily "enlargen" the scope of edit decisions (in this case, mutes), to match
+(either paranoia or) mplayer playback, useful for daily normal use, too, in principle.
+
 == 0.18.3 ==
 
 Cleanup UI, make more user friendly in a few circumstances, for create, fix buttons.

data/README

@@ -1,23 +1,33 @@
-Sensible-cinema (also known as "paranoid cinema" [inside joke] ) is a program that allows you to apply 
-programmed edit lists (Edit Decision Lists [2]) to DVD's.
-I.e. you can edit a DVD to "mute out" or "bleep out" scenes, or skip them.
+Sensible-cinema (also known to us as "paranoid cinema" [inside joke ha ha] ) is a program that allows you to apply 
+programmed edit lists (i.e. Edit Decision Lists) to DVD's you own [2].
+
+I.e. you can edit a DVD to "mute out" or skip certain scenes.
 
 It is essentially a linear editor [1] that applies Edit Decision Lists [2] to videos, by wrapping
-a few freely available open source (GPL) programs [3] (VLC Media Player, Mplayer/mencoder, ffmpeg et al)
-to accomplish the editing.
+a few freely available open source programs [3] (VLC Media Player, Mplayer/mencoder, ffmpeg et al)
+to accomplish the editing for you.  Then you can sit back and relax as you watch a "sanitized"
+version of your DVD.
 
-To use it, basically install then run it (see below).
+To use it, basically install it then run it (see installation section, below).
 It will come up with some windows where you choose what you want to do
-(edit an edit list, use an edit decision list to edit a DVD, etc.)
 
 If you try to make an edited copy of your DVD, note that it will take about one and a half times
 as long as the playtime of the movie itself, so budget some time for it.
 
-Enjoy!
+Also note that just because a video lacks profanity...does not immediately make it an inspiring experience.
+I'd suggest carefully evaluating your motives, and going with those.
+Sensible cinema does not a clean movie make of a dirty one.  Don't watch it if it's not wholesome! Be nice to yourself!
+dove.org is a good reference for discovering the "uplifting" level of movies [4].  And of course sensible cinema does help
+a little bit.
+Also note that even if you have an edited copy of a DVD floating around, if you have kids, chances are they
+will eventually find (and watch) the unedited originals, so be careful there, and do what is needful.
+
+Enjoy your movies!
 
 [1] http://en.wikipedia.org/wiki/Linear_video_editing
 [2] http://en.wikipedia.org/wiki/Edit_decision_list
-[3] http://www.gnu.org/licenses/
+[3] mostly GPL programs, see http://www.gnu.org/licenses/
+[4] http://lds.org/library/display/0,4945,161-1-11-1,00.html search for the word "wholesome"
 
 == Installation ==
 
@@ -125,6 +135,8 @@ Clean Flicks (used to) sell edited movies
 http://www.mplayerhq.hu/DOCS/HTML/en/edl.html
 http://www.oreillynet.com/sysadmin/blog/2005/06/make_your_own_phantom_edit_wit.html (mplayer has had this ability for awhile, with no complaints).
 http://clearplay.com a commercial editing player (tracks DVD's while they play--closed source, costs money, no user contribution possible), and only for DVD's.
+  It does offer a few features that sensible cinema disables, for patent reasons, like automatic (user flexible) content decisions.  Ours are manual.
+  Theirs is also a DVD "instant" player, which this is not, except on computer, though you must use theirs, etc (see motivation section, above).
 http://en.wikipedia.org/wiki/RiffTrax has an interesting idea of "overlaying" audio over the original video, and synchronizing between the two (their re-player does, anyway).
 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
@@ -132,6 +144,7 @@ http://wiki.xbmc.org/?title=EDL_(commercial_skipping)_and_SceneMarker_support (X
 http://dvdshrink.info "Re-author" mode: to make "movie-only" backups, compilations, combine "flippers",.... DvdShrink has the ability to "crop or cut parts of a title" etc.
 The VCR with its record button, coupled with the stop+rewind button.
 http://code.google.com/p/movie-content-editor (written in Python, controls VLC based on captions and edit decision lists, in realtime)
+http://forums.gbpvr.com/showthread.php?10606-Automated-Cutting-and-Transcoding-Guide-Using-Mencoder/page45
 http://www.imdb.com/swiki/special?ParentalGuideHelp (search for "scene description")
 http://www.mythtv.org/wiki/Removing_Commercials
 Using the remote control with the pause, mute, stop, fast forward, and play buttons, along with previous knowledge of scene locations
@@ -155,6 +168,13 @@ to your EDL and try again.
 
 Also if your DVD playback has no audio, try the "lavc" setting, above.  And report it (see feedback).
 
+It can fail also because an edit decision is past end of DVD, or 
+Also note that if your DVD has scratches that cause it to skip, the time signatures will be off after that point, 
+so clean your discs and try again!
+
+Also you could try a different computer (desktop computers' DVD drives seem to work better at times than laptops')
+
+
 == Feedback ==
 
 Feedback, including feature requests, comments, etc. welcome.

data/RUN SENSIBLE CINEMA CLICK HERE.bat

@@ -2,4 +2,5 @@
 @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! Please report back the error you see! && pause
+@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! Please report back the error you see! && pause
+@rem taskkill /f /im mencoder.exe

data/Rakefile

@@ -108,7 +108,7 @@ task 'create_distro_dir' do
   FileUtils.mkdir_p dir_out
   FileUtils.cp_r(existing, dir_out)
   # this one belongs in the trunk
-  FileUtils.cp(Dir["#{dir_out}/*.bat"], "#{dir_out}/..")
+  FileUtils.cp(Dir["#{dir_out}/*.bat"].reject{|f| f =~ /go.*bat/}, "#{dir_out}/..")
   p 'created (still need to zip it) ' + dir_out
 end
 

data/TODO

@@ -3,39 +3,47 @@
 == up next release ==
 
   edit lists:
-    temple
     cool runnings
-    cars
+  make sure release has right .bat files
     
 == slightly lower than that, somewhat ordered ==
 
-  research into edl dvdnav being flaky...
-    especially with arrows...
-  kill mencoder instances always, even if hard in jruby 1.5 :)
-    how can I get the return val tho? processbuilder gem?
-  all dogs edit list
-  compare computer DVD timings with physical player...
-  mpeg is lossy (at least my current one pass one is)
-  could check if DVD Flick handles *oversize* files well, for information sake 
+  linearize edl's
+    don't use them linear, just linearize
+  
+  edit lists:
+    temple
+    cool runnings
+    cars
+  compare computer DVD timings with physical player's timings...
+    if same, add imdb todo's here
+  mpeg is lossy (at least my current one pass conversion is)
+  check the DVD burning experience too...
+    could check if DVD Flick handles *oversize* files well, for information sake 
   partner for filters (Jon, Karlie if interested...give beta)
     lotsa filters somehow
       my dvd's (loose timestamps...)
       partners'...
+      only after linearize
   beta release/rinse and repeat with various ppl (once it's releasable...)
   a real'ish-er website
     mailing list, link to it
   play a bigger noise when totally done...(dvd flick'ish...)
-  make them acknowledge "just because it lacks profanity...does not immediately make it an inspiring experience."
-    note that this can corrupt your soul!
-    don't watch it if it's dark! come on!
-    dove.org, your kids will find the originals!
-
+  propaganda-ize
+    advertise in christian places
+    alternative.to
+    blogs that have ever mentioned clearplay :P
+    free google adwords (?)
+    advertise urug, ruby flow :)
+  add they 'play from unedited till it hits the first bad spot
+  
 == DVD backlog (unordered, some very low prio, basically never do) ==
 
   disallow choosing empty drive? fail more gracefully? (issue 11)
   some status bar that shows which DVD is in currently, how many match it, et al (pre button)
   splitter abs. coords option
   video on how to use imdb
+    if times match DVD players
   alternate endings
   @ffmpeg there's no audio when going mpg -> mpg with copy!
   @mplayer you *die* with edl's on many DVD's... ex: on bunny one
@@ -44,9 +52,6 @@
   can pull from imdb at package time [?]
   delete fulli file
     except if it's a specific scene run...
-  bundle 7z [?]
-   if license agreement allows
-   thinking not though...
   mencoder harddup useful?
   .exe installer
     just unzips, runs the .bat file for them [?] :)
@@ -55,11 +60,6 @@
   split EDL's somehow into their own project/LLC...
   add md5 "warning" when something (anything) had failed disc fails doesn't match because of read failure...
   not loop on preview view (smplayer)
-  propaganda-ize
-    advertise in christian places
-    alternative.to
-    blogs that have ever mentioned clearplay :P
-    free google adwords (?)
   LLC before ever pay anyone, if I ever do
   @DVD flick: support multi-track audio/subtitles (if they're already in the streams...)
   note the mplayer/smplayer as a player fast forward feature...
@@ -94,7 +94,6 @@
   imagemagick (ffmpeg) easier install...
   DRY up dependency installation code
   install dep's to cache2 or something...so I can cleanup the deploy code...
-  advertise urug, ruby flow :)
   "Re-run most recent" disabled when there isn't one [?]
   re-do DVD EDL's that need it :P
   warn when labels exist and don't match...
@@ -343,3 +342,5 @@ something like you watch it *with* you friends and can all chat together...hmm..
 donate money to several projects I use/like :)
 
 @mencoder: ripping like this results in an (avidemux, VLC) fourcc of 'ugh':  mencoder2 dvdnav://1  -oac copy -ovc copy -o D:\raw_rip_mpeg_example.avi -endpos 20 -dvd-device E:\
+
+@jruby: system("mencoder") from a button doesn't get interrupted by an exception [!]

data/VERSION

@@ -1 +1 @@
-0.18.4
+0.19.0

data/bin/sensible-cinema

@@ -17,7 +17,7 @@ This file is part of Sensible Cinema.
     along with Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-puts 'Loading Sensible Cinema...'
+print 'Loading Sensible Cinema...'
 
 require File.dirname(__FILE__) + "/../lib/add_any_bundled_gems_to_load_path.rb"
 require 'sane' # failure here means you haven't bundled your dependencies...[rake task]
@@ -40,6 +40,9 @@ for drive in ['c', 'd', 'e']
 end
 
 module SensibleSwing
+  VERSION = File.read(File.dirname(__FILE__) + "/../VERSION").strip
+  puts "v. " + VERSION
+  
   class MainWindow < JFrame
 
     def new_jbutton title, only_on_create_mode
@@ -74,15 +77,12 @@ module SensibleSwing
     
     # make them choose which system call to use explicitly
     undef system
-
     def initialize
       super "Sensible-Cinema"
-      version = File.read(File.dirname(__FILE__) + "/../VERSION")
-      puts "v. " + version.strip
-      if !(Storage['main_license_accepted'] == version)
+      if !(Storage['main_license_accepted'] == VERSION)
         show_blocking_license_accept_dialog 'Sensible Cinema', 'gplv3', 'http://www.gnu.org/licenses/gpl.html'
         show_blocking_license_accept_dialog 'Sensible Cinema', 'LICENSE file', File.expand_path(File.dirname(__FILE__) + "/../LICENSE.TXT"), 'LICENSE file', 'I acknowledge that I have read the LICENSE file.'
-        Storage['main_license_accepted'] = version
+        Storage['main_license_accepted'] = VERSION
       end
 
       setDefaultCloseOperation JFrame::EXIT_ON_CLOSE
@@ -108,18 +108,20 @@ module SensibleSwing
       @mplayer_edl = new_jbutton( "Watch DVD on computer edited realtime", false )
       @mplayer_edl.on_clicked {
         drive, dvd_volume_name, md5sum, edl_path, descriptors = choose_dvd_and_edl_for_it
+        descriptors = EdlParser.parse_file edl_path
         temp_dir = Dir.tmpdir
         temp_file = temp_dir + '/mplayer.temp.edl'
-        edl_contents = MplayerEdl.convert_to_edl descriptors
+        edl_contents = MplayerEdl.convert_to_edl descriptors, 1.75 # add a sec to mutes to accomodate for mplayer's oddness...
         File.write(temp_file, edl_contents)
         title_track = get_title_track(descriptors)
         # oh the insanity of the console UI...LODO more user friendly player
-        popup = NonBlockingDialog.new("Running mplayer.  To control it, use space for pause.\n
+        @popup ||= NonBlockingDialog.new("Running mplayer.  To control it, use space for pause.\n
         Also right and left arrows to seek, F key for full screen,
         q to quit.")
-        # LODO dry up mplayer opts...
-        command =  "mplayer dvdnav://#{title_track} -nocache -alang en -sid 1000 -edl #{File.expand_path temp_file} -dvd-device #{drive}"
-        Thread.new { system_blocking command; popup.dispose }
+        # LODO dry up mplayer dvd opts...
+        command =  "mplayer dvd://#{title_track} -nocache -alang en -sid 1000 -edl #{File.expand_path temp_file} -dvd-device #{drive}"
+        p command
+        Thread.new { system_blocking command; @popup.dispose }
       }
 
       @watch_unedited = new_jbutton("Watch a DVD unedited (while grabbing to hard drive)", true)
@@ -453,11 +455,11 @@ EOL
       lines.each_with_index{|line, idx|
         if success
           puts "running #{line}"
-          success = system_blocking(line) unless ARGV.find{|a| a == '--test'} # this might not actually cancel out early for some reason...
+          success = system_blocking(line)
           if line =~ /@rem /
             success = true # these fail fof some reason?
           else
-            p 'line failed: ' + line + ' maybe time frame is past end of DVD, or Also note that if your DVD has scratches that cause it to skip, the time signatures will be off, so clean your discs!' unless success
+            puts "\n", 'line failed: ' + line + "\n" + '   see troubleshooting in README.txt file!' unless success
           end
         end
         @progress_bar.set_value(10 + idx/total_size*90)
@@ -469,9 +471,10 @@ EOL
         if run_mplayer
           system_non_blocking "smplayer #{saved_to}"
         else
-          NonBlockingDialog.new(" Done--you may now watch file #{saved_to} in SMPlayer or VLC player")
+          # lodo NonBlockingDialog once it can get to the top instead of being so buried...
           show_file = "explorer /e,/select,\"#{File.expand_path(saved_to).to_filename}\""
-          system_non_blocking show_file
+          system_blocking show_file # returns immediately
+          show_blocking_message_dialog "Done--you may now watch file #{saved_to} in SMPlayer or VLC player"
         end
       else
         show_blocking_message_dialog("Failed--please examine screen output and report back!\nAlso consult the troubleshooting section of the README file.", "Failed", JOptionPane::ERROR_MESSAGE)
@@ -534,6 +537,7 @@ EOL
 end
 
 if $0 == __FILE__
-  SensibleSwing::MainWindow.new.set_visible true
+  a = SensibleSwing::MainWindow.new
+  a.set_visible true
   puts 'Please use the Sensible Cinema GUI window popup...'
 end

data/create or edit sensible cinema decision list files.bat

@@ -2,4 +2,5 @@
 @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 --create-mode || echo you need to install java first! please report back the error you see! && pause
+@cd sensible-cinema && java -cp "./vendor/cache/jruby-complete-1.5.5.jar" org.jruby.Main bin\sensible-cinema --create-mode || echo you need to install java first! please report back the error you see! && pause
+@rem taskkill /f /im mencoder.exe

data/go.bat

@@ -0,0 +1,2 @@
+call j bin\sensible-cinema
+taskkill /f /im mencoder.exe

data/goc.bat

@@ -0,0 +1,2 @@
+call j bin\sensible-cinema --create-mode
+taskkill /f /im mencoder.exe

data/lib/mplayer_edl.rb

@@ -20,8 +20,8 @@ require_relative 'overlayer'
 require_relative 'vlc_programmer'
 
 class MplayerEdl
-  def self.convert_to_edl specs
-    combined = VLCProgrammer.convert_incoming_to_split_sectors specs
+  def self.convert_to_edl specs, add_this_many_to_end = 0
+    combined = VLCProgrammer.convert_incoming_to_split_sectors specs, add_this_many_to_end
     out = ''
     map = {:mute => 1, :blank => 0}
     for start, endy, type in combined

data/lib/vlc_programmer.rb

@@ -26,10 +26,10 @@ class VLCProgrammer
   
   # divides up mutes and blanks so that they don't overlap, preferring blanks over mutes
   # returns it like [[start,end,type], [s,e,t]...] type like :blank and :mute
-  def self.convert_incoming_to_split_sectors incoming
+  def self.convert_incoming_to_split_sectors incoming, add_this_to_mutes = 0
     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]}
+    mutes = mutes.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v) + add_this_to_mutes, :mute]}
     blanks = blanks.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v), :blank]}
 
     combined = (mutes+blanks).sort

data/sensible-cinema.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.18.4"
+  s.version = "0.19.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
-  s.date = %q{2010-12-17}
+  s.date = %q{2010-12-18}
   s.email = %q{rogerdpack@gmail.com}
   s.executables = ["sensible-cinema", "sensible-cinema-cli"]
   s.extensions = ["ext/mkrf_conf.rb"]
@@ -32,6 +32,8 @@ Gem::Specification.new do |s|
     "create or edit sensible cinema decision list files.bat",
     "experimental_readme.txt",
     "ext/mkrf_conf.rb",
+    "go.bat",
+    "goc.bat",
     "gplv3.txt",
     "how_to_create.txt",
     "lib/add_any_bundled_gems_to_load_path.rb",

data/spec/mplayer_edl.spec.rb

@@ -39,4 +39,22 @@ EOL
 EOL
     
   end
+
+  it "should add to mutes" do
+    a = MplayerEdl.convert_to_edl({ "mutes"=>{105=>106}, "blank_outs" => {110 => 111} }, 1 )
+    a.should == <<EOL
+105.0 107.0 1
+110.0 111.0 0
+EOL
+  end
+
+  it "should catch overlaps from additions to mutes" do
+    a = MplayerEdl.convert_to_edl({ "mutes"=>{105=>106}, "blank_outs" => {106 => 107} }, 1 )
+    a.should == <<EOL
+105.0 106.0 1
+106.0 107.0 0
+EOL
+
+end  
+
 end

data/spec/sensible_cinema_gui.spec.rb

@@ -149,8 +149,8 @@ module SensibleSwing
       @subject.do_copy_dvd_to_hard_drive(false)
       @subject.background_thread.join
       @args[-3].should == nil
-      @command.should match /explorer/
-      @command.should_not match /fulli/
+      @system_blocking_command.should match /explorer/
+      @system_blocking_command.should_not match /fulli/
     end
     
     it "should be able to return the full list if it already exists" do
@@ -225,11 +225,20 @@ module SensibleSwing
     end
     
     it "should create an edl and pass it through to mplayer" do
-      @subject.instance_variable_get(:@mplayer_edl).simulate_click.join
+      click_button(:@mplayer_edl).join
       @system_blocking_command.should match(/mplayer.*-edl/)
       @system_blocking_command.should match(/-dvd-device /)
     end
     
+    it "should play edl with elongated mutes" do
+      temp_dir = Dir.tmpdir
+      temp_file = temp_dir + '/mplayer.temp.edl'
+      click_button(:@mplayer_edl).join
+      wrote = File.read(temp_file)
+      # normally "378.0 379.1 1\n"
+      wrote.should include("380.6 1")
+    end
+    
     it "should only prompt for drive once" do
       count = 0
       @subject.stub!(:choose_dvd_drive) {
@@ -253,8 +262,9 @@ module SensibleSwing
       count.should == 1
     end
     
+    it "should prompt you if you need to insert a dvd"
+    
+    
   end
   
-  it "should prompt you if you need to enter a dvd"
-  
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
     - 0
-    - 18
-    - 4
-  version: 0.18.4
+    - 19
+    - 0
+  version: 0.19.0
 platform: ruby
 authors: 
   - Roger Pack
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -07:00
+date: 2010-12-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -170,6 +170,8 @@ files:
   - create or edit sensible cinema decision list files.bat
   - experimental_readme.txt
   - ext/mkrf_conf.rb
+  - go.bat
+  - goc.bat
   - gplv3.txt
   - how_to_create.txt
   - lib/add_any_bundled_gems_to_load_path.rb