sensible-cinema 0.23.6 → 0.24.0

data/spec/sensible_cinema_gui.spec.rb

@@ -114,7 +114,9 @@ module SensibleSwing
     end
     
     before do
+      ARGV << "--create-mode" # want all the buttons for some tests.
       @subject = MainWindow.new
+      ARGV.pop
       @subject.stub!(:choose_dvd_drive_or_file) {
         ["mock_dvd_drive", "Volume", Test_DVD_ID] # happiest baby on the block
       }
@@ -177,7 +179,9 @@ module SensibleSwing
     
     # name like :@rerun_previous
     def click_button(name)
-      @subject.instance_variable_get(name).simulate_click
+      button = @subject.instance_variable_get(name)
+      raise 'button not found: ' + name.to_s unless button
+      button.simulate_click
     end
     
     it "should be able to run system" do
@@ -185,7 +189,7 @@ module SensibleSwing
     end
 
     it "should be able to do a normal copy to hard drive, edited" do
-      @subject.do_copy_dvd_to_hard_drive(false).should == [false, "abc.fulli_unedited.tmp.mpg"]
+      @subject.do_copy_dvd_to_hard_drive_via_file(false).should == [false, "abc.fulli_unedited.tmp.mpg"]
       File.exist?('test_file_to_see_if_we_have_permission_to_write_to_this_folder').should be false
     end
     
@@ -199,8 +203,8 @@ module SensibleSwing
         count += 1
         'abc'
       }
-      @subject.do_copy_dvd_to_hard_drive(false).should == [false, "abc.fulli_unedited.tmp.mpg"]
-      3.times { @subject.do_copy_dvd_to_hard_drive(false) }
+      @subject.do_copy_dvd_to_hard_drive_via_file(false).should == [false, "abc.fulli_unedited.tmp.mpg"]
+      3.times { @subject.do_copy_dvd_to_hard_drive_via_file(false) }
       count.should == 2
     end
     
@@ -210,11 +214,11 @@ module SensibleSwing
      @subject.get_title_track(descriptors).should == "3"
     end
     
-    it "should call through to explorer for the full thing" do
+    it "should call through to explorer to display the final output file" do
       PlayAudio.stub!(:play) {
         @played = true
       }
-      @subject.do_copy_dvd_to_hard_drive(false)
+      @subject.do_copy_dvd_to_hard_drive_via_file(false)
       @subject.background_thread.join
       @get_mencoder_commands_args[-4].should == nil
       @system_blocking_command.should match /explorer/
@@ -224,12 +228,12 @@ module SensibleSwing
     
     it "should be able to return the fulli name if it already exists" do
       FileUtils.touch "abc.fulli_unedited.tmp.mpg.done"
-      @subject.do_copy_dvd_to_hard_drive(false,true).should == [true, "abc.fulli_unedited.tmp.mpg"]
+      @subject.do_copy_dvd_to_hard_drive_via_file(false,true).should == [true, "abc.fulli_unedited.tmp.mpg"]
       FileUtils.rm "abc.fulli_unedited.tmp.mpg.done"
     end
     
     it "should call explorer eventually, if it has to create the fulli file" do
-     @subject.do_copy_dvd_to_hard_drive(true).should == [false, "abc.fulli_unedited.tmp.mpg"]
+     @subject.do_copy_dvd_to_hard_drive_via_file(true).should == [false, "abc.fulli_unedited.tmp.mpg"]
      join_background_thread
      @get_mencoder_commands_args[-2].should == "2"
      @get_mencoder_commands_args[-3].should == "01:00"
@@ -265,11 +269,8 @@ module SensibleSwing
     end
     
     it "should call something for fast preview" do
-      click_button(:@fast_preview).join
-      join_background_thread
-      #XXXX @system_blocking_command.should =~ /ffmpeg.*ntsc-dvd/ # I think this is a timing thing...
+      click_button(:@fast_preview)
       @system_blocking_command.should =~ /smplayer/
-      @system_blocking_command.should_not =~ /mplayer.*fast/ # the old way
     end
     
     it "should be able to rerun the latest start and end times with the rerun button" do
@@ -310,11 +311,11 @@ module SensibleSwing
     
     it "if the .done files exists, do_copy... should call smplayer ja" do
       FileUtils.touch "abc.fulli_unedited.tmp.mpg.done"
-      @subject.do_copy_dvd_to_hard_drive(false, true, true).should == [true, "abc.fulli_unedited.tmp.mpg"]
+      @subject.do_copy_dvd_to_hard_drive_via_file(false, true, true).should == [true, "abc.fulli_unedited.tmp.mpg"]
     end
     
     it "should create a new file for ya" do
-      out = MainWindow::EDL_DIR + "/sweetest_disc_ever.txt"
+      out = MainWindow::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
@@ -335,9 +336,13 @@ module SensibleSwing
     end
     
     it "should create an edl and pass it through to mplayer" do
+      smplayer_opts = nil
+      @subject.stub(:set_smplayer_opts) { |to_this|
+        smplayer_opts = to_this
+      }
       click_button(:@mplayer_edl).join
-      @system_blocking_command.should match(/mplayer.*-edl/)
-      @system_blocking_command.should match(/-dvd-device /)
+      smplayer_opts.should match(/-edl /)
+      @system_blocking_command.should match(/dvdnav/)
     end
     
     it "should play edl with extra time for the mutes because of the EDL aspect" do
@@ -443,19 +448,26 @@ module SensibleSwing
       end
     end
     
-    it "should not show the normal buttons in create mode" do
-      MainWindow.new.buttons.length.should == 5
+    it "should show additional buttons in create mode" do
+      MainWindow.new.buttons.length.should == 6
+      old_length = MainWindow.new.buttons.length
       ARGV << "--create-mode"
-      MainWindow.new.buttons.length.should == 17
+      MainWindow.new.buttons.length.should be > (old_length + 5)
       ARGV.pop # post-test cleanup--why not :)
     end
+
+    it "should show upconvert buttons" do
+      ARGV << "--upconvert-mode"
+      MainWindow.new.buttons.length.should be > 3
+      ARGV.pop 
+    end 
     
     it "should read splits from the file" do
       splits1 = nil
       MplayerEdl.stub(:convert_to_edl) do |d,s,s,splits|
         splits1 = splits
       end
-      @subject.do_mplayer_edl nil, 0, 0
+      @subject.play_mplayer_edl
       splits1.should == []
     end
     
@@ -465,7 +477,7 @@ module SensibleSwing
         @subject.stub!(:choose_dvd_drive_or_file) {
            ["mock_dvd_drive", "mockVolume", "abcdef1234"]
         }
-        @subject.do_mplayer_edl(nil, 0, 0)
+        @subject.play_mplayer_edl
         @show_blocking_message_dialog_last_arg.should =~ /does not contain mplayer replay information \[mplayer_dvd_splits\]/
       end
    end
@@ -496,7 +508,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/edl_for_unit_tests.txt")
+    @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")
     click_button(:@create_dot_edl)
     assert File.exist? 'yo.edl'
     assert prompted

data/todo.upconvert

@@ -0,0 +1,13 @@
+lower cs?
+
+    -zoom -sws 9 -vf scale=1280:720:::9:10 -ssf ls=74.0 -ssf cs=7.0
+
+lanczos 10?
+
+hqdn3d settings?
+
+opengl?
+
+== never ==
+
+sharpen filter?

data/upconvert.bat

@@ -0,0 +1,2 @@
+@rem NB that you can call it like go --debug
+call j %* bin\sensible-cinema --upconvert-mode

data/www/index.html

@@ -22,7 +22,7 @@
 <html>
 <pre>
 Welcome to the (work in progress) home page of Sensible Cinema, the free video scene skipper/muter.
-It Allows you watch edited movies by applying delete lists (EDL's) (i.e. "mute out" or "cut out" questionable scenes) to DVD's.
+It Allows you watch edited movies by applying edit lists (EDL's) (i.e. "mute out" or "cut out" questionable scenes) to DVD's.
 
 A description and history/background of sensible-cinema can be found <a href="https://github.com/rdp/sensible-cinema/blob/master/README">here</a>.  Don't forget to come back to this page to download it, though (see below).
 
@@ -48,27 +48,29 @@ $ sudo port install mencoder mplayer ffmpeg gocr
 After this finishes (it will take awhile) you'll be ready to run Sensible Cinema.
 Note that by installing these, you're accepting their respective licenses/distributions.
 
-<h3>Available delete lists</h3>
-You can see the (small) current list of DVD delete lists thus far available <a href="https://github.com/rdp/sensible-cinema/tree/master/zamples/edit_decision_lists/dvds">here</a> (all of them created earlier by volunteers like you).  
+<h3>Available edit lists</h3>
+You can see the (small) current list of DVD edit lists thus far available <a href="https://github.com/rdp/sensible-cinema/tree/master/zamples/edit_decision_lists/dvds">here</a> (all of them created earlier by volunteers like you).  
 If yours is already there, then you should be good to go.
 
-If yours isn't there, then we'd ask you to help us by creating and submitting your own "delete list" for the DVD that doesn't have one yet, 
-see the <a href="https://github.com/rdp/sensible-cinema/blob/master/how_to_create_your_own_delete_lists.txt">how to create</a> file for instructions on creating a new delete list. <!-- this is actually a short line -->
-Then run the file "advanced-edit or create sensible cinema delete list files.bat" to create and edit your new delete list.  
+If yours isn't there, then we'd ask you to help us by creating and submitting your own "edit list" for the DVD that doesn't have one yet, 
+see the <a href="https://github.com/rdp/sensible-cinema/blob/master/how_to_create_your_own_delete_lists.txt">how to create</a> file for instructions on creating a new edit list. <!-- this is actually a short line -->
+Then run the file "advanced-edit or create sensible cinema edit list files.bat" to create and edit your new edit list file.  
 Don't forget to upload your new file back to us when you're done, so others can benefit from your work (see "contact", below).
 
 This is the full list--your help is wanted/needed!
 
 <h2 style="margin: 0px;">Other Resources/Contact</h2>
 Let me know via the <a href="http://groups.google.com/group/sensible-cinema?pli=1">google group</a> or email sensible-cinema@googlegroups.com or rogerdpack@gmail.com if you have feedback or have any other ideas/suggestions.
-<h3>Source code</h3>
-Source code is available <a href="http://github.com/rdp/sensible-cinema">here</a>.  Notes for potential source code developers are <a href="https://github.com/rdp/sensible-cinema/blob/master/development.txt">here</a>.  For (techy or non-techy) contributions, see the contact info in the README file, or write to the google group, above.
+<h3>Source code</h3> Source code is available <a href="http://github.com/rdp/sensible-cinema">here</a>.  Notes for potential source code developers are <a href="https://github.com/rdp/sensible-cinema/blob/master/development.txt">here</a>.  
+For (techy or non-techy) contributions, see the contact info in the README file, or write to the google group, above.
 
 Sensible cinema is currently windows only, ping me if you want this changed.
 
 You can see the <a href="source/change_log_with_feature_list.txt">change log with feature list</a> and also on github.
 
-Please click the license agreement to see list of older releases.
+You can get a list of "test" creative commons DVD ISO's <a href="releases/dvd_isos">here</a>, if you want to try them out for experimenting/development/research etc.
+
+Please click the license agreement checkbox at the top to see list of old releases (newer ones are found on sourceforge exclusively, as well as on rubygems).
 <div id="comments2" style="display:none;">You can find an old list of older releases, as well as the MS based C <a href="releases/c_player">DVD player</a> listed <a href="releases">in the archives</a>.
 
 </div>

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

@@ -0,0 +1,32 @@
+# comments can go after a # on any line, for example this one.
+"name" => "iq",
+
+"mutes" => [
+"00:04:23.329" , "00:04:24.887", "profanity", "b.....", "Come on you little [b.....]",
+"00:14:35.574" , "00:14:40.136", "profanity", "genital", "He puts electrodes on the [genital]s of the rats",
+"00:20:15.747" , "00:20:17.772", "profanity", "sex", "that's something akin to [sex]ual climax",
+"00:25:28.327" , "00:25:31.057", "profanity", "deity", "My [deity] he's the head of the whole department",
+"00:25:53.285" , "00:25:56.186", "profanity", "make love", "What because l won't [make love] to you in the middle",
+"00:28:45.123" , "00:28:47.614", "profanity", "deity", "Learn to drive for [deity]'s sake", # mkv...TOO EARLY
+"00:44:30.300" , "00:44:32.598", "profanity", "deity", "My [deity] the mazes must be enormous",
+"00:46:26.5" , "00:46:28.614", "profanity", "deity", "Oh my [deity] that's you", # this one was off somehow?
+"00:54:45.615" , "00:54:47.082", "profanity", "he..", "Who the [he..] are you",
+"01:16:25.513" , "01:16:27.447", "profanity", "deity", "Oh my [deity]",
+"01:19:20.254" , "01:19:22.586", "profanity", "deity", "Oh for [deity]'s sake",
+"01:20:29.957" , "01:20:32.721", "profanity", "he..", "What the [he..] does an automobile mechanic",
+"01:30:43.970" , "01:30:45.597", "profanity", "deity", "Oh my [deity]",
+
+],
+
+"blank_outs" => [
+  # an example line, uncomment the leading "#" to make it active
+  # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
+],
+
+"volume_name" => "IQ",
+"disk_unique_id" => "75ce05d8|9e597164",
+"dvd_title_track" => "1", 
+"opensubtitles_number" => "195359",
+# "not edited out stuff" => "some violence",
+# "closing thoughts" => "",
+# "mplayer_dvd_splits" => [], # too many to count! Not worth it probably...

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

@@ -0,0 +1,19 @@
+# comments can go after a # on any line, for example this one.
+"name" => "The other side of heaven",
+
+"mutes" => [
+  # an example line, uncomment the leading "#" to make it active
+  # "0:00:01.0", "0:00:02.0", "profanity", "da..", 
+],
+
+"blank_outs" => [
+  # an example line, uncomment the leading "#" to make it active
+  # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
+],
+
+"volume_name" => "OTHER_SIDE_OF_HEAVEN",
+"disk_unique_id" => "9338ab59|48d01042",
+"dvd_title_track" => "1", # most DVD's use title 1. Not all do, though.  If sensible-cinema plays anything except the main title (for example, it plays a trailer), when you use it, see http://goo.gl/QHLIF to set this right.
+# "not edited out stuff" => "some violence",
+# "closing thoughts" => "still...",
+# "mplayer_dvd_splits" => ["59:59", "1:04:59"], # in mplayer, the DVD timestamp "resets" to zero for some reason, see http://goo.gl/yMfqX to set this value right. Note that [] is valid, if there are no resets.

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

@@ -0,0 +1,19 @@
+# comments can go after a # on any line, for example this one.
+"name" => "snow white and the 7 dwarfs 1937",
+
+"mutes" => [
+  # an example line, uncomment the leading "#" to make it active
+  # "0:00:01.0", "0:00:02.0", "profanity", "da..", 
+],
+
+"blank_outs" => [
+  # an example line, uncomment the leading "#" to make it active
+  # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
+],
+
+"volume_name" => "Snow_White",
+"disk_unique_id" => "4a3cd891|ab315d08",
+"dvd_title_track" => "1", # most DVD's use title 1. Not all do, though.  If sensible-cinema plays anything except the main title (for example, it plays a trailer), when you use it, see http://goo.gl/QHLIF to set this right.
+# "not edited out stuff" => "some violence",
+# "closing thoughts" => "still...",
+# "mplayer_dvd_splits" => [a lot!], # or [] if there are none.  In mplayer, the DVD timestamp "resets" to zero for some reason, so you need to specify when if you want to use mplayer DVD realtime playback, or use mencoder -edl to split your file.  See http://goo.gl/yMfqX

data/zamples/edit_decision_lists/{dvds/old_and_inaccurate → old_not_yet_updated/dvds}/cars_disney.txt

@@ -20,5 +20,5 @@ mutes:
   "1:30:02" : "1:30:04" # thank the manufacturer...
   "1:39:13.1" : "1:39:14.0" # hot snot we're back in business
   "1:55:38" : "1:55:40" # for the "love of Chrysler" please....
-dvd_title_track: 23
+dvd_title_track: 23 # NB that there's another DVD out there with a different label...CRZ0NNF1 track 21 "disk_unique_id" => "aa06ad1c|e1e62ad0",
 dvd_drive_label: "CRZ0NNW7                        "

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.23.6
+  version: 0.24.0
 platform: ruby
 authors: 
   - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -06:00
+date: 2011-07-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -223,7 +223,7 @@ files:
   - business_ideas.txt
   - change_log_with_feature_list.txt
   - developer_how_to_contribute_to_the_project.txt
-  - documentation/README.TXT
+  - documentation/DOCUMENTATION_README.TXT
   - documentation/how_to_create_your_own_delete_lists.txt
   - documentation/how_to_get_files_from_dvd.txt
   - documentation/is_it_legal_to_copy_dvds.txt
@@ -259,6 +259,7 @@ files:
   - lib/overlayer.rb
   - lib/play_audio.rb
   - lib/screen_tracker.rb
+  - lib/shutdown_kill.rb
   - lib/storage.rb
   - lib/subtitle_profanity_finder.rb
   - lib/swing_helpers.rb
@@ -294,12 +295,14 @@ files:
   - spec/vlc_programmer.spec.rb
   - template_bats/RUN SENSIBLE CINEMA CLICK HERE.bat
   - template_bats/_DO_NOT_RUN_IT_FROM_HERE_DOWNLOAD_THE_RELEASE_ZIP_FROM_SOURCEFORGE_INSTEAD
-  - template_bats/advanced--create or edit sensible cinema delete list files.bat
+  - template_bats/advanced--create or edit sensible cinema edit list files.bat
   - todo.build_library.txt
   - todo.inventionzy.txt
   - todo.open_edl_list_org.txt
   - todo.propaganda
   - todo.subtitle
+  - todo.upconvert
+  - upconvert.bat
   - vendor/jruby-complete-1.6.2.jar
   - vendor/mac_dvdid/bin/dvdid
   - vendor/mac_dvdid/include/dvdid/dvdid.h
@@ -313,35 +316,37 @@ files:
   - vendor/readme.txt
   - vendor/tsmuxer_1.10.6/licence.txt
   - www/index.html
-  - zamples/edit_decision_lists/category descriptions.txt
   - zamples/edit_decision_lists/dvds/Harry Potter 2.txt
-  - zamples/edit_decision_lists/dvds/bambi.txt
+  - zamples/edit_decision_lists/dvds/aa_example_delete_list_that_has_no_cuts_in_it.txt
   - zamples/edit_decision_lists/dvds/big_buck_bunny_dvd.txt
   - zamples/edit_decision_lists/dvds/bob the builder pets in a pickle.txt
   - zamples/edit_decision_lists/dvds/bobs_big_plan.txt
   - zamples/edit_decision_lists/dvds/cool runnings.txt
-  - zamples/edit_decision_lists/dvds/edl_for_unit_tests.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/bambi.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/edl_for_unit_tests.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/iq.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/other_side_of_heaven.txt
+  - zamples/edit_decision_lists/dvds/edls_being_edited/snow_white_and_the_7_dwarfs_1937.txt
   - zamples/edit_decision_lists/dvds/example_delete_list.txt
   - zamples/edit_decision_lists/dvds/happiest baby on the block.txt
+  - zamples/edit_decision_lists/dvds/harry_potter_prisoner_of_azkaban.txt
   - zamples/edit_decision_lists/dvds/how_to_train_your_dragon.txt
   - zamples/edit_decision_lists/dvds/kung_fu_panda_1.txt
   - zamples/edit_decision_lists/dvds/legend_of_the_guardians_the_owls_of_gahoole.txt
   - zamples/edit_decision_lists/dvds/making_marriage_work.txt
   - zamples/edit_decision_lists/dvds/narnia_voyage_of_the_dawn_treader.txt
-  - zamples/edit_decision_lists/dvds/old_and_inaccurate/White Christmas.txt
-  - zamples/edit_decision_lists/dvds/old_and_inaccurate/all_dogs_go_to_heaven.txt
-  - zamples/edit_decision_lists/dvds/old_and_inaccurate/cars_disney.txt
-  - zamples/edit_decision_lists/dvds/old_and_inaccurate/happy_feet.txt
-  - zamples/edit_decision_lists/dvds/old_and_inaccurate/labyrinth.txt
-  - zamples/edit_decision_lists/dvds/old_and_inaccurate/making marriage work.txt
-  - zamples/edit_decision_lists/dvds/old_and_inaccurate/star_trek_generations_hulu.txt
   - zamples/edit_decision_lists/dvds/pack_wedding_2007-03-03.txt
-  - zamples/edit_decision_lists/dvds/potter_prisoner_of_azkaban.txt
   - zamples/edit_decision_lists/dvds/sintel_open_source_blender.txt
   - zamples/edit_decision_lists/dvds/tron_legacy.txt
   - zamples/edit_decision_lists/dvds/turn_around_alma_younger.txt
-  - zamples/edit_decision_lists/dvds/zz_example_delete_list_that_has_no_cuts_in_it.txt
   - zamples/edit_decision_lists/netflix_instant/greatest_story_ever_told_netflix.txt
+  - zamples/edit_decision_lists/old_not_yet_updated/dvds/White Christmas.txt
+  - zamples/edit_decision_lists/old_not_yet_updated/dvds/all_dogs_go_to_heaven.txt
+  - zamples/edit_decision_lists/old_not_yet_updated/dvds/cars_disney.txt
+  - zamples/edit_decision_lists/old_not_yet_updated/dvds/happy_feet.txt
+  - zamples/edit_decision_lists/old_not_yet_updated/dvds/labyrinth.txt
+  - zamples/edit_decision_lists/old_not_yet_updated/dvds/making marriage work.txt
+  - zamples/edit_decision_lists/old_not_yet_updated/dvds/star_trek_generations_hulu.txt
   - zamples/edit_decision_lists/old_not_yet_updated/example_edit_decision_list.txt
   - zamples/edit_decision_lists/old_not_yet_updated/youtube/gummy_bear_song_youtube.txt
   - zamples/edit_decision_lists/youtube/demo_mutes.txt

data/zamples/edit_decision_lists/category descriptions.txt

@@ -1,35 +0,0 @@
-"profanity categories, so you don't have to write them":
-
- euphemization: (these prolly aren't as important to note)
-  1 oh my gosh
-  2 dang
-  3 crap
-  
- religious reference:
-  1 "L*** have mercy"
-  2 "G.. knows"
-
- religious exclamation:
-  1  da**
-  2  he**
-
- religious exclamation deity:
-  1  oh my **** 
-  2  g** d***
-    
- bodily function mild:
-   1 crap
-   2 suck(s)
-    
- bodily function strong:
-   1 s***
-    
- innuendo:
-   language that has sexual overtones
-  
- sexual profanity:
-   1 f***
-  
- body stuff:
-   1 a**
-   2 dick