sensible-cinema 0.24.3 → 0.24.4

data/Rakefile

@@ -63,7 +63,7 @@ def get_transitive_dependencies dependencies
    transitive_deps = dependency_spec.runtime_dependencies
    new_dependencies << transitive_deps
   }
-  new_dependencies.flatten
+  new_dependencies.flatten.uniq
 end
 
 task 'clear_and_copy_vendor_cache' do
@@ -81,6 +81,7 @@ task 'rebundle_copy_in_dependencies' => 'gemspec' do
    spec = eval File.read('sensible-cinema.gemspec')
    dependencies = spec.runtime_dependencies
    dependencies = (dependencies + get_transitive_dependencies(dependencies)).uniq
+   FileUtils.mkdir_p 'vendor/cache'
    Dir.chdir 'vendor/cache' do
      dependencies.each{|d|
        system("#{OS.ruby_bin} -S gem unpack #{d.name}")
@@ -102,6 +103,7 @@ task 'create_distro_dir' => :gemspec do # depends on gemspec...
   FileUtils.cp_r(existing, dir_out) # copies files, subdirs in
   # these belong in the parent dir, by themselves.
   FileUtils.cp(Dir["#{dir_out}/template_bats/*.bat"], "#{dir_out}/..")
+  FileUtils.cp_r(dir_out + '/template_bats/mac', dir_out)
   p 'created (still need to zip it) ' + dir_out
   FileUtils.rm_rf Dir[dir_out + '/**/{spec}'] # don't need to distribute those..save 3M!
 end

data/TODO

@@ -11,23 +11,31 @@
     LLC
       if...back off to just the ffmpeg (plus an "[A,B]" viewer) only...but for now stick with just DVD playback [?] until people want more...
     no propaganda...
-	  no auto subtitle downloads...
+    no auto subtitle downloads...
     fix VLC dvdnav itself +- mplayer DVD EDL
   
 == high prio like blocking bugs ==  
   
 == under next release specific items: ==
-  a "half mute" demo, using volume downs/ups     
+   a "half mute" demo, using volume downs/ups     
+      plus one that also overlays an extra audio LOL
    cheap minimize via (probably minimize foreground window/windows API) 
    url -> url inference [hopefully this is cake...]
    can handle multiple dvdid's et al
- 
+   VLC "insert foreign missing scene" demo, overlay section with image (mplayer?)
+
 == yes do ordered in conjunction with the above probably ==
-  C player
+  m4m: the play button, "regenerate" admin button, "click here x other arrangements of this hymn"
+  does a released version work in mac?
+  mac court jester upconvert: without -nocache, with aggressive sync....
+    jester at home...still laggy at end?
   unit tests
-  release at some point...
-  mulder response
+  subs: if at beginning, add extra offset...hmm...why not?
+  release at some point...Jon? urug?
+    after check mac coiso...
+
   consistency for flight of nav. srt? huh?
+    consistency of others, also "DVD reported full-time versus ts time" for others...
   lightning strike from various outlets...
   try buy edit lists from all x,y,z [?] maybe ask for them for free first? ()
     http://www.familysafemovies.com
@@ -46,21 +54,31 @@
   make it load faster! this is cuh-razy! or splash screen! yes!
 
 == yes do, un-ordered currently, from the various future release options ==
+  facebook survey :)
+  "--developer" mode
+    export JSON command line, note it in the docu, show it in --developer mode, no new bat file for developer mode
+  dialog on button aborted, see if I like it :)
+  fan editor (after C player ?? though I suppose we could bring back batch mplayer to also do this...)
+    "fan editor" .bat file LOL
+    
+  new button "auto-test" a subtitles file for timing :)
+  new upconv button: take some snapshots (just to straight mjpeg or jpeg or the what not)
+  auto-update website on release.
+  publish a ripped raw big bunny
+    update development howto
+  @jruby scan court jester is *so* slow...what the...
   urug again?
-  subtitles: compare with powerdvd
-  if 2 EDL's, still choose title track
-  add an auto "scan for expected title, times"
-    add time to the generator EDL
-    complain if times looks wrong...
-  complain [accomodate option] if start time looks off...600
+    after works in mac. Why not?
+  netflix upconverter
+  if 2 EDL's, still choose a title track, playback
+  add largest title to the generator EDL
+    complain if times looks wrong...on playback? sum time
   "1:07:5.718" , "1:07:10.447", "profanity", "ba.....", "Faraday that [ba.....] That ba He's gonna wish he never met us",
   tighten splits
   "save to" -> same dir as "get from" yeah
   open EDL can have a rememberable DIR
   @instructions "this is great for comparing srt's, except...when it isn't, then you have to..."
-  @instructions: full srt how-to
-  can I just use ffmpeg for an initial -> ts ? http://eotmsnotes.wordpress.com/2011/04/25/tsmuxer-notes/
-  add dvd_title_time option
+  @instructions: full srt how-to document instead of tooltip [?]
   volume_name => dvd_volume_name
   why is the Sintel's EDL seemingly off?
     ascertain how accurate mplayer EDL is...I guess compared to...umm...something?
@@ -72,28 +90,23 @@
     don't have to use eval!
     EDL with JSON on top, full timestamps.
   setpriority for several :)
-  bring to top after a conversion, and for prompts...
+  bring to top after a conversion, and before prompts...
   can auto-use tsmuxer at all [?]
     mac just die with instructions to use tsmuxer first...
-  check if some other buttons are now outdated...
-  unit tests (all pass)
-  upconvert: a file
-  can I avoid requiring use of tsmuxer first? hmm...
+  check if some buttons are now outdated...
   check with blu-ray...do they match timing-wise? sub-title wise?
-  donate tsmuxer, makemkv, http://ffmpeg.zeranoe.com/builds, mulder [?] smplayer menumeter
+  donate tsmuxer, mplayer, http://ffmpeg.zeranoe.com/builds, mulder +- [?] smplayer menumeter http://instantitunes.wordpress.com/2010/02/26/use-tsmuxer-on-snow-leopard/
+  already donated: unlocker, mac fan thing, open office, many sourceforge tops, 7zip, VLC, cannot donate: ffmpeg
   youtube/hulu timings
-  @mplayer do you want a demo disk of how it fails edl dvdnav?
   split LLC's website+consumer
     get LLC before a "real" domain name
-  upconverter
-    check gl mac
-    check permutations
   employee instructions: watch @ realtime after profanity filter first pass :P  
   @makemkv: timing feels broken weird-like!
+    try out libdvdcss + handbrake on the one that was totally broken...is it better?
   clear runnings
     have ben and chris test it out, have it work, then ask about video quality
     me try
-  try disney digital copy
+  try out disney digital copy
   C player:
     folder, look for title.edl
     use DVD navigator
@@ -110,25 +123,22 @@
         can come out of full screen more easily :P
     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] [?]
-  create the "play previously created edited file for current DVD" button
+    [A,B] 
   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
-    beta release: rinse and repeat with various ppl
+    rinse and repeat with various ppl
   create a semi-accurate phantom edit EDL
     http://www.chefelf.com/forums/index.php?showtopic=6176
-    karlie?
   inventionzy: blu-ray stuff from todo.inventionzy
 
-  port to mac OS X--try everything out (all buttons), make sure all works...
-      ppc dvdid?
-      use mplayerx well [?] like wrap it...
+  port to mac OS X
+    ppc dvdid?
   the final "edited.avi" really "could/should" be playable in WMP...if possible
-  do I need tsmuxer?
-  auto-"guess" the best title...
   add button "fast preview segment" (from dvd)
+    add button "fast preview one" (from file) smplayer
   upconvert research/compare various options
-  investigate WMC "call out to smplayer EDL" or the like...
+  investigate WMC "call out to smplayer + EDL" or the like...
+    add to docu
 
 == other lists ==
 
@@ -140,9 +150,9 @@
   todo.subtitle
 
 == DVD decide later to move up or down ==
-  add button "fast preview one" (from file)
 
 == DVD-realtime backlog once yes do, now not do, unordered ==
+  can I just use ffmpeg for an initial -> ts ? http://eotmsnotes.wordpress.com/2011/04/25/tsmuxer-notes/
   investigate xbmc dvd edl how do you do that? [+- real dvd]
   fast preview: change it to be aggressive sometimes yes, other times no
   fast preview mode: watch for modifications to file, kill mplayer instances for them on change :)
@@ -153,7 +163,11 @@
   investigate: can I use zoomplayer max?
 
 == DVD+-DVD-realtime backlog (totally unordered, some very low prio, basically all never do) ==
-  subtitle idio
+  @ffmpeg: bounty/plz multi-thread the lanczos filter? plz?
+  @ffmpeg: super video enhancer filter. plz? LOL [bounty?]
+  use mplayerx well [?] like wrap it...
+    could for files, not for dvd's yet tho...
+  try to team up with fanedit.org ?
   slow cpu: mater tall tales: are my av sync values better or worse than smplayer defaults, with/without upsampling, blacky?
   investigate boxee edl (just fer fun...maybe possible?) http://getsatisfaction.com/boxee/topics/commercial_skipping_edl_support
   mplayer EDL allow this:
@@ -164,6 +178,8 @@
   test with cars-ws (at work), mac (to make sure volume name doesn't have spaces)
   investigate dvdrsbvdl (windows media center edl plugin)
   the distro could be made smaller yet [at least not as many gem deps needed...maybe more possible...]
+  @mplayer: chooses wrong language ts from jester...sigh
+  @mplayer: crash: http://betterlogic.com/roger/2011/07/mplayer-mac-os-x-woe/
   @mplayer: crash IQ nav, keys dont' work in windows, prolly dvdcss doesn't cache in windows, can't pass parameter in windows LOL
   @mplayer: could you umm...go ahead and support avisynth input pleaz, assuming you don't?
   @mplayer: dvdnav:///e: should play the *menu* please? please? [???]
@@ -192,6 +208,7 @@
   some way to hide spoilers, like soundtrack adds that ruin the movie for ya...
   decide on "community" -- should it be all my own community? mymovies community?
   the auto-matcher filename to subtitles [?]
+    auto-downloader based on filename/dvd name/md5 ?
   "media browser" plugin?
   @makemkv: show us the title numbers, and number them *by those*
   @macports: set notestxt \
@@ -208,13 +225,12 @@
   create an XBMC plugin that auto-searches for...ummm...uh...filters for you? huh? some type of plugin?
     just create the side by side .EDL for various files for people.
   make a mymovies plugin to auto-use EDL's somehow... ?
-  auto download subtitles from opensubtitles somehow err other...
   an almost rifftrax that...says "here overlay x, change normal volume to 50% during that time..."
   check if tmdb needs some type of upload...hmm...to save them... ask that one guy if I can bribe him into doing it? dvdxml? dvdid.info?
-  allow for filter subtitles, a la "always skip" [?]
+  allow for filtered subtitles, a la "always skip" [?]
   allow for AAF or OMF export, as well as EDL (?)
-  C specific portion [A,B] player
   also edit the playback of trailers et al [?] hmm...
+    allow for mplayer too? hmm...
   @mplayer: double click default to full screen! :) and enter default to dvdnav select!
   add button "play from exactly here to here" in [mplayer uh guess?] :P
     what does mplayer do with -ss big_number past the end of an end [monster's inc]?
@@ -233,8 +249,6 @@
   research the gplv3, add terms. Maybe want real lawyer, even?
   sons of provo "music video" EDL
   it can "slow certain sections down" that might look way cool! LOL
-  how does this one download subtitles? http://www.pcworld.com/article/227465/freebie_splayer_plays_almost_any_video_fileand_looks_good_doing_it.html
-    also xbmc has a plugin
   script powerdvd via keystrokes
   VLC: suggest uservoice
   can I just use mencoder with an EDL parameter to possibly split/join more quickly or something?
@@ -265,9 +279,9 @@
   machine learning for video analysis [?]
   figure out how to auto-crop after grab?
   figure out some way to work with cable providers/iphones/gphones?
-  @smplayer: why do you sometimes start with subtitles enabled?
+  @mplayer: why do you sometimes start with subtitles enabled?
   don't need to include in package rdp-win32screenshot et al for just DVD work...
-  bring in batch file mplayer :)
+  bring back batch file mplayer :)
   make my website slightly more "pictures-zy"
   check why out of sync my turn on earth on blacky MPH-HC
     does it with other players...?
@@ -299,7 +313,6 @@
     http://themoviedb.lighthouseapp.com/projects/17044-themoviedborg/tickets/142
     their mkv player probably does some lookup 'er other...maybe...for dvd's
     I really need to tell tvdb to allow for discid, and/or themoviedb to allow for series'
-  @themoviedb: allow for series, also allow for subtitles?
   @mplayer: some way to not have to use phreaky phreaky pipes in doze ("+1")
   @ffmpeg: gop 12 for ntsc-dvd?
   can watch conference like a music video :)

data/VERSION

@@ -1 +1 @@
-0.24.3
+0.24.4

data/bin/sensible-cinema

@@ -31,21 +31,30 @@ raise 'need newer jruby!' unless RUBY_DESCRIPTION >= 'jruby 1.6.0' # may not nee
 
 alias system_original system
 require 'fileutils'
-require_relative '../lib/mencoder_wrapper'
-require_relative '../lib/storage'
-require_relative '../lib/edl_parser'
-require_relative '../lib/mplayer_edl'
-require_relative '../lib/play_audio'
-require_relative '../lib/subtitle_profanity_finder'
-require_relative '../lib/convert_thirty_fps'
-require_relative '../lib/ruby_clip'
 
-require 'tmpdir'
+class String
+  def snake_case
+    self.gsub(/::/, '/').
+    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    tr("-", "_").
+    downcase
+  end
+end
 require_relative '../lib/swing_helpers'
-require_relative '../lib/drive_info'
+
+for kls in [:MencoderWrapper, :EdlParser, :MplayerEdl, :PlayAudio, :SubtitleProfanityFinder, :ConvertThirtyFps, :RubyClip, :DriveInfo]
+  autoload kls, "./lib/#{kls.to_s.snake_case}"
+end
+
+# a few I'll need...
+require_relative '../lib/storage'
+require 'tmpdir'
 require 'whichr'
 require 'os'
-require 'ruby-wmi' unless OS.mac?
+unless OS.mac?
+  autoload :WMI, 'ruby-wmi'
+end
 
 vendor_cache = File.expand_path(File.dirname(__FILE__)) + '/../vendor/cache'
 
@@ -119,7 +128,7 @@ module SensibleSwing
     end
 
     LocalStorage = Storage.new("sensible_cinema_storage")
-    LocalStorage.set_default('multiple_half_screens', 4)
+    LocalStorage.set_default('screen_multiples', 2)
     
     def setup_upconvert_buttons
     
@@ -127,25 +136,29 @@ module SensibleSwing
         warn_if_no_upconvert_options_currently_selected
         filename_mpg = new_existing_file_selector_and_select_file( "pick movie file (like moviename.mpg)")
         play_mplayer_edl [filename_mpg, nil]
-      end
+      end.tool_tip= "This plays back a movie file, like moviefile.mpg, using your current upconverter settings.\nTo playback a file edited upconverted, set upconvert options here first, then run them using sensible cinema main--it will automatically use your new upconverting options." # LODO
       
-      @watch_file_upconvert = new_jbutton( "Watch a DVD upconverted (unedited)") do
+      @watch_dvd_upconvert = new_jbutton( "Watch a DVD upconverted (unedited)") do
         warn_if_no_upconvert_options_currently_selected
         play_dvd_smplayer_unedited false, false
       end
+      @watch_dvd_upconvert.tool_tip = "Plays back the currently inserted DVD, using your current upconverter settings.\nIf it fails (dies immediately, blank screen, etc.), try setting upconvert options to a smaller screen resolution multiple.\nOr try playing the DVD with VLC first, then it might work.\nTo playback a DVD edited upconverted, set upconvert options here first, then run them using sensible cinema main--it will automatically use your new upconverting options."
       
       @upconv_line = add_text_line ''
       change_upconvert_line_to_current
       
       add_text_line ''
-      
-      @show_upconvert_options = new_jbutton( "Change/Set upconvert options" ) do
-        add_setup_upconvert_options
-      end
+      add_change_upconvert_options_button   
       add_text_line "Note that sensible cinema will also upconvert when it plays back edited DVD's/files."
       add_text_line ''
       
     end
+
+    def add_change_upconvert_options_button
+      @show_upconvert_options = new_jbutton( "Change/Set upconverting playback options" ) do
+        add_setup_upconvert_options
+      end.tool_tip= "Allows you to set your upconvert options.\nUpconverting attempts to playback your movie with higher quality on high resolution monitors."
+    end
     
     def warn_if_no_upconvert_options_currently_selected
       if !LocalStorage[UpConvertEnglish]
@@ -191,28 +204,59 @@ module SensibleSwing
         LocalStorage[UpConvertEnglish] = "experimental"
         display_current_upconvert_setting
       }
-      
+      add_text_line "Multiple factor screen widths (higher is better, but uses more cpu, 2x is good)." 
+      add_text_line "If mplayer just dies or if it displays only a blank screen then lower this."
       slider = JSlider.new
-      slider.setBorder(BorderFactory.createTitledBorder("Multiple factor of half screen widths (higher is better, uses more cpu, default 4)"));
+      slider.setBorder(BorderFactory.createTitledBorder("Screen resolution multiple"));
+  
+      # I want tick for 1x, 1.5x, 2x, 2.5x, 3x
+      # so let's do 10 -> 30 ... 
+      
+      labelTable = java.util.Hashtable.new
+      i = java.lang.Integer
+      l = JLabel
+      
+      # allow for 0.75 too, if you have a large monitor, slower cpu...
+      local_minimum = (720.0/get_current_max_width_resolution)*100 # allow 1024 to use upscaling to 860 LOL
+      # => 70 for 1024 monitor, so we'll then allow for the 75 below...
+      label_minimum = nil
+      (0..300).step(25) do |n|
+        if n > local_minimum
+          label_minimum ||= n
+          if (n % 100 == 0)
+            labelTable.put(i.new(n), l.new("#{n/100}x")) # 1x
+          elsif n == label_minimum # just for the bottom label, rest too chatty
+            labelTable.put(i.new(n), l.new("#{n/100.0}x")) # 1.5x
+          end
+        end
+      end
+      slider.setLabelTable( labelTable )
   
-      slider.maximum=6# LODO non 6 here...hmm...
-      slider.minimum=0
-      slider.setMajorTickSpacing(1) 
+      slider.maximum=300
+      slider.minimum=label_minimum
+      slider.setMajorTickSpacing(100) 
+      slider.setMinorTickSpacing(25) 
       slider.setPaintTicks(true)
       slider.setPaintLabels(true)    
       slider.snap_to_ticks=true
       
-      slider.set_value LocalStorage['multiple_half_screens']
+      slider.set_value LocalStorage['screen_multiples'] * 100
       
       slider.add_change_listener { |event|
-        if slider.value >= 2
-          p 'set slider to', slider.value  # LODO tell them.
-          LocalStorage['multiple_half_screens'] = slider.value
-        else
-          show_blocking_message_dialog "you can't set it lower than 2 that wouldn't make any sense, since that's screen width"
+        if !slider.value_is_adjusting
+          # they released their hold on it...
+          old_value = LocalStorage['screen_multiples']
+          new_value = slider.value/100.0
+          LocalStorage['screen_multiples'] = new_value
+          if new_value != old_value
+            display_current_upconvert_setting
+            if slider.value == label_minimum
+              show_blocking_message_dialog "Setting it too low like that might make it not really do much upconverting!"
+            end
+          end
         end
       }
-      slider.set_bounds(44, @starting_button_y, @button_width, 56)
+      slider.set_bounds(44, @starting_button_y, @button_width, 66)
       2.times {increment_button_location}
       @panel.add(slider)
     end
@@ -220,20 +264,24 @@ module SensibleSwing
     def display_current_upconvert_setting
       change_upconvert_line_to_current
       show_blocking_message_dialog get_current_upconvert_as_phrase
+      p get_current_upconvert_as_phrase
     end
     
     def get_current_upconvert_as_phrase
       settings = LocalStorage[UpConvertEnglish]
-      "Upconvert options currently #{  settings ? "are set to #{settings} style" : "are NOT SET"}."
+      "Upconvert options currently #{  settings ? "are set to #{settings} style" : "are NOT SET"} (screen multiplier #{LocalStorage['screen_multiples']})."
+    end
+    
+    def get_current_max_width_resolution
+      java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment.getScreenDevices.map{|gd| gd.display_mode.width}.max.to_i
     end
     
     def get_upconvert_vf_settings
       template = LocalStorage[UpConvertKey]
       if template
         # choose width of widest monitor (why would they display it on the other?)
-        screen_x = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment.getScreenDevices.map{|gd| gd.display_mode.width}.max.to_i        
-        screen_multiple = LocalStorage['multiple_half_screens']/2
-        template.gsub('SCREEN_X', (screen_x*screen_multiple).to_i.to_s) # has to be an integer...
+        screen_multiple = LocalStorage['screen_multiples']
+        template.gsub('SCREEN_X', (get_current_max_width_resolution*screen_multiple).to_i.to_s) # has to be an integer...
       else
         nil 
       end
@@ -251,6 +299,7 @@ module SensibleSwing
         "If your DVD doesn't have an EDL created for it, this will be your first step--create an EDL file for it.")
       @create_new_edl_for_current_dvd.on_clicked do
         create_brand_new_edl
+        @display_unique.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.")
@@ -269,7 +318,7 @@ module SensibleSwing
         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 true
+        choose_file_and_edl_and_create_sxs_or_play true
       }
 
       @play_smplayer = new_jbutton( "Watch full DVD unedited (realtime smplayer)")
@@ -351,12 +400,23 @@ module SensibleSwing
         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:")
-        parsed = SubtitleProfanityFinder.edl_output filename, {}, 0, 0 # 0.35, 0.25 # PUT MOVIE SPECIFIC OFFSET SUBTITLE TIMINGS HERE LODO prompt :P
-        File.write(EdlTempFile, "# add these into your mute section if they are offensive\n" + parsed)
+        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
       
@@ -407,7 +467,7 @@ module SensibleSwing
     end # advanced buttons
 
     def setup_normal_buttons
-            
+      
       @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 {
@@ -424,21 +484,25 @@ module SensibleSwing
         do_copy_dvd_to_hard_drive_via_file false
       }
       
-#      @watch_created_file = new_jbutton( "Watch the edited version of DVD file", false).on_clicked {
-#        play_mplayer_edl  # LODO
-#      }
-
       @watch_file_edl = new_jbutton( "Watch movie file edited (realtime)" ) do
-        choose_file_and_edl false 
-      end      
+        choose_file_and_edl_and_create_sxs_or_play false 
+      end
       
       @open_help_file = new_jbutton("View Sensible Cinema Documentation") do
         show_in_explorer __DIR__ + "/../documentation"
-      end      
+      end
       
+      if LocalStorage[UpConvertEnglish]
+        @upconv_line = add_text_line "    #{get_current_upconvert_as_phrase}"
+      else
+        @upconv_line = add_text_line ''
+      end
+      
+      add_change_upconvert_options_button 
+
     end
     
-    def choose_file_and_edl just_create_dot_edl_file_instead_of_play
+    def choose_file_and_edl_and_create_sxs_or_play just_create_dot_edl_file_instead_of_play
       filename_mpg = new_existing_file_selector_and_select_file( "pick moviefile (like moviename.mpg)")
       edl_filename = new_existing_file_selector_and_select_file( "Pick an EDL file to use with it", EDL_DIR)
       assert_ownership_dialog
@@ -447,10 +511,9 @@ module SensibleSwing
         # LODO these timings...DRY up...plus is XBMC the same? what about on a slower computer?
         # NB these are just for the SxS EDL!
         
-              #add_secs_end = 0
+      #add_secs_end = 0
       #add_secs_beginning = 0.5 # LODO are these accurate for file based, as well? slow cpu versus fast?
 
-        # TODO do I want these added at file create time, not use time!
         edl_contents = MplayerEdl.convert_to_edl descriptors, add_secs_end = MplayerEndBuffer, MplayerBeginingBuffer, splits = []
         output_file = filename_mpg.gsub(/\.[^\.]+$/, '') + '.edl' # sanitize...
         File.write(output_file, edl_contents)
@@ -531,6 +594,7 @@ module SensibleSwing
     end
 
     def run_smplayer_blocking play_this, extra_options, force_use_mplayer
+      extra_options += " -alang en " # for those that put french first...
       extra_options += " -mouse-movements #{get_upconvert_secondary_settings} " # just in case smplayer also needs -mouse-movements... :)
       extra_options += " -lavdopts threads=#{OS.cpu_count} " # just in case this helps [supposed to with H.264] :)
       if OS.mac? || force_use_mplayer
@@ -543,6 +607,8 @@ module SensibleSwing
         extra_options += " -slang en "
         extra_options += " -font #{ENV['SystemRoot']}\\fonts\\ARIAL.TTF " # would need EXTRA ESCAPING FOR SMPLAYER USE
         conf_file = conf_file[2..-1] # strip off drive letter, which it doesn't like no sir
+       else
+        extra_options += " -font /Library/Fonts/Arial.ttf "
        end
        extra_options += " -fs " # full screen
        c = "mplayer #{extra_options} #{"-vf " + get_upconvert_vf_settings if get_upconvert_vf_settings} -input conf=\"#{conf_file}\" -mouse-movements \"#{play_this}\" "
@@ -553,7 +619,7 @@ module SensibleSwing
         config_path = set_smplayer_opts extra_options
         c = "smplayer_portable \"#{play_this}\" -fullscreen -config-path \"#{File.dirname config_path}\" -close-at-end "
       end
-      puts c
+      p c # for debugging...
       system_blocking c
     end
     
@@ -596,13 +662,15 @@ module SensibleSwing
 
 "volume_name" => "#{volume}",
 "disk_unique_id" => "#{dvd_id}",
-"dvd_title_track" => "1", # the show info button will tell you title length (typically longest is main feature)
-# "not edited out stuff" => "some violence",
-# "closing thoughts" => "still...",
+"dvd_title_track" => "1", # the "show DVD info" button will tell you title lengths (typically longest title is the title track)
+# "dvd_title_track_length" => "6095", # sum length, on the DVD, use the show DVD info button to retrieve it.
+# "opensubtitles_number" => "1234567",
+# "not edited out stuff" => "some violence left in...",
+# "closing thoughts" => "only did the...",
 # "mplayer_dvd_splits" => ["59:59", "1:04:59"], # or [] if there are none.  Additive currently.  12345.6 ok. In mplayer, the DVD timestamp "resets" to zero for some reason, so you need to specify when if you want to use mplayer DVD realtime playback, or use mencoder -edl to split your file.  See http://goo.gl/yMfqX
         EOL
-      # frame0 is the name of our window LOL tough to avoid that collision...hmm...
-      filename = EDL_DIR + "\\edls_being_edited\\" + english_name.gsub(' ', '_') + '.txt'
+      # TODO auto-ify above, move docs to a file in documentation.
+      filename = EDL_DIR + "/edls_being_edited/" + english_name.gsub(' ', '_') + '.txt'
       filename.downcase!
       File.write(filename, input) unless File.exist?(filename) # lodo let them choose name (?)
       open_file_to_edit_it filename
@@ -687,26 +755,38 @@ module SensibleSwing
         'o' key: turn on on-screen-display timestamps (note: the OSD timestamps [upper left] are 30 fps so will need to be converted to use).
         'v' key: turn off subtitles.
         '.' key: step one frame.
+        # key: switch audio language track
       EOL
     end
     
     MplayerBeginingBuffer = 1.0
     MplayerEndBuffer = 0.0
     
-    def play_mplayer_edl file_with_edl_path = nil
+    def play_mplayer_edl optional_file_with_edl_path = nil
       extra_mplayer_commands = []
-      if file_with_edl_path
-        drive_or_file, edl_path = file_with_edl_path
-        dvd_id = NonDvd # fake it out...LODO
+      if optional_file_with_edl_path
+        drive_or_file, edl_path = optional_file_with_edl_path
+        dvd_id = NonDvd # fake it out...LODO a bit smelly
       else
         drive_or_file, dvd_volume_name, dvd_id, edl_path, descriptors = choose_dvd_or_file_and_edl_for_it
       end
+      start_add_this_to_all_ts = 0
       if dvd_id == NonDvd
         play_this = drive_or_file # play straight file...
+        # check if starts offset...
+        all =  `ffmpeg -i "#{play_this}" 2>&1`
+        # Duration: 01:35:49.59, start: 600.000000
+        all =~ /Duration.*start: ([\d\.]+)/
+        start = $1.to_f
+        if start > 0
+          show_non_blocking_message_dialog "Warning: file seems to start at an extra offset, adding it to the timestamps... #{start}
+            maybe not compatible with XBMC, if that's what you use, and you probably don't" # TODO test it XBMC...
+          start_add_this_to_all_ts = start
+        end
       else
         using_dvd = true
         title_track = get_title_track(descriptors)
-        extra_mplayer_commands << " -nocache -dvd-device #{drive_or_file} "
+        extra_mplayer_commands << "-nocache -dvd-device #{drive_or_file}"
         play_this = "dvdnav://#{title_track}"
       end
       if edl_path
@@ -715,7 +795,6 @@ module SensibleSwing
         descriptors = {}
       end
       if using_dvd
-        p descriptors
         splits = descriptors['mplayer_dvd_splits']
         if splits == nil
           show_blocking_message_dialog("warning: edit list does not contain mplayer replay information [mplayer_dvd_splits] so edits past a certain time period might not won't work ( http://goo.gl/yMfqX ).")
@@ -725,23 +804,18 @@ module SensibleSwing
       else
         splits = []
       end
-      edl_contents = nil
-      begin
-       edl_contents = MplayerEdl.convert_to_edl descriptors, add_secs_end = MplayerEndBuffer, MplayerBeginingBuffer, splits #, 600 TODOS # add a sec to mutes to accomodate for mplayer's oddness...
-      rescue SyntaxError => e # overlaps et al
-        show_blocking_message_dialog 'fail:' + e.to_s
-        raise e
-      end
+      edl_contents = MplayerEdl.convert_to_edl descriptors, add_secs_end = MplayerEndBuffer, MplayerBeginingBuffer, splits, start_add_this_to_all_ts # add a sec to mutes to accomodate for mplayer's oddness..
       File.write(EdlTempFile, edl_contents)
       
       # -framedrop is for slow CPU's
       # same with -autosync to try and help it stay in sync... -mc 0.03 is to A/V correct 1s audio per 2s video
       # -hardframedrop might help but hurts just too much
-      extra_mplayer_commands << "-framedrop "      
-      # ?? extra_mplayer_commands << " -mc 0.016 -autosync 15"
+      extra_mplayer_commands << "-framedrop"      
+      # ?? extra_mplayer_commands << "-mc 0.016" ??
+      extra_mplayer_commands << "-autosync 15" 
       
-      # prefer english, attempt to disable subtitles, set edl...
-      extra_mplayer_commands << "-alang en -nosub -noautosub -forcedsubsonly -sid 1000 -edl #{File.expand_path EdlTempFile}" # some maybe no longer necessary, but avoid subtitles by default...
+      # prefer english, attempt to disable subtitles, pass in edl...
+      extra_mplayer_commands << "-alang en -nosub -noautosub -forcedsubsonly -sid 1000 -edl #{File.expand_path EdlTempFile}" 
       
       run_smplayer_non_blocking play_this, extra_mplayer_commands.join(' '), false
     end
@@ -839,13 +913,7 @@ module SensibleSwing
     end
     
     def check_for_various_dependencies
-      if we_are_in_create_mode
-        ffmpeg_exe_loc = File.expand_path('vendor/cache/ffmpeg/ffmpeg.exe')
-        if !check_for_exe(ffmpeg_exe_loc, 'ffmpeg')
-          require_blocking_license_accept_dialog 'ffmpeg', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: ffmpeg."
-          download_zip_file_and_extract "ffmpeg (5MB)", "http://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-git-1929807-win32-shared.7z", "ffmpeg"
-        end
-        
+      if we_are_in_create_mode        
         if !check_for_exe('vendor/cache/mencoder/mencoder.exe', 'mencoder')
           require_blocking_license_accept_dialog 'mplayer', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: mplayer with mencoder."
           download_zip_file_and_extract "Mplayer/mencoder (6MB)", "http://downloads.sourceforge.net/project/mplayer-win32/MPlayer%20and%20MEncoder/revision%2033574/MPlayer-rtm-svn-33574.7z", "mencoder"
@@ -853,6 +921,11 @@ module SensibleSwing
       end
 
       # runtime dependencies, at least today...
+      ffmpeg_exe_loc = File.expand_path('vendor/cache/ffmpeg/ffmpeg.exe')
+      if !check_for_exe(ffmpeg_exe_loc, 'ffmpeg')
+        require_blocking_license_accept_dialog 'ffmpeg', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: ffmpeg."
+        download_zip_file_and_extract "ffmpeg (5MB)", "http://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-git-1929807-win32-shared.7z", "ffmpeg"
+      end
       if OS.mac?
         check_for_exe("mplayer", "mplayer") # mencoder and mplayer are separate for mac... [this checks for mac's mplayerx, too]
       else      
@@ -886,7 +959,7 @@ module SensibleSwing
           system_non_blocking "notepad \"#{filename}\""
         end
       else
-        system_non_blocking "#{OS.open_file_command} \"#{filename}\""
+        system_non_blocking "open -a TextEdit \"#{filename}\""
       end
     end
 
@@ -939,7 +1012,7 @@ module SensibleSwing
     
     def get_user_input(message, default = '', cancel_ok = false)
       received = JOptionPane.showInputDialog(message, default)
-      raise 'user canceled' unless received unless cancel_ok
+      raise 'user cancelled' unless received unless cancel_ok
       received
     end
     
@@ -1319,11 +1392,14 @@ end
 
 if $0 == __FILE__
   if ARGV.index('-h') || ARGV.index('--help')
-    puts 'syntax: [--create-mode]'
+    puts 'syntax: [ --create-mode | --upconvert-mode ]'
   else
     a = SensibleSwing::MainWindow.new
     a.set_visible true
     puts 'Please use the Sensible Cinema GUI window popup...'
+    if ARGV.index('--exit-immediately')
+      a.dispose
+    end
   end
 end