sensible-cinema 0.25.1 → 0.25.2

data/spec/screen_tracker.spec.rb

@@ -23,7 +23,7 @@ describe ScreenTracker do
 
   SILENCE = /silence.*VLC/
 
-  def start_vlc
+  def start_vlc_windowed_doze
     unless $pid1
       assert !$pid1
       # enforce that we only have at most one running...
@@ -44,8 +44,19 @@ describe ScreenTracker do
     end
   end
 
+  def start_vlc_full_screen_mac
+    a = IO.popen "/Applications/VLC.app/Contents/MacOS/VLC --fullscreen --play-and-exit ../lib/silence.wav"
+    $pid1 = a.pid
+  end
+
   before(:all) do
-    start_vlc
+    if OS.doze?
+      start_vlc_windowed_doze
+    elsif OS.mac?
+      start_vlc_full_screen_mac
+    else
+      raise 'unsupported'
+    end
   end
 
   before do

data/spec/sensible_cinema_gui.spec.rb

@@ -20,28 +20,21 @@ require File.expand_path(File.dirname(__FILE__) + '/common')
 
 Dir.chdir '..' # need to run in the main folder, common moves us to spec...
 load 'bin/sensible-cinema'
+#require_relative 'lib/edl_parser' # to avoid having require_relative collide with autoload <sigh>
 
 module SensibleSwing
   describe MainWindow do
-
+    EdlParser::EDL_DIR.gsub!(/^.*$/, 'spec/files/edls')
     it "should be able to start up" do
       MainWindow.new.dispose# doesn't crash :)
     end
 
     Test_DVD_ID = 'deadbeef|8b27d001'
     
-    it "should auto-select a EDL if it matches a DVD's title" do
-      MainWindow.new.single_edit_list_matches_dvd(Test_DVD_ID).should_not be nil
-    end
-
-    it "should not auto-select if you pass it nil" do
-      MainWindow.new.single_edit_list_matches_dvd(nil).should be nil
-    end
-    
-    it "should not die if you choose a poorly formed edl (should warn)" do
+    it "should not die if you file select a poorly formed edl (should warn though)" do
       time_through = 0
-      @subject.stub!(:single_edit_list_matches_dvd) {
-        'fake filename doesnt matter because we fake its being parsed'
+      EdlParser.stub!(:single_edit_list_matches_dvd) { |dir, md5|
+        'fake filename doesnt matter what we return here because we fake its parsing later'
       }
       
       @subject.stub!(:parse_edl) {
@@ -74,37 +67,18 @@ module SensibleSwing
       @show_blocking_message_dialog_last_arg.should be nil
     end
     
-    it "should not select a file if poorly formed" do
-      @subject.stub!(:parse_edl) {
-        eval("a----")
-      }
-      @subject.single_edit_list_matches_dvd('fake md5') # doesn't die
-    end
-    
     def with_clean_edl_dir_as this
       FileUtils.rm_rf 'temp'
       Dir.mkdir 'temp'
-      old_edl = MainWindow::EDL_DIR.dup
-      MainWindow::EDL_DIR.sub!(/.*/, 'temp')
+      old_edl = EdlParser::EDL_DIR.dup
+      EdlParser::EDL_DIR.sub!(/.*/, 'temp')
       begin
         yield
       ensure
-        MainWindow::EDL_DIR.sub!(/.*/, old_edl)
+        EdlParser::EDL_DIR.sub!(/.*/, old_edl)
       end
     end
     
-    it "should prompt if two EDL's match a DVD title" do
-      MainWindow.new.single_edit_list_matches_dvd("BOBS_BIG_PLAN").should be nil
-      with_clean_edl_dir_as 'temp' do
-        MainWindow.new.single_edit_list_matches_dvd("BOBS_BIG_PLAN").should be nil
-        Dir.chdir 'temp' do
-          File.binwrite('a.txt', "\"disk_unique_id\" => \"abcdef1234\"")
-          File.binwrite('b.txt', "\"disk_unique_id\" => \"abcdef1234\"")
-        end
-        MainWindow.new.single_edit_list_matches_dvd("abcdef1234").should be nil
-      end
-    end
-
     it "should modify path to have mencoder available" do
       RubyWhich.new.which('mencoder').length.should be > 0
     end
@@ -358,7 +332,7 @@ module SensibleSwing
     end
     
     it "should create a new file for ya" do
-      out = MainWindow::EDL_DIR + "/edls_being_edited/sweetest_disc_ever.txt"
+      out = EdlParser::EDL_DIR + "/edls_being_edited/sweetest_disc_ever.txt"
       File.exist?( out ).should be_false
       @subject.stub!(:get_user_input) {'sweetest disc ever'}
       @subject.instance_variable_get(:@create_new_edl_for_current_dvd).simulate_click
@@ -551,7 +525,7 @@ module SensibleSwing
       end
    end
   
-   it "should be able to parse an srt for ya" do
+  it "should be able to parse an srt for ya" do
      @subject.stub!(:new_existing_file_selector_and_select_file) {
        'spec/dragon.srt'
      }
@@ -559,12 +533,9 @@ module SensibleSwing
      FileUtils.rm_rf file
      click_button(:@parse_srt)
      assert File.read(file).contain? "deitys"
-   end
+  end
   
   it "should have a created play unedited smplayer button" do
-    @subject.stub(:single_edit_list_matches_dvd) {
-      nil
-    }
     click_button(:@play_smplayer)
   end
   
@@ -574,7 +545,7 @@ module SensibleSwing
     @subject.stub(:assert_ownership_dialog) {
       prompted = true
     }
-    @subject.stub(:new_existing_file_selector_and_select_file).and_return("yo.mpg", "zamples/edit_decision_lists/dvds/edls_being_edited/edl_for_unit_tests.txt")
+    @subject.stub(:new_existing_file_selector_and_select_file).and_return("yo.mpg", "spec/files/edls/edls_being_edited/edl_for_unit_tests.txt")
     click_button(:@create_dot_edl)
     assert File.exist? 'yo.edl'
     assert prompted

data/todo.inventionzy.txt

@@ -1,36 +1,37 @@
   === patentzy yes actually do vaguely ordered ===
+    make it suck in large list of EDL's from imdb at build time
     blu-ray OCR
       more blu-ray stuff: can ID them, can playback (through...mkv? VLC? powerdvd OCr/scripted?)
       some blu-ray player descriptor somehow
-    
+
+    can handle multiple dvdid's et al (same EDL) (kind of already shown)
+    can overlay over online films too
+    control VLC RC to overlay a logo dynamically
+    can control volume *and* play other audio
+    can add to to supplement EDL + EDL timestamps
     can pick specific profanities to avoid
-    both mute and blank when blanking by default...
     manual select which to include into an EDL
     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
-    make it so it can "auto-download" based on DVD
     space -> advance from pause until next edit item?
     add fine grained "new ratings" to some demo EDL
-    infer edl from url for netflix
     amazon player descriptor, just in case ;P
     can jerk mouse only every so often (cheap would be to just arbitrarily have it from x to y, demo that)
-    can scan several player descriptors to "pick the right one"
+    can scan several player descriptors to "pick the right one" (kind of already showed this one)
     edited streamer screencast demo (the rumor guy demo, like zediva)
-    incorporate the DL translator from the BYU-I fella
+    incorporate the EDL translator from the BYU-I fella
     post a demo of it playing back blu-ray edited local computer, +- projector, +- playon (?)
     post some playon.tv demo screencast...this should prove all shouldn't it [?]
-    can "control mouse" to drag it to change location
+    can "control mouse" to drag it to change location (ex: "move down 10 pixels at beginning of movie" LOL)
     beep at them/warn when not tracking [?]
       default on...I think.
     can jerk mouse more often closer to failure sections...
     can pull one from imdb at all, video "show it creates a file"
-    make it suck in large list of EDL's from imdb at build time
     C player: minimize instead of skip :P
     C player: don't mute, just almost mute LOL or almost mute and static-ify
     can suck it in "in realtime" from online, and parse it, for demo purposes
     a UI to select categories, works
-    4 point editor
     edited blu ray movie playback screencast, as that's apparently not in the patent...
     don't use timecodes, use "% of the movie" and "total length" perhaps?
     look at their patents for other ideas? [all patents, nissim patents?]
@@ -41,11 +42,9 @@
       phase 2: I can accomodate for pauses, too.
       phase 3: I can re-train based on events of stoppage
       phase 4: I can constantly poll and react
-    post a demo of it streaming to a console device
+    post video demo of it streaming to a console device
     categories filterable by "level" "profanity level 2 and below is ok for me and my kids"
     maybe could just "play from x to y" [no exclude info?] 
     stage one: query, auto-download when they hit a netflix movie of some type
-      stage two: chrome plugin for the same
-    editor that can use OCR, too :P
-    can insert deleted scenes et al [even external scenes :P]
-    can have user submittable bookmarks, kind of like how espn3 does their playbacks...hmm...
+      stage two: chrome plugin for the same :)
+    can insert deleted scenes et al [even external scenes :P] (already showed it)

data/todo.upconvert

@@ -17,31 +17,25 @@ do I need double tapping? http://archive2.avsforum.com/avs-vb/showthread.php?s=&
 
   make it able to grab from a window, and work when dragged too...
   can I make it look awesome?
-  tell mplayer how to fix directx :)
   
   ==== some day ====
-    shearing
+    shearing (?) compared to itself upscreened...
     perfect looks of absolutely everything upconverted LOL
     # TODO cut off all black edges too...why not, eh? mplayer has crop detect...
     make really low q stuff like youtube less than even 360 look good
     # TODO can align better youtube
     better benchmarker (windows vs. desktop, just show reverse)
+    the "drag to select window" seter-zy-upperzy
+
+ is ffplay on avisynth piece of crud compared to the other? vs. mplayer? why only like 10 fps? what the...
 
 == OS dshow screen tracker ==
 
- It probably needs to send out input "only if it's changed" I'm thinkin..." for my purposes anyway...
- VLC compatible'ify it..
- can limit it to only 5 fps [?]
-  @ avisynth wiki: max fps
-  is ffplay on avisynth piece of crud compared to the other? vs. mplayer? why only like 10 fps? what the...
- 
- jruby "drag to select"
+  see its TODO, things I actually want to do add here.
 
  === some day ===
     bounty multi-thread scaling, iff it seems helpful-er for quad core.
-    threading the input [?] (a bit complicated because of the "only if it's changed" mantra)
     can I live with aero wasn't bitblt getting like 800fps *with* aero?
-    more efficient by skipping an extra copy (we're already pretty fast though...)
   
 == never ==
 
@@ -49,5 +43,4 @@ add another sharpen filter?
 
 add a VLC version?
 
-
 prop: http://ubuntuforums.org/showthread.php?t=804537 didn't I have another list somewhere... ?

data/upconvert_netflix/latest2/combine_video.avs

@@ -0,0 +1,23 @@
+# from http://avisynth.org/mediawiki/Enhancing_dvd_videos
+
+#Video1 = DirectShowSource("push2.GRF", fps=35, audio=False, framecount=1000000) # fps appears to be a "max" fps
+#Video2 = DirectShowSource("", fps=35, audio=False, framecount=1000000) # fps appears to be a "max" fps
+#Video1 = DirectShowSource("push2.GRF", fps=35, audio=False, framecount=1000000) # fps appears to be a "max" fps
+Video1 = DirectShowSource("g:\Video\Sintel_NTSC\title01a.ts", fps=25)
+Video2 = DirectShowSource("push2.GRF", fps=35, audio=False, framecount=1000000) # fps appears to be a "max" fps
+Return Overlay(Video1, Video2, 100, 100,opacity=0.5)
+
+# 
+# these are the size of your monitor that the output is displayed on.  Unless it lags too much, then try experimenting with smaller values
+# Video = ConvertToYUY2 (Video) 
+# screen_width = 1024 # CHANGE THIS TODO propagate it...
+# screen_height = 768 # CHANGE THIS
+# 
+# # note that you can get even better looking images by say, upscaling to 2x your current screen resolution, by uncommenting the following two lines
+# screen_width = screen_width*2
+# screen_height = screen_height*2
+# 
+# Video = Lanczos4Resize (Video, screen_width, screen_height) # said to be a good upsampler...hmm...
+# 
+# Video = Sharpen (Video, 0.78) # Helps sharpen smoothness enlarging does. 0.78 = (1.25*(1024/720))-1
+# Return Video

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

@@ -16,6 +16,8 @@
 "blank_outs" => [
   # an example line, uncomment the leading "#" to make it active
   # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
+# 1358 1452
+# 4730 - 600 -<  4837 - 600
 ],
 
 "volume_name" => "JESTER",

data/zamples/edit_decision_lists/youtube/nuki_song_youtube.txt

@@ -9,5 +9,6 @@
 ],
 
 "title" => "Nuki Song",
+"rating_with_this_edl" => {"violence" => "67% 7 for first half, 65% 5 for second half, 66% 4 for second half if you include the last blank_outs", "language" => "PG-12"},
 "source" => "youtube",
 "url" => "http://www.youtube.com/watch?v=xd12hR68sWM"

data/zamples/edit_decision_lists/youtube/nuki_song_youtube_pointer.txt

@@ -0,0 +1,2 @@
+"url" => "http://www.youtube.com/watch?v=xd12hR6 8sWM",
+"from_url" => "https://github.com/rdp/sensible-cinema/raw/master/zamples/edit_decision_lists/youtube/nuki_song_youtube.txt"

data/zamples/players/youtube/normal_in_youtube.com.chrome.txt

@@ -19,4 +19,5 @@ digits:
       :levels:
       - 250
       - 200
-does_not_need_mouse_movement: true
+does_not_need_mouse_movement: true
+window_title: !ruby/regexp /Chrome/

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.25.1
+  version: 0.25.2
 platform: ruby
 authors: 
   - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 -06:00
+date: 2011-08-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.9.3
+            version: 0.9.4
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.22.0
+            version: 0.24.2
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -41,9 +41,9 @@ dependencies:
     requirement: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - "="
           - !ruby/object:Gem::Version 
-            version: 0.0.7.3
+            version: 0.0.9
     type: :runtime
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
@@ -69,14 +69,14 @@ dependencies:
     type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency 
-    name: jruby-win32ole
+    name: rautomation
     prerelease: false
     requirement: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ">"
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: 0.6.3
     type: :runtime
     version_requirements: *id006
   - !ruby/object:Gem::Dependency 
@@ -205,6 +205,7 @@ email: rogerdpack@gmail.com
 executables: 
   - sensible-cinema
   - sensible-cinema-cli
+  - sensible-cinema-dependencies.rb
 extensions: []
 
 extra_rdoc_files: 
@@ -220,9 +221,11 @@ files:
   - _DO_NOT_RUN_IT_FROM_HERE_DOWNLOAD_THE_RELEASE_ZIP_FROM_SOURCEFORGE_INSTEAD
   - bin/sensible-cinema
   - bin/sensible-cinema-cli
+  - bin/sensible-cinema-dependencies.rb
   - business_ideas.txt
   - change_log_with_feature_list.txt
   - conclusions
+  - cone.png
   - developer_how_to_contribute_to_the_project.txt
   - documentation/DOCUMENTATION_README.TXT
   - documentation/how_to_create_your_own_delete_lists.txt
@@ -242,6 +245,7 @@ files:
   - legal/transcript_mute_vlc.txt
   - legal2
   - lib/add_any_bundled_gems_to_load_path.rb
+  - lib/auto_window_finder.rb
   - lib/blanker.rb
   - lib/check_installed_mac.rb
   - lib/convert_thirty_fps.rb
@@ -273,8 +277,11 @@ files:
   - lib/vlc_programmer.rb
   - never_do
   - ocr.todo_if_need_speed
+  - play_with_inserted_scene.bat
+  - play_with_overlay.bat
   - preamble
   - spec/arse.srt
+  - spec/auto_window_finder.spec.rb
   - spec/blanker.spec.rb
   - spec/common.rb
   - spec/convert_image.rb
@@ -282,6 +289,7 @@ files:
   - spec/dragon.srt
   - spec/drive_info.spec.rb
   - spec/edl_parser.spec.rb
+  - spec/files/edls/edls_being_edited/edl_for_unit_tests.txt
   - spec/frame_accurate.spec.rb
   - spec/go_line.bat
   - spec/keyboard_input.spec.rb
@@ -314,7 +322,9 @@ files:
   - todo.propaganda
   - todo.subtitle
   - todo.upconvert
+  - transparent.png
   - upconvert.bat
+  - upconvert_netflix/latest2/combine_video.avs
   - upconvert_netflix/latest2/go_no_upscaling.bat
   - upconvert_netflix/latest2/go_upscaling.bat
   - upconvert_netflix/latest2/push2.GRF
@@ -354,7 +364,6 @@ files:
   - zamples/edit_decision_lists/dvds/bobs_big_plan.txt
   - zamples/edit_decision_lists/dvds/cool runnings.txt
   - zamples/edit_decision_lists/dvds/edls_being_edited/court_jester.txt
-  - zamples/edit_decision_lists/dvds/edls_being_edited/edl_for_unit_tests.txt
   - zamples/edit_decision_lists/dvds/edls_being_edited/test_delete_list_for_experimenting_with.txt
   - zamples/edit_decision_lists/dvds/flight_of_the_navigator.txt
   - zamples/edit_decision_lists/dvds/happiest baby on the block.txt
@@ -384,6 +393,7 @@ files:
   - zamples/edit_decision_lists/old_not_yet_updated/youtube/gummy_bear_song_youtube.txt
   - zamples/edit_decision_lists/youtube/demo_mutes.txt
   - zamples/edit_decision_lists/youtube/nuki_song_youtube.txt
+  - zamples/edit_decision_lists/youtube/nuki_song_youtube_pointer.txt
   - zamples/players/how_to_create_more_players.txt
   - zamples/players/hulu/total_length_over_an_hour.txt
   - zamples/players/netflix/netflix_firefox_non_maximized.txt