sensible-cinema 0.26.1 → 0.26.2

data/TODO

@@ -24,19 +24,16 @@
   
 == high prio like blocking bugs ==  
   
-== under next release specific items: ==
-  test out DVD upscale
-    no super scale res?
-      
 == next things I was working on ==
-  a srt that works with my DVD...does it match netflix instant jonah?
   unit tests work
-  innerspace
-  screen recording
+  screen recording sintel
   more netflix instant timing
-    bluray jonah
+    bluray jonah total time vs. other
   
 == yes do ordered for release  ==
+  test out DVD upscale
+    no super scale res?
+      
   add srt instructions to docu, release
   fake "tenseness" metric
   netflix instant descriptor for OS X/work at all

data/VERSION

@@ -1 +1 @@
-0.26.1
+0.26.2

data/change_log_with_feature_list.txt

@@ -1,3 +1,7 @@
+== 0.26.2 ==
+
+Fix license acceptance code, quick redeploy
+
 == 0.26.1 ==
 
 Cleaned up the upconvert interface, added a way for easier comparison of different upconversion settings (automated-ly-zy).

data/lib/gui/sensible-cinema-base.rb

@@ -427,7 +427,6 @@ module SensibleSwing
     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.'
-      # cancel button stays the same...
       
       message ||= "Sensible Cinema requires a separately installed program (#{program}), not yet installed.
         You can install this program manually to the vendor/cache subdirectory, or Sensible Cinema can download it for you.
@@ -438,12 +437,11 @@ module SensibleSwing
         You agree that you are responsible for the download and use of this program, within sensible cinema or otherwise."
       answer = JOptionPane.show_select_buttons_prompt message, :yes => 'Accept', :no => "View #{license_name}"
       assert_confirmed_dialog answer, license_url_should_also_be_embedded_by_you_in_message
-      p 'confirmation of sensible cinema related license saved of: ' + license_name
-      throw unless returned == 0
-      
+      p 'confirmation of sensible cinema related license noted of: ' + license_name # LODO require all licenses together :P
+      throw unless answer == :yes
     end
     
-    def assert_confirmed_dialog answer, license_url_should_also_be_embedded_by_you_in_message
+    def assert_confirmed_dialog returned, license_url_should_also_be_embedded_by_you_in_message
       # :yes, :no, :cancel
       # 1 is view button was clicked
       # 0 is accept

data/spec/notes

@@ -1,5 +1,39 @@
 up next:
 
+curious george 2 http://movies.netflix.com/WiPlayer?trkid=805148&movieid=70130481 37:35 has an accomplish oh my g
+
+== netflix upscale notes ==
+
+ :width=>657 for "HD" that said it was playing in HD, eh? ... hmm...
+
+ hulu has "up to 480p" as options...hmm...
+  360p speedracer displays as {:start_x=>535, :start_y=>328, :width=>542, :height=>410}
+  480p speedracer displays as {:start_x=>524, :start_y=>331, :width=>550, :height=>408} (same)
+    and always the same size minimzed eh...
+    
+ netflix instant 
+    default minimum size is {:start_x=>38, :start_y=>109, :width=>649, :height=>372}
+    Jonah is in hd 
+     http://blog.netflix.com/2011/03/netflix-lowers-data-usage-by-23-for.html 1080p possible, typically it's 720p apparently [?]
+     720p:
+        2200 kbps/192 kbps
+    while "buffering hd" it looks a bit jagged...hmm...
+    if you drag, it loses and discards all buffering. yipes.
+    "DIS" allowing HD at first looks junky, then looks really good LOL
+    HD looks basically perfect, though maybe some sharpening or what not could help still...
+      the lines look awesome to good (this is "apparently probably" 1080p
+    non HD, with their upconversion
+      lines look pretty good, maybe a teeny touchup
+      coloring maybe a bit weak
+      maybe barely non sharp lines
+      no artifacts that I can tell
+        might not need hqdn3d?
+        unless they have/use their own...
+      
+    TODO CGI netflix instant 1080p
+      compare HD and non...
+      
+    
 == netflix instant vs srt ==
 
 00:02:34,427 --> 00:02:36,361
@@ -1535,23 +1569,40 @@ hulu
  15: wash your hands [before] you eat
  30: a man that .. can count on to deliver his message yes [well]
  45: just before the big grin from duck
+ sum: 1:22:51 1:22:52 in thing, seems to get that far... hmm...
+
 
 youtube jonah: appears lower quality?
  15: wash your hands before you [eat]
  30: yes well [you] and ...
  45: big smile, turns [to his right]
-
-powerdvd 8:
-  15: wash your hands before you [eat] --- wash your hands [before] you eat --- wash your [hands] before you eat LOL
-  30: can count on to deliver his messages yes [] well  ---  yes well ... you and [] ... are like peas in a pod ai ai 
-  45: big smile [] he turns to his right  --- turns [to his right] -- [] turns to his right
+ sum: (says 1:22:59 for pay version [?]) says 1:22:54  in index, and on vid, felt really like 1:22:52 or so
+
+
+powerdvd 8 (DVD):
+  15: 
+    wash your hands before you [eat] 
+    wash your hands [before] you eat
+    wash your [hands] before you eat LOL
+  30: 
+    can count on to deliver his messages yes [] well  
+    yes well ... you and [] ... are like peas in a pod
+  45: 
+    big smile [] he turns to his right
+    turns [to his right] 
+    [] turns to his right
 
 wmp windows 7: [wmp feels slightly unstable timing-wise]
   15:  before [] you eat --- before [you] eat
   30:  yes []well --- yes well[]
   45:  turns [to his right] --- turns to his right[]
   
-LODO jonah blu ray timings
+blu-ray powerdvd:
+  30: deep in my family [] my uncle * 2
+  45: blue light shines down 44:58 or 59
+    duck 44:47 look left about 44:48      
+  1:22:45 sum, seems to have the same closing credits et al...
+  totally uses 100% cpu
 
 netflix instant jonah
 
@@ -1569,7 +1620,7 @@ netflix instant jonah
         [fr]om the Lord.
         me[ss]age from the Lord [HD]
         
- conclusion: browser doesn't matter, at lesat for HD streams, at work
+ conclusion: browser doesn't matter, (at least for HD stream at work)
         
  30: like two humps on a camel, you always sway the same way, humor runs in my family, my uncle was a [big] star
      IE at work: humor runs very deep in my family[] my uncle was, my uncle was[] a big star, my [uncle] was a big star
@@ -1579,7 +1630,11 @@ netflix instant jonah
      chrome: 1.5 seconds as blue light fades in
      it's like 10 seconds in...
      same with mac
+     47 duck
      conclusion: netflix doesn't care about mac versus pc timing-wise
+     59 blu ray how apropo
+    
+     conclusion (based on this compared with the blu-ray): netflix instant seems to match pretty close, within 1s to the blu-ray
 
  conclusion: netflix varies pretty widely from instance to instance of playing back (same computer, same movie, same browser).
 

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.26.1
+  version: 0.26.2
 platform: ruby
 authors: 
   - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-07 00:00:00 Z
+date: 2011-09-08 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: os
@@ -266,8 +266,6 @@ files:
   - lib/keyboard_input.rb
   - lib/media_info_parser.rb
   - lib/mencoder_wrapper.rb
-  - lib/mouse.rb
-  - lib/mouse_draw.rb
   - lib/mouse_forever.rb
   - lib/mplayer_edl.rb
   - lib/muter.rb
@@ -298,7 +296,6 @@ files:
   - spec/keyboard_input.spec.rb
   - spec/media_info_parser.spec.rb
   - spec/mencoder_wrapper.spec.rb
-  - spec/mouse.spec.rb
   - spec/mplayer_edl.spec.rb
   - spec/muter.spec.rb
   - spec/notes
@@ -307,7 +304,6 @@ files:
   - spec/screen_tracker.spec.rb
   - spec/sensible_cinema_gui.spec.rb
   - spec/subtitle_profanity_finder.spec.rb
-  - spec/swing_helpers.spec.rb
   - spec/test_yaml.yml
   - spec/tsmuxer.output
   - spec/vlc_programmer.spec.rb

data/lib/mouse.rb

@@ -1,148 +0,0 @@
-=begin
-Copyright 2010, Roger Pack 
-This file is part of Sensible Cinema.
-
-    Sensible Cinema is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Sensible Cinema is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    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
-require 'rubygems'
-require 'ffi'
-require 'java'
-
-module Mouse
-  extend FFI::Library
-  MouseInfo =  java.awt.MouseInfo
-
-  ffi_lib 'user32'
-  ffi_convention :stdcall
-  
-  MOUSEEVENTF_MOVE = 1
-  INPUT_MOUSE = 0
-  MOUSEEVENTF_ABSOLUTE = 0x8000
-  MOUSEEVENTF_LEFTDOWN = 0x0002
-  MOUSEEVENTF_LEFTUP   = 0x0004
-  
-  
-  class MouseInput < FFI::Struct
-    layout :dx, :long,
-           :dy, :long,
-           :mouse_data, :ulong,
-           :flags, :ulong,
-           :time, :ulong,
-           :extra, :ulong
-  end
-  
-  class InputEvent < FFI::Union
-    layout :mi, MouseInput
-  end 
-  
-  class Input < FFI::Struct
-    layout :type, :ulong,
-           :evt, InputEvent
-  end
-  
-  # UINT SendInput(UINT nInputs, LPINPUT pInputs, int cbSize);
-  attach_function :SendInput, [ :uint, :pointer, :int ], :uint
-
-  # poller...
-  attach_function :GetAsyncKeyState, [:int], :uint
-  
-  class << self
-    
-    def jitter_forever_in_own_thread
-  
-      old_x, old_y = get_mouse_location
-      Thread.new {
-        loop {
-          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
-            # blit it up
-            move_mouse_relative(0, move_y)
-            move_mouse_relative(0, move_y * -1)
-            # let it move it back
-            sleep 0.05
-            old_x, old_y = get_mouse_location
-            sleep 0.75
-          else
-            # 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
-        }
-      }
-      
-    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!
-      p "CLICKED LEFT MOUSE BUTTON"
-    end
-    
-    def left_mouse_down!
-      send_left_mouse_button MOUSEEVENTF_LEFTDOWN
-    end
-    
-    def left_mouse_up!
-      send_left_mouse_button MOUSEEVENTF_LEFTUP
-    end
-
-    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
-      if GetAsyncKeyState(VK_LBUTTON) == 0 # zero means up
-        :up
-      else
-        :down
-      end
-    end
-    
-    # [x, y]
-    def get_mouse_location
-      loc = MouseInfo.getPointerInfo.getLocation
-      [loc.x, loc.y]
-    end
-    
-    attr_accessor :total_movements
-    
-    private
-    
-    def send_left_mouse_button action_type
-      myinput = Mouse::Input.new
-      myinput[:type] = Mouse::INPUT_MOUSE
-      in_evt = myinput[:evt][:mi]
-      in_evt[:flags] = action_type
-      SendInput(1, myinput, Mouse::Input.size)
-    end
-
-    
-  end
-    
-end
-Mouse.total_movements=0 # ruby is a bit freaky with these...

data/lib/mouse_draw.rb

@@ -1,43 +0,0 @@
-require 'mouse'
-
-
-class MouseDraw
-  
-  def self.go
-  
-  require 'java'
-
-  java_import 'javax.swing.JFrame'
-  java_import 'javax.swing.JButton'
-  java_import 'com.sun.awt.AWTUtilities'
-
-  f = JFrame.new
-  f.add JButton.new('capture window')
-  f.set_size(200,200)
-
-  AWTUtilities.set_window_opacity(f, 0.5)
-  
-  # wait till mouse goes down...
-  while(Mouse.left_mouse_button_state == :up)
-    sleep 0.05
-    print 'waiting'
-  end
-  f.undecorated = true
-  f.default_close_operation = JFrame::EXIT_ON_CLOSE
-  f.always_on_top = true
-  f.visible = true
-  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.dispose
-end
-  
-end
-
-
-if $0 == __FILE__
-  MouseDraw.go
-end

data/spec/mouse.spec.rb

@@ -1,65 +0,0 @@
-=begin
-Copyright 2010, Roger Pack 
-This file is part of Sensible Cinema.
-
-    Sensible Cinema is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Sensible Cinema is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    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
-require File.expand_path(File.dirname(__FILE__) + '/common')
-require_relative '../lib/mouse'
-
-p 'dont move the mouse!'
-
-describe Mouse do
-
-  it "should move it a couple times" do
-    old = Mouse.total_movements
-    begin
-    Timeout::timeout(2) {
-      Mouse::jitter_forever_in_own_thread.join
-    }
-    rescue Timeout::Error
-    end
-    Mouse.total_movements.should be > old
-  end
-  
-  it "should not move it if the user does" do
-    old = Mouse.total_movements
-    begin
-    Timeout::timeout(2) {
-      Mouse::jitter_forever_in_own_thread
-      x = 1
-      loop {java.awt.Robot.new.mouse_move(500 + (x+=1),500); sleep 0.1; }
-    }
-    rescue Timeout::Error
-    end
-    Mouse.total_movements.should == old + 1
-  end
-  
-  it "should be able to left mouse click" do
-    Mouse.left_mouse_button_state.should be :up
-    Mouse.left_mouse_down!
-    Mouse.left_mouse_button_state.should be :down
-    Mouse.left_mouse_up!
-    Mouse.left_mouse_button_state.should be :up
-  end
-  
-  it "should be able to click" do
-    Mouse.left_mouse_button_state.should be :up
-    Mouse.single_click_left_mouse_button
-    Mouse.left_mouse_up!
-    Mouse.left_mouse_up!
-    Mouse.left_mouse_button_state.should be :up
-  end
-
-end

data/spec/swing_helpers.spec.rb

@@ -1,44 +0,0 @@
-=begin
-Copyright 2010, Roger Pack 
-This file is part of Sensible Cinema.
-
-    Sensible Cinema is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Sensible Cinema is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    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
-require File.expand_path(File.dirname(__FILE__) + '/common')
-require 'os'
-require_relative '../lib/swing_helpers'
-module SensibleSwing
-describe SensibleSwing do
-
-  it "should close its modeless dialog" do
-   
-   dialog = NonBlockingDialog.new("Is this modeless?")
-   dialog = NonBlockingDialog.new("Is this modeless?\nSecond lineLL")
-   dialog = NonBlockingDialog.new("Is this modeless?\nSecond lineLL\nThird line too!")
-   dialog = NonBlockingDialog.new("Can this take very long lines of input, like super long?")
-   #dialog.dispose # should get here :P
-   # let user close it :P
-  end
-  
-  it "should be able to convert filenames well" do
-    if OS.windows?
-      "a/b/c".to_filename.should == "a\\b\\c"
-    else
-      "a/b/c".to_filename.should == "a/b/c"
-    end
-  end
-
-end
-end
-puts 'close the windows...'