sensible-cinema 0.25.3 → 0.25.4

data/TODO

@@ -1,7 +1,8 @@
 == roadmap [for just tasks, see below though] == 
 
-  netflix instant for OS X
   upconvert DVD/netflix
+  srt release
+  tweaks/docu
   C EDL
   
   === loose ordering/eventually ===
@@ -18,30 +19,38 @@
 == high prio like blocking bugs ==  
   
 == under next release specific items: ==
+  make it suck in single EDL from imdb based on a list 
 
 == yes do ordered in conjunction with the above probably ==
 
 == yes do, un-ordered currently, from the various future release options ==
-  can move the mouse 10 pixels down at the beginning, in order to...put it in the right place.
-  both mute and blank when blanking by default... (add the other type in there, esp. if a man answers)
-  make it suck in single EDL from imdb based on a list 
-  test court jester :)
+  change upconvert options needs its own "close" button
+  netflix instant for OS X
+
+  real docu on how to use the srt scanner
+  is there a bug if you switch DVD's
   lightning strike from various outlets...
   release at some point...Oliver? facebook? (one at a time...)
   research VOB dirs
     still needs timesplits? what about in XBMC? what about XBMC with DVD's
   todo.upconvert
     netflix quality upconverter, have a go at it
-      finalize screen capture
+      finalize screen capturer
     have people test it
     me test it
       1x, 2x Sintel
       snapshots of Sintel "normal", then deploy the various comparison pics
-  add new open button "edit the one for current DVD"
-  "fix" mplayer EDL pausing [?]
+    DVD test it (+- with others testing it for me too)
+  add new open button "edit the EDL for current DVD"
+  "fix" mplayer EDL pausing their code
   the open button should open in the "editing" EDL dir.
+  test court jester :)
   warn against makemkv (and check it, too, and offer a bounty! :)
+  (add the other type in there, esp. if a man answers, can parse it)
+    add to the template, DVD can use it
+    release
   an overlapping mute failure when you hit the "watch edited realtime" should popup.
+  witch lady
   split out the "dependency" code
   try buy edit lists from all x,y,z [?] offer them money LOL
     http://www.familysafemovies.com
@@ -69,21 +78,21 @@
   consistency for flight of nav. srt? huh?
     consistency of others, also "DVD reported full-time versus ts time" for others...
   subtitles: if at beginning of a sub, add extra offset...hmm...why not?
-  fix released version to downloadable work in mac
-  report ffmpeg bug, mplayer various (as bugs):P
+  fix released version to downloadable work in mac [7zip won't cut it]
   "--developer" mode
     has "export JSON command line, reload code" , note it in the docu
   new button "auto-test" a subtitles file for timing :)
   new upconv button: auto-take some snapshots (just to straight mjpeg or jpeg or the what not [?])
   advertise urug again?
     after works in mac. Why not?
+	@ffmpeg windows builds += mulder +- VLC : libjpegturbo :)
   advertise virtual audio
   advertise screen capture
+  create skype fella...hmm...
   mplayer directx patch check it...
   auto-add largest title to the generator EDL
-    complain if times looks wrong...on playback? sum time
-  tighten old splits... [remove, really, I guess...sure while I only have few...and also add better instructions...]
-  "save to" -> same dir as "get from" yeah
+    complain if times look wrong...on playback? sum time
+  splits... [add better instructions...]
   open EDL to edit it can have a rememberable DIR
   @instructions "this is great for comparing srt's, except...when it isn't, then you have to..."
   @instructions: full srt how-to document instead of tooltip [?] or combine the two! yes!
@@ -99,8 +108,7 @@
     mac just die with instructions to use tsmuxer first...
     actually don't do this, just make sure to warn them if they pass us an mkv...indeed.
   check if some create buttons are now outdated...
-  check with blu-ray...do they match timing-wise? sub-title wise?
-  donate tsmuxer (sent email), http://ffmpeg.zeranoe.com/builds, mulder +- [?] smplayer menumeter http://instantitunes.wordpress.com/2010/02/26/use-tsmuxer-on-snow-leopard
+  check with blu-rays...do they match timing-wise? sub-title wise?
   youtube/hulu timings
   split LLC's website+consumer
     get LLC before a "real" domain name
@@ -109,17 +117,18 @@
     try out libdvdcss + handbrake on the one that was totally broken...is it better?
     it should work like a champ shouldn't it?
   clear runnings
-    have ben and chris test it out, have it work, then ask about video quality
     me try
+    have ben and chris test it out [realtime?]
   try out disney digital copy
   C player:
-    folder, look for title.edl
     use DVD navigator (check)
     just use mplayer EDL syntax, plus a title track (or just detect track change, if long enough, assume... :P) :)
     http://msdn.microsoft.com/en-us/library/ms787412(VS.85).aspx
   	http://msdn.microsoft.com/en-us/library/dd407175(v=VS.85).aspx can be synchronous? might be a good first pass...
     PlayPeriodInTitleAutoStop EC_DVD_PLAYPERIOD_AUTOSTOP
     make it frame accurate output text :)
+    use 29.97 fps
+    folder, look for title.edl
     allow it to "just play from X to Y exactly" ...
     can start fullscreen
     does this line up right/perfect? can it work, at all?
@@ -131,23 +140,15 @@
     note to them windows vista/7: use ac3filter [?]
     [A,B] 
     once I can jump around, advertise as a phantom editor :)
-  note better to previewer "you are about to preview these specific edits..." ?
   ask for more beta testers for use, ask for more beta testers for creation, too
-    rinse and repeat with various ppl
   create a semi-accurate phantom edit EDL [?] just with splits
     http://www.chefelf.com/forums/index.php?showtopic=6176
-  the final "edited.avi" really "could/should" be playable in WMP...if possible
-  add button "fast preview segment" (from dvd)
-  upconvert 
-    test it out (+- with others)
+  add button "fast preview segment" (mplayer from dvd)
   investigate WMC "call out to smplayer + EDL" or the like...
     add to docu
-  be a hero and sync the dvdnav repo's [?] also fix mplayer not being able to startup on some dvd's what the...this is nuts!
-    I'm almost beginning to think VLC for files, DEBUG_C player for DVD's (except on mac, where they just have to live hosed)
-    or maybe...umm...ask the dvdnav people why it might work with one and not the other? ask VLC? huh? what the...
-    call out to VLC on DVDNAV_ERROR occurrence? what the... if can reproduce, submit bug report with trace et al.
- virtual desktop -> real input
-
+  refresh bug
+  can edit books, too.
+  
 == other lists to not do (duplicate the todo here if want to actually do it though) ==
 
   todo.upconvert
@@ -161,13 +162,23 @@
 == DVD decide later to move up or down ==
 
 == DVD+-DVD-realtime backlog (totally unordered, some very low prio, basically all never do) ==
+  accomodate ISO's as input as if they were DVD's themselves
+  make OCR actually use blanks versus skip
+  fix ffmpeg's "red hue" within their code
+  be a hero and sync the dvdnav repo's [?] also fix mplayer not being able to startup on some dvd's what the...this is nuts!
+    I'm almost beginning to think VLC for files, DEBUG_C player for DVD's (except on mac, where they just have to live hosed)
+    or maybe...umm...ask the dvdnav people why it might work with one and not the other? ask VLC? huh? what the...
+    call out to VLC on DVDNAV_ERROR occurrence? what the... if can reproduce, submit bug report with trace et al.
+  report ffmpeg bugs as real bugs, mplayer various (as bugs):P
+  the final "edited.avi" really "could/should" be playable in WMP...if possible
+  note better to previewer "you are about to preview these specific edits..." ?
+  "save to" -> same dir as "get from" yeah
   inventionzy: blu-ray stuff from todo.inventionzy
   figure out a way to get to the roku [ps3ms?], +- netflix edited to roku LOL
-  advertise virtual desktop :)
   port to mac OS X
     ppc dvdid? documentation button? notepad?
   say something if the EDL is actually "empty" :)
-  already donated: unlocker, mac fan thing, open office, many sourceforge tops, 7zip, VLC, mplayer, cannot donate: ffmpeg
+  already donated: mplayer, vlc, menumeter, http://instantitunes.wordpress.com/2010/02/26/use-tsmuxer-on-snow-leopard, unlocker, mac fan thing, open office, many sourceforge tops, 7zip, VLC, mplayer, cannot donate: ffmpeg, http://ffmpeg.zeranoe.com/builds, tsmuxer (sent email), asked mulder, smplayer ($5)
   note "you want to optimize your reverse blitting first... :)"
   if 2 EDL's, still can choose a title track
   fast preview: change it to be aggressive sometimes yes, other times no

data/VERSION

@@ -1 +1 @@
-0.25.3
+0.25.4

data/bin/sensible-cinema

@@ -93,14 +93,13 @@ module SensibleSwing
      ARGV.index("--create-mode")
     end
     
-    # currently advanced mode only *adds* buttons
     def new_jbutton title, tooltip = nil
       button = JButton.new title
       button.tool_tip = tooltip
       button.set_bounds(44, @starting_button_y, @button_width, 23)
       @panel.add button
       @buttons << button
-      if block_given? # allow for new_jbutton("xx") do ... end [this works through some miraculous means LOL]
+      if block_given? # allow for new_jbutton("xx") do ... end [this is possible through some miraculous means LOL]
         button.on_clicked { yield }
       end
       increment_button_location
@@ -133,15 +132,14 @@ module SensibleSwing
     end
 
     LocalStorage = Storage.new("sensible_cinema_storage")
-    LocalStorage.set_default('screen_multiples', 1.5) # high compatibility :)
     
-    def close_when_done thread, jitem
-      if jitem
-        Thread.new { thread.join; jitem.dispose }
+    def close_when_done thread, j_item
+      if j_item
+        Thread.new { thread.join; j_item.dispose }
       end
     end
     
-    def setup_upconvert_buttons
+    def add_play_upconvert_buttons
     
       @watch_file_upconvert = new_jbutton( "Watch a movie file upconverted (unedited)") do
         popup = warn_if_no_upconvert_options_currently_selected
@@ -167,17 +165,33 @@ module SensibleSwing
       
     end
     
-    def self.new_child_window
-      out = MainWindow.new
-      out.setDefaultCloseOperation(JFrame::DISPOSE_ON_CLOSE)
-      out
+    # a window that when closed doesn't bring the whole app down
+    def new_child_window
+      child = MainWindow.new
+      child.setDefaultCloseOperation(JFrame::DISPOSE_ON_CLOSE)
+      child.parent=self # this should have failed in the PPL
+      child
     end
+    
+    attr_accessor :parent, :upconv_line
 
     def add_change_upconvert_options_button
-      @show_upconvert_options = new_jbutton("Set Playback Upconversion Options") do
-        upconvert_window = MainWindow.new_child_window
-        upconvert_window.add_setup_upconvert_buttons
-        # now join it, oops that isn't possible [?]
+      @show_upconvert_options = new_jbutton("Set Playback Upconversion Quality Options") do
+        
+        unless LocalStorage[ScreenMultipleFactor]
+=begin          show_blocking_message_dialog <<-EOL
+          With upconversion, if your monitor is 1024 pixels wide and you upconvert to 2048 pixels then display it on 1024, it looks better.
+          Sensible Cinema sets the default default resolution to be 2x your screen resolution, which is better for high end cpu's.
+          If you have a low powered system or laptop you may need to change it (drag the slider) lower to avoid it displaying only a black or white screen, as your system can't handle it,
+          so adjust accordingly if you have a lesser system.  Also changing this setting can make it use more or less CPU overall.
+          EOL
+=end
+          # LODO make into tooltip too [?]
+          LocalStorage['screen_multiples'] = 2.0
+        end
+        
+        upconvert_window = new_child_window
+        upconvert_window.add_change_upconvert_buttons
       end
       @show_upconvert_options.tool_tip= "Allows you to set your upconvert options.\nUpconverting attempts to playback your movie with higher quality on high resolution monitors."
     end
@@ -189,7 +203,13 @@ module SensibleSwing
     end
     
     def change_upconvert_line_to_current
-      @upconv_line.set_text get_current_upconvert_as_phrase if @upconv_line
+      current = get_current_upconvert_as_phrase
+      if @upconv_line
+        @upconv_line.set_text current
+      end
+      if @parent && @parent.upconv_line
+        @parent.upconv_line.set_text current
+      end # LODO we want both [?]
     end
     
     def select_new_sxs_style
@@ -209,9 +229,11 @@ module SensibleSwing
     UpConvertKey = 'upconvert_setting'
     UpConvertKeyExtra = 'upconvert_setting_extra'
     UpConvertEnglish = 'upconvert_english_name'
+    ScreenMultipleFactor = 'screen_multiples'
 
-    def add_setup_upconvert_buttons
-      @none = new_jbutton("reset upconvert options to default (none)")
+    def add_change_upconvert_buttons
+      raise 'should have already been set for us' unless LocalStorage[ScreenMultipleFactor]
+      @none = new_jbutton("Reset upconvert options to default (no upconversion)")
       @none.tool_tip = "Having no upconvert options is reasonably good, might use directx for scaling, nice for slow cpu's"
       @none.on_clicked {
         LocalStorage[UpConvertKey] = nil
@@ -219,14 +241,14 @@ module SensibleSwing
         LocalStorage[UpConvertEnglish] = nil
         display_current_upconvert_setting
       }
-      @medium_dvd = new_jbutton("Change upconvert options to DVD-style video") {
+      @medium_dvd = new_jbutton("Change upconvert options for DVD-style video") {
         LocalStorage[UpConvertKey] = "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("Change upconvert options for playing back highly compressed video") {
+      high_compression = new_jbutton("Change upconvert options for playing high compressed video files") {
         # -autoq 6 -vf pp [?]
         LocalStorage[UpConvertEnglish] = "high compressed"
         LocalStorage[UpConvertKey] = "hqdn3d=0:1:4:4,pp=hb:y/vb:y,scale=SCREEN_X:-10:0:0:3" # pp should be after hqdn3d I think... and hqdn3d should be before scale...
@@ -240,8 +262,8 @@ module SensibleSwing
         LocalStorage[UpConvertEnglish] = "experimental"
         display_current_upconvert_setting
       }
-      add_text_line "Multiple factor screen widths (higher is better, but uses more cpu, 2x is typically good)." 
-      add_text_line "If mplayer just dies or if it displays only a blank screen then lower this."
+      add_text_line "Multiple factor screen widths (higher is better, but uses more cpu, 2x is good for high-end)." 
+      add_text_line "If mplayer just dies or displays only a black or white screen then lower this setting."
       slider = JSlider.new
       slider.setBorder(BorderFactory.createTitledBorder("Screen resolution multiple"));
   
@@ -276,14 +298,14 @@ module SensibleSwing
       slider.setPaintLabels(true)    
       slider.snap_to_ticks=true
       
-      slider.set_value LocalStorage['screen_multiples'] * 100
+      slider.set_value LocalStorage[ScreenMultipleFactor] * 100
       
       slider.add_change_listener { |event|
         if !slider.value_is_adjusting
           # they released their hold on it...
-          old_value = LocalStorage['screen_multiples']
+          old_value = LocalStorage[ScreenMultipleFactor]
           new_value = slider.value/100.0
-          LocalStorage['screen_multiples'] = new_value
+          LocalStorage[ScreenMultipleFactor] = new_value
           if new_value != old_value
             display_current_upconvert_setting
             if slider.value == label_minimum
@@ -306,7 +328,7 @@ module SensibleSwing
       settings = LocalStorage[UpConvertEnglish]
       out = "Upconvert options currently #{  settings ? "are set to #{settings} style" : "are NOT SET"}"
       if settings
-        multiple = LocalStorage['screen_multiples']
+        multiple = LocalStorage[ScreenMultipleFactor]
        out += " (screen multiplier #{multiple} = #{(multiple * get_current_max_width_resolution).to_i}px)."
       end
       out
@@ -320,7 +342,7 @@ module SensibleSwing
       template = LocalStorage[UpConvertKey]
       if template
         # choose width of widest monitor (why would they display it on the other?)
-        screen_multiple = LocalStorage['screen_multiples']
+        screen_multiple = LocalStorage[ScreenMultipleFactor]
         upc = template.gsub('SCREEN_X', (get_current_max_width_resolution*screen_multiple).to_i.to_s) # has to be an integer...
         upc = 'pullup,softskip,' + upc
         p 'using upconvert settings ' + upc
@@ -345,7 +367,8 @@ module SensibleSwing
     def setup_advanced_buttons
     
       new_jbutton("Display the standard buttons") do
-        setup_normal_buttons
+        window = new_child_window
+        window.setup_normal_buttons
       end
     
       add_text_line 'Realtime/Create Options:'
@@ -413,8 +436,6 @@ module SensibleSwing
         sleep 0.3 if OS.mac? # add delay...
         open_file_to_edit_it EdlTempFile
       end
-      
-
 
       @display_dvd_info = new_jbutton( "Display information about current DVD (ID, 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."
@@ -485,10 +506,10 @@ module SensibleSwing
 #      end
 
       
-      add_text_line 'Create Options that first create/use a local intermediary file:'
+      add_text_line 'Create Options with local intermediary file:'
       
-      new_jbutton("Show options that first create/use a local intermediary file") do
-        window = MainWindow.new_child_window
+      new_jbutton("Show options with local intermediary file") do
+        window = new_child_window
         window.add_options_that_use_local_files
       end
       
@@ -643,7 +664,7 @@ module SensibleSwing
     
     def setup_default_buttons
       if we_are_in_upconvert_mode
-        setup_upconvert_buttons
+        add_play_upconvert_buttons
       else
       
         if we_are_in_create_mode
@@ -1446,7 +1467,7 @@ module SensibleSwing
           return [filename, File.basename(filename), NonDvd]
         else
           disk = opticals[selected_idx]
-          out = show_non_blocking_message_dialog "calculating current disk's unique id..." # useful, believe it or not
+          out = show_non_blocking_message_dialog "calculating current disk's unique id...if this freezes clean your disk..." # useful, believe it or not
           dvd_id = DriveInfo.md5sum_disk(disk.MountPoint)
           out.dispose
           @_choose_dvd_drive_or_file = [disk.MountPoint, opticals[selected_idx].VolumeName, dvd_id]

data/bin/sensible-cinema-cli

@@ -84,7 +84,7 @@ def go_sc(args)
     # assume they want an online player, right? LODO player can tell us...
     auto_found = AutoWindowFinder.search_for_single_url_match
     if auto_found
-      p 'auto-discovered open window for EDL, using it ' + auto_found
+      p 'auto-discovered open window for player x EDL, using it ' + auto_found
       settings = EdlParser.parse_file auto_found
       if settings["from_url"]
          require 'tempfile'
@@ -108,8 +108,8 @@ def go_sc(args)
     puts 'Selected scene descriptions file ' + File.basename(edit_decision_list) + "\n\t(full path: #{edit_decision_list})"
     Blanker.startup
     # todo start it late as it has an annoying startup blip
-    overlay = OverLayer.new(edit_decision_list	)    
-  end  
+  end
+  overlay = OverLayer.new(edit_decision_list) if edit_decision_list
   
   if File.exist? player_description.to_s
     puts 'Selected player ' + File.basename(player_description) + "\n\t(full path: #{player_description})"
@@ -138,6 +138,8 @@ def go_sc(args)
   
   OCR.unserialize_cache_from_disk # do this every time so we don't delete it if they don't have one...
 
+  p 'moving mouse to align it for muting down 10'
+  Mouse.move_mouse_relative 0, 10 # LODO 
   puts "Opening the curtains... (please play in your other video player now)"
   overlay.start_thread true
   key_input = KeyboardInput.new overlay

data/change_log_with_feature_list.txt

@@ -1,3 +1,21 @@
+== 025.5==
+
+Cleaned up upconverting options to hopefully cause less confusion. Until somebody complains otherwise.
+
+Also note the existence of these files and their implication:
+...\sensible-cinema>ls legal
+control_youtube.html  md5s.txt  serve.rb  transcript_mute_vlc.txt
+
+
+== 0.25.4 ==
+
+Also note experimented with diferent frequencies of mouse jitter at one point,
+to preserve that the timestamp be available on screen, and also it
+avoids annoying the user with mouse jerks when the user has been moving it,
+and several other advanced features.
+
+Add a mode for "skipping" when using OCR overlayer (mute and blank, basically).
+
 == 0.25.3 ==
 
 Mostly explore some more "inventionzy" ideas.

data/lib/mouse.rb

@@ -60,38 +60,24 @@ module Mouse
   class << self
     
     def jitter_forever_in_own_thread
-      
-      myinput = Mouse::Input.new
-      myinput[:type] = Mouse::INPUT_MOUSE
-  
-      in_evt = myinput[:evt][:mi]
-  
-      in_evt[:mouse_data] = 0 # null it out
-      in_evt[:flags] = Mouse::MOUSEEVENTF_MOVE
-      in_evt[:time] = 0
-      in_evt[:extra] = 0
-      in_evt[:dx] = 0
-      in_evt[:dy] = 8 # just enough for VLC when full screened...
   
-      old_x = get_mouse_location.x
-      old_y = get_mouse_location.y
+      old_x, old_y = get_mouse_location
       Thread.new {
         loop {
-          cur_x = get_mouse_location.x
-          cur_y = get_mouse_location.y
+          move_y = 8 # just enough for VLC when full screened...
+          cur_x, cur_y = get_mouse_location
           if(cur_x == old_x && cur_y == old_y)
             @total_movements += 1
-            in_evt[:dy] *= -1
-            SendInput(1, myinput, Mouse::Input.size)
-            in_evt[:dy] *= -1
+            # blit it up
+            move_mouse_relative(0, move_y)
+            move_mouse_relative(0, move_y * -1)
+            # let it move it back
             sleep 0.05
-            SendInput(1, myinput, Mouse::Input.size)
-            old_x = get_mouse_location.x
-            old_y = get_mouse_location.y            
+            old_x, old_y = get_mouse_location
             sleep 0.75
           else
-            old_x = get_mouse_location.x
-            old_y = get_mouse_location.y
+            # user has been moving the mouse around, so we don't need to, to not annoy them
+            old_x, old_y = get_mouse_location
             sleep 3
           end
         }
@@ -99,6 +85,19 @@ module Mouse
       
     end
     
+    def move_mouse_relative dx, dy 
+      myinput = Mouse::Input.new
+      myinput[:type] = Mouse::INPUT_MOUSE
+      in_evt = myinput[:evt][:mi]
+      in_evt[:mouse_data] = 0 # null it out
+      in_evt[:flags] = Mouse::MOUSEEVENTF_MOVE
+      in_evt[:time] = 0
+      in_evt[:extra] = 0
+      in_evt[:dx] = dx
+      in_evt[:dy] = dy
+      SendInput(1, myinput, Mouse::Input.size)
+    end
+    
     def single_click_left_mouse_button
       left_mouse_down!
       left_mouse_up!
@@ -106,14 +105,14 @@ module Mouse
     end
     
     def left_mouse_down!
-      change_left_mouse_button MOUSEEVENTF_LEFTDOWN
+      send_left_mouse_button MOUSEEVENTF_LEFTDOWN
     end
     
     def left_mouse_up!
-      change_left_mouse_button MOUSEEVENTF_LEFTUP
+      send_left_mouse_button MOUSEEVENTF_LEFTUP
     end
 
-    VK_LBUTTON = 0x01 # mouse left button for GetAsyncKeyState
+    VK_LBUTTON = 0x01 # mouse left button for GetAsyncKeyState (seeing if mouse down currently or not)
     
     def left_mouse_button_state
       GetAsyncKeyState(VK_LBUTTON) # ignore a first response, which also tells us if it has changed at all since last call
@@ -124,15 +123,17 @@ module Mouse
       end
     end
     
+    # [x, y]
     def get_mouse_location
-      MouseInfo.getPointerInfo.getLocation
+      loc = MouseInfo.getPointerInfo.getLocation
+      [loc.x, loc.y]
     end
     
     attr_accessor :total_movements
     
     private
     
-    def change_left_mouse_button action_type
+    def send_left_mouse_button action_type
       myinput = Mouse::Input.new
       myinput[:type] = Mouse::INPUT_MOUSE
       in_evt = myinput[:evt][:mi]
@@ -144,4 +145,4 @@ module Mouse
   end
     
 end
-Mouse.total_movements = 0
+Mouse.total_movements=0 # ruby is a bit freaky with these...

data/lib/mouse_draw.rb

@@ -20,7 +20,7 @@ class MouseDraw
   # wait till mouse goes down...
   while(Mouse.left_mouse_button_state == :up)
     sleep 0.05
-    print '.'
+    print 'waiting'
   end
   f.undecorated = true
   f.default_close_operation = JFrame::EXIT_ON_CLOSE
@@ -29,8 +29,10 @@ class MouseDraw
   f.set_location(Mouse.get_mouse_location)
   while(Mouse.left_mouse_button_state == :down)
     # set_size
+    p 'waiting for end'
+    p Mouse.get_mouse_location
   end
-  #f.close
+  f.dispose
 end
   
 end

data/lib/muter.rb

@@ -56,12 +56,18 @@ module Muter
   def mute!
     #unmute! # just in case...somehow this was causing problems...windows 7 perhaps? VLC? 
     # anyway we just use a toggle for now...dangerous but works hopefully...
-    hit_mute_key
+    if @@use_mouse_click
+      Mouse.single_click_left_mouse_button
+    else
+      hit_mute_key
+    end
   end
+  
+  @@use_mouse_click = true
 
   # LODO better for doze 7/xp
   def unmute!
-    if @@use_mouse
+    if @@use_mouse_click
       Mouse.single_click_left_mouse_button
     elsif @@use_static_on_top
       stop_playing_static

data/lib/overlayer.rb

@@ -353,6 +353,7 @@ class OverLayer
     
     if should_be_blank && !blank?
       blank! "%.02f" % (next_point - cur_time)
+      mute! # mute with blanks currently...
       display_change 'blanked'
     end
 

data/lib/storage.rb

@@ -15,7 +15,8 @@ This file is part of Sensible Cinema.
     You should have received a copy of the GNU General Public License
     along with Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
 =end
-# use it like
+
+# shamelessly stolen from the redcar project
 
     class Storage
       class << self
@@ -23,7 +24,7 @@ This file is part of Sensible Cinema.
       end
     
       def self.storage_dir
-        @user_dir ||= File.join(File.expand_path('~'), ".storage")
+        @user_dir ||= File.join(File.expand_path('~'), ".sensible_cinema_storage")
       end
 
       # Open a storage file or create it if it doesn't exist.

data/spec/screen_tracker.spec.rb

@@ -33,6 +33,7 @@ describe ScreenTracker do
       rescue
         silence = File.expand_path("../lib/silence.wav").gsub("/", "\\")
         vlc =  Dir['/program files*/videolan/VLC/vlc.exe'][0]
+# /Applications/VLC.app/Contents/MacOS/VLC   lib/silence.wav -f
         Dir.chdir(File.dirname(vlc)) do; IO.popen("vlc.exe #{silence}").pid; end # includes a work around for JRUBY-4959 /4958
         
         # now also work around JRUBY-5756

data/spec/sensible_cinema_gui.spec.rb

@@ -556,7 +556,8 @@ module SensibleSwing
   
   it "should be able to upconvert at all" do
     @subject = MainWindow.new false
-    @subject.add_setup_upconvert_buttons
+    MainWindow::LocalStorage['screen_multiples'] = 2.0 # default so it won't fail us...
+    @subject.add_change_upconvert_buttons
     @subject.stub(:display_current_upconvert_setting) {} # no popup ;)
     @subject.stub(:show_mplayer_instructions_once) {}
     click_button(:@medium_dvd)
@@ -583,7 +584,7 @@ module SensibleSwing
   end
   
   it "should be able to play upconverted stuff" do
-    @subject.setup_upconvert_buttons
+    @subject.add_play_upconvert_buttons
     click_button(:@watch_file_upconvert)
     assert_played_mplayer
     click_button(:@watch_dvd_upconvert)

data/todo.inventionzy.txt

@@ -4,6 +4,8 @@
       some blu-ray player descriptor somehow
     can move the mouse 10 pixels down at the beginning, in order to...put it in the right place.
 
+	EDL can say "this exact text was at this exact time" to allow for matching with other videos of same content that may have slightly different timestamps/speeds/start time etc.
+	allow for extra start time offset for videos, if netflix instant has any
     can "suck in" a large list of EDL's from imdb at build time, and/or from a wiki (github wiki in this case), and a "resync" button?
     can handle multiple dvdid's et al (same EDL) (mostly do already though)
     can overlay over online films too
@@ -12,7 +14,11 @@
     can control volume *and* play other audio
     can add to to supplement EDL + EDL timestamps
     can pick specific profanities to avoid
+    it can scan "playing" instant streaming titles, and/or OCR or take the audio and look for words, to check for profanity.
+      it can examine "output volume level" to auto-detects violence.
+      similarly for "questionable" content
     manual select which to include into an EDL
+    use multiple filters/complex mapping graphs to overlay just the correct frameage: http://ffmpeg.org/libavfilter.html
     user preference "how many down clicks on volume for profanity"? 
     make it so it can suck in from "another wiki" the DL's, at package time, somehow (just one)
       or even just suck in any web file, for starters
@@ -51,3 +57,4 @@
     stage one: query, auto-download when they hit a netflix movie of some type
       stage two: chrome plugin for the same, auto-detect, auto-user, auto-download, auto-watch edited :)
     can insert deleted scenes et al [even external scenes :P] (already showed it somewhat)
+    many others were already completed and done from this list and removed

data/upconvert.bat

@@ -1 +1 @@
-j bin/sensible-cinema --upconvert-mode
+j %* bin/sensible-cinema --upconvert-mode

data/zamples/edit_decision_lists/dvds/Harry Potter 2 chamber of secrets.txt

@@ -13,5 +13,5 @@
 
 # "disk_unique_id" => "",
 "title" => "Harry Potter 2 Chamber of secrets",
-"mplayer_dvd_splits" => ["1:16:32"],
+#"mplayer_dvd_splits" => ["1:16:32"], inaccurate slightly...
 "not yet edited out" => "plenty of violence at the end with the snake, and also the spiders. hmmmm."

data/zamples/edit_decision_lists/dvds/edls_being_edited/cars_disney.txt

@@ -19,8 +19,10 @@
 "01:28:01.615", "01:28:06.119", "profanity", "Thank the manufacturer",
 "00:31:42.319", "00:31:46.406", "profanity", "innuendo", "Nah, I'm just kiddin'. She just likes me fer muh body.",
 "52:52", "52:57", "profanity", "innuendo", "not with me but with me",
-# 28:30 mumble [?]
+"28:00", "28:08", "profanity", "mumble l...",
 ],
+# 00:48:09,264 --> 00:48:11,934
+#That crazy old devil woman.
 
 # sister DVD: CRZ0NNF1 track 21 "disk_unique_id" => "aa06ad1c|e1e62ad0"
 

data/zamples/edit_decision_lists/dvds/harry_potter_3_prisoner_of_azkaban.txt

@@ -17,4 +17,4 @@
 #   "02:00:33", "02:01:03",  "dementors d", "",
 ],
 
-"mplayer_dvd_splits" => ["01:15:39"],
+#"mplayer_dvd_splits" => ["01:15:39"], inaccurate slightly

data/zamples/edit_decision_lists/dvds/tron_legacy.txt

@@ -23,5 +23,4 @@
 
 "not edited out stuff" => "some cyborg violence",
 "probable rating" => "still pg, age about 10",
-"mplayer_dvd_splits" => ["1:19:09"]
-# 4749
+#"mplayer_dvd_splits" => ["1:19:09"] # inaccurate slightly

data/zamples/players/vlc/windowed_total_length_under_an_hour.txt

@@ -19,3 +19,4 @@ digits:
       - 7
       :levels:
       - 130
+does_not_need_mouse_movement: true

metadata

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