sensible-cinema 0.19.1 → 0.19.2

data/ChangeLog

@@ -1,3 +1,7 @@
+== 0.19.2 ==
+
+More user friendliness.
+
 == 0.19.1 ==
 
 Clarify buttons' meanings, layout (add one), fix some bugs in create mode, like it not re-loading edited files.

data/LICENSE.TXT

@@ -23,6 +23,7 @@ It's about the same as using VLC media player to watch a DVD, which also uses li
 Also note that if you watch an edited DVD in a commercial DVD player, your are using a DVD player that conforms
 with encryption specifications, so that might have some sway.
 Note also that fair use at times does allow one to "record" things for personal use/backup (for example off the TV).
+Note that sensible cinema does require the original DVD to be present when using it, also.
 
 If general, if it's not legal in your country, then don't use it!
 You are responsible for your actions and use of this program.
@@ -31,16 +32,16 @@ regarding its use themselves, since they re-distribute no edited media,
 nor distribute cracking codes.  Check your country's rules first.
 If it's illegal, don't use it!
 
-Note: do not redistribute/re-sell edited commercial DVD's.  We have learned from clean flicks that
-redistributing edited commercial DVD's is illegal in the US.  We hope that sensible-cinema
-is more legal, since you can get the DVD's from wherever you want, and it doesn't change their
-structure at all.  Please don't redistribute.  If creating copies of commercial DVD's is illegal
+Note: do not redistribute/re-sell edited DVD's.  We have learned the hard way from clean flicks that
+redistributing edited commercial DVD's is against copyright in the US.  We hope that sensible-cinema
+is more legal, since you can get the DVD's from wherever you want, and keep the original.  
+Please don't redistribute.  If creating copies of commercial DVD's is illegal
 in your country, then don't do it!  Use the "watch in realtime" option.
 
 DO NOT MAKE ILLEGAL COPIES.
 
-In terms of copyright, it could be legal under the The Family Home Movie Act of 2005, 
-at least in the United States, when viewed using the "playlist" option (v 0.10'ish, then later removed).
+In terms of copyright, it could be legal under the The Family Home Movie Act of 2005,
+at least in the United States, when viewed using the "playlist" option (v 0.10'ish, then later removed), or the "realtime" option (0.18.0'ish +).
 In general, if I have the original DVD sitting next to my TV, I don't feel bad about watching
 its edited copy, but please consult a laywer first if you have any concerns.
 

data/README

@@ -166,20 +166,22 @@ If it says "audio problem try pcm" then you can add
 "audio_codec" => "lavc"
 to your EDL and try again.
 
-Also if your DVD playback has no audio, try the "lavc" setting, above.  And report it (see feedback).
-
 It can fail also because a deletion is past end of DVD, or 
 Also note that if your DVD has scratches that cause it to skip, the time signatures will be off after that point, 
 so clean your discs and try again!
 
 Also you could try a different computer (desktop computers' DVD drives seem to work better at times than laptops')
 
+Too slow? One big speedup would be getting a faster hard drive (like an SSD).  A second might be to get a faster DVD drive.
+  I'm not certain but I don't believe that a faster cpu (or even dual core, etc.), will currently help much, 
+  though it might like 3% or something.
 
 == Feedback ==
 
 Feedback, including feature requests, comments, etc. welcome.
 
-http://github.com/rdp/sensible-cinema (message me or create an issue for feedback/any requests/bugs)
-or e-mail rogerdpack@gmail.com
+Mailing List: http://groups.google.com/group/sensible-cinema
+
 If you're a developer and want to help out with programmming it, please do!
-Also ping me if you want a mailing list created or what not.
+Source code: http://github.com/rdp/sensible-cinema (create an issue for any feature requests/bugs)
+or e-mail rogerdpack@gmail.com

data/RUN SENSIBLE CINEMA CLICK HERE.bat

@@ -2,5 +2,6 @@
 @rem disable any local rubyopt settings...
 @set RUBYOPT=
 @echo This window will display lots of debug message output!
-@cd sensible-cinema && java -cp "./vendor/cache/jruby-complete-1.5.5.jar" org.jruby.Main bin\sensible-cinema || echo you need to install java first! Please report back the error you see! && pause
+@java -version || echo need to install java first && pause
+@cd sensible-cinema && java -cp "./vendor/cache/jruby-complete-1.5.5.jar" org.jruby.Main bin\sensible-cinema || echo ERROR. Please look for error message, above, and report back the error you see, or fix it && pause
 @rem taskkill /f /im mencoder.exe

data/TODO

@@ -2,25 +2,21 @@
   
 == up next release ==
 
-  edit lists:
-    cool runnings EDL
-    stuff from paper
-      less "need java first" messages
+  edit lists actually *work*:
+    cool runnings
+    temple
+    cars
+    HP
       
 == slightly lower than that, somewhat ordered ==
 
-  @license: requires legal DVD's to be present
-  can you forceidx on the original copy and have mplayer replay EDL in realtime accurately or not?
   linearize edl's
     don't use them linear, just linearize
       not this release
-  
-  edit lists:
-    temple
-    cars
   compare computer DVD timings with physical player's timings...
     if same, add imdb todo's up here
-  mpeg is lossy (at least my current one pass conversion is)
+  mpeg is lossy (at least my current one pass conversion still is...)
+    frame accurate splitter
   check the DVD burning experience too...
     could check if DVD Flick handles *oversize* files well, for information sake 
   partner for filters (Jon, Karlie if interested...give beta)
@@ -30,18 +26,29 @@
       only after linearize
   beta release/rinse and repeat with various ppl (once it's releasable...)
   a real'ish-er website
-    mailing list, link to it
-    button to mail/submit :)
+    link to ML
+    add button "upload/mail/submit" to ML [?]
   play a bigger noise when totally done...(dvd flick'ish...)
   propaganda-ize
     advertise in christian places
     blogs that have ever mentioned clearplay :P
     free google adwords (?)
     advertise urug, ruby flow :)
-  add they 'play from unedited till it hits the first bad spot, if still useful
+  add they 'play from unedited from grab till it hits the first bad spot', if useful [?]
+  fix edl_parser spec
   
 == DVD backlog (unordered, some very low prio, basically never do) ==
 
+  can you forceidx on the original copy and have mplayer replay EDL in realtime accurately or not, with audio?
+    if not somehow, wait till video falls through, then see if I can...do something here with audio...yipers..
+    sound accurate?
+      back to audio copy? huh?
+  calculating disk's unique id... -> gui somewhere
+  @dvd flick: auto-detect the aspect ratio, if possible (?)
+  detect disks have changed, re-query.
+  ffmpeg handle 3F2R audio [sigh] [cars, should work with temple at lavc, too, bob dvd's are dual, I think...hmm...]
+  "preview edited in a wholly blank section that includes an audio section should fail"
+  an 'always skip mutes' option for paranoia.
   dvdnav versus dvd for mplayer edl?
   disallow choosing empty drive? fail more gracefully? (issue 11)
   some status bar that shows which DVD is in currently, how many match it, et al (pre button)
@@ -70,7 +77,7 @@
   several "play now" options...without a navigator of course :)
     visualbasic-like playlist
       one line at a time :P
-      provide link for cheap DVD decoder if absent [ffdshow?] :)
+      provide link for cheap DVD decoder if they lack one :)
     "round conservatively, write no file" playback
       mplayer batch (playlist?)
     "round conservatively, yes write file"
@@ -164,10 +171,11 @@ report to jruby "when one thread dies, the GUI becomes unresponsive" (and others
 a "certified clean" list
 advertise my "splitting joining" google doc page. also test the various options there for accurateness :)
 check for "newer version available" or not...
-buy blu-ray decrypter, try it out.
+buy blu-ray decrypter, and drive, try it out.
 
 == random non-DVD backlog ... note: just plow forward, to "grab" available ideas...except that for now, just what *I* plan on needing for myself (filters for what I need/want). ==
 
+copy to one drive, write to another, for speedup
 fade in/fade out volume, video
 make the other stuff work again, since I no longer use YAML...
 

data/VERSION

@@ -1 +1 @@
-0.19.1
+0.19.2

data/bin/sensible-cinema

@@ -81,7 +81,7 @@ module SensibleSwing
       super "Sensible-Cinema"
       if !(Storage['main_license_accepted'] == VERSION)
         show_blocking_license_accept_dialog 'Sensible Cinema', 'gplv3', 'http://www.gnu.org/licenses/gpl.html'
-        show_blocking_license_accept_dialog 'Sensible Cinema', 'LICENSE file', File.expand_path(File.dirname(__FILE__) + "/../LICENSE.TXT"), 'LICENSE file', 'I acknowledge that I have read the LICENSE file.'
+        show_blocking_license_accept_dialog 'Sensible Cinema', 'LICENSE.TXT file', File.expand_path(File.dirname(__FILE__) + "/../LICENSE.TXT"), 'LICENSE.TXT file', 'I acknowledge that I have read the LICENSE.TXT file.'
         Storage['main_license_accepted'] = VERSION
       end
 
@@ -147,7 +147,7 @@ module SensibleSwing
         repeat_last_copy_dvd_to_hard_drive 
       }
 
-      @open_list = new_jbutton("Open a Delete List", true)
+      @open_list = new_jbutton("Open/Edit a Delete List", true)
       @open_list.on_clicked {
         dialog = FileDialog.new(self, "Pick file to edit")
         dialog.set_directory EDL_DIR
@@ -221,7 +221,7 @@ EOL
     end
     
     def show_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 an open window'
+      puts 'Please confirm license agreement in open window'
       old = ['no', 'yes', 'ok'].map{|name| 'OptionPane.' + name + 'ButtonText'}.map{|name| [name, UIManager.get(name)]}
       UIManager.put("OptionPane.yesButtonText", 'Accept')
       UIManager.put("OptionPane.noButtonText", 'View License')
@@ -248,7 +248,7 @@ EOL
         System.exit 1
       end
       throw unless returned == 0
-      old.each{|name, old_setting| UIManager.put(name, old_setting)}
+      old.each{|name, old_setting| UIManager.put(name, old_setting)}
     end
 
     def check_for_dependencies
@@ -301,7 +301,7 @@ EOL
         begin
           parse_edl(file)["disk_unique_id"] == md5
         rescue SyntaxError
-         # ignore
+         # ignore poorly formed delete lists for auto choose
         end
       }
       if matching.length == 1
@@ -325,6 +325,7 @@ EOL
 
     def show_blocking_message_dialog(message, title = message.split("\n")[0], style= JOptionPane::INFORMATION_MESSAGE)
       JOptionPane.showMessageDialog(nil, message, title, style)
+      true
     end
     
     include_class javax.swing.UIManager
@@ -349,19 +350,21 @@ EOL
           edit_list_path = fc.go
         end
         raise 'cancelled' unless edit_list_path
-        descriptors = nil
-        while(!descriptors)
+        [drive, dvd_volume_name, md5sum, edit_list_path, nil]
+      end
+      
+      # reload it just in case it has changed on disk
+      edit_list_path = @_choose_dvd_and_edl_for_it[3]
+      descriptors = nil
+      while(!descriptors)
           begin
             descriptors = parse_edl edit_list_path
           rescue SyntaxError => e
             puts e
-            show_blocking_message_dialog("syntax error: " + edit_list_path + " " + e)
+            show_blocking_message_dialog("your file has an error: \n" + edit_list_path + "\n " + e)
           end
-        end
-        [drive, dvd_volume_name, md5sum, edit_list_path, descriptors]
       end
-      # reload it just in case it has changed on disk
-      @_choose_dvd_and_edl_for_it[4] = parse_edl(@_choose_dvd_and_edl_for_it[3])
+      @_choose_dvd_and_edl_for_it[-1] = descriptors
       @_choose_dvd_and_edl_for_it
     end
     
@@ -392,8 +395,9 @@ EOL
       
       # LODO allow for spaces in the save_to filename
       if should_prompt_for_start_and_end_times
-        # only show it once :)
-        @show_block ||= show_blocking_message_dialog("Ok, let's preview just a portion of it. \nNote that you'll want to preview a section that wholly includes a deletion section in it\n For example, if it mutes from second 1 to second 10, you'll want to play from 00:00 to 00:12 or what not.\nAlso note that the first time you preview a section of a video, it will take like 20 minutes as it sets up the video for previewing.\nSubsequent previews will be faster, though, as long as you use the same filename.", "Preview") || true
+        # only show this message once :)
+        @show_block ||= show_blocking_message_dialog("Ok, let's preview just a portion of it. \nNote that you'll want to preview a section that wholly includes a deleted section in it\n For example, if it mutes from second 1 to second 10, you'll want to play from 00:00 to 00:12 or what not.\nAlso note that the first time you preview a section of a video, it will take a long time as it sets up the video for previewing.\nSubsequent previews will be faster, though, as long as you use the same filename.\n
+        Also note that if you change your delete list, you'll need to close, and regenerate the video to see it with your new settings.", "Preview")
         start_time = get_user_input("At what point in the video would you like to start your preview? (like 01:00 for starting at 1 minute)", Storage['start_time'])
         end_time = get_user_input("At what point in the video would you like to finish your preview? (like 02:00 for ending at the 2 minute mark)", Storage['end_time'])
         unless start_time and end_time
@@ -416,8 +420,8 @@ EOL
       end
       
       dvd_title_track = get_title_track(descriptors)
-      run_mplayer = should_prompt_for_start_and_end_times || exit_early_if_fulli_exists
-      generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, run_mplayer, !ignore_settings
+      should_run_mplayer = should_prompt_for_start_and_end_times || exit_early_if_fulli_exists
+      generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, should_run_mplayer, !ignore_settings
       [false, fulli] # false means it's running in a background thread :P
     end
 
@@ -425,13 +429,19 @@ EOL
       DriveInfo.get_drive_with_most_space_with_slash
     end
     
+    # stubbable :)
     def get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track, require_deletion_entry
       MencoderWrapper.get_bat_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track, true, require_deletion_entry # delete partials...
     end
 
     def generate_and_run_bat_file save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, run_mplayer, require_deletion_entry
       Storage['last_params'] = [save_to, edit_list_path, descriptors, drive, dvd_title, start_time, end_time, dvd_title_track, run_mplayer, require_deletion_entry]
-      commands = get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track, require_deletion_entry
+      begin
+        commands = get_mencoder_commands descriptors, drive, save_to, start_time, end_time, dvd_title_track, require_deletion_entry
+      rescue MencoderWrapper::TimingError => e
+        show_blocking_message_dialog("Appears you chose a time frame with no deletion segment in it--please try again:" + e)
+        return
+      end
       temp_dir = Dir.tmpdir
       temp_file = temp_dir + '/vlc.temp.bat'
       File.write(temp_file, commands)
@@ -492,7 +502,7 @@ EOL
     def choose_dvd_drive
       opticals = DriveInfo.get_dvd_drives_as_win32ole
       show_blocking_message_dialog 'insert dvd first' unless opticals.find{|d| d.VolumeName }
-      names = opticals.map{|d| d.Name + "\\" + " (" +  (d.VolumeName || 'Insert DVD and re-select') + ")"}
+      names = opticals.map{|d| d.Name + "\\" + " (" +  (d.VolumeName || 'Insert DVD and re-start') + ")"}
 
       if opticals.length != 1
         dialog = GetDisk.new(self, names)

data/create or edit sensible cinema decision list files.bat

@@ -2,5 +2,6 @@
 @rem disable any local rubyopt settings...
 @set RUBYOPT=
 @echo This window will display lots of debug message output!
-@cd sensible-cinema && java -cp "./vendor/cache/jruby-complete-1.5.5.jar" org.jruby.Main bin\sensible-cinema --create-mode || echo you need to install java first! please report back the error you see! && pause
+@java -version || echo need to install java first && pause
+@cd sensible-cinema && java -cp "./vendor/cache/jruby-complete-1.5.5.jar" org.jruby.Main bin\sensible-cinema --create-mode || echo ERROR. Please look for error message, above, and report back the error you see, or fix it && pause
 @taskkill /f /im mencoder.exe

data/lib/edl_parser.rb

@@ -84,6 +84,7 @@ class EdlParser
     mutes = mutes.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v) + add_this_to_mutes, :mute]}
     blanks = blanks.map{|k, v| [OverLayer.translate_string_to_seconds(k), OverLayer.translate_string_to_seconds(v), :blank]}
 
+    combined = (mutes+blanks).sort_by{|entry| entry[0,1]}
     combined = (mutes+blanks).sort
 
     combined.each{|s, e, t|
@@ -129,4 +130,14 @@ class EdlParser
     }
   end
 
+end
+
+# <= 1.8.7 Symbol compat
+
+class Symbol
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
+  def <=>(with)
+    return nil unless with.is_a? Symbol
+    to_s <=> with.to_s
+  end unless method_defined? :"<=>"
 end

data/lib/mencoder_wrapper.rb

@@ -19,7 +19,8 @@ This file is part of Sensible Cinema.
 require_relative 'edl_parser'
 
 class MencoderWrapper
-
+  class TimingError < StandardError
+  end
   class << self
   
     def get_header this_drive, these_settings
@@ -29,9 +30,9 @@ class MencoderWrapper
       end
       # video_opts = "-ovc lavc -lavcopts keyint=1" # seems reasonable quality somehow...
       # equivalent of ffmpeg's -target ntsc-dvd...I think...except that aspect thing terrifies me...
-      audio_codec = these_settings['audio_codec'] || 'copy'
+      audio_codec = these_settings['audio_codec'] || 'lavc' # not copy...sniff...
       video_opts = "-ovc lavc -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=1:vstrict=0:acodec=ac3:abitrate=192:autoaspect -ofps 30000/1001"
-      out + "call mencoder dvdnav://#{@dvd_title_track} -of mpeg -mpegopts format=dvd:tsaf -alang en -nocache -sid 1000 -oac #{audio_codec} #{video_opts} -ovc lavc -o #{@big_temp} -dvd-device #{this_drive} && echo got_file > #{@big_temp}.done\n"
+      out + "call mencoder dvdnav://#{@dvd_title_track} -of mpeg -mpegopts format=dvd:tsaf -alang en -nocache -sid 1000 -oac #{audio_codec} #{video_opts} -o #{@big_temp} -dvd-device #{this_drive} && echo got_file > #{@big_temp}.done\n"
     end
     
     def calculate_final_filename to_here_final_file
@@ -48,7 +49,7 @@ class MencoderWrapper
         start_here = OverLayer.translate_string_to_seconds(start_here)
         end_here   = OverLayer.translate_string_to_seconds(end_here)
         combined.select!{|start, endy, type| start > start_here && endy < end_here }
-        raise "unable to find deletion entry between #{start_here} and #{end_here}" if require_deletion_entry && combined.length == 0
+        raise TimingError.new("unable to find deletion entry between #{start_here} and #{end_here}") if require_deletion_entry && combined.length == 0
         # it's relative now, since we rip from not the beginning
         previous_end = start_here
       else
@@ -73,10 +74,11 @@ class MencoderWrapper
       partials = (1..@idx).map{|n| "#{to_here_final_file}.#{n}.avi"}
       to_here_final_file = to_here_final_file + ".avi"
       if File.exist? to_here_final_file
-        FileUtils.rm to_here_final_file # raises on failure...which is what we want I think
+        FileUtils.rm to_here_final_file # raises on deletion failure...which is what we want I think...hopefully.
       end
       out += "call mencoder #{partials.join(' ')} -o #{to_here_final_file} -ovc copy -oac copy\n"
-      # LODO only do this if they want to watch it on their computer, with something other than smplayer, or want to make it smaller, as it takes *forever* longer
+      # LODO only do this if they want to watch it on their computer, with something other than smplayer, or want to make it smaller, as it takes *forever* longer to run...
+      # or is ffdshow enough without this?
       out += "@rem call mencoder -oac lavc -ovc lavc -of mpeg -mpegopts format=dvd:tsaf -vf scale=720:480,harddup -srate 48000 -af lavcresample=48000 -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=18:vstrict=0:acodec=ac3:abitrate=192:aspect=16/9 -ofps 30000/1001  #{partials.join(' ')} -o #{to_here_final_file}\n"
       
       delete_prefix = delete_partials ? "" : "@rem "

data/lib/mplayer_edl.rb

@@ -17,7 +17,7 @@ This file is part of Sensible Cinema.
 =end
 
 require_relative 'overlayer'
-require_relative 'vlc_programmer'
+require_relative 'edl_parser'
 
 class MplayerEdl
   def self.convert_to_edl specs, add_this_many_to_end = 0

data/lib/swing_helpers.rb

@@ -40,9 +40,9 @@ module SensibleSwing
        begin
          block.call
        rescue Exception => e
-         puts 'got fatal exception', e
-         puts e.backtrace.join("\n")
-         System.exit(1) # LODO no exit 
+         puts 'got fatal exception in button', e, e.class
+         puts e.backtrace.join("\n"), e
+         System.exit(1) # LODO no exit [?]
        end        
      end
      self

data/lib/vlc_programmer.rb

@@ -111,11 +111,3 @@ class VLCProgrammer
 
 end
 
-# <= 1.8.7 compat...
-class Symbol
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
-  def <=>(with)
-    return nil unless with.is_a? Symbol
-    to_s <=> with.to_s
-  end unless method_defined? :"<=>"
-end

data/sensible-cinema.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.19.1"
+  s.version = "0.19.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]

data/spec/edl_parser.spec.rb

@@ -100,4 +100,8 @@ describe EdlParser do
     E.parse_string('"mutes"=>["0:33", "0:34"]', 'filename', [], true)['mutes'].should == []
   end
   
+  it "should sort exactly overlapping segments" do
+    EdlParser.convert_incoming_to_split_sectors({"mutes"=>{105=>145}, "blank_outs"=>{105=>145}}).should == [[105.0, 145.0, :blank]]
+  end
+  
 end

data/spec/mencoder_wrapper.spec.rb

@@ -45,7 +45,16 @@ describe MencoderWrapper do
     if use_mpg2_fulli_unedited
       @out.should match(/dvdnav.*lavcopt.*mpeg2video/)
       @out.should match(/autoaspect/) # try to preserve aspect
+    else
+      @out.should match(/dvdnav.*-ovc copy/)
     end
+    # "poor" audio for certain DVD's <sigh>
+    @out.should match(/dvdnav.*-oac lavc/)
+  end
+  
+  it "should not double setting params" do
+    @out.should_not =~ /-ovc.*-ovc/
+    @out.should_not =~ /-oac.*-oac/
   end
   
   it "should avoid subtitles" do
@@ -117,12 +126,9 @@ describe MencoderWrapper do
     @out.should_not include(".avi.1 ")
   end
   
-  it "should concatenate (merge) them all together" do
+  it "should concatenate (merge) them all together into one large conglom file" do
     @out.should match(/mencoder.* -ovc copy -oac copy/)
     @out.should match(/mencoder to_here.1.avi/)
-  end
-  
-  it "should create a large conglom file" do
     @out.should match(/mencoder.*-o to_here.avi -ovc copy -oac copy/)
   end
   
@@ -152,9 +158,10 @@ describe MencoderWrapper do
   end
   
   it "should accept audio_code" do
-    settings = {"audio_codec"=>"pcm"}
+    # for the audio philes, I guess..
+    settings = {"audio_codec"=>"copy2"}
     out = MencoderWrapper.get_bat_commands settings, "e:\\", 'to_here.avi'
-    out.should include("-oac pcm")
+    out.should include("-oac copy2")
   end
   
   def setup

data/spec/mplayer_edl.spec.rb

@@ -37,7 +37,6 @@ EOL
     a.should == <<EOL
 105.0 145.0 0
 EOL
-    
   end
 
   it "should add to mutes" do

data/spec/sensible_cinema_gui.spec.rb

@@ -15,6 +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
+
+require 'ostruct'
 require File.expand_path(File.dirname(__FILE__) + '/common')
 load '../bin/sensible-cinema'
 
@@ -189,7 +191,7 @@ module SensibleSwing
     temp_dir = Dir.tmpdir
     
     def join_background_thread
-      @subject.background_thread.join
+      @subject.background_thread.join # must be running...
     end
     
     it "should be able to preview unedited" do
@@ -211,12 +213,13 @@ module SensibleSwing
       @command.should match(/smplayer/)
     end
     
-    it "should raise if you watch an edited time frame with no edits in it" do
+    it "should warn if you watch an edited time frame with no edits in it" do
       @subject.unstub!(:get_mencoder_commands)
-      proc { prompt_for_start_and_end_times }.should raise_error(/unable to find deletion entry/)
+      click_button(:@preview_section)
+      @show_blocking_message_dialog_last_args[0].should =~ /unable to/
       @subject.stub!(:get_user_input).and_return('06:00', '07:00')
-      # rspec bug: wrong backtrace: proc { prompt_for_start_and_end_times #}.should_not raise_error LODO
-      click_button(:@preview_section) # doesn't raise
+      # rspec bug: wrong'ish backtrace: proc { prompt_for_start_and_end_times #}.should_not raise_error LODO
+      click_button(:@preview_section)
       join_background_thread
       @system_blocking_command.should == "echo wrote (probably successfully) to abc.avi"
     end
@@ -281,18 +284,34 @@ module SensibleSwing
       count.should == 1
     end
     
-    it "should allow for file to change contents while editing it" do
-      with_clean_edl_dir_as 'temp' do
+    def should_allow_for_changing_file corrupt_file = false
+       with_clean_edl_dir_as 'temp' do
         File.binwrite('temp/a.txt', "\"disk_unique_id\" => \"abcdef1234\"")
         @subject.stub!(:choose_dvd_drive) {
           ["mock_dvd_drive", "Volume", "abcdef1234"]
         }
         @subject.choose_dvd_and_edl_for_it[4]['mutes'].should == []
-        File.binwrite('temp/a.txt', '"disk_unique_id" => "abcdef1234","mutes"=>["0:33", "0:34"]')
+        new_file_contents = '"disk_unique_id" => "abcdef1234","mutes"=>["0:33", "0:34"]'
+        new_file_contents = '"a syntax error' if corrupt_file
+        File.binwrite('temp/a.txt', new_file_contents)
+        # it changed!
         @subject.choose_dvd_and_edl_for_it[4]['mutes'].should_not == []
       end
     end
     
+    it "should allow for file to change contents while editing it" do
+      should_allow_for_changing_file
+    end
+    
+    it "should prompt you if you re-choose, and your file now has a failure in it" do
+      @subject.stub(:show_blocking_message_dialog) {
+        @got_here = true
+        @subject.stub(:parse_edl) { 'pass the second time through' }
+      }
+      should_allow_for_changing_file true
+      @got_here.should == true
+    end
+    
     it "should only prompt for save to filename once" do
       count = 0
       @subject.stub!(:new_filechooser) {
@@ -305,14 +324,22 @@ module SensibleSwing
     end
     
     it "should prompt you if you need to insert a dvd" do
-      # it does :)
+      DriveInfo.stub(:get_dvd_drives_as_win32ole) {
+        a = OpenStruct.new
+        a.Name = 'a name'
+        # no VolumeName though
+        [a] 
+      }
+      @subject.unstub!(:choose_dvd_drive)
+      proc {@subject.choose_dvd_drive }.should raise_error(/might not yet have.*in it/)
+      @show_blocking_message_dialog_last_args.should_not be nil
     end
     
     it "should not show the normal buttons in create mode" do
       MainWindow.new.buttons.length.should == 3 # exit button, two normal buttons
       ARGV << "--create-mode"
       MainWindow.new.buttons.length.should == 8
-      ARGV.pop # cleanup--why not :)
+      ARGV.pop # test cleanup--why not :)
     end
     
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 19
-    - 1
-  version: 0.19.1
+    - 2
+  version: 0.19.2
 platform: ruby
 authors: 
   - Roger Pack