sensible-cinema 0.24.2 → 0.24.3

data/Rakefile

@@ -90,7 +90,7 @@ end
 
 desc 'create distro zippable dir'
 task 'create_distro_dir' => :gemspec do # depends on gemspec...
-  raise 'need  rebundle_dependencies first' unless File.directory? 'vendor/cache'
+  raise 'need rebundle_dependencies first' unless File.directory? 'vendor/cache'
   require 'fileutils'
   spec = eval File.read('sensible-cinema.gemspec')
   dir_out = spec.name + "-" + spec.version.version + '/sensible-cinema'
@@ -112,7 +112,7 @@ end
 
 task 'zip' do
   name = 'sensible-cinema-' + cur_ver
-  c = "\"c:\\Program Files\\7-Zip\\7z.exe\" a -tzip -r  #{name}.zip #{name}"
+  raise unless File.directory? name
   raise unless system("\"c:\\Program Files\\7-Zip\\7z.exe\" a -tzip -r  #{name}.zip #{name}")
   FileUtils.rm_rf name
   p 'created ' + name + '.zip, and deleted its [from] folder'

data/TODO

@@ -26,7 +26,7 @@
   C player
   unit tests
   release at some point...
-  
+  mulder response
   consistency for flight of nav. srt? huh?
   lightning strike from various outlets...
   try buy edit lists from all x,y,z [?] maybe ask for them for free first? ()
@@ -46,6 +46,8 @@
   make it load faster! this is cuh-razy! or splash screen! yes!
 
 == yes do, un-ordered currently, from the various future release options ==
+  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

data/VERSION

@@ -1 +1 @@
-0.24.2
+0.24.3

data/bin/sensible-cinema

@@ -17,7 +17,7 @@ This file is part of Sensible Cinema.
     along with Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-print 'Loading Sensible Cinema...'
+print 'Starting Sensible Cinema...'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/add_any_bundled_gems_to_load_path.rb")
 begin
   require 'sane' 
@@ -109,23 +109,23 @@ module SensibleSwing
     end
     
     def force_accept_license_first
-      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 (http://www.gnu.org/licenses/gpl.html).\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__) + "/../documentation/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 documentation/is_it_legal_to_copy_dvds.txt file'
-      LocalStorage['main_license_accepted'] = VERSION
+      if !(LocalStorage['main_license_accepted'] == VERSION)
+        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 (http://www.gnu.org/licenses/gpl.html).\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__) + "/../documentation/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 documentation/is_it_legal_to_copy_dvds.txt file'
+        LocalStorage['main_license_accepted'] = VERSION
+      end
     end
 
     LocalStorage = Storage.new("sensible_cinema_storage")
     LocalStorage.set_default('multiple_half_screens', 4)
-
     
     def setup_upconvert_buttons
     
-      @watch_file_upconvert = new_jbutton( "Watch a file upconverted (unedited)") do
-        # ?? drive, volume, dvd_id = choose_dvd_drive_or_file true
+      @watch_file_upconvert = new_jbutton( "Watch a movie file upconverted (unedited)") do
         warn_if_no_upconvert_options_currently_selected
-        filename_mpg = new_existing_file_selector_and_select_file( "pick moviefile (like moviename.mpg)")
+        filename_mpg = new_existing_file_selector_and_select_file( "pick movie file (like moviename.mpg)")
         play_mplayer_edl [filename_mpg, nil]
       end
       
@@ -137,9 +137,13 @@ module SensibleSwing
       @upconv_line = add_text_line ''
       change_upconvert_line_to_current
       
-      @show_upconvert_options = new_jbutton( "Change upconvert options" ) do
+      add_text_line ''
+      
+      @show_upconvert_options = new_jbutton( "Change/Set upconvert options" ) do
         add_setup_upconvert_options
       end
+      add_text_line "Note that sensible cinema will also upconvert when it plays back edited DVD's/files."
+      add_text_line ''
       
     end
     
@@ -179,19 +183,19 @@ module SensibleSwing
         LocalStorage[UpConvertKey] = "pullup,softskip,hqdn3d=0:1:4:4,pp=hb:y/vb:y,scale=SCREEN_X:-10:0:0:3" # ordering?
         LocalStorage[UpConvertKeyExtra] = "-sws 9 -ssf ls=75.0 -ssf cs=25.0"
         display_current_upconvert_setting
-        # -Processing method: mplayer with accurate deblocking ??
+        # -Processing method: mplayer with accurate deblocking ???
       }
-      new_jbutton("set upconvert options to experimental DVD/HQ-style playback") {
+      new_jbutton("set upconvert options to experimental style playback") {
         LocalStorage[UpConvertKey] = "pullup,softskip,hqdn3d=7:7:5,scale=SCREEN_X:-10:0:0:10"
         LocalStorage[UpConvertKeyExtra] = "-sws 9 -ssf ls=100.0 -ssf cs=75.0"
-        LocalStorage[UpConvertEnglish] = "experimental DVD/HQ"
+        LocalStorage[UpConvertEnglish] = "experimental"
         display_current_upconvert_setting
       }
       
       slider = JSlider.new
-      slider.setBorder(BorderFactory.createTitledBorder("Multiple factor of half screen widths (higher is better, but uses more cpu, default 4)"));
+      slider.setBorder(BorderFactory.createTitledBorder("Multiple factor of half screen widths (higher is better, uses more cpu, default 4)"));
   
-      slider.maximum=6# LODO non 6 here...
+      slider.maximum=6# LODO non 6 here...hmm...
       slider.minimum=0
       slider.setMajorTickSpacing(1) 
       slider.setPaintTicks(true)
@@ -202,6 +206,7 @@ module SensibleSwing
       
       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"
@@ -209,7 +214,7 @@ module SensibleSwing
       }
       slider.set_bounds(44, @starting_button_y, @button_width, 56)
       2.times {increment_button_location}
-      @panel.add(slider); #//     content.add(slider, BorderLayout::SOUTH);
+      @panel.add(slider)
     end
     
     def display_current_upconvert_setting
@@ -219,7 +224,7 @@ module SensibleSwing
     
     def get_current_upconvert_as_phrase
       settings = LocalStorage[UpConvertEnglish]
-      "Upconvert options #{  settings ? "are set to #{settings}" : "not currently set"}"
+      "Upconvert options currently #{  settings ? "are set to #{settings} style" : "are NOT SET"}."
     end
     
     def get_upconvert_vf_settings
@@ -255,9 +260,9 @@ module SensibleSwing
       }
       
 
-      @create_dot_edl = new_jbutton( "Create an associatable moviefilename.edl file")
+      @create_dot_edl = new_jbutton( "Create a side-by-side moviefilename.edl file")
       @create_dot_edl.tool_tip = <<-EOL
-        Create a moviefilename.edl file (corresponding to moviefilename.some_ext which already exists)
+        Create a moviefilename.edl file (corresponding to some moviefilename.some_ext file already existing)
         XBMC/smplayer (smplayer can be used by WMC plugins, etc.) "automagically detect", 
         if it exists, and automatically use it .edl to show that file edited played back.
         If you use smplayer, note that you'll need to download the "lord mulder mplayer"
@@ -409,11 +414,11 @@ module SensibleSwing
         play_mplayer_edl 
       }
       
-      @create = new_jbutton( "Create edited copy of video on Your Hard Drive" )
+      @create = new_jbutton( "Create edited copy of DVD/file on Your Hard Drive" )
       @create.tool_tip = <<-EOL
-        This grabs from your DVD and creates a new file on your hard disk like dvd_name_edited.mpg for you to watch later.
+        This takes a file and creates a new file on your hard disk like dvd_name_edited.mpg that you can watch when it's done.
         The file you create will contain the whole movie edited.
-        It takes quite awhile maybe 2 hours.  Sometimes the progress bar will look paused--it will continue eventually.
+        It takes quite awhile maybe 2 hours.  Sometimes the progress bar will look paused--it typically continues eventually.
       EOL
       @create.on_clicked {
         do_copy_dvd_to_hard_drive_via_file false
@@ -462,9 +467,7 @@ module SensibleSwing
     
     def initialize
       super "Sensible-Cinema #{VERSION} (GPL)"
-      if !(LocalStorage['main_license_accepted'] == VERSION)
-        force_accept_license_first
-      end
+      force_accept_license_first
 
       setDefaultCloseOperation JFrame::EXIT_ON_CLOSE
       panel = JPanel.new
@@ -478,11 +481,7 @@ module SensibleSwing
       add_text_line "Welcome to Sensible Cinema!"
       @starting_button_y += 10 # kinder ugly...
       add_text_line "      Rest mouse over buttons for \"help\" type descriptions (tooltips)."
-      if LocalStorage[UpConvertEnglish]
-        add_text_line "        Upconvert settings are at:" + LocalStorage[UpConvertEnglish]
-      else
-        add_text_line ""
-      end
+      add_text_line ""
       add_text_line ""
       
       if we_are_in_upconvert_mode
@@ -515,7 +514,7 @@ module SensibleSwing
       @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!'
-        java.lang.System.exit 0
+        System.exit 0
       }
 
       increment_button_location
@@ -786,7 +785,7 @@ module SensibleSwing
           system_non_blocking("start #{license_url_should_also_be_embedded_by_you_in_message}")
           puts "Please restart after reading license agreement, to be able to then accept it."
         end
-        System.exit 1
+        System.exit 0
       end
       if returned == 2
         p 'license not accepted...exiting'
@@ -860,11 +859,12 @@ module SensibleSwing
         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.", 
+          show_blocking_message_dialog("It appears that you need to install a pre-requisite dependency: MPlayer for Windows (MPUI).
+          Click ok to be directed to its download website, where you can download and install it (recommend: MPUI Full-complete), 
+          then restart sensible cinema.  NB that it takes awhile to install MPUI.  Sorry about that.", 
           "Lacking dependency", JOptionPane::ERROR_MESSAGE)
           open_url_to_view_it_non_blocking "http://code.google.com/p/mulder/downloads/detail?name=MPUI.2011-06-09.Full-Package.exe"
-          System.exit(1)
+          System.exit 0
         end
       end
     end

data/change_log_with_feature_list.txt

@@ -1,3 +1,8 @@
+== 0.24.3 ==
+
+Distribution cleanups
+polish up UI.
+
 == 0.24.2 ==
 
 In some recent version or other, added ability to start EDL's from an offset
@@ -20,6 +25,10 @@ It even mutes and skips appropriately.  See demo (must be run from a web server
 Added a demonstration of using "static overlay" as a form of muting.  Basically, play some static so that it obscures
 the current audio, instead of muting it. Actually works, though oddly.
 
+Subtitles now are split into "bad" profanities and "mild" profanities for easier parsing.
+
+Can use multiple threads to speedup playback.  Slight speedup for mpeg2.  Thanks mplayer guys!
+
 == 0.24.1 ==
 
 A few more profanities/subtitle tweaks.

data/template_bats/RUN SENSIBLE CINEMA CLICK HERE.bat

@@ -1,6 +1,6 @@
 @echo Welcome to Sensible Cinema...
 @IF NOT EXIST sensible-cinema\VENDOR\CACHE GOTO NOVENDORDIR
-@echo This window will display lots of debug output (you can just ignore this window)
+@echo This window will display lots of debug output (you can just ignore this window or minimize it)
 @setlocal
 @rem disable any local rubyopt settings, just in case...
 @set RUBYOPT=

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.24.2
+  version: 0.24.3
 platform: ruby
 authors: 
   - Roger Pack