sensible-cinema 0.24.6 → 0.24.7

data/TODO

@@ -25,19 +25,10 @@
    VLC "insert foreign missing scene" demo, overlay section with image (mplayer?)
 
 == yes do ordered in conjunction with the above probably ==
-  XBMC mode doesn't mind the 600 starting offset...
-    oh wait we weren't even using it right to begin with LOL
   m4m: 
     the play button, "regenerate" admin button, "click here x other arrangements of this hymn"
-  mac court jester upconvert: without -nocache, with aggressive sync....
-    jester at home...still laggy at end?
-  unit tests
-  subs: if at beginning, add extra offset...hmm...why not?
-  release at some point...Jon? urug?
-    after check mac coiso...
+  release at some point...Jon?
 
-  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
@@ -56,10 +47,25 @@
   make it load faster! this is cuh-razy! or splash screen! yes!
 
 == yes do, un-ordered currently, from the various future release options ==
+  research VOB
+  research XBMC
+  split into various separate windows themselves...
+  on mac at home: Constitution: is it 'tresor national'? if yes, submit bug report.
+  call out to VLC on DVDNAV_ERROR occurrence? what the... if can reproduce, submit bug report with trace et al.
+  consistency for flight of nav. srt? huh?
+    consistency of others, also "DVD reported full-time versus ts time" for others...
+  XBMC mode doesn't mind the 600 starting offset...
+    oh wait we weren't even using it right to begin with LOL
+  unit tests
+  subs: if at beginning of a line, add extra offset...hmm...why not?
+  release urug?
+    after check mac coiso...
+  say something if the EDL is blank :)
+  rename EDL's to clean-as-a-whistle too why not?
   figure out if an offset of '1's should be accomodated for...
     0.3 ...
   some upconvert specs
-  fix released version work in mac?
+  fix released version downloadable and work in mac?
     distro
   facebook survey :)
   "--developer" mode
@@ -195,7 +201,6 @@
   @mplayer: that one [IQ? hitchhikers'?] fail fail fail until I used -dvd-device [?] huh?
     try to reproduce...
   @mplayer: do I need -zoom ?
-  @smplayer: you don't capture stderr [?] ex -vf scale:1280.0
   @mplayer: http://www.infognition.com/VideoEnhancer/ can I do that through any means LOL?
   @mplayer: gl shucks on windows 7!
   can accept straight ".edl" files too, as my input (?)

data/VERSION

@@ -1 +1 @@
-0.24.6
+0.24.7

data/bin/sensible-cinema

@@ -164,7 +164,7 @@ module SensibleSwing
     
     def warn_if_no_upconvert_options_currently_selected
       if !LocalStorage[UpConvertEnglish]
-        show_blocking_message_dialog "Warning: upconvert options have not been set yet--set upconvert options first and restart, if desired."
+        show_non_blocking_message_dialog "Warning: upconvert options have not been set yet--set upconvert options first and restart, if desired."
       end
     end
     
@@ -308,7 +308,12 @@ module SensibleSwing
         'pullup,softskip,' + upc
       else
         p 'not using any upconversion'
-        "pullup,softskip"
+        # TODO not for straight mplayer [?] tangled fails mac
+        if OS.mac?
+          '' # avoid odd message try appending the scale filter <sigh> I don't *want* the scale filter with no upconversion gah.
+        else
+          "pullup,softskip"
+        end
       end
     end
 
@@ -544,7 +549,7 @@ module SensibleSwing
     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 or VIDEO_TS/vts_01_0.vob)")
+      filename_mpg = new_existing_file_selector_and_select_file( "Pick moviefile (like moviename.mpg or video_ts/anything.ext)")
       edl_filename = new_existing_file_selector_and_select_file( "Pick an EDL file to use with it", EDL_DIR)
       assert_ownership_dialog
       if just_create_dot_edl_file_instead_of_play
@@ -634,11 +639,24 @@ module SensibleSwing
       }
     end
 
-    def run_smplayer_blocking play_this, title_track_maybe_nil, extra_options, force_use_mplayer
+    def run_smplayer_blocking play_this, title_track_maybe_nil, extra_options, force_use_mplayer, show_subs = false
       unless File.exist?(File.expand_path(play_this))
         _dbg
         raise play_this 
       end
+
+      # -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_options << " -framedrop "      
+      # ?? extra_mplayer_commands << "-mc 0.016" ??
+      extra_options << " -autosync 15 " 
+      
+      unless show_subs
+        # disable subtitles
+        extra_options << " -alang en -nosub -noautosub -forcedsubsonly -sid 1000 "
+      end
+
       parent_parent = File.basename(File.dirname(play_this))
       force_use_mplayer ||= OS.mac?
       if parent_parent == 'VIDEO_TS'
@@ -665,28 +683,30 @@ module SensibleSwing
         extra_options << " -msglevel identify=4 " # prevent smplayer from using *forever* to look up info on DVD's 4
       end
       
-      extra_options += " -alang en " # for those that put french first...though this doesn't help...
       extra_options += " -mouse-movements #{get_upconvert_secondary_settings} " # just in case smplayer also needs -mouse-movements... :) LODO
       extra_options += " -lavdopts threads=#{OS.cpu_count} " # just in case this helps [supposed to with h.264] # fast *crashes* doze...
       if force_use_mplayer
        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...
+
+       File.write conf_file, "ENTER {dvdnav} dvdnav select\nMOUSE_BTN0_DBL vo_fullscreen\nMOUSE_BTN2 vo_fullscreen\nKP_ENTER dvdnav select\n" # dvdnav doesn't work here...
        extra_options += " -font #{File.expand_path('subfont.ttf')} "
        extra_options += " -volume 100 " # why start low? mplayer why oh why
+       extra_options += " -slang en "
        if OS.windows?
         # direct3d for windows 7 old nvidia cards' sake [yipes] and also dvdnav sake
         extra_options += " -vo direct3d "
-        extra_options += " -slang en "
         conf_file = conf_file[2..-1] # strip off drive letter, which it doesn't seem to like no sir
        end
        extra_options += " -fs " # full screen
-       c = "mplayer #{extra_options} -vf #{get_upconvert_vf_settings} -input conf=\"#{conf_file}\" \"#{play_this}\" "
+       upconv = get_upconvert_vf_settings
+       upconv = "-vf #{upconv}" if upconv.present?
+       c = "mplayer #{extra_options} #{upconv} -input conf=\"#{conf_file}\" \"#{play_this}\" "
       else
         if OS.windows?
           extra_options += " -vo direct3d " # more light nvidia...should be ok...
         end
-        config_path = set_smplayer_opts extra_options
+        config_path = set_smplayer_opts extra_options, show_subs
         c = "smplayer_portable \"#{play_this}\" -fullscreen -config-path \"#{File.dirname config_path}\" " 
         if !we_are_in_create_mode
           #c += " -close-at-end "
@@ -706,7 +726,6 @@ module SensibleSwing
       raise to_this if to_this =~ /"/ # unexpected, unfortunately... <smplayer bug>
       new_prefs = old_prefs.gsub(/mplayer_additional_options=.*/, "mplayer_additional_options=#{to_this}")
       new_prefs.gsub!(/autoload_sub=.*$/, "autoload_sub=#{show_subs.to_s}")
-      upconvert_settings = 
       new_prefs.gsub!(/mplayer_additional_video_filters=.*$/, "mplayer_additional_video_filters=\"#{get_upconvert_vf_settings}\"")
       new_prefs.gsub!(/priority=.*$/, "priority=3") # normal priority...scary otherwise! lodo tell smplayer...
       
@@ -871,15 +890,8 @@ module SensibleSwing
       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" ??
-      extra_mplayer_commands << "-autosync 15" 
-      
       # prefer english, attempt to disable subtitles, pass in edl...
-      extra_mplayer_commands << "-alang en -nosub -noautosub -forcedsubsonly -sid 1000 -edl #{File.expand_path EdlTempFile}" 
+      extra_mplayer_commands << "-edl #{File.expand_path EdlTempFile}" 
       
       run_smplayer_non_blocking drive_or_file, title_track, extra_mplayer_commands.join(' '), false
     end

data/change_log_with_feature_list.txt

@@ -1,3 +1,8 @@
+== 0.24.7 ==
+
+Tweak upconvert for when it has nothing set, and to not show subtitles.
+Tooltip down down from infinity.
+
 == 0.24.6 ==
 
 Make it so it can load VIDEO_TS style directories, too.

data/lib/swing_helpers.rb

@@ -65,7 +65,7 @@ module SensibleSwing
   
  end
 
- ToolTipManager.sharedInstance().setDismissDelay(java.lang.Integer::MAX_VALUE) # don't timeout tooltips...
+ ToolTipManager.sharedInstance().setDismissDelay(10000)
 
  class JFrame
    def close

data/spec/sensible_cinema_gui.spec.rb

@@ -384,7 +384,7 @@ module SensibleSwing
     
     it "should create an edl and pass it through to mplayer" do
       smplayer_opts = nil
-      @subject.stub(:set_smplayer_opts) { |to_this|
+      @subject.stub(:set_smplayer_opts) { |to_this, show_subs|
         smplayer_opts = to_this
       }
       click_button(:@mplayer_edl).join

data/www/index.html

@@ -20,8 +20,10 @@
 
 <body>
 <html>
-<img src="monkey.png"/>
-<div style="float:left; margin-right: 50px; margin-left: 20px;"><h1>Sensible Cinema</h1></div>
+<div style="float:right; margin-right: 50px; margin-left: 20px;">
+<img src="source/vendor/profs.png" width=150 />
+
+<h1>Sensible Cinema</h1></div>
 <pre>
 Welcome to the (work in progress) home page of Sensible Cinema, the free video scene skipper/muter.
 Sensible Cinema allows you watch edited movies by applying edit lists (EDL's) 

metadata

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