sensible-cinema 0.25.2 → 0.25.3

data/Rakefile

@@ -14,7 +14,7 @@ Jeweler::Tasks.new do |s|
     s.add_dependency 'rdp-win32screenshot', '= 0.0.9'
     s.add_dependency 'mini_magick', '>= 3.1' # for ocr...
     s.add_dependency 'whichr', '>= 0.3.6'
-    s.add_dependency 'rautomation', '> 0.6.3'
+    s.add_dependency 'rdp-rautomation', '> 0.6.3' # LODO
     s.add_dependency 'rdp-ruby-wmi' # for windows
     s.add_dependency 'plist' # for mac
     s.add_dependency 'ffi' # mouse, etc. needed at least for windows MRI

data/TODO

@@ -1,9 +1,11 @@
 == roadmap [for just tasks, see below though] == 
 
-  release: C EDL
-  compare netflix/blu-ray timings et al
+  netflix instant for OS X
+  upconvert DVD/netflix
+  C EDL
   
   === loose ordering/eventually ===
+    compare netflix/blu-ray timings et al
     linearize [?] hmm...
     re-update todo/all docu/user feedback etc.
     create web site/api-ify
@@ -16,26 +18,29 @@
 == high prio like blocking bugs ==  
   
 == under next release specific items: ==
-  it can filter out specific profanities even, too :P
 
 == yes do ordered in conjunction with the above probably ==
 
 == yes do, un-ordered currently, from the various future release options ==
+  can move the mouse 10 pixels down at the beginning, in order to...put it in the right place.
   both mute and blank when blanking by default... (add the other type in there, esp. if a man answers)
-  cars EDL x2
+  make it suck in single EDL from imdb based on a list 
+  test court jester :)
   lightning strike from various outlets...
   release at some point...Oliver? facebook? (one at a time...)
-  research VOB
-    timesplits?
+  research VOB dirs
+    still needs timesplits? what about in XBMC? what about XBMC with DVD's
   todo.upconvert
-    netflix quality upconverter
+    netflix quality upconverter, have a go at it
+      finalize screen capture
     have people test it
     me test it
       1x, 2x Sintel
       snapshots of Sintel "normal", then deploy the various comparison pics
-  netflix instant for OS X
   add new open button "edit the one for current DVD"
+  "fix" mplayer EDL pausing [?]
   the open button should open in the "editing" EDL dir.
+  warn against makemkv (and check it, too, and offer a bounty! :)
   an overlapping mute failure when you hit the "watch edited realtime" should popup.
   split out the "dependency" code
   try buy edit lists from all x,y,z [?] offer them money LOL
@@ -61,22 +66,19 @@
       oh wait we weren't even using it right to begin with LOL
       plus it needs to "always just skip instead of mute" for now I guess
       report XBMC bugs, too.
-  split into various separate windows themselves...
   consistency for flight of nav. srt? huh?
     consistency of others, also "DVD reported full-time versus ts time" for others...
   subtitles: if at beginning of a sub, add extra offset...hmm...why not?
-  say something if the EDL is actually "empty" :)
   fix released version to downloadable work in mac
   report ffmpeg bug, mplayer various (as bugs):P
   "--developer" mode
-    export JSON command line, note it in the docu, show it in --developer mode, no new bat file for developer mode
+    has "export JSON command line, reload code" , note it in the docu
   new button "auto-test" a subtitles file for timing :)
-  new upconv button: auto-take some snapshots (just to straight mjpeg or jpeg or the what not)
-  @jruby scan court jester is *so* slow...what the...[mac at least...]
+  new upconv button: auto-take some snapshots (just to straight mjpeg or jpeg or the what not [?])
   advertise urug again?
     after works in mac. Why not?
   advertise virtual audio
-  advertise virtual desktop :)
+  advertise screen capture
   mplayer directx patch check it...
   auto-add largest title to the generator EDL
     complain if times looks wrong...on playback? sum time
@@ -112,13 +114,14 @@
   try out disney digital copy
   C player:
     folder, look for title.edl
-    use DVD navigator
+    use DVD navigator (check)
     just use mplayer EDL syntax, plus a title track (or just detect track change, if long enough, assume... :P) :)
     http://msdn.microsoft.com/en-us/library/ms787412(VS.85).aspx
   	http://msdn.microsoft.com/en-us/library/dd407175(v=VS.85).aspx can be synchronous? might be a good first pass...
     PlayPeriodInTitleAutoStop EC_DVD_PLAYPERIOD_AUTOSTOP
     make it frame accurate output text :)
     allow it to "just play from X to Y exactly" ...
+    can start fullscreen
     does this line up right/perfect? can it work, at all?
       lodo:
         update its semi-bad error messages...
@@ -127,28 +130,25 @@
     note pay for XP http://windows.microsoft.com/en-US/windows/downloads/windows-media-player/plug-ins search for the cheapest
     note to them windows vista/7: use ac3filter [?]
     [A,B] 
+    once I can jump around, advertise as a phantom editor :)
   note better to previewer "you are about to preview these specific edits..." ?
   ask for more beta testers for use, ask for more beta testers for creation, too
     rinse and repeat with various ppl
-  create a semi-accurate phantom edit EDL
+  create a semi-accurate phantom edit EDL [?] just with splits
     http://www.chefelf.com/forums/index.php?showtopic=6176
-  inventionzy: blu-ray stuff from todo.inventionzy
-  port to mac OS X
-    ppc dvdid? documentation button? notepad?
   the final "edited.avi" really "could/should" be playable in WMP...if possible
   add button "fast preview segment" (from dvd)
-    add button "fast preview one" (from file) smplayer
-  upconvert research/compare various options
-    test it out (+- with people)
-    propaganda it
+  upconvert 
+    test it out (+- with others)
   investigate WMC "call out to smplayer + EDL" or the like...
     add to docu
   be a hero and sync the dvdnav repo's [?] also fix mplayer not being able to startup on some dvd's what the...this is nuts!
     I'm almost beginning to think VLC for files, DEBUG_C player for DVD's (except on mac, where they just have to live hosed)
     or maybe...umm...ask the dvdnav people why it might work with one and not the other? ask VLC? huh? what the...
     call out to VLC on DVDNAV_ERROR occurrence? what the... if can reproduce, submit bug report with trace et al.
+ virtual desktop -> real input
 
-== other lists to do ==
+== other lists to not do (duplicate the todo here if want to actually do it though) ==
 
   todo.upconvert
   todo.propaganda
@@ -161,6 +161,12 @@
 == DVD decide later to move up or down ==
 
 == DVD+-DVD-realtime backlog (totally unordered, some very low prio, basically all never do) ==
+  inventionzy: blu-ray stuff from todo.inventionzy
+  figure out a way to get to the roku [ps3ms?], +- netflix edited to roku LOL
+  advertise virtual desktop :)
+  port to mac OS X
+    ppc dvdid? documentation button? notepad?
+  say something if the EDL is actually "empty" :)
   already donated: unlocker, mac fan thing, open office, many sourceforge tops, 7zip, VLC, mplayer, cannot donate: ffmpeg
   note "you want to optimize your reverse blitting first... :)"
   if 2 EDL's, still can choose a title track
@@ -258,7 +264,6 @@
   @makemkv: wrong title no:Title #0 was added (7 cell(s), 0:14:58)
      Title #1 was added (8 cell(s), 0:14:57), also give us title no's in the dialog :P
   @mencoder you lop off the end somehow (dvd rip)
-  @VLC: plugin for EDL maybe? [when opening file/DVD look for .edl file?]
   blu ray timing
     my one, others.  Are they the same as DVD's?  They seem really close...
   pull in information from thetvdb to the GUI app
@@ -431,8 +436,6 @@ take out use_class_name for descriptors
 
 after 2020: DVD Navigator in C++ ?
 
-it should track "is paused" better (OCR)
-
 something that works with cable TV, too, somehow?
 
 if sued, could use straight mplayer -ss (+- one at a time, or possibly in a playlist [?] like VLC can...)
@@ -456,10 +459,8 @@ fix:
 
 byu.tv descriptor
 youtube non full screen: work with all browsers
-easier "here's how on the command line, BTW"
 amazon player
-a netflix player descriptor
-  "just choose VLCx55" LOL
+"just choose VLCx55" LOL
 
 Just fold if s....
 
@@ -566,8 +567,6 @@ 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.
 
-compare VLC (and other) timings with a real DVD player, and with netflix instant, etc.
-
 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
 
@@ -637,7 +636,7 @@ maybe require them to rip their stuff "through some means or other" and we'll op
 give money to nomachine--wow!
 
 a boxee api? 
-I *could* record netflix movies, then edit those manually (or mapped-ly)...meh clearplay needs some niche--we don't have each other after all.
+I *could* record netflix movies, then edit those manually (or mapped-ly)...meh clearplay needs some niche--we don't have each other after all, plus legality
 donate to the top 25 sourceforge's that don't look illegal, esp. if haven't before
 @mplayer: allow the equals in this: mplayer dvdnav:// -dvd-device=f:
 
@@ -651,7 +650,5 @@ RuntimeError: poor width or wrong window 94 1 71
 
 create a "map" of VLC DVD timings to "real" timings via tracking.  Hopefully never necessary...
         
-if it looks paused I should basically pause my tracking [if it looks nothing, then keep going with my tracking]
 it fails on "friday" tracks 0:48 as 1:48
 probably at startup should not start at 0, either, wait for first screen trackage
-figure out a way to get to the roku [ps3ms?], +- netflix edited to roku LOL

data/VERSION

@@ -1 +1 @@
-0.25.2
+0.25.3

data/bin/sensible-cinema

@@ -166,10 +166,18 @@ module SensibleSwing
       add_text_line ''
       
     end
+    
+    def self.new_child_window
+      out = MainWindow.new
+      out.setDefaultCloseOperation(JFrame::DISPOSE_ON_CLOSE)
+      out
+    end
 
     def add_change_upconvert_options_button
-      @show_upconvert_options = new_jbutton("Change Upconvert Options") do
-        add_setup_upconvert_buttons
+      @show_upconvert_options = new_jbutton("Set Playback Upconversion Options") do
+        upconvert_window = MainWindow.new_child_window
+        upconvert_window.add_setup_upconvert_buttons
+        # now join it, oops that isn't possible [?]
       end
       @show_upconvert_options.tool_tip= "Allows you to set your upconvert options.\nUpconverting attempts to playback your movie with higher quality on high resolution monitors."
     end
@@ -181,7 +189,7 @@ module SensibleSwing
     end
     
     def change_upconvert_line_to_current
-      @upconv_line.set_text get_current_upconvert_as_phrase
+      @upconv_line.set_text get_current_upconvert_as_phrase if @upconv_line
     end
     
     def select_new_sxs_style
@@ -335,8 +343,12 @@ module SensibleSwing
     end
     
     def setup_advanced_buttons
-      
-      add_text_line 'Realtime create Options:'
+    
+      new_jbutton("Display the standard buttons") do
+        setup_normal_buttons
+      end
+    
+      add_text_line 'Realtime/Create Options:'
       
       @create_new_edl_for_current_dvd = new_jbutton("Create new Edit List for a DVD", 
         "If your DVD doesn't have an EDL created for it, this will be your first step--create an EDL file for it.")
@@ -345,29 +357,12 @@ module SensibleSwing
         @display_dvd_info.simulate_click # for now...
       end
       
-      @open_list = new_jbutton("Open/Edit a previously created EDL file", "If your DVD has a previously existing EDL for it, you can open it to edit it with this button.")
+      @open_list = new_jbutton("Open/Edit a previously created Edit List file", "If your DVD has a previously existing EDL for it, you can open it to edit it with this button.")
       @open_list.on_clicked {
         filename = new_existing_file_selector_and_select_file( "Pick any file to open in editor", EdlParser::EDL_DIR)
         open_file_to_edit_it filename
       }
       
-
-      @create_dot_edl = new_jbutton( "Create a side-by-side moviefilename.edl file")
-      @create_dot_edl.tool_tip = <<-EOL
-        Create a moviefilename.edl file (corresponding to some moviefilename.some_ext file already existing)
-        XBMC/smplayer (smplayer can be used by WMC plugins, etc.) "automagically detect", 
-        if it exists, and automatically use it .edl to show that file edited played back.
-        If you use smplayer, note that you'll need to download the "lord mulder mplayer"
-        version (which includes an updated version of mplayer that fixes some bugs in EDL playback)
-      EOL
-      @create_dot_edl.on_clicked {
-        choose_file_and_edl_and_create_sxs_or_play true
-      }
-      
-      new_jbutton("Select side by side EDL file style (smplayer vs. XBMC)") do
-        select_new_sxs_style
-      end
-
       @play_smplayer = new_jbutton( "Watch full DVD unedited (realtime smplayer)")
       @play_smplayer.tool_tip = <<-EOL
         This will play the DVD unedited within smplayer.
@@ -392,6 +387,34 @@ module SensibleSwing
       @play_mplayer_raw.on_clicked {
         play_dvd_smplayer_unedited true, true, true
       }
+      
+      @parse_srt = new_jbutton("Scan a subtitle file (.srt) to detect profanity times automatically" )
+      @parse_srt.tool_tip = <<-EOL
+        You can download a .srt file and use it to automatically search for profanities.
+        Basically download it from opensubtitles.org (possibly from other sites, too),
+        (enter dvd name in the search box, click a result, click one from the list with an English flag, then click 'Download(zip)')
+        Once you download the zip, unzip it, and then compare the timestamps in it with those on the DVD (see the button "Watch DVD unedited (realtime mplayer)")
+        NB that you'll first want/need to *carefully* double check your subtitle
+        file with the actual DVD.  (ex: smplayer, hit the 'o' button to display
+        the current timestamp, then go to the end, stop at some point with text
+        and hit the '.' key until a subtitle very first displays.
+        Next convert that number to 29.97 fps (using the button given).
+        The numbers should match precisely.  If they don't, edit this file
+        so that it will have some offsets given.
+      EOL
+
+      @parse_srt.on_clicked do
+        filename = new_existing_file_selector_and_select_file("Pick srt file to scan for profanity:")
+        add_to_beginning = get_user_input("How much time to subtract from the beginning of each subtitle entry (ex: 1:00 -> 1:01 becomes 0:59 -> 1:01)", "0.0")
+        add_to_end = get_user_input("How much time to add to the end of each subtitle entry (ex: 1:00 -> 1:01 becomes 1:00 -> 1:02)", "0.0")
+        parsed = SubtitleProfanityFinder.edl_output filename, {}, add_to_beginning.to_f, add_to_end.to_f # flight: TODO necessary typically ??? 0.35, 0.25 
+        File.write(EdlTempFile, "# add these into your mute section if you deem them mute-worthy\n" + parsed)
+        open_file_to_edit_it filename, true
+        sleep 0.3 if OS.mac? # add delay...
+        open_file_to_edit_it EdlTempFile
+      end
+      
+
 
       @display_dvd_info = new_jbutton( "Display information about current DVD (ID, etc.)" )
       @display_dvd_info.tool_tip = "This is useful to setup a DVD's 'unique ID' within an EDL for it. \nIf your EDL doesn't have a line like disk_unique_id => \"...\" then you will want to run this to be able to add that line in."
@@ -412,27 +435,30 @@ module SensibleSwing
       @convert_seconds_to_ts = new_jbutton( "Convert 3600 <-> 1:00:00 style timestamps" )
       @convert_seconds_to_ts.on_clicked {
         input = get_user_input("Enter \"from\" timestamps, like 3600 or 1:40:00:", "1:00:00.1 or 3600.1")
-        if input =~ /:/
-          output = EdlParser.translate_string_to_seconds input
-        else
-          output = EdlParser.translate_time_to_human_readable input.to_f, true
-        end 
-        show_copy_pastable_string("Converted:", output)         
+        while(input)
+          if input =~ /:/
+            output = EdlParser.translate_string_to_seconds input
+          else
+            output = EdlParser.translate_time_to_human_readable input.to_f, true
+          end 
+          input = show_copy_pastable_string("Converted:", output)         
+        end
       }
       
-      @convert_timestamp = new_jbutton( "Convert timestamp from DVD player time (30 fps) to EDL player time (29.97 fps)" )
+      @convert_timestamp = new_jbutton( "Convert timestamp from DVD player time to EDL time (30->29.97 fps)" )
       @convert_timestamp.tool_tip=<<-EOL
-        Our EDL's assume 29.97 fps (which is what a DVD is).  Unfortunately most hardware/commercial DVD players
-        assume that the DVD is 30 fps, which means that if you watch a movie with them, then use those timestamps
-        for your EDL file, you will be off, at the end of a 2 hour film, by 8 seconds.  So all your edits will be wrong.
+        Our EDL's assume 29.97 fps (which is what a DVD actually has).  Unfortunately most hardware or commercial DVD players
+        think that the DVD is 30 fps, which means that if you use them for timestamps for your EDL's,
+        you will be slightly off (at the end of a 2 hour film, by 8 seconds).  So all your edits will be wrong.
         How to fix: convert your times from "DVD player" time to "EDL accurate" time by using this button.
-        This is necessary for hardware DVD player timestamps, PowerDVD, Windows Media Player (playing a DVD),
-        but not necessary for smplayer timestamps (or mplayer's "V: 3600" in the command line), which are already 29.97.
+        This is necessary for all hardware DVD player timestamps, PowerDVD player (software), Windows Media Player (playing a DVD), 
+        and mplayer's "on screen display" DVD timestamps.
+        It is not necessary for smplayer timestamps (or mplayer's "V: 3600" in the command line), which are already 29.97.
         smplayer's on-screen-display (the 'o' key) is accurate (and doesn't suffer from dvd_mplayer_splits) 
         but is 30 fps, so timestamps would need to be converted.
         Dont use VLC for DVD timestamps at all--it can get up to 30s off!  VLC playing back a file is usually pretty accurate to 29.97.
         In general, GUI's like VLC or smplayer are always a tidge off (maybe 0.3s) from the right timestamp, so take that into consideration.
-        Mplayers "V: 3600" is usually right on, however.
+        Mplayers "V: 3600" is usually right on (29.97 fps), however.
       EOL
       @convert_timestamp.on_clicked {
         thirty_fps = get_user_input("Enter your DVD (30 fps) timestamp, I'll convert it to 29.97 (usable in EDL's):", "1:00:00.1")
@@ -442,32 +468,37 @@ module SensibleSwing
         show_copy_pastable_string("Sensible cinema usable value (29.97 fps) for #{thirty_fps} would be:                ", human_twenty_nine_seven)
       }
       
-      @parse_srt = new_jbutton("Scan a subtitle file (.srt) to detect profanity times automatically" )
-      @parse_srt.tool_tip = <<-EOL
-        You can download a .srt file and use it to automatically search for profanities.
-        Basically download it from opensubtitles.org (possibly from other sites, too),
-        (enter dvd name in the search box, click a result, click one from the list with an English flag, then click 'Download(zip)')
-        Once you download the zip, unzip it, and then compare the timestamps in it with those on the DVD (see the button "Watch DVD unedited (realtime mplayer)")
-        NB that you'll first want/need to *carefully* double check your subtitle
-        file with the actual DVD.  (ex: smplayer, hit the 'o' button to display
-        the current timestamp, then go to the end, stop at some point with text
-        and hit the '.' key until a subtitle very first displays.
-        Next convert that number to 29.97 fps (using the button given).
-        The numbers should match precisely.  If they don't, edit this file
-        so that it will have some offsets given.
+      @create_dot_edl = new_jbutton( "Create a side-by-side moviefilename.edl file")
+      @create_dot_edl.tool_tip = <<-EOL
+        Creates a moviefilename.edl file (corresponding to some moviefilename.some_ext file already existing)
+        XBMC/smplayer (smplayer can be used by WMC plugins, etc.) "automagically detect", 
+        if it exists, and automatically use it .edl to show that file edited played back.
+        If you use smplayer, note that you'll need to download the "lord mulder mplayer"
+        version (which includes an updated version of mplayer that fixes some bugs in EDL playback)
       EOL
+      @create_dot_edl.on_clicked {
+        choose_file_and_edl_and_create_sxs_or_play true
+      }
+      
+#      new_jbutton("Select side by side EDL file style (smplayer vs. XBMC)") do
+#        select_new_sxs_style # TODO
+#      end
 
-      @parse_srt.on_clicked do
-        filename = new_existing_file_selector_and_select_file("Pick srt file to scan for profanity:")
-        add_to_beginning = get_user_input("How much time to subtract from the beginning of each subtitle entry (ex: 1:00 -> 1:01 becomes 0:59 -> 1:01)", "0.0")
-        add_to_end = get_user_input("How much time to add to the end of each subtitle entry (ex: 1:00 -> 1:01 becomes 1:00 -> 1:02)", "0.0")
-        parsed = SubtitleProfanityFinder.edl_output filename, {}, add_to_beginning.to_f, add_to_end.to_f # flight: TODO necessary typically ??? 0.35, 0.25 
-        File.write(EdlTempFile, "# add these into your mute section if you deem them mute-worthy\n" + parsed)
-        open_file_to_edit_it filename, true
-        sleep 0.3 if OS.mac? # add delay...
-        open_file_to_edit_it EdlTempFile
+      
+      add_text_line 'Create Options that first create/use a local intermediary file:'
+      
+      new_jbutton("Show options that first create/use a local intermediary file") do
+        window = MainWindow.new_child_window
+        window.add_options_that_use_local_files
       end
       
+#      @reload = new_jbutton("reload bin/sensible-cinema code") do
+#        load $0
+#      end
+      
+    end # advanced buttons
+    
+    def add_options_that_use_local_files
       add_text_line 'Create Options that first create/use a local intermediary file:'
 
       @preview_section = new_jbutton( "Preview a certain time frame from fulli file (edited)" )
@@ -507,13 +538,8 @@ module SensibleSwing
         nice_file = wrote_to_here_fulli
         run_smplayer_blocking nice_file, nil, "-edl #{normalize_path EdlTempFile}", false, true
       }
-      
-      @reload = new_jbutton("reload bin/sensible-cinema code") do
-        load $0
-      end
-      
-    end # advanced buttons
-    
+    end
+   
     # converts to full path, 8.3 if on doze
     def normalize_path path
       path = File.expand_path path
@@ -521,7 +547,8 @@ module SensibleSwing
     end
 
     def setup_normal_buttons
-      
+      add_text_line ""
+  
       @mplayer_edl = new_jbutton( "Watch DVD edited (realtime)")
       @mplayer_edl.tool_tip = "This will watch your DVD in realtime from your computer while skipping/muting questionable scenes."
       @mplayer_edl.on_clicked {
@@ -551,7 +578,7 @@ module SensibleSwing
         add_open_documentation_button
       end
       
-      add_change_upconvert_options_button 
+      add_change_upconvert_options_button
       
       @progress_bar = JProgressBar.new(0, 100)
       @progress_bar.set_bounds(44,@starting_button_y,@button_width,23)
@@ -592,11 +619,11 @@ module SensibleSwing
        ARGV.index("--upconvert-mode")
     end
     
-    def initialize
+    def initialize be_visible = true
       super "Sensible-Cinema #{VERSION} (GPL)"
       force_accept_license_first
 
-      setDefaultCloseOperation JFrame::EXIT_ON_CLOSE
+      setDefaultCloseOperation JFrame::EXIT_ON_CLOSE # default is exit on close
       @panel = JPanel.new
       @buttons = []
       @panel.set_layout nil
@@ -608,26 +635,25 @@ module SensibleSwing
       @starting_button_y += 10 # kinder ugly...
       add_text_line "      Rest mouse over buttons for \"help\" type descriptions (tooltips)."
       add_text_line ""
-      add_text_line ""
       
       setIconImage(ImageIcon.new(__DIR__ + "/../vendor/profs.png").getImage())
       check_for_various_dependencies
+      set_visible be_visible
     end
     
-    
     def setup_default_buttons
-      
       if we_are_in_upconvert_mode
         setup_upconvert_buttons
       else
-        setup_normal_buttons
       
         if we_are_in_create_mode
           setup_advanced_buttons
           add_text_line 'Contact:'
+        else
+          setup_normal_buttons
         end
       
-        @upload = new_jbutton("Submit feedback/Upload/Request Help") # keep this one last! :)
+        @upload = new_jbutton("Submit Feedback/Upload new EDL's/Request Help") # keeps this one last! :)
         @upload.tool_tip = "We welcome all feedback!\nQuestion, comments, request help.\nAlso if you create a new EDL, please submit it back to us so that others can benefit from it later!"
         @upload.on_clicked {
           system_non_blocking("start mailto:sensible-cinema@googlegroups.com")
@@ -1098,7 +1124,9 @@ module SensibleSwing
     
     def get_user_input(message, default = '', cancel_ok = false)
       received = JOptionPane.showInputDialog(message, default)
-      raise 'user cancelled' unless received unless cancel_ok
+      unless cancel_ok
+        raise 'user cancelled' unless received
+      end
       received
     end
     
@@ -1496,7 +1524,6 @@ if $0 == __FILE__
   else
     a = SensibleSwing::MainWindow.new
     a.setup_default_buttons
-    a.set_visible true
     puts 'Please use the Sensible Cinema GUI window popup...'
     if ARGV.index('--exit-immediately')
       a.dispose

data/bin/sensible-cinema-dependencies.rb

@@ -6,7 +6,7 @@ module SensibleSwing
     def self.download full_url, to_here
       require 'open-uri'
       require 'openssl'
-      eval("OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE")
+      eval("OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE") if full_url =~ /https/
       writeOut = open(to_here, "wb")
       writeOut.write(open(full_url).read)
       writeOut.close

data/change_log_with_feature_list.txt

@@ -1,3 +1,60 @@
+== 0.25.3 ==
+
+Mostly explore some more "inventionzy" ideas.
+Add abiliy to filter whole categories of content (allow/disallow them), or levels of content, based on
+user perceived level/user desired, including opposite.
+
+Note also that we have successfully discovered how to integrate with playing through peoples'
+portable playing devices/consoles (windows media center--use plugins, XBMC, use its EDL's, ps3ms, use EDL's),
+see mailing list.
+
+Also a lot of work has been done on upconverting screen capture, which can also similarly be
+applied to edited movie content, with DVD and/or/ blu-ray and/or online based streaming media.
+
+Also we have fairly sophisticated algorithms for determining the correct time to actually do or trust the
+OCR readout, ex:  checking for screen change frequently before doing any actual digit detection,
+using third party OCR software reader software, checking to coordinate timestamp signatures when 
+"09" goes to "10" or the like.  To help the timing needs there.  Also we can detect
+arbitrary players, and warn when detect fails/ceases, and detect when it pauses but doesn't fail, et al.
+See also more comments below, etc.
+
+Also sensible cinema has been shown to work with 3rd party "subtitle detection" software, run that against
+the film, and it works splendidly.  There has also been some experimentation with leveraging 3rd party
+(read: Microsoft) DVD player software/API's/internals in order to effect an appropriate EDL playback,
+with and without messages being sent back and forth between the two programs.
+
+We've also experimented with capturing virtual audio (audio out), as well as combining it with
+virtual camera (desktop screen shot capture), in order to be able to beam out what is playing on the
+computer to available devices.  This also could be made to work for edited content output, ex: netflix instant
+and since it can select the exact coordinates it needs, it could thus be made to avoid the timestamp
+signature while still being able to keep it on-screen to OCR while the content edited movie is playing.
+Also I have experimented slightly with keeping parts of a window "off screen" but still being able to OCR them
+(windows 7 aero allows this).
+
+There is also lots of subtitle comparison helpers, etc., and edited movie segment "checking EDL settings"
+helpers that have been integrated along the way, like a good ol' editing movie software might do.
+We leverage all sorts of nifty things like bringing windows to the top, internal audio api's, all the
+good stuff.
+
+Since we integrate with VLC, we already have edited blu-ray playback implicitly, by playing them back
+through slysoft hd-dvd.
+
+Note also that I recently showed demos of how an edited player can jump around/skip to scenes within a movie,
+not just playback linear "skipping" content.
+
+We have many timing conversion utility helpers (see source for details).
+
+Also have ability to auto-generate EDL files based on current DVD et al., and use DVD ID
+generator software, basically from Microsoft, to auto-recognize inserted DVD's. 
+
+Also note that there was a case recently demoing a new style of skipping: it pauses, then the user
+basically fast forwards or "skips it forward" themself, thus jumping over the questionable scenes.
+
+Also note that mine currently allows for "unlimited" levels of detail/categorization of media, it can parse
+it all, and even use it in a limited manner.
+
+Note that we can also copy to the clipboard
+
 == 0.25.2 ==
 
 It tracks better now if the current OCR tracked player is paused, reverting back to its current timestamp.

data/documentation/how_to_get_files_from_dvd.txt

@@ -17,7 +17,7 @@ Sensible Cinema only accepts raw "unencrypted" movie streams,
 so you're going to have to get the movie file off the DVD somehow first.
 There are a few options available to you.
 Some options are described here http://wiki.videolan.org/Rip_DVD#Related
-(basically, use mplayer, or use both makemkv + tsmuxer).
+(basically, use mplayer, or use both makemkv + tsmuxer [never makemkv by itself, though, it has wrong timings]).
 Look for the "title track" setting in the EDL to see which you'll want, 
 usually the longest title.
 
@@ -27,4 +27,4 @@ Slysoft AnyDVD might help out somehow, too, though you shouldn't need to.
 
 Report back if you have problems.  See README for contact info.
 
-[1] http://www.archive.org/details/BigBuckBunny
+[1] http://www.archive.org/details/BigBuckBunny

data/lib/edl_parser.rb

@@ -57,16 +57,33 @@ class EdlParser
     raw
   end
   
-  # converts "blanks" => ["00:00:00", "00", "reason", "01", "01", "02", "02"] into sane arrays, also filters based on category, though disabled
+  # converts "blanks" => ["00:00:00", "00", "reason", "01", "01", "02", "02"] into sane arrays, also filters based on category, though disabled for production
   def self.convert_to_timestamp_arrays array, ok_categories_array
     out = []
     while(single_element = extract_entry!(array))
-      # assume that it's always start_time, end_time, category, number
+      # assume that it (could be, at least) start_time, end_time, category, number
       category = single_element[-2]
       category_number = single_element[-1]
-      unless ok_categories_array.index([category, category_number])
-        out << single_element
+      include = true
+      if ok_categories_array.index([category, category_number])
+       include = false
+      elsif ok_categories_array.index([category])
+       include = false
+      elsif ok_categories_array.detect{|cat, setting| setting.is_a? Fixnum}
+       for cat, setting in ok_categories_array
+         if cat == category && setting.is_a?(Fixnum)
+            # check for a number? 
+            if category_number.to_i.to_s == category_number
+              as_number = category_number.to_i
+              if as_number < setting
+                include = false
+              end
+            end
+         end
+       end
+
       end
+      out << single_element if include
     end
     out
   end

data/spec/edl_parser.spec.rb

@@ -76,16 +76,28 @@ describe EdlParser do
    out = <<-EOL
       "mutes" => [
       "00:10", "00:15", "test category", "1",
-      "00:20", "00:25", "test category", "2"
+      "00:20", "00:25", "test category", "2",
+      "00:30", "00:35", "test category", "3"
       ]
     EOL
     parsed = E.parse_string out, nil
-    parsed["mutes"].length.should == 2 # has them both
+    parsed["mutes"].length.should == 3 # has all of them
 
     1.upto(2) do |n|
       parsed = E.parse_string(out, nil, [["test category", n.to_s]] )
-      parsed["mutes"].length.should == 1 # has them both
+      parsed["mutes"].length.should == 2 # excludes one
     end
+    parsed = E.parse_string(out, nil, [["test category", "1"], ["test category", "2"]] )
+    parsed["mutes"].length.should == 1 # excludes two
+
+    # now with...just saying "this entire category is fine"
+    parsed = E.parse_string(out, nil, [["test category"]])
+    parsed["mutes"].length.should == 0
+
+    # now with...just saying "levels below this are ok"
+    parsed = E.parse_string(out, nil, [["test category", 2]])
+    parsed["mutes"].length.should == 2
+
   end
   
   it "should parse mplayer_dvd_splits as floats" do

data/spec/sensible_cinema_gui.spec.rb

@@ -88,9 +88,11 @@ module SensibleSwing
     end
     
     before do
-      ARGV << "--create-mode" # want all the buttons for some tests.
-      @subject = MainWindow.new.setup_default_buttons
-      ARGV.pop
+      @subject = MainWindow.new false # false to speedup tests
+      # want lots of buttons :)
+      @subject.setup_advanced_buttons
+      @subject.setup_normal_buttons
+      @subject.add_options_that_use_local_files
       FileUtils.touch "selected_file.fulli_unedited.tmp.mpg.done" # a few of them need this...
       FileUtils.touch 'selected_file.avi'
       @subject.stub!(:choose_dvd_drive_or_file) {
@@ -138,6 +140,7 @@ module SensibleSwing
         @subject.stub!(:print) {}
         @subject.stub!(:p) {}
         @subject.stub!(:puts) {}
+        EdlParser.stub!(:p) {}
       end
       
       @subject.stub(:show_non_blocking_message_dialog) {
@@ -552,10 +555,8 @@ module SensibleSwing
   end
   
   it "should be able to upconvert at all" do
-    ARGV << "--upconvert-mode"
-    @subject = MainWindow.new.setup_default_buttons
-    ARGV.pop
-    click_button(:@show_upconvert_options) # reveal buttons...
+    @subject = MainWindow.new false
+    @subject.add_setup_upconvert_buttons
     @subject.stub(:display_current_upconvert_setting) {} # no popup ;)
     @subject.stub(:show_mplayer_instructions_once) {}
     click_button(:@medium_dvd)

data/todo.inventionzy.txt

@@ -1,11 +1,13 @@
   === patentzy yes actually do vaguely ordered ===
-    make it suck in large list of EDL's from imdb at build time
     blu-ray OCR
       more blu-ray stuff: can ID them, can playback (through...mkv? VLC? powerdvd OCr/scripted?)
       some blu-ray player descriptor somehow
+    can move the mouse 10 pixels down at the beginning, in order to...put it in the right place.
 
-    can handle multiple dvdid's et al (same EDL) (kind of already shown)
+    can "suck in" a large list of EDL's from imdb at build time, and/or from a wiki (github wiki in this case), and a "resync" button?
+    can handle multiple dvdid's et al (same EDL) (mostly do already though)
     can overlay over online films too
+    it can pull in a DVD based just on the dvd-id "query id, not local? go get it from online"
     control VLC RC to overlay a logo dynamically
     can control volume *and* play other audio
     can add to to supplement EDL + EDL timestamps
@@ -15,7 +17,6 @@
     make it so it can suck in from "another wiki" the DL's, at package time, somehow (just one)
       or even just suck in any web file, for starters
     space -> advance from pause until next edit item?
-    add fine grained "new ratings" to some demo EDL
     amazon player descriptor, just in case ;P
     can jerk mouse only every so often (cheap would be to just arbitrarily have it from x to y, demo that)
     can scan several player descriptors to "pick the right one" (kind of already showed this one)
@@ -27,24 +28,26 @@
     beep at them/warn when not tracking [?]
       default on...I think.
     can jerk mouse more often closer to failure sections...
+      and/or resize the playing/streaming window to match it when the mouse "has been moved recently" +- by us, or not.
     can pull one from imdb at all, video "show it creates a file"
-    C player: minimize instead of skip :P
-    C player: don't mute, just almost mute LOL or almost mute and static-ify
-    can suck it in "in realtime" from online, and parse it, for demo purposes
+    C DVD player: minimize instead of skip :P
+    don't mute, just almost mute LOL or almost mute and static-ify
+      or combine the two
+    can suck it in "in realtime" from online, and parse it +- from a user editable wiki
     a UI to select categories, works
     edited blu ray movie playback screencast, as that's apparently not in the patent...
     don't use timecodes, use "% of the movie" and "total length" perhaps?
-    look at their patents for other ideas? [all patents, nissim patents?]
-    just pause it, tell them how far to fast forward at that point :P
+    look at their patents for other ideas? [+- nissim patents?]
+    just pause it, tell them how far to fast forward at that point :P [somewhat already done]
+    
     have the user forced to tell me what each digit is, themselves :P
     the online edl stuff itself (its todo list)
     javascript API
       phase 2: I can accomodate for pauses, too.
       phase 3: I can re-train based on events of stoppage
-      phase 4: I can constantly poll and react
+      phase 4: I can constantly poll and react appropriately to current timestamp
     post video demo of it streaming to a console device
-    categories filterable by "level" "profanity level 2 and below is ok for me and my kids"
-    maybe could just "play from x to y" [no exclude info?] 
+    maybe could just "play from x to y" [no exclude info?] instead of "here are the bad parts"
     stage one: query, auto-download when they hit a netflix movie of some type
-      stage two: chrome plugin for the same :)
-    can insert deleted scenes et al [even external scenes :P] (already showed it)
+      stage two: chrome plugin for the same, auto-detect, auto-user, auto-download, auto-watch edited :)
+    can insert deleted scenes et al [even external scenes :P] (already showed it somewhat)

data/todo.upconvert

@@ -15,32 +15,24 @@ do I need double tapping? http://archive2.avsforum.com/avs-vb/showthread.php?s=&
 
 === netflix/OS screen capture ===
 
-  make it able to grab from a window, and work when dragged too...
   can I make it look awesome?
+  pushdesktop\TODO high prio
   
   ==== some day ====
-    shearing (?) compared to itself upscreened...
-    perfect looks of absolutely everything upconverted LOL
+    perfect the looks of absolutely everything upconverted LOL
     # TODO cut off all black edges too...why not, eh? mplayer has crop detect...
     make really low q stuff like youtube less than even 360 look good
-    # TODO can align better youtube
-    better benchmarker (windows vs. desktop, just show reverse)
-    the "drag to select window" seter-zy-upperzy
+    # can align better youtube
 
  is ffplay on avisynth piece of crud compared to the other? vs. mplayer? why only like 10 fps? what the...
 
-== OS dshow screen tracker ==
-
-  see its TODO, things I actually want to do add here.
-
  === some day ===
-    bounty multi-thread scaling, iff it seems helpful-er for quad core.
-    can I live with aero wasn't bitblt getting like 800fps *with* aero?
+  bounty multi-thread scaling, iff it seems helpful-er for quad core.
   
 == never ==
 
 add another sharpen filter?
 
-add a VLC version?
+create a VLC version?
 
-prop: http://ubuntuforums.org/showthread.php?t=804537 didn't I have another list somewhere... ?
+propaganda: http://ubuntuforums.org/showthread.php?t=804537 

data/zamples/edit_decision_lists/dvds/{edls_being_edited/court_jester.txt → court_jester.txt}

@@ -16,8 +16,8 @@
 "blank_outs" => [
   # an example line, uncomment the leading "#" to make it active
   # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
-# 1358 1452
-# 4730 - 600 -<  4837 - 600
+  "758", "852", "kissing scene",
+  "4130", "4237", "pretending to kiss the king",
 ],
 
 "volume_name" => "JESTER",

data/zamples/edit_decision_lists/dvds/edls_being_edited/cars_disney.txt

@@ -0,0 +1,40 @@
+"name" => "cars disney",
+
+"mutes" => [
+  
+"0:51:00.310" , "0:51:02.312", "profanity", "lo..", "Oh [lo..]",
+"0:52:41.745" , "0:52:44.289", "profanity", "he..", "'Cause even in hillbilly [he..] we have standards",
+"00:40:14.957", "00:40:18.126", "profanity", "he..", "I'm in hillbilly [he..]! My IQ's dropping by the second!",
+
+"0:07:26.363" , "0:07:28.448", "profanity", "idiot", "You need tires you [idiot]",
+"0:14:57.105" , "0:14:59.274", "profanity", "piss", "That race was a [piss]er You were booking",
+"0:23:25.991" , "0:23:30.619", "profanity", "moron", "fer dang sake, Turn on your lights you [moron]",
+"0:35:29.546" , "0:35:33.509", "profanity", "dumb", "Boy we ain't as [dumb] as you think we are",
+"0:36:00.202" , "0:36:03.038", "profanity", "sex", "I want to get a look at that [sex]y hot rod",
+"0:49:56.914" , "0:50:00.334", "profanity", "idiot", "Crazy grandpa car What an [idiot]",
+"0:55:21.321" , "0:55:24.449", "profanity", "dumb", "I swear tractors is so [dumb]",
+"01:55:37.104" , "01:55:41.775", "profanity", "lo..", "for the love of [deity]",
+
+"00:30:06.849" , "00:30:10.185", "profanity", "May [deity] have mercy on your soul",
+"01:28:01.615", "01:28:06.119", "profanity", "Thank the manufacturer",
+"00:31:42.319", "00:31:46.406", "profanity", "innuendo", "Nah, I'm just kiddin'. She just likes me fer muh body.",
+"52:52", "52:57", "profanity", "innuendo", "not with me but with me",
+# 28:30 mumble [?]
+],
+
+# sister DVD: CRZ0NNF1 track 21 "disk_unique_id" => "aa06ad1c|e1e62ad0"
+
+"blank_outs" => [
+  "39:22", "39:29", "lewd", "look honey, von dutch",
+  # an example line, uncomment the leading "#" to make it active
+  # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
+],
+
+"volume_name" => "CRZ0NNW7                        ",
+"disk_unique_id" => "f5751899|2862d307",
+"dvd_title_track" => "23",
+"dvd_title_track_length" => "6985.700",
+# "opensubtitles_number" => "4022054",
+# "not edited out stuff" => "some violence left in...",
+# "closing thoughts" => "only did the...",
+"mplayer_dvd_splits" => ["3767.35", " 6490.35"], 

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.25.2
+  version: 0.25.3
 platform: ruby
 authors: 
   - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 -06:00
+date: 2011-08-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -69,7 +69,7 @@ dependencies:
     type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency 
-    name: rautomation
+    name: rdp-rautomation
     prerelease: false
     requirement: &id006 !ruby/object:Gem::Requirement 
       none: false
@@ -363,7 +363,8 @@ files:
   - zamples/edit_decision_lists/dvds/bob the builder pets in a pickle.txt
   - zamples/edit_decision_lists/dvds/bobs_big_plan.txt
   - zamples/edit_decision_lists/dvds/cool runnings.txt
-  - zamples/edit_decision_lists/dvds/edls_being_edited/court_jester.txt
+  - zamples/edit_decision_lists/dvds/court_jester.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/cars_disney.txt
   - zamples/edit_decision_lists/dvds/edls_being_edited/test_delete_list_for_experimenting_with.txt
   - zamples/edit_decision_lists/dvds/flight_of_the_navigator.txt
   - zamples/edit_decision_lists/dvds/happiest baby on the block.txt