sensible-cinema 0.22.1 → 0.23.0

data/VERSION

@@ -1 +1 @@
-0.22.1
+0.23.0

data/bin/sensible-cinema

@@ -20,15 +20,16 @@ This file is part of Sensible Cinema.
 print 'Loading Sensible Cinema...'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/add_any_bundled_gems_to_load_path.rb")
 begin
-  require 'sane' # failure here means you haven't bundled your dependencies... [$ jruby -S rake bundle_dependencies after doing jruby -S gem install sensible-cinema ]
+  require 'sane' 
 rescue LoadError
-  p 'warning, didnt find bundled gems, loading full rubygems for developer convenience [run rake bundle_dependencies]'
+  p 'please run $ rake rebundle_copy_in_dependencies first, as we dislike needing locally installed rubygems'
   raise
 end
 
 raise 'need jruby' unless OS.java?
-raise 'need newer jruby!' unless RUBY_DESCRIPTION >= 'jruby 1.6.0.RC2' # may not need this since we still accomodate for so many oddities :P
+raise 'need newer jruby!' unless RUBY_DESCRIPTION >= 'jruby 1.6.0' # may not need this since we still have to accomodate for so many oddities :P
 
+alias system_original system
 require_relative '../lib/mencoder_wrapper'
 require_relative '../lib/storage'
 require_relative '../lib/edl_parser'
@@ -39,19 +40,25 @@ require 'tmpdir'
 require_relative '../lib/swing_helpers'
 require_relative '../lib/drive_info'
 require 'whichr'
-require 'ruby-wmi'
+require 'os'
+require 'ruby-wmi' unless OS.mac?
 
 vendor_cache = File.expand_path(File.dirname(__FILE__)) + '/../vendor/cache'
 
-for name in ['.', 'mencoder', 'ffmpeg']
-  # put them all before the old path
-  ENV['PATH'] = (vendor_cache + '/' + name).to_filename + ';' + ENV['PATH']
-end
+if OS.windows?
+  for name in ['.', 'mencoder', 'ffmpeg']
+    # put them all before the old path
+    ENV['PATH'] = (vendor_cache + '/' + name).to_filename + ';' + ENV['PATH']
+  end
+  
+  installed_smplayer_folders = Dir['{c,d,e,f,g}:/program files*/MPlayer for Windows*'] # sometimes ends with UI? huh?
 
-installed_smplayer_folders = Dir['{c,d,e}:/program files*/SMPlayer']
+  for folder in installed_smplayer_folders
+    ENV['PATH'] = ENV['PATH'] + ";#{folder.gsub('/', "\\")}"
+  end
 
-for folder in installed_smplayer_folders
-  ENV['PATH'] = ENV['PATH'] + ";#{folder.gsub('/', "\\")}"
+else
+  ENV['PATH'] = ENV['PATH'] + ':' + '/opt/local/bin' # add macports' bin in, just in case...
 end
 
 import 'javax.swing.ImageIcon'
@@ -91,10 +98,10 @@ module SensibleSwing
     def initialize
       super "Sensible-Cinema #{VERSION} (GPL)"
       if !(Storage['main_license_accepted'] == VERSION)
-        show_blocking_license_accept_dialog 'Sensible Cinema', 'gplv3', 'http://www.gnu.org/licenses/gpl.html', 'Sensible Cinema license agreement', 
-          'Sensible Cinema is distributed under the gplv3. Click accept if you accept the terms of this license agreement.'
-        show_blocking_license_accept_dialog 'Sensible Cinema', 'is_it_legal_to_copy_dvds.txt file', File.expand_path(File.dirname(__FILE__) + "/../is_it_legal_to_copy_dvds.txt"), 
-          'is_it_legal_to_copy_dvds.txt file', 'I acknowledge that I have read, understand, and accept and agree to abide by the implications noted in the is_it_legal_to_copy_dvds.txt file'
+        require_blocking_license_accept_dialog 'Sensible Cinema', 'gplv3', 'http://www.gnu.org/licenses/gpl.html', 'Sensible Cinema license agreement', 
+          "Sensible Cinema is distributed under the gplv3.\nBY CLICKING \"accept\" YOU SIGNIFY THAT YOU HAVE READ, UNDERSTOOD AND AGREED TO ABIDE BY THE TERMS OF THIS AGREEMENT"
+        require_blocking_license_accept_dialog 'Sensible Cinema', 'is_it_legal_to_copy_dvds.txt file', File.expand_path(File.dirname(__FILE__) + "/../is_it_legal_to_copy_dvds.txt"), 
+          'is_it_legal_to_copy_dvds.txt file', 'I acknowledge that I have read, understand, accept and agree to abide by the implications noted in the is_it_legal_to_copy_dvds.txt file'
         Storage['main_license_accepted'] = VERSION
       end
 
@@ -142,9 +149,13 @@ module SensibleSwing
       @play_smplayer = new_jbutton( "Watch DVD unedited (realtime smplayer)", true).on_clicked {
         play_dvd_smplayer_unedited
       }
-      
+
+      @play_mplayer_raw = new_jbutton( "Watch DVD unedited (realtime mplayer--useful for subtitle timing)", true).on_clicked {
+        play_dvd_smplayer_unedited true
+      }
+
 #      @watch_created_file = new_jbutton( "Watch edited file copy of DVD", false).on_clicked {
-#        raise 'todo'
+#        raise 'todo' # TODO 
 #      }
 
       @preview_section = new_jbutton( "Preview a certain time frame from file (edited)", true )
@@ -168,7 +179,7 @@ module SensibleSwing
         background_thread.join if background_thread # let it write out the original fulli, if necessary [?]
         nice_file = wrote_to_here_fulli #+ ".fast.mpg"
         if false#!File.exist?(nice_file)
-          p = NonBlockingDialog.new("Creating quick lookup file--NB that for each changed deletion, 
+          p = show_non_blocking_message_dialog("Creating quick lookup file--NB that for each changed deletion, 
           you'll need to restart the fast preview SMplayer
           Also note that the start and end times will be slightly off if reality [delayed]
           Also note that while doing fast preview, it can be doing a normal preview as well
@@ -179,16 +190,13 @@ module SensibleSwing
           end
           p.dispose # it will be active for sure
         end
-        smplayer_prefs_file = File.expand_path("~/.smplayer/smplayer.ini")
-        old_prefs = File.read(smplayer_prefs_file) rescue ''
-        new_prefs = old_prefs.gsub(/mplayer_additional_options=.*/, "mplayer_additional_options=-edl #{EdlTempFile}")
-        File.write(smplayer_prefs_file, new_prefs)
-        thread = do_mplayer_edl( "smplayer #{nice_file}") # note the smplayer, but it's for the fast file...
+        set_smplayer_opts "-edl #{EdlTempFile}"
+        thread = do_mplayer_edl( "smplayer_portable #{nice_file}") # note the smplayer, but it's for the fast file...
         Thread.new { # XXX do we need this?
           begin
             thread.join
           ensure
-            File.write(smplayer_prefs_file, old_prefs)
+            set_smplayer_opts ''
           end
         }
       }
@@ -197,18 +205,18 @@ module SensibleSwing
       @watch_unedited.on_clicked {
         success_no_run, wrote_to_here_fulli = do_copy_dvd_to_hard_drive false, true, true
         sleep 5 unless success_no_run
-        command = "smplayer #{wrote_to_here_fulli}"
+        command = "smplayer_portable #{wrote_to_here_fulli}"
         system_non_blocking command
       }
 
 
       # until I can let them know *why* they would ever need this button...
-      # @display_unique = new_jbutton( "Display a DVD's unique ID", true ).on_clicked {
-      #   drive, volume, md5 = choose_dvd_drive
-      #   # display it, allow them to copy and paste it out
-      #   get_user_input("#{drive} #{volume} for your copying+pasting pleasure (highlight, then ctrl+c to copy)        \n
-      #   This is USED to identify a disk to match it to its EDL, later.", "\"disk_unique_id\" => \"#{md5}\",")
-      # }
+      @display_unique = new_jbutton( "Display a DVD's unique ID", true ).on_clicked {
+        drive, volume, dvd_id = choose_dvd_drive
+        # display it, allow them to copy and paste it out
+        get_user_input("#{drive} #{volume} for your copying+pasting pleasure (highlight, then ctrl+c to copy)\n
+        This is USED to identify a disk to match it to its EDL, later.", "\"disk_unique_id\" => \"#{dvd_id}\",")
+      }
       
       @upload = new_jbutton("Upload/E-mail suggestion/Submit anything", true).on_clicked {
         system_non_blocking("start mailto:sensible-cinema@googlegroups.com")
@@ -224,7 +232,9 @@ module SensibleSwing
       increment_button_location
 
       @exit = new_jbutton("Exit", false, true).on_clicked {
-        self.close
+        #self.close # don't waste time :P
+        kill_processes
+        java.lang.System.exit 0
       }
 
       increment_button_location
@@ -235,11 +245,26 @@ module SensibleSwing
       check_for_dependencies
     end
     
+    require 'fileutils'
+    
+    def set_smplayer_opts to_this
+        smplayer_prefs_file = File.expand_path("~/.smplayer/smplayer.ini")
+        old_prefs = File.read(smplayer_prefs_file) rescue ''
+        old_prefs = "[advanced]\nmplayer_additional_options=" unless old_prefs.contain? 'mplayer_additional_options='
+        new_prefs = old_prefs.gsub(/mplayer_additional_options=.*/, "mplayer_additional_options=#{to_this}")
+        FileUtils.mkdir_p File.dirname(smplayer_prefs_file) # case it doesn't exist'
+        File.write(smplayer_prefs_file, new_prefs)
+        p 'wrote', new_prefs.length, smplayer_prefs_file, to_this
+        # no worky doze File.write(File.expand_path('~/.mplayer/config'), to_this)
+        smplayer_prefs_file
+    end
+    
     def create_brand_new_edl
-      drive, volume, md5 = choose_dvd_drive
+      drive, volume, dvd_id = choose_dvd_drive
       english_name = get_user_input("Enter a human readable DVD description for #{volume}", volume.gsub('_', ' ').downcase)
       input = <<-EOL
 # comments can go after a # on any line, for example this one.
+"name" => "#{english_name}",
 
 "mutes" => [
   # example line, uncomment the leading "#" to make it active
@@ -251,11 +276,9 @@ module SensibleSwing
   # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
 ],
 
-"name" => "#{english_name}",
 "volume_name" => "#{volume}",
-"disk_unique_id" => "#{md5}",
-
-# "dvd_title_track" => "1", # most DVD's use title 1. Not all do, though.  If sensible-cinema plays anything except the main title (for example, a trailer), when you use it, see http://goo.gl/QHLIF to set this right.
+"disk_unique_id" => "#{dvd_id}",
+"dvd_title_track" => "1", # most DVD's use title 1. Not all do, though.  If sensible-cinema plays anything except the main title (for example, a trailer), when you use it, see http://goo.gl/QHLIF to set this right.
 # "not edited out stuff" => "some violence",
 # "closing thoughts" => "still...",
 # "mplayer_dvd_splits" => ["59:59", "1:04:59"], # these are where, in mplayer, the DVD timestamp "resets" to zero for some reason (bug) http://goo.gl/yMfqX . [] is a valid option, if there are none.
@@ -267,7 +290,6 @@ module SensibleSwing
       open_file_to_edit_it filename
     end
      
-    alias system_original system
     
     def system_blocking command, low_prio = false
       return true if command =~ /^@rem/ # jruby+MRI bug, I think...
@@ -292,7 +314,7 @@ module SensibleSwing
               p 'unable to find to set priority ' + exe_name
             end
           rescue Exception => e
-            p 'warning, got exception trying to set PID [jruby...]', e
+            p 'warning, got exception trying to set priority [jruby? ...]', e
           end
         end
         print out.read # let it finish
@@ -304,7 +326,7 @@ module SensibleSwing
     end
     
     def system_non_blocking command
-     Thread.new { system_original command }
+      Thread.new { system_original command }
     end
     
     # make them choose which system call to use explicitly
@@ -317,18 +339,40 @@ module SensibleSwing
       writeOut.close
     end
     
-    def play_dvd_smplayer_unedited
-      drive, dvd_volume_name, md5sum, edl_path, descriptors = choose_dvd_and_edl_for_it
-      title_track = get_title_track(descriptors)
-      command =  "smplayer dvdnav://#{title_track} -dvd-device #{drive}"
+    def _dbg
+      require 'ruby-debug'
+      debugger
+    end
+    
+    def play_dvd_smplayer_unedited use_mplayer_instead = false
+      # LODO really even if there are 2 it should still pick out the title track...hmm...on demand :P
+      # lodo mac os x 'ify'
+      drive, dvd_volume_name, dvd_id, edl_path_maybe_nil, descriptors_maybe_nil = choose_dvd_and_edl_for_it false
+      if descriptors_maybe_nil
+        title_track_maybe_nil = get_title_track(descriptors_maybe_nil, false)
+      end
+      if use_mplayer_instead
+        exe = "mplayer "
+        # maybe, maybe following would be useful for people just watching through the film (?)
+        #"-font #{ENV['SystemRoot']}\\fonts\\ARIAL.TTF "
+      else
+        config_path = set_smplayer_opts "  " # smplayer doesn't take -osdlevel 2 sniff...
+        exe = "smplayer_portable -config-path \"#{File.dirname config_path}\" "
+      end
+      command = "#{exe} dvdnav://#{title_track_maybe_nil}/#{drive} -osd-fractions 2 -nocache "
       p command
+      @play_smplayer_warn ||= show_non_blocking_message_dialog "Directions:
+      'o' key: turn on on-screen time stamps (note: these are 30 fps timestamps so will need to be converted to use).
+      'v' key: turn off subtitles.
+      '.' key: step one frame.
+      'f' for full screen."
       system_non_blocking command
     end
 
     EdlTempFile = Dir.tmpdir + '/mplayer.temp.edl'
     
     def do_mplayer_edl play_this_mplayer = nil, add_secs_end = 0, add_secs_beginning = 0.5
-      drive, dvd_volume_name, md5sum, edl_path, descriptors = choose_dvd_and_edl_for_it
+      drive, dvd_volume_name, dvd_id, edl_path, descriptors = choose_dvd_and_edl_for_it
       descriptors = EdlParser.parse_file edl_path
       splits = descriptors['mplayer_dvd_splits']
       if splits == nil && !play_this_mplayer
@@ -343,26 +387,33 @@ module SensibleSwing
       File.write(EdlTempFile, edl_contents)
       title_track = get_title_track(descriptors)
       # oh the insanity of the console UI...LODO more user friendly player
-      @popup ||= NonBlockingDialog.new("About to run mplayer DVD.  To control it, use space for pause, f to toggle full screen, arrow keys to seek.")
+      @popup ||= show_non_blocking_message_dialog("About to run mplayer DVD.  To control it, use\n space for pause,\n f for full screen,\n arrow keys to seek.")
       # LODO dry up mplayer dvd opts...
-      play_this_mplayer ||= "mplayer dvd://#{title_track} " 
-      # direct3d for windows 7 nvidia's sake yipes
-      command =  "#{play_this_mplayer} -vo direct3d -framedrop -alang en -sid 1000 -edl #{File.expand_path EdlTempFile} -dvd-device #{drive}"
-      # -framedrop for slower systems, once had -nocache, but that's only for dvdnav:// I think
-      # -hardframedrop might help a bit but hurts so much too
-      #dvd:// bcause the bundled mplayer crashes with dvdnav LOL
+      if OS.windows?
+        play_this_mplayer ||= "mplayer -nocache dvdnav://#{title_track} "
+      else
+        # macports' mplayer has no dvdnav ?? 
+        play_this_mplayer ||= "mplayer dvd://#{title_track} "
+      end
+      if OS.windows?
+        # direct3d for windows 7 old nvidia's sake yipes
+        play_this_mplayer += " -vo direct3d "
+        play_this_mplayer += " -font #{ENV['SystemRoot']}\\fonts\\ARIAL.TTF"
+      end
+      command =  "#{play_this_mplayer} -framedrop -alang en -sid 1000 -edl #{File.expand_path EdlTempFile} -dvd-device #{drive}"
+      # -hardframedrop might help but hurts just too much
       p command
       Thread.new { system_blocking command; @popup.dispose }
     end
       
-    def show_blocking_license_accept_dialog program, license_name, license_url_should_also_be_embedded_by_you_in_message, 
+    def require_blocking_license_accept_dialog program, license_name, license_url_should_also_be_embedded_by_you_in_message, 
         title = 'Confirm Acceptance of License Agreement', message = nil
       puts 'Please confirm license agreement in open window.'
       old = ['no', 'yes', 'ok'].map{|name| 'OptionPane.' + name + 'ButtonText'}.map{|name| [name, UIManager.get(name)]}
       UIManager.put("OptionPane.yesButtonText", 'Accept')
       UIManager.put("OptionPane.noButtonText", "View License (#{license_name})")
       # cancel button stays the same...
-      
+
       message ||= "Sensible Cinema requires a separately installed program (#{program}).  You can install this program
       separately, or Sensible Cinema can download it for you.
       By clicking accept, below, you are confirming that you have read and agree to be bound by the
@@ -400,7 +451,7 @@ module SensibleSwing
       Dir.mkdir('./vendor/cache') unless File.directory? 'vendor/cache' # development may not have it created yet... [?]
       unless File.exist? 'vendor/cache/7za.exe'
         Dir.chdir('vendor/cache') do
-          print 'downloading unzipper...'
+          print 'downloading unzipper (400K) ...'
           download("http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip", "7za920.zip")
           system_blocking("../unzip.exe -o 7za920.zip") # -o means "overwrite" without prompting
         end
@@ -419,30 +470,48 @@ module SensibleSwing
         end
     end
     
+    require 'lib/check_installed_mac.rb'
+    
+    def check_for_exe windows_loc, unix_name
+      # in windows, that exe *at that location* must exist...
+      if OS.windows?
+        File.exist?(windows_loc)
+      else
+        if !CheckInstalledMac.check_for_installed(unix_name)
+          exit 1
+        else
+          true
+        end
+      end
+    end
+    
     def check_for_dependencies
-      #ffmpeg = RubyWhich.new.which('ffmpeg')
       ffmpeg_exe_loc = File.expand_path('vendor/cache/ffmpeg/ffmpeg.exe')
-      if !File.exist?(ffmpeg_exe_loc)
-        show_blocking_license_accept_dialog 'ffmpeg', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: ffmpeg."
+      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_to "ffmpeg (5MB)", "http://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-git-1929807-win32-shared.7z", "ffmpeg"
       end
-      raise unless File.exist?(ffmpeg_exe_loc)
       
-      if !File.exist?('vendor/cache/mencoder/mencoder.exe')
-        show_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_to "Mplayer/mencoder (6MB)", "http://downloads.sourceforge.net/project/mplayer-win32/MPlayer%20and%20MEncoder/revision%2033216/MPlayer-rtm-svn-33216.7z", "mencoder"
+      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_to "Mplayer/mencoder (6MB)", "http://downloads.sourceforge.net/project/mplayer-win32/MPlayer%20and%20MEncoder/revision%2033574/MPlayer-rtm-svn-33574.7z", "mencoder"
       end
       
       if ARGV.index('--create-mode')
         # they're going to want these dependencies
-        path = RubyWhich.new.which('smplayer')
-        if(path.length == 0)
-          # this one has its own license...
-          show_blocking_message_dialog("It appears that you need to install a dependency: SMPlayer.\n
-          Click ok to be directed to its download website, where you can download and install it (recommend webdl download), then restart sensible cinema.", 
-          "Lacking dependency", JOptionPane::ERROR_MESSAGE)
-          system_non_blocking("start http://smplayer.sourceforge.net/downloads.php")
-          System.exit(1)
+        if OS.windows?
+          path = RubyWhich.new.which('smplayer_portable')
+          if(path.length == 0)
+            # this one has its own installer...
+            show_blocking_message_dialog("It appears that you need to install a dependency: MPlayer for Windows (MPUI).\n
+            Click ok to be directed to its download website, where you can download and install it (recommend: MPUI Full-package), then restart sensible cinema.", 
+            "Lacking dependency", JOptionPane::ERROR_MESSAGE)
+            system_non_blocking("start http://mulder.dummwiedeutsch.de/#mplayer") # LODO would launchy help/work here with the full url?
+            System.exit(1)
+          end
+        else
+          check_for_exe("mplayer", "mplayer") # OS X ...
+          puts 'warning for OS X users--the smplayer-type buttons aren\'t going to work'
         end
       end
     end
@@ -451,10 +520,10 @@ module SensibleSwing
       system_non_blocking "notepad \"#{filename}\""
     end
 
-    def single_edit_list_matches_dvd md5
+    def single_edit_list_matches_dvd dvd_id
       matching =  Dir[EDL_DIR + '/*.txt'].select{|file|
         begin
-          parse_edl(file)["disk_unique_id"] == md5
+          parse_edl(file)["disk_unique_id"] == dvd_id
         rescue SyntaxError
          # ignore poorly formed delete lists for the auto choose
           p 'warning, unable to parse:' + file
@@ -463,7 +532,7 @@ module SensibleSwing
       }
       if matching.length == 1
         file = matching[0]
-        p "selecting the one matching file #{file} #{md5}"
+        p "selecting the one matching file #{file} #{dvd_id}"
         file
       else
         nil
@@ -485,6 +554,12 @@ module SensibleSwing
       true
     end
     
+    # call dispose on this to close it if it hasn't been canceled yet...
+    def show_non_blocking_message_dialog message, close_button_text = 'Close'
+      # lodo NonBlockingDialog it can get to the top instead of being so buried...
+      NonBlockingDialog.new(message, close_button_text)
+    end
+    
     include_class javax.swing.UIManager
     
     def get_user_input(message, default = '')
@@ -501,37 +576,39 @@ module SensibleSwing
       JFile.new(File.dirname(path)).get_usable_space
     end
     
-    def choose_dvd_and_edl_for_it
-      drive, dvd_volume_name, md5sum = choose_dvd_drive
-      @_edit_list_path ||= 
-      begin
-        puts "#{drive}, #{dvd_volume_name}, #{md5sum}"
-        edit_list_path = single_edit_list_matches_dvd(md5sum)
-        if !edit_list_path
+    def choose_dvd_and_edl_for_it choose_file = true
+      drive, dvd_volume_name, dvd_id = choose_dvd_drive
+      unless @_edit_list_path
+        edit_list_path = single_edit_list_matches_dvd(dvd_id)
+        if !edit_list_path && choose_file
           fc = FileDialog.new(self)
           fc.set_title "Please pick a DVD Delete List File (non matching found)"
           fc.set_directory EDL_DIR
           edit_list_path = fc.go
+          raise 'cancelled' unless edit_list_path
         end
-        raise 'cancelled' unless edit_list_path
-        edit_list_path
+        @_edit_list_path = edit_list_path
       end
       
-      # reload it just in case it has changed on disk
-      descriptors = nil
-      while(!descriptors)
+      if @_edit_list_path
+        # reload it just in case it has changed on disk
+        descriptors = nil
+        while(!descriptors)
           begin
             descriptors = parse_edl @_edit_list_path
           rescue SyntaxError => e
             puts e
-            show_blocking_message_dialog("your file has an error--please fix then hit ok: \n" + @_edit_list_path + "\n " + e)
+            show_blocking_message_dialog("this file has an error--please fix then hit ok: \n" + @_edit_list_path + "\n " + e)
           end
+        end
       end
-      [drive, dvd_volume_name, md5sum, @_edit_list_path, descriptors]
+      [drive, dvd_volume_name, dvd_id, @_edit_list_path, descriptors]
     end
     
-    def get_title_track descriptors
-      descriptors["dvd_title_track"] || "1"
+    def get_title_track descriptors, use_default_of_one = true
+      given = descriptors["dvd_title_track"] 
+      given ||= "1" if use_default_of_one
+      given
     end
     
     def get_save_to_filename dvd_title
@@ -557,7 +634,7 @@ module SensibleSwing
     end
 
     def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times, exit_early_if_fulli_exists = false, watch_unedited = false
-      drive, dvd_volume_name, md5sum, edit_list_path, descriptors = choose_dvd_and_edl_for_it
+      drive, dvd_volume_name, dvd_id, edit_list_path, descriptors = choose_dvd_and_edl_for_it
       
       descriptors = parse_edl(edit_list_path)
       if watch_unedited
@@ -627,7 +704,7 @@ module SensibleSwing
       temp_dir = Dir.tmpdir
       temp_file = temp_dir + '/vlc.temp.bat'
       File.write(temp_file, commands)
-      popup = NonBlockingDialog.new(
+      popup = show_non_blocking_message_dialog(
       "Applying #{File.basename edit_list_path} \n   against #{drive} (#{dvd_title}).\n" +
       "Copying to #{save_to}.\n" +
       "This could take quite awhile, and will prompt you and chime a noise when it is done.\n" +
@@ -668,9 +745,9 @@ module SensibleSwing
       if success
         saved_to = save_to + '.avi'
         if run_mplayer
-          system_non_blocking "smplayer #{saved_to}"
+          set_smplayer_opts ''
+          system_non_blocking "smplayer_portable #{saved_to}"
         else
-          # lodo NonBlockingDialog once it can get to the top instead of being so buried...
           show_file = "explorer /e,/select,\"#{File.expand_path(saved_to).to_filename}\""
           system_blocking show_file # returns immediately
           PlayAudio.play(File.expand_path(File.dirname(__FILE__)) + "/../vendor/music.wav")
@@ -681,14 +758,17 @@ module SensibleSwing
       end
     end
 
-    # returns e:\, volume, md5sum
+    # returns e:\, volume, dvd_id
     def choose_dvd_drive
       opticals = DriveInfo.get_dvd_drives_as_openstruct
       if @saved_opticals == opticals
         # memoize...kind of :)
         return @_choose_dvd_drive
       end
-      show_blocking_message_dialog 'insert a dvd first' unless opticals.find{|d| d.VolumeName }
+      unless opticals.find{|d| d.VolumeName }
+        show_blocking_message_dialog 'insert a dvd first' 
+        exit 1
+      end
       names = opticals.map{|d| d.Name + "\\" + " (" +  (d.VolumeName || 'Insert DVD to use') + ")"}
 
       if opticals.length != 1
@@ -706,16 +786,14 @@ module SensibleSwing
         end
       else
         selected_idx = 0
-        p 'selecting user\'s only disk drive ' + names[0]
+        p 'selecting user\'s only DVD drive ' + names[0]
       end
 
       if selected_idx
         disk = opticals[selected_idx]
-        prefix = names[selected_idx][0..2]
-        puts "calculating disk's unique id..."
-        md5sum = DriveInfo.md5sum_disk(prefix)
-        @_choose_dvd_drive = [prefix, opticals[selected_idx].VolumeName, md5sum]
-        @saved_opticals = opticals
+        dvd_id = DriveInfo.md5sum_disk(disk.MountPoint)
+        @_choose_dvd_drive = [disk.MountPoint, opticals[selected_idx].VolumeName, dvd_id]
+        @saved_opticals = opticals # since we force them to have their disc already in there...guess this is ok for os x :)
         return @_choose_dvd_drive
       else
         puts 'did not select a drive...hard exiting'
@@ -750,17 +828,6 @@ module SensibleSwing
   end
 end
 
-require 'ffi'
-
-module Win
-  extend FFI::Library
-  ffi_lib 'kernel32'
-  ffi_convention :stdcall
-  attach_function :get_process_id, :GetProcessId, [ :long ], :uint
-end
-
-
-
 class ShutdownHook 
   include java.lang.Runnable
           	def initialize( &block)
@@ -772,21 +839,32 @@ class ShutdownHook
               end
 end
           
-          def at_exit2( &block)
-          	hook = ShutdownHook.new( &block)
-          	java.lang.Runtime.getRuntime.addShutdownHook(java.lang.Thread.new( hook ))
-          end
+def at_exit2( &block)
+   hook = ShutdownHook.new( &block)
+   java.lang.Runtime.getRuntime.addShutdownHook(java.lang.Thread.new( hook ))
+end
+
+def kill_processes
+  if OS.windows?
+    system_original("taskkill /f /im mencoder.exe 2>NUL") # todo...is there a better way?
+    system_original("taskkill /f /im ffmpeg.exe 2>NUL")
+    system_original("taskkill /f /im smplayer_portable.exe 2>NUL")
+    system_original("taskkill /f /im mplayer.exe 2>NUL")
+  end
+end
 
 at_exit2 {
-  system("taskkill /f /im mencoder.exe 2>NUL") # todo...is there a cleaner way?
-  system("taskkill /f /im ffmpeg.exe 2>NUL")
-  system("taskkill /f /im mplayer.exe 2>NUL")
+  kill_processes # just in case
 }
 
 if $0 == __FILE__
-  a = SensibleSwing::MainWindow.new
-  a.set_visible true
-  puts 'Please use the Sensible Cinema GUI window popup...'
+  if ARGV.index('-h') || ARGV.index('--help')
+    puts 'syntax: [--create-mode]'
+  else
+    a = SensibleSwing::MainWindow.new
+    a.set_visible true
+    puts 'Please use the Sensible Cinema GUI window popup...'
+  end
 end
 
-# icon attribution: http://www.threes.com/index.php?option=com_content&view=article&id=1800:three-wise-monkeys&catid=82:mythology&Itemid=62
+# icon derived from: http://www.threes.com/index.php?option=com_content&view=article&id=1800:three-wise-monkeys&catid=82:mythology&Itemid=62