sensible-cinema 0.34.0 → 0.35.3

data/documentation/troubleshooting.txt

@@ -1,12 +1,7 @@
 == Troubleshooting ==
-
-Problem: disk (or VOB folder) hangs on a "skip" segment.
-  A. Known problem, just use the right arrow to skip past the problem section for now.
   
 Problem: disk (or VOB folder) just never play.  Nothing happens, smplayer is just blank.
-Try to playback your DVD in "VLC Media Player" first, then try it again.  Also check the "mplayer logs" and report back
-as a bug report.
-
+Try to playback your DVD in "VLC Media Player" first, then try it again.  Also check the "mplayer logs" and report this occurrence as a bug report.
 
 General trouble shooting:
 
@@ -24,9 +19,8 @@ You try to play back a sensible cinema-ized video file and it plays back without
  This probably means you're using windows media player, and don't have "codecs" installed
    to handle this type of audio.  Not to fear, just download the "ffdshow tryouts" (google for it)
    and, when it gives you the option, be sure to check "mpeg2 video" and then
-   it should "just work."  You could also optionally just play the file in VLC Media Player or smplayer
-   (there's a button for that).  Installing "AC3Filter" may help if you can hear no audio.  
-   Really VLC Media Player is your best bet though.
+   it should "just work."  You could also optionally just play the file in VLC Media Player or smplayer instead.  Installing "AC3Filter" may help if you can hear no audio.  
+   Really VLC Media Player is your best bet overall.
 
 If the end result video is too grainy/pixelated or if the overall process is too slow, let me know and I'll work on
 making it better.  No really, I have some ideas, but want to see if there's need first for improvement in those areas.

data/go.bat

@@ -1,2 +1,2 @@
-@rem NB that you can call it like go --debug
-call j %* bin\sensible-cinema
+@rem NB that you can call it like go --debug
+call j --1.8 %* bin\sensible-cinema

data/go.sh

@@ -0,0 +1 @@
+j -J-Xdock:name="Sensible Cinema" -J-Xdock:icon="vendor/profs.png" bin/sensible-cinema $1 $2 $3 $4 $5

data/goc.bat

@@ -1 +1 @@
-call j %* bin\sensible-cinema --create-mode --developer-mode
+call j --1.8 %* bin\sensible-cinema --create-mode --developer-mode

data/goc.sh

@@ -0,0 +1 @@
+j -J-Xdock:name="Sensible Cinema" -J-Xdock:icon="vendor/profs.png" bin/sensible-cinema $1 $2 $3 $4 $5 --create-mode

data/lib/check_installed_mac.rb

@@ -18,21 +18,13 @@ module CheckInstalledMac
     end
   end
 
-  if name == 'mplayer'
-    unless File.exist?('/opt/rdp_project_local/bin/mplayer')
-      puts "please install mplayer edl, please install mplayer-edl, see website http://rogerdpack.t28.net/sensible-cinema/content_editor.html"
-      return false
-    end
-    return true
-  end
-
   # check for the others generically
 
-  command = {"gocr" => "gocr --help", "convert" => "convert --help", "ffmpeg" => "ffmpeg -version"}[name]
+  command = {"gocr" => "gocr --help", "convert" => "convert --help", "ffmpeg" => "ffmpeg -version", "mplayer" => "mplayer"}[name]
 
   raise 'unknown ' + name unless command # sanity check
 
-  unless system(command + " 1> " + OS.dev_null + " 2>" + OS.dev_null)
+  unless system("/opt/rdp_project_local/bin/#{command} 1>/dev/null 2>&1")
      name = 'ImageMagick' if name == 'convert' # special case...
      puts 'lacking dependency! Please install ' + name + ' by installing the contrib pkg from the website'
      false

data/lib/edl_parser.rb

@@ -20,6 +20,29 @@ require 'sane'
 require_relative 'convert_thirty_fps'
 
 class EdlParser
+  
+  def self.on_any_file_changed_single_cached_thread &this_block
+    raise unless this_block
+    get_files_hash = proc {
+      glob = EDL_DIR + '/../**/*'
+      Dir[glob].map{|f|
+        [f, File.mtime(f)]
+      }.sort
+    }
+    old_value = get_files_hash.call
+    @@checking_thread ||= Thread.new {
+      loop {
+        current_value = get_files_hash.call
+        if current_value != old_value
+          print 'detected some file was changed! Re-parsing to update...'
+          old_value = current_value
+          this_block.call
+          puts 'done.'
+        end
+        sleep 2 # 0.02 for size 70, so...hopefully this is ok...
+      }
+    }
+  end
 
   # this one is 1:01:02.0 => 36692.0
   # its reverse is this: translate_time_to_human_readable
@@ -135,14 +158,15 @@ class EdlParser
       end
     rescue Exception => e
       string.strip.lines.to_a[0..-3].each_with_index{|l, idx| # last line doesn't need a comma check
-	    orig_line = l
-	    l = l.split('#')[0]
-		  l = l.strip
-		  unless l.empty?
-		    # todo strip off # comments at the end of lines too...
-		    end_char = l[-1..-1]
-          if !end_char.in? [']', '[', '{'] # these are probably all ok...
-            puts "warning: line #{idx} might be bad: (maybe needs comma after?) " + l unless end_char == ',' 
+	      orig_line = l
+	      l = l.split('#')[0]
+		    l = l.strip
+      
+		    unless l.empty?
+		      # todo strip off # comments at the end of lines too...
+		      end_char = l[-1..-1]
+          if !end_char.in? ['[', '{'] # these are probably ok...
+            puts "warning: #{File.basename filename} line #{idx} might be bad: (maybe needs comma after?) " + l unless end_char == ',' 
           end
         end
       }
@@ -221,30 +245,30 @@ class EdlParser
     raise if add_this_to_all_ends < 0
     raise if subtract_this_from_ends < 0
     add_this_to_all_ends -= subtract_this_from_ends # now we allow negative :)
-	#raise if splits.size > 0 # for now
+   # raise if splits.size > 0 # just ignore them for now
     mutes = incoming["mutes"] || {}
     blanks = incoming["blank_outs"] || {}
     mutes = mutes.map{|k, v| [k,v,:mute]}
     blanks = blanks.map{|k, v| [k,v,:blank]}
-    combined = (mutes+blanks).sort.map{|s,e,type|  [translate_string_to_seconds(s),  translate_string_to_seconds(e), type]}
+    combined = (mutes+blanks).map{|s,e,type|  [translate_string_to_seconds(s),  translate_string_to_seconds(e), type]}.sort
     
     # detect any weirdness...
     previous = nil
-    combined.map!{|current|
+    combined.map!{ |current|
       s,e,type = current
       if e < s || !s || !e || !type
-       raise SyntaxError.new("detected an end before a start or other weirdness: #{e} < #{s}")
+	   p caller
+       raise SyntaxError.new("detected an end before a start or other weirdness: #{s} > #{e}")
       end
       if previous
         ps, previous_end, pt = previous
         if (s < previous_end)
-          raise SyntaxError.new("detected an overlap #{current.join(' ')} #{previous.join(' ')}")
+          raise SyntaxError.new("detected an overlap current #{s} < #{previous_end} of current: #{current.join(' ')} previous: #{previous.join(' ')}")
         end
-        
       end
       previous = current
-	  # do the math later to allow for ones that barely hit into each other 1.0 2.0, 2.0 3.0
-	  [s-subtract_this_from_beginnings, e+add_this_to_all_ends,type]
+      # do the math later to allow for ones that barely hit into each other 1.0 2.0, 2.0 3.0
+      [s-subtract_this_from_beginnings, e+add_this_to_all_ends,type]
     }
     combined
   end

data/lib/gui/base.rb

@@ -88,7 +88,7 @@ module SensibleSwing
     
     def initialize start_visible = true, args = ARGV # lodo not optionals
       super "Sensible-Cinema #{VERSION} (GPL)"
-	  @args = args
+	    @args = args # save them away so this works with sub-child-windows
       force_accept_license_first # in other file :P
       setDefaultCloseOperation JFrame::EXIT_ON_CLOSE # closes the whole app when they hit X ...
       @panel = JPanel.new
@@ -105,10 +105,15 @@ module SensibleSwing
       @current_dvds_line2 = add_text_line ""
       @callbacks_for_dvd_edl_present = []
       DriveInfo.create_looping_drive_cacher
-      DriveInfo.add_notify_on_changed_disks { update_currently_inserted_dvd_list }
-      
-      setIconImage(ImageIcon.new(__DIR__ + "/../vendor/profs.png").getImage())
+      DriveInfo.add_notify_on_changed_disks { update_currently_inserted_dvd_list }      
+	  icon_filename = __DIR__ + "/../../vendor/profs.png"
+	  raise unless File.exist? icon_filename # it doesn't check this for us?
+      setIconImage(ImageIcon.new(icon_filename).getImage())
       check_for_various_dependencies
+	  LocalStorage.set_once('init_preferences_once') {
+	    show_blocking_message_dialog "lets setup some preferences once..."
+	    set_individual_preferences
+	  }
       set_visible start_visible
     end
     
@@ -302,7 +307,6 @@ KP_ENTER dvdnav select
         upconv = ""
        end
        if OS.doze?
-         # we want this even if we don't have -osd-add, since it adds confidence :)
          mplayer_loc = LocalModifiedMplayer
          assert File.exist?(mplayer_loc)
        else
@@ -412,20 +416,25 @@ KP_ENTER dvdnav select
       
       nav, mpeg_time = descriptors['dvd_nav_packet_offset'] # like [0.5, 0.734067]
       if nav
-        offset_time = mpeg_time*1/1.001 - nav # our reading like 0.5 is actually a bit offset, since in reality that "means 4.997" or what not
+	    mpeg_time *= 1/1.001 # -> 29.97 fps
+        offset_time = mpeg_time - nav
       else
   		  # readings: 0.213  0.173 0.233 0.21 0.18 0.197 they're almost all right around 0.20...
-        show_blocking_message_dialog "error--your DVD EDL doesn\'t list a start offset time [dvd_nav_packet_offset] which is needed for precise accurate timing. Please run\nadvanced mode -> Display information about current DVD\nand add it to the EDL. Using a default for now..."
+        show_blocking_message_dialog "error--your DVD EDL doesn\'t list a start offset time [dvd_nav_packet_offset] which is needed for precise accurate timing. Please run\nadvanced mode -> Display information about current DVD\nand add it to the EDL. Using a default for now...if you tweak any timing info you may want to set this more accurately first!"
         offset_time = 0.20
-        p caller
       end
 	  raise if offset_time <= 0 # unexpected...
-	    out << "-osd-add #{ "%0.3f" % offset_time}"
+	  # -osd-add is because the initial NAV packet is "x" seconds off from the mpeg, and since 
+	  # we have it set within mplayer to "prefer to just give you the MPEG time when you haven't passed a DVD block"
+	  # we wanted to match that more precisely once we did get past it.
+	  # so basically today we are trying to "match" the underlying MPEG time well. Which is wrong, of course.
+	  # either match the file or match the DVD, punk!
+	  out << "-osd-add #{ "%0.3f" % offset_time}"
       out.join(' ')
     end
 
     if OS.doze? # avoids spaces in filenames :)
-      EdlTempFile = EightThree.convert_path_to_8_3(Dir.tmpdir) + '\\mplayer.temp.edl'
+      EdlTempFile = EightThree.convert_path_to_8_3(Dir.tmpdir) + '\\mplayer.edl' # stay 8.3 friendly :)
     else
       raise if Dir.tmpdir =~ / / # that would be unexpected, and possibly cause problems...
       EdlTempFile = Dir.tmpdir + '/mplayer.temp.edl'
@@ -477,8 +486,12 @@ KP_ENTER dvdnav select
 
 #    MplayerBeginingBuffer = 1.0
 #    MplayerEndBuffer = 0.0
+   def begin_buffer_preference
+    LocalStorage['mplayer_beginning_buffer']
+   end
     
-    def play_smplayer_edl_non_blocking optional_file_with_edl_path = nil, extra_mplayer_commands_array = [], force_mplayer = false, start_full_screen = true, add_secs_end = 0, add_secs_begin = LocalStorage['mplayer_beginning_buffer'], show_subs = false
+    def play_smplayer_edl_non_blocking optional_file_with_edl_path = nil, extra_mplayer_commands_array = [], force_mplayer = false, start_full_screen = true, add_secs_end = 0, 
+	    add_secs_begin = begin_buffer_preference, show_subs = false
       if we_are_in_create_mode
         assert(add_secs_begin == 0 && add_secs_end == 0)
       end
@@ -489,8 +502,19 @@ KP_ENTER dvdnav select
         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 edl_path # some don't care...
-        descriptors = EdlParser.parse_file edl_path
+	  
+      if edl_path # some don't have one [?]
+	    begin
+		  # TODO combine these 2 methods yipzers
+          descriptors = EdlParser.parse_file edl_path
+  	      splits = [] # TODO not pass as parameter either
+          edl_contents = MplayerEdl.convert_to_edl descriptors, add_secs_end, add_secs_begin, splits, start_add_this_to_all_ts # add a sec to mutes to accomodate for mplayer's oddness..
+          File.write(EdlTempFile, edl_contents)
+          extra_mplayer_commands_array << "-edl #{EdlTempFile}" 
+		rescue SyntaxError => e
+		  show_blocking_message_dialog "unable to parse file! #{edl_path} #{e}"
+		  raise
+		end
         title_track = get_title_track_string(descriptors)
       end
       
@@ -510,13 +534,6 @@ KP_ENTER dvdnav select
         end
       end
       
-      if edl_path
-  	    splits = [] # TODO not pass as parameter either
-        edl_contents = MplayerEdl.convert_to_edl descriptors, add_secs_end, add_secs_begin, splits, start_add_this_to_all_ts # add a sec to mutes to accomodate for mplayer's oddness..
-        File.write(EdlTempFile, edl_contents)
-        extra_mplayer_commands_array << "-edl #{File.expand_path EdlTempFile}" 
-      end
-      
       run_smplayer_non_blocking drive_or_file, title_track, extra_mplayer_commands_array.join(' '), force_mplayer, show_subs, start_full_screen, get_srt_filename(descriptors, edl_path)
     end
     
@@ -538,13 +555,13 @@ KP_ENTER dvdnav select
     end
     
     def new_nonexisting_filechooser_and_go title = nil, default_dir = nil, default_file = nil
-      bring_to_front unless OS.mac? # causes triples on mac!
+      bring_to_front unless OS.mac? # causes triples on mac! TODO rdp
       JFileChooser.new_nonexisting_filechooser_and_go title, default_dir, default_file
     end
 
     # also caches directory previously selected ...
     def new_existing_file_selector_and_select_file title, dir = nil
-      bring_to_front unless OS.mac?
+      bring_to_front unless OS.mac? # causes duplicate prompts or something?
       unique_trace = caller.inspect
       if LocalStorage[unique_trace]
         dir = LocalStorage[unique_trace]
@@ -557,7 +574,6 @@ KP_ENTER dvdnav select
     end
     
     def show_blocking_message_dialog(message, title = message.split("\n")[0], style= JOptionPane::INFORMATION_MESSAGE)
-      bring_to_front
       SwingHelpers.show_blocking_message_dialog message, title, style
     end
     
@@ -568,10 +584,9 @@ KP_ENTER dvdnav select
       SwingHelpers.show_non_blocking_message_dialog message, close_button_text
     end
     
-    include_class javax.swing.UIManager
+    java_import javax.swing.UIManager
     
     def get_user_input(message, default = '', cancel_ok = false)
-      bring_to_front
       SwingHelpers.get_user_input message, default, cancel_ok
     end
     
@@ -586,10 +601,9 @@ KP_ENTER dvdnav select
     end
     
     def show_select_buttons_prompt message, names ={}
-      JOptionPane.show_select_buttons_prompt(message, names)
+      SwingHelpers.show_select_buttons_prompt(message, names)
     end
 
-
     def parse_edl path
       EdlParser.parse_file path
     end
@@ -676,6 +690,50 @@ KP_ENTER dvdnav select
       a.close
     end
 	
+    def we_are_in_upconvert_mode
+      @args.index("--upconvert-mode")
+    end
+
+    def setup_default_buttons
+      if we_are_in_upconvert_mode
+        add_play_upconvert_buttons
+      else
+        if we_are_in_create_mode
+          setup_create_buttons
+        else
+          setup_normal_buttons
+        end
+      
+      end # big else
+      
+      @exit = new_jbutton("Exit", "Exits the application and kills any background processes that are running at all--don't exit unless you are done processing all the way!")
+      @exit.on_clicked {
+        Thread.new { self.close } # don't waste the time to close it :P
+        puts 'Thank you for using Sensible Cinema. Come again!'
+        System.exit 0
+      }
+
+      increment_button_location
+      increment_button_location
+      self
+
+    end
+
+    def get_disk_chooser_window names
+      DropDownSelector.new(self, names, "Click to select DVD drive")
+    end
+	
+	def get_temp_file_name name_with_ext
+	  File.dirname(EdlTempFile) + '/' + name_with_ext
+	end
+	
+    # converts to full path, 8.3 if on doze
+    def normalize_path path
+      path = File.expand_path path
+      path = EightThree.convert_path_to_8_3 path if OS.doze?
+    end
+
+
   end
   
 end

data/lib/gui/create-file.rb

@@ -3,7 +3,8 @@ module SensibleSwing
   class MainWindow
     
     def add_options_that_use_local_files
-	  check_for_file_manipulation_dependencies
+      force_accept_file_style_license
+	    check_for_file_manipulation_dependencies
       add_text_line 'These are Create Options that operate on a file:'
 
       @preview_section = new_jbutton( "Preview a certain time frame (edited)" )
@@ -41,7 +42,7 @@ module SensibleSwing
         sleep 0.5 # lodo take out ???
         background_thread.join if background_thread # let it write out the original fulli, if necessary [?]
         nice_file = wrote_to_here_fulli
-        run_smplayer_blocking nice_file, nil, "-edl #{normalize_path EdlTempFile}", false, true, false, nil
+        run_smplayer_blocking nice_file, nil, "-edl #{EdlTempFile}", false, true, false, nil
       }
     end
     

data/lib/gui/create.rb

@@ -9,9 +9,11 @@ module SensibleSwing
       }
     end
 
-    def setup_advanced_buttons
-    
-	  add_text_line 'Normal playback Options:'
+    def setup_create_buttons
+	  # only create mode needs this uh guess
+      EdlParser.on_any_file_changed_single_cached_thread { DriveInfo.notify_all_drive_blocks_that_change_has_occured }
+	  
+	    add_text_line 'Normal playback Options:'
       new_jbutton("Display Standard Playback Options") do
         window = new_child_window
         window.setup_normal_buttons
@@ -45,13 +47,14 @@ module SensibleSwing
       end
       
       add_callback_for_dvd_edl_present { |disk_available, edl_available|
+        #TODO rdp file buttons
         @open_current.set_enabled edl_available
-        @create_new_edl_for_current_dvd.set_enabled disk_available
+        #@create_new_edl_for_current_dvd.set_enabled disk_available
         if edl_available
           @create_new_edl_for_current_dvd.text= create_new_edl_for_current_dvd_text + " [yours already has one!]"
         else
 		  if disk_available
-            @create_new_edl_for_current_dvd.text= create_new_edl_for_current_dvd_text + " [doesn't have one yet!]"
+            @create_new_edl_for_current_dvd.text= create_new_edl_for_current_dvd_text + " [it doesn't have one yet!]"
 		  else
 		    @create_new_edl_for_current_dvd.text= create_new_edl_for_current_dvd_text + " [no disk inserted!]"
 		  end
@@ -88,35 +91,41 @@ module SensibleSwing
         add_to_end = "0.0"#get_user_input("How much time to add to the end of every subtitle entry (ex: (1:00,1:04) becomes (1:00,1:05))", "0.0")
  
 	if show_select_buttons_prompt("Sometimes subtitle files' time signatures don't match precisely with the video.\nWould you like to enter some information to allow it to synchronize the timestamps?\n  (on the final pass you should do this, even if it already matches well, for future information' sake)") == :yes
-          with_autoclose_message("parsing srt file...") do
+          euphemized_synchronized_entries = nil
+          with_autoclose_message("parsing srt file... #{srt_filename}") do
             parsed_profanities, euphemized_synchronized_entries = SubtitleProfanityFinder.edl_output_from_string File.read(srt_filename), {},  0, 0, 0, 0, 3000, 3000
-			write_subs_to_file euphemized_filename = EdlTempFile + '.euphemized.srt.txt', euphemized_synchronized_entries
+			write_subs_to_file euphemized_filename = get_temp_file_name('euphemized.subtitles.txt'), euphemized_synchronized_entries
   		    open_file_to_edit_it euphemized_filename
             sleep 0.5 # let it open in TextEdit/Notepad first...
       	    bring_to_front
           end
 
           if show_select_buttons_prompt("Would you like to start playing the movie in mplayer, to be able to search for subtitle timestamp times [you probably do...]?\n") == :yes
-            Thread.new { play_dvd_smplayer_unedited true }
-            show_blocking_message_dialog "ok--use the arrow keys and pgdown/pgup to search/scan, and then '.' to pinpoint a precise subtitle start time within mplayer.\nYou will be prompted for a beginning and starting timestamp time."
+            show_blocking_message_dialog "ok--use the arrow keys and pgdown/pgup to search/scan, and then '.' to pinpoint a precise subtitle start time within mplayer.\nYou will be prompted for a beginning and starting timestamp time to search for."
+            play_dvd_smplayer_unedited true
           end
-          all_entries = SubtitleProfanityFinder.split_to_entries File.read(srt_filename)
+          all_entries = euphemized_synchronized_entries
+
+          all_entries.shift if all_entries[0].text =~ / by |downloaded/i # only place I think
+          all_entries.pop if all_entries[-1].text =~ / by |downloaded/i
+
           display_and_raise "unable to parse subtitle file?" unless all_entries.size > 10
           
           start_text = all_entries[0].single_line_text
           start_srt_time = all_entries[0].beginning_time
           human_start = EdlParser.translate_time_to_human_readable(start_srt_time)
-          start_movie_ts = get_user_input("Enter beginning timestamp within the movie itself for when the subtitle \"#{start_text}\"\nfirst frame the subtitle appears on the on screen display (possibly near #{human_start})")
+          start_movie_ts = get_user_input("Enter beginning timestamp within the movie itself for when the subtitle \"#{start_text}\"\nfirst frame the subtitle appears on the on screen display (possibly near #{human_start})", @start_movie_remember)
+          @start_movie_remember = start_movie_ts
           start_movie_time = EdlParser.translate_string_to_seconds start_movie_ts
           if(show_select_buttons_prompt 'Would you like to select an ending timestamp at the end or 3/4 mark of the movie [end can be a spoiler at times]?', :yes => 'very end of movie', :no => '3/4 of the way into movie') == :yes
            end_entry = all_entries[-1]
           else
-           end_entry = all_entries[all_entries.length*0.75]  
+           end_entry = all_entries[all_entries.length*0.75] 
           end
           end_text = end_entry.single_line_text
           end_srt_time = end_entry.beginning_time
           human_end  = EdlParser.translate_time_to_human_readable(end_srt_time)
-          end_movie_ts = get_user_input("Enter beginning timestamp within the movie itself for when the subtitle #{end_entry.index_number}\n\"#{end_text}\"\nfirst appears (possibly near #{human_end}).\nYou can find it by searching to near that time in the movie [pgup+pgdown, then arrow keys], find some subtitle, then find where that subtitle is within the .srt file to see where it lies\nrelative to the one you are interested in\nthen seek relative to that to find the one you want.")
+          end_movie_ts = get_user_input("Enter beginning timestamp within the movie itself for when the subtitle ##{end_entry.index_number}\n\"#{end_text}\"\nfirst appears (possibly near #{human_end}).\nYou can find it by searching to near that time in the movie [pgup+pgdown, then arrow keys], find some subtitle, then find where that subtitle is within the .srt file to see where it lies\nrelative to the one you are interested in\nthen seek relative to that to find the one you want.")
           end_movie_time = EdlParser.translate_string_to_seconds end_movie_ts
         else
 	      start_srt_time = 0
@@ -126,36 +135,38 @@ module SensibleSwing
     	end
 
         parsed_profanities, euphemized_synchronized_entries = nil
-        with_autoclose_message("parsing srt file...") do
+        with_autoclose_message("parsing srt file... #{srt_filename}") do
           parsed_profanities, euphemized_synchronized_entries = SubtitleProfanityFinder.edl_output_from_string File.read(srt_filename), {}, add_to_beginning.to_f, add_to_end.to_f, start_srt_time, start_movie_time, end_srt_time, end_movie_time
         end
         
-        filename = EdlTempFile + '.parsed.txt'
-        out =  "# add these into your \"mute\" section if you deem them mutable\n" + parsed_profanities
-        if end_srt_time != 3000
-          out += %!\n\n#Also add these lines at the bottom of the EDL (for later coordination):\n"beginning_subtitle" => ["#{start_text}", "#{start_movie_ts}"],! +
-                 %!\n"ending_subtitle_entry" => ["#{end_text}", "#{end_movie_ts}"],!
-          middle_entry = euphemized_synchronized_entries[euphemized_synchronized_entries.length*0.5]
-		  show_blocking_message_dialog "You may want to double check if the math worked out.\n\"#{middle_entry.single_line_text}\" (##{middle_entry.index_number})\nshould first appear at #{EdlParser.translate_time_to_human_readable middle_entry.beginning_time}\nIf it's off much you may want to try a different .srt file"
-        end
+        filename = get_temp_file_name('partial.edl.txt')
+        out =  "# copy and paste these into your \"mute\" section of A SEPARATE EDL already created with the other buttons, for lines you deem them mutable\n" + parsed_profanities
+        out += %!\n\n#Also add these lines at the bottom of the EDL (for later coordination):\n"beginning_subtitle" => ["#{start_text}", "#{start_movie_ts}"],! +
+               %!\n"ending_subtitle_entry" => ["#{end_text}", "#{end_movie_ts}"],!
+        middle_entry = euphemized_synchronized_entries[euphemized_synchronized_entries.length*0.5]
+        show_blocking_message_dialog "You may want to double check if the math worked out.\n\"#{middle_entry.single_line_text}\" (##{middle_entry.index_number})\nshould appear at #{EdlParser.translate_time_to_human_readable middle_entry.beginning_time}\nIf it's off much you may want to try a different .srt file"
         File.write filename, out
         open_file_to_edit_it filename
         sleep 1 # let it open
 		
-	    if show_select_buttons_prompt("Would you like to write out a synchronized, euphemized .srt file [useful if you want to watch the movie with sanitized subtitles later]?") == :yes
-          out_file = new_nonexisting_filechooser_and_go("Select filename to write to", File.dirname(srt_filename), File.basename(srt_filename)[0..-5] + ".euphemized.srt")
-		  write_subs_to_file out_file, euphemized_synchronized_entries
-          show_in_explorer out_file
-        end
+		if LocalStorage['prompt_obscure_options']
+	      if show_select_buttons_prompt("Would you like to write out a synchronized, euphemized .srt file [useful if you want to watch the movie with sanitized subtitles later]\nyou probably don't?") == :yes
+            out_file = new_nonexisting_filechooser_and_go("Select filename to write to", File.dirname(srt_filename), File.basename(srt_filename)[0..-5] + ".euphemized.srt")
+		    write_subs_to_file out_file, euphemized_synchronized_entries
+            show_in_explorer out_file
+          end
+		end
         
       end
 	  
       add_text_line 'Create: Advanced View Edited Options'
       
-      @mplayer_edl_with_subs = new_jbutton( "Watch DVD edited (realtime) (mplayer) (yes subtitles)") do
+      @mplayer_edl_with_subs = new_jbutton( "Watch DVD edited (realtime) (with mplayer, subtitles)") do
         watch_dvd_edited_realtime_mplayer true
       end
       
+	  @mplayer_edl_with_subs.tool_tip="This watches it in mplayer, which has access to its console output, and also includes subtitles."
+	  
       @mplayer_partial = new_jbutton( "Watch DVD edited (realtime) (mplayer) based on timestamp") do
         times = get_start_stop_times_strings
         times.map!{|t| EdlParser.translate_string_to_seconds t}
@@ -164,6 +175,8 @@ module SensibleSwing
         extra_mplayer_commands = ["-ss #{start_time}", "-endpos #{end_time - start_time}"]
         play_smplayer_edl_non_blocking nil, extra_mplayer_commands, true, false, add_end = 0.0, add_begin = 0.0 # create mode => aggressive
       end
+	  
+	  @mplayer_partial.tool_tip="this can play just a specific portion of your film, like from second 30 to 35, for testing."
             
       new_jbutton("Display mplayer keyboard commands/howto/instructions") do
         show_mplayer_instructions
@@ -189,69 +202,14 @@ module SensibleSwing
       add_text_line "Less commonly used Edit options:"
 
       new_jbutton("Create new Edit List (for netflix instant or movie file)") do # LODO VIDEO_TS here too?
-        names = ['movie file', 'netflix instant']
-        dialog = DropDownSelector.new(self, names, "Select type")
-        type = dialog.go_selected_value
-        extra_options = {}
-        if type == 'movie file'
-          path = SwingHelpers.new_previously_existing_file_selector_and_go "Select file to create EDL for"
-          guess_name = File.basename(path).split('.')[0..-2].join('.') # like yo.something.720p.HDTV.X264-DIMENSION.m4v maybe?
-          extra_options['filename'] = File.basename path
-          require 'lib/movie_hasher'
-          extra_options['movie_hash'] = MovieHasher.compute_hash path
-        else
-          url = get_user_input "Please input the movies url (like http://www.netflix.com/Movie/Curious-George/70042686 )" #?
-          if url =~ /netflix/
-            guess_name = url.split('/')[-2]
-          else
-            show_blocking_message_dialog "non hulu/netflix? please report!"
-            type = 'unknown'
-            guess_name = url.split('/')[-1]
-          end
-          extra_options['url'] = url
-        end
-        english_name = get_user_input "Enter name of movie", guess_name.gsub(/[-._]/, ' ')
-        filename = new_nonexisting_filechooser_and_go 'Pick new EDL filename', EdlParser::EDL_DIR + '/..', english_name.gsub(' ', '_') + '.txt'
-        display_and_raise "needs .txt extension" unless filename =~ /\.txt$/i
-        
-        output = <<-EOL
-# edl_version_version 1.1, created by sensible cinema v#{VERSION}
-# comments can go be created by placing text after a # on any line, for example this one.
-"name" => "#{english_name}",
-
-"source" => "#{type}",
-#{extra_options.map{|k, v| %!\n"#{k}" => "#{v}",\n!}}
-"mutes" => [
-  # an example line, uncomment the leading "#" to make it active
-  # "0:00:01.0", "0:00:02.0", "profanity", "da..", 
-],
-
-"blank_outs" => [
-  # an example line, uncomment the leading "#" to make it active
-  # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
-],
-
-"timestamps_relative_to" => ["#{type}"],
-# "not edited out stuff" => "some...",
-# "closing thoughts" => "only ...",
-# "subtitles_to_display_relative_path" => "some_file.srt" # if you want to display some custom subtitles alongside your movie
-        EOL
-        File.write filename, output
-        open_file_to_edit_it filename
+	    create_new_for_file_or_netflix
       end
       
-      new_jbutton("Show even more rarely used buttons") do
+      new_jbutton("Show more (rarely used) buttons/options") do
         child = new_child_window
         child.show_rarely_used_buttons
       end
 
-      add_text_line 'Options for creating an edited movie file from a local file:'
-      
-      new_jbutton("Show options to help with creating a fully edited movie file") do
-        window = new_child_window
-        window.add_options_that_use_local_files
-      end
-      
     end
 
 		def write_subs_to_file out_file, euphemized_synchronized_entries
@@ -277,12 +235,6 @@ module SensibleSwing
        end
       end
 
-      @open_list = new_jbutton("Open/Edit an arbitrary file (EDL, .srt file, whatever)")
-      @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
-      }
-
       @display_dvd_info = new_jbutton( "Display information about current DVD (ID, timing, 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."
       @display_dvd_info.on_clicked {
@@ -290,7 +242,7 @@ module SensibleSwing
           out_hashes, title_lengths = get_disk_info
 	        out_string = out_hashes.map{|name, value| name.inspect + ' => ' + value.inspect  + ','}.join("\n") + "\n" + title_lengths.join("\n")
           out_string += %!\n"timestamps_relative_to" => ["dvd_start_offset","29.97"],! # since they're all this way currently
-          filename = EdlTempFile + '.disk_info.txt'
+          filename = get_temp_file_name('disk_info.txt')
           File.write filename, out_string 
           open_file_to_edit_it filename
           out_string # for unit tests :) TODO
@@ -343,9 +295,18 @@ module SensibleSwing
         version (which includes an updated version of mplayer that fixes some bugs in EDL playback)
       EOL
       @create_dot_edl.on_clicked {
-        show_blocking_message_dialog "Warning: With XBMC you'll need Eden 11.0 for mutes to work"
+        show_blocking_message_dialog "Warning: With XBMC you'll need at least Eden v11.0 for mutes to work at all"
         choose_file_and_edl_and_create_sxs_or_play true
       }
+	  
+      add_text_line 'Options for creating an edited movie file from a local file:'
+      
+      new_jbutton("Show options to help with creating a fully edited movie file") do
+        window = new_child_window
+        window.add_options_that_use_local_files
+      end
+      
+	  
       if LocalStorage['have_zoom_button']
         @create_zoomplayer = new_jbutton( "Create a ZoomPlayer MAX compatible EDL file") do
           raise unless OS.doze?
@@ -391,6 +352,9 @@ module SensibleSwing
       title_lengths = title_lengths_output.split("\n").select{|line| line =~ /TITLE.*LENGTH/}
       # ID_DVD_TITLE_4_LENGTH=365.000
       titles_with_length = title_lengths.map{|name| name =~ /ID_DVD_TITLE_(\d+)_LENGTH=([\d\.]+)/; [$1, $2.to_f]}
+	  if titles_with_length.length > 50
+	    show_blocking_message_dialog "this DVD has > 50 titles, this may mean that our 'guess' for the main title will be off, please double check the right number\nby starting the main movie in VLC then Playback menu -> title to see which number it is on."
+	  end
       largest_title = titles_with_length.max_by{|title, length| length}
   	  if !largest_title
   	    display_and_raise "unable to parse title lengths? maybe need to clean disk first? #{title_lengths_output}"
@@ -408,7 +372,7 @@ module SensibleSwing
 	
     def watch_dvd_edited_realtime_mplayer show_subs
       edl_out_command = ""
-      if !@has_ever_rejected_edl_outfile
+      if LocalStorage['prompt_obscure_options']
         answer = show_select_buttons_prompt <<-EOL, {}
           Would you like to create an .edl outfile as it plays (hit button to capture timestamps)?
           EOL
@@ -452,11 +416,11 @@ module SensibleSwing
           mpeg = $2.to_f
           if !outs[:dvd_nav_packet_offset] && nav > 0.0 # like 0.4
 			  if mpeg < nav
-			    # case there is an MPEG split before the second NAV packet [ratatouille]
+			    # case there is an MPEG split before the second NAV packet [ratatouille, hp]
 			    p mpeg, nav, old_mpeg
 			    assert old_mpeg > 0.3
 				mpeg = old_mpeg + mpeg - 0.033367 # assume 30 fps, and that this is the second frame since it occurred, since the first one we apparently display "weird suddenly we're not a dvd?"
-				show_blocking_message_dialog "this dvd has some weird stuff at the start, attempting to accomodate..."
+				show_blocking_message_dialog "this dvd has some weird timing stuff at the start, attempting to accomodate...please report..."
 			  end
 	          outs[:dvd_nav_packet_offset] = [nav, mpeg] # like [0.4, 0.6] or the like
             else
@@ -464,7 +428,7 @@ module SensibleSwing
 	    end
       	  end
       }
-      show_blocking_message_dialog "unable to calculate time?" unless outs.length == 2
+      show_blocking_message_dialog "unable to calculate DVD start time from #{command}?" unless outs.length == 2
       outs
     end
     
@@ -537,12 +501,12 @@ module SensibleSwing
       filename = EdlParser::EDL_DIR + "/edls_being_edited/" + english_name.gsub(' ', '_') + '.txt'
       filename.downcase!
       if File.exist?(filename)
-	    show_blocking_message_dialog 'cannot overwrite file in the edit dir that already has same name, opening it instead...'
-	  else
-	    File.write(filename, input)
+	      show_blocking_message_dialog 'don\'t want to overwrite a file in the edit dir that already has same name, opening it instead...'
+	    else
+	      File.write(filename, input)
       end
       open_file_to_edit_it filename
-    end     
+    end    
 
     def show_mplayer_instructions
       show_non_blocking_message_dialog <<-EOL
@@ -560,6 +524,59 @@ module SensibleSwing
    		  [ and ] make playback faster or slower [like 2x]
       EOL
     end
+	
+    def create_new_for_file_or_netflix
+	    names = ['movie file', 'netflix instant']
+        dialog = DropDownSelector.new(self, names, "Select type")
+        type = dialog.go_selected_value
+        extra_options = {}
+        if type == 'movie file'
+          path = SwingHelpers.new_previously_existing_file_selector_and_go "Select file to create EDL for"
+          guess_name = File.basename(path).split('.')[0..-2].join('.') # like yo.something.720p.HDTV.X264-DIMENSION.m4v maybe?
+          extra_options['filename'] = File.basename path
+          require 'lib/movie_hasher'
+          extra_options['movie_hash'] = MovieHasher.compute_hash path
+        else
+          url = get_user_input "Please input the movies url (like http://www.netflix.com/Movie/Curious-George/70042686 )" #?
+          if url =~ /netflix/
+            guess_name = url.split('/')[-2]
+          else
+            show_blocking_message_dialog "non hulu/netflix? please report!"
+            type = 'unknown'
+            guess_name = url.split('/')[-1]
+          end
+          extra_options['url'] = url
+        end
+        english_name = get_user_input "Enter name of movie", guess_name.gsub(/[-._]/, ' ')
+        filename = new_nonexisting_filechooser_and_go 'Pick new EDL filename', EdlParser::EDL_DIR + '/..', english_name.gsub(' ', '_') + '.txt'
+        display_and_raise "needs .txt extension" unless filename =~ /\.txt$/i
+        
+        output = <<-EOL
+# edl_version_version 1.1, created by sensible cinema v#{VERSION}
+# comments can go be created by placing text after a # on any line, for example this one.
+"name" => "#{english_name}",
+
+"source" => "#{type}",
+#{extra_options.map{|k, v| %!\n"#{k}" => "#{v}",\n!}}
+"mutes" => [
+  # an example line, uncomment the leading "#" to make it active
+  # "0:00:01.0", "0:00:02.0", "profanity", "da..", 
+],
+
+"blank_outs" => [
+  # an example line, uncomment the leading "#" to make it active
+  # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
+],
+
+"timestamps_relative_to" => ["#{type}"],
+# "not edited out stuff" => "some...",
+# "closing thoughts" => "only ...",
+# "subtitles_to_display_relative_path" => "some_file.srt" # if you want to display some custom subtitles alongside your movie
+        EOL
+        File.write filename, output
+        open_file_to_edit_it filename
+
+	  end
 
   end
 end