sensible-cinema 0.24.4 → 0.24.5

data/Rakefile

@@ -103,7 +103,8 @@ 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)
+  puts 'still not mac compatible OOTB'
+#  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

@@ -54,6 +54,7 @@
   make it load faster! this is cuh-razy! or splash screen! yes!
 
 == yes do, un-ordered currently, from the various future release options ==
+  new icon plz
   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
@@ -61,12 +62,14 @@
   fan editor (after C player ?? though I suppose we could bring back batch mplayer to also do this...)
     "fan editor" .bat file LOL
     
+  upconvert 4200 known to fail...
+  
   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...
+  @jruby scan court jester is *so* slow...what the...[mac at least...]
   urug again?
     after works in mac. Why not?
   netflix upconverter

data/VERSION

@@ -1 +1 @@
-0.24.4
+0.24.5

data/bin/sensible-cinema

@@ -183,14 +183,14 @@ module SensibleSwing
         LocalStorage[UpConvertEnglish] = nil
         display_current_upconvert_setting
       }
-      medium_dvd = new_jbutton("set upconvert options to DVD-style input") {
+      medium_dvd = new_jbutton("Change upconvert options to DVD-style input") {
         LocalStorage[UpConvertKey] = "pullup,softskip,hqdn3d=0:1:4:4,scale=SCREEN_X:-10:0:0:2"
         # hqdn3d[=luma_spatial:chroma_spatial:luma_tmp:chroma_tmp]
         LocalStorage[UpConvertKeyExtra] = "-sws 9 -ssf ls=75.0 -ssf cs=7.0"
         LocalStorage[UpConvertEnglish] = "DVD"
         display_current_upconvert_setting
       }
-      high_compression = new_jbutton("set upconvert options for playing back highly compressed video") {
+      high_compression = new_jbutton("Change upconvert options for playing back highly compressed video") {
         # -autoq 6 -vf pp [?]
         LocalStorage[UpConvertEnglish] = "high compressed"
         LocalStorage[UpConvertKey] = "pullup,softskip,hqdn3d=0:1:4:4,pp=hb:y/vb:y,scale=SCREEN_X:-10:0:0:3" # ordering?
@@ -198,7 +198,7 @@ module SensibleSwing
         display_current_upconvert_setting
         # -Processing method: mplayer with accurate deblocking ???
       }
-      new_jbutton("set upconvert options to experimental style playback") {
+      new_jbutton("Change 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"
@@ -263,13 +263,18 @@ module SensibleSwing
     
     def display_current_upconvert_setting
       change_upconvert_line_to_current
-      show_blocking_message_dialog get_current_upconvert_as_phrase
+      @display_current_upconvert_setting_dialog
+      @display_current_upconvert_setting_dialog = show_non_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"} (screen multiplier #{LocalStorage['screen_multiples']})."
+      out = "Upconvert options currently #{  settings ? "are set to #{settings} style" : "are NOT SET"}"
+      if settings
+       out += " (screen multiplier #{LocalStorage['screen_multiples']})."
+      end
+      out
     end
     
     def get_current_max_width_resolution
@@ -488,20 +493,24 @@ module SensibleSwing
         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
-      
       if LocalStorage[UpConvertEnglish]
+        add_open_documentation_button
         @upconv_line = add_text_line "    #{get_current_upconvert_as_phrase}"
       else
         @upconv_line = add_text_line ''
+        add_open_documentation_button
       end
       
       add_change_upconvert_options_button 
 
     end
     
+    def add_open_documentation_button
+      @open_help_file = new_jbutton("View Sensible Cinema Documentation") do
+        show_in_explorer __DIR__ + "/../documentation" # TODO mac :)
+      end
+    end
+    
     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)
@@ -598,7 +607,7 @@ module SensibleSwing
       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
-       @_run_smplayer_instructions ||= show_mplayer_instructions
+       show_mplayer_instructions_once
        conf_file = File.expand_path './mplayer_input_conf'
        File.write conf_file, "MOUSE_BTN0_DBL vo_fullscreen\nMOUSE_BTN2 vo_fullscreen\nKP_ENTER dvdnav select\n" # dvdnav doesn't work here...
        if OS.windows?
@@ -727,15 +736,19 @@ module SensibleSwing
     end
     
     def play_dvd_smplayer_unedited use_mplayer_instead = false, show_instructions = true
-      drive, dvd_volume_name, dvd_id, edl_path_maybe_nil, descriptors_maybe_nil = choose_dvd_or_file_and_edl_for_it false
+      drive_or_file, dvd_volume_name, dvd_id, edl_path_maybe_nil, descriptors_maybe_nil = choose_dvd_or_file_and_edl_for_it false
       if descriptors_maybe_nil
         title_track_maybe_nil = get_title_track(descriptors_maybe_nil, false)
       end
-      file_to_play = "dvdnav://#{title_track_maybe_nil}"
-      options = " -osd-fractions 2 -nocache -dvd-device #{drive} "
+      if dvd_id == NonDvd # TODO smelly...this if statement all over the place...
+        file_to_play = drive_or_file
+      else
+        file_to_play = "dvdnav://#{title_track_maybe_nil}"
+      end
+      options = " -osd-fractions 2 -nocache -dvd-device #{drive_or_file} "
       if show_instructions
         # want this even with smplayer sometimes I guess...
-        @play_smplayer_warn ||= show_mplayer_instructions
+        show_mplayer_instructions_once
       end
 
       run_smplayer_non_blocking file_to_play, options, use_mplayer_instead
@@ -744,18 +757,17 @@ module SensibleSwing
 
     EdlTempFile = Dir.tmpdir + '/mplayer.temp.edl'
     
-    def show_mplayer_instructions
-      show_non_blocking_message_dialog <<-EOL
-        About to run mplayer.  
-        To control it, use
+    def show_mplayer_instructions_once
+      @_show_mplayer_instructions_once ||= show_non_blocking_message_dialog <<-EOL
+        About to run mplayer.  To control it, use
         spacebar : pause,
         double clicky/right click : toggle full screen,
-        arrow keys (left, right, up down) to seek/scan
+        arrow keys (left, right, up down, pg up, pg dn) to seek/scan
         / and *	: inc/dec volume.
         '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
+         # key: change audio language track
       EOL
     end
     
@@ -845,7 +857,7 @@ module SensibleSwing
       
       returned = JOptionPane.showConfirmDialog self, message, title, JOptionPane::YES_NO_CANCEL_OPTION
       assert_confirmed_dialog returned, license_url_should_also_be_embedded_by_you_in_message
-      p 'confirmation of sensible cinema related license noted of: ' + license_name
+      p 'confirmation of sensible cinema related license saved of: ' + license_name
       throw unless returned == 0
       old.each{|name, old_setting| UIManager.put(name, old_setting)}
     end

data/change_log_with_feature_list.txt

@@ -1,3 +1,8 @@
+== 0.24.5 ==
+
+Fix some options for advanced mode so that it can playback files better.
+Tweak upconvert to make it a bit more user friendly.
+
 == 0.24.4 ==
 
 Note that previous releases had the ability to "invert" skipping scenes,

data/template_bats/mac/RUN SENSIBLE CINEMA CLICK HERE.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 cd ../sensible-cinema
-java -cp "./vendor/jruby-complete-1.6.2.jar" org.jruby.Main bin/sensible-cinema $1 $2 $3 || (echo ERROR. Please look for error message, above, and report back the error you see, or fix it && read -p "Press any key to continue...")
+java -Xdock:name="Sensible Cinema" -Xdock:icon="./vendor/monkey.png" -cp "./vendor/jruby-complete-1.6.2.jar" org.jruby.Main bin/sensible-cinema $1 $2 $3 || (echo ERROR. Please look for error message, above, and report back the error you see, or fix it && read -p "Press any key to continue...")
 

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.24.4
+  version: 0.24.5
 platform: ruby
 authors: 
   - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 -06:00
+date: 2011-07-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency