sensible-cinema 0.23.3 → 0.23.4

data/LICENSE.TXT

@@ -13,6 +13,8 @@ Ffmpeg is included, under the GPLv2: http://www.ffmpeg.org/legal.html http://www
 
 unzip.exe is herein included, under the info-zip license: http://www.info-zip.org/license.html
 
-some binary builds of dvdid are also distributed here.  See http://www.srcf.ucam.org/~cjk32/dvdid
+Some binary builds of dvdid are also distributed here.  See http://www.srcf.ucam.org/~cjk32/dvdid
+
+TsMuxer binaries are included, with their own license, see vendor/tsmuxer1.10.6/licence.txt (it allows for redistribution).
 
 See first also the file "documentation/is_it_legal_to_copy_dvds.txt" for more information on legal implications in your country.

data/TODO

@@ -17,6 +17,8 @@
 == high prio like blocking bugs ==  
   
 == under next release specific items: ==
+  latest dir "conflict" for grabbing sintel from file
+  can I just use ffmpeg for -> ts ? http://eotmsnotes.wordpress.com/2011/04/25/tsmuxer-notes/
   cheap minimize demo "fake auto" :)
     friday 2: http://www.youtube.com/watch?v=SDeLjcTxMaM&feature=player_profilepage
   cheap static-ify demo for mutes
@@ -44,32 +46,33 @@
     Almost overnight, competitors to CleanFlicks popped up with twists on the CleanFlicks brand -- CleanFilms, Clean Flix, Clean-Flicks, Family Focus Films
     family flix
     http://theeditedmovieencyclopedia.blogspot.com/2008/08/clean-play-dvds-grand-opening-e-mail.html has grande list
+    movie mask
   next timing thing (notes file)
 
 == yes do, un-ordered currently, from the various future release options ==
+  bring to top after a conversion--we get hidden!
+  ascertain how accurate mplayer EDL is...I guess compared to...umm...something?
+    fix discrepancy between EDL mplayer and ffmpeg...maybe a new button "accurate EDL playback"?
   don't use eval!
+  can auto-use tsmuxer at all
+  add buttons for "convert 4945 to x" and vice versa...
   warn/redirect if wrong looking file extension...
+   mac just die with instructions to use tsmuxer first...
   add the "create .edl file for xbmc et al" button
   add a "watch edited from file" option...don't *force* too...?
     check if some other buttons are outdated...
   unit tests (all)
-  if they disdain to choose a save to filename the whole thing exits.
-  tell them "to edit easily..."
     double check--are my ffmpeg splits really really really the same as mplayer's EDL DVD splits? really?
-    "you could watch it under mplayer with the OSD turned on" 
-      [+ button for same?]
   can I avoid requiring use of tsmuxer first?
-    auto tsmuxer/mediainfo [yikes]? 
-      MUXOPT --no-pcr-on-video-pid --new-audio-pes --vbr --vbv-len=500 V_MPEG-2, "G:\Video\c\title00.mkv", fps=23.976, ar=As source, track=1, lang=eng A_AC3, "G:\Video\c\title00.mkv", track=2, lang=eng
   check with blu-ray...do they match timing-wise? sub-title wise?
-  donate tsmuxer, makemkv, http://ffmpeg.zeranoe.com/builds, mulder [?] smplayer
+  donate tsmuxer, makemkv, http://ffmpeg.zeranoe.com/builds, mulder [?] smplayer menumeter
   add an mencoder convert with mplayer_breaks button :P
-    can I just use mencoder -hr-edl-seek (off mpeg) to avoid the fulli phase? please? does it work super-accurately, after that?
+    can I just use mencoder -hr-edl-seek (off mpeg) to avoid the fulli phase? please? does it work super-accurately, though, off fulli? off other?
     maybe just under an "advanced" window...
   youtube/hulu timings
   split LLC's website+consumer
     get LLC before a "real" domain name
-  always force them to have a DVD in the drive :P ?
+  always don't use auto file hashes to discourage piracy
   upconverter
   employee instructions: watch @ realtime after profanity filter first pass :P  
   clear runnings
@@ -91,7 +94,7 @@
         can come out of full screen more easily :P
     note pay for XP http://windows.microsoft.com/en-US/windows/downloads/windows-media-player/plug-ins search for the cheapest
     note to them windows vista/7: use ac3filter [?]
-  donate menumeter $ makemkv
+  donate menumeter $
   reate the "play previously created edited file for current DVD" button
   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
@@ -106,10 +109,11 @@
       ppc dvdid?
       app store mplayer perhaps?
       bundle a copy of smplayer locally?
+      can use a working copy of tsmuxer with instructions :)
   typically delete unedited.fulli file automatically
     except if it's a specific scene run test...
   the final "edited.avi" really "could/should" be playable in WMP...if possible
-  generic/consumer EDL run through should be through smplayer...do I need the other way around, even?
+  generic/consumer EDL run through should be through smplayer...do I need/want straight mplayer option too though?
 
 == other lists ==
 
@@ -117,10 +121,11 @@
   todo.inventionzy
   open_edl_list_org_todo.txt file
   todo.build_library
-  todo.subtitle
+  todo.subtitle
 
 == DVD decide later to move up or down ==
-  canceling from the "dvd id" box exits the whole app LOL
+  add button "fast preview one" (from file)
+  add button "fast preview one" (from dvd)
 
 == DVD-realtime backlog once do, now not do, unordered ==
   investigate boxee edl (just fer fun...maybe possible?) http://getsatisfaction.com/boxee/topics/commercial_skipping_edl_support
@@ -143,6 +148,7 @@
   investigate dvdrsbvdl (windows media center edl plugin)
 
 == DVD/DVD-realtime backlog (totally unordered, some very low prio, basically all never do) ==
+  "media browser" plugin?
   @makemkv: show us the title numbers, and number them *by those*
   @macports: set notestxt \
   13	    "The MPlayer developers do not believe in making regular releases. \

data/VERSION

@@ -1 +1 @@
-0.23.3
+0.23.4

data/bin/sensible-cinema

@@ -145,13 +145,13 @@ module SensibleSwing
       
       ## BUTTONS ##
       
-      @mplayer_edl = new_jbutton( "Watch DVD edited on computer (realtime -- mplayer EDL)", false)
-      @mplayer_edl.tool_tip = "This will watch your DVD in realtime on your computer while skipping/muting the questionable scenes."
+      @mplayer_edl = new_jbutton( "Watch DVD/file edited on computer (realtime -- mplayer EDL)", false)
+      @mplayer_edl.tool_tip = "This will watch your DVD in realtime from your computer while skipping/muting the questionable scenes."
       @mplayer_edl.on_clicked {
         do_mplayer_edl
       }
       
-      @create = new_jbutton( "Create edited copy of a DVD file on Your Hard Drive", false)
+      @create = new_jbutton( "Create edited copy of a DVD's file on Your Hard Drive", false)
       @create.tool_tip = <<-EOL
         This grabs from your DVD and creates a new file on your hard disk like dvd_name_edited.mpg for you to watch later.
         The file you create will contain the whole movie edited.
@@ -175,10 +175,8 @@ module SensibleSwing
       
       @open_list = new_jbutton("Open/Edit a previously created Delete List", true, "If your DVD has a previously existing EDL for it, you can open it to edit it with this button.")
       @open_list.on_clicked {
-        dialog = FileDialog.new(self, "Pick file to edit")
-        dialog.set_directory EDL_DIR
-        filename = dialog.go
-        open_file_to_edit_it filename if filename
+        filename = new_existing_file_selector_and_select_file( "Pick file to edit", EDL_DIR)
+        open_file_to_edit_it filename
       }
       
       @play_smplayer = new_jbutton( "Watch full DVD unedited (realtime smplayer)", true)
@@ -216,7 +214,7 @@ module SensibleSwing
       @display_unique = new_jbutton( "Display current DVD's unique ID", true )
       @display_unique.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."
       @display_unique.on_clicked {
-        drive, volume, dvd_id = choose_dvd_drive
+        drive, volume, dvd_id = choose_dvd_drive_or_file true
         # display it, allow them to copy and paste it out
         show_copy_pastable_string("#{drive} #{volume} for your copying+pasting pleasure (highlight, then ctrl+c to copy)\n
         This is USED to identify a disk to match it to its EDL, later.", "\"disk_unique_id\" => \"#{dvd_id}\",")
@@ -252,15 +250,7 @@ module SensibleSwing
         Once you download the zip, unzip it, and then compare the timestamps in it with those on the DVD (see the button "Watch DVD unedited (realtime mplayer)")
       EOL
       @parse_srt.on_clicked {
-        fc = new_filechooser
-        fc.set_title "Pick srt file:"
-        if old_dir = Storage['old_srt_dir']
-          fc.set_current_directory JFile.new(old_dir)
-        end
-        filename = fc.go
-        Storage['old_srt_dir'] = fc.get_current_directory.to_s
-        Storage['start_time']
-        
+        filename = new_existing_file_selector_and_select_file("Pick srt file:")
         parsed = SubtitleProfanityFinder.edl_output [filename]
         File.write(EdlTempFile, "# add these into your mute section if they apply\n" + parsed)
         open_file_to_edit_it EdlTempFile
@@ -361,13 +351,11 @@ module SensibleSwing
       new_prefs = old_prefs.gsub(/mplayer_additional_options=.*/, "mplayer_additional_options=#{to_this}")
       FileUtils.mkdir_p File.dirname(smplayer_prefs_file) # case it doesn't exist'
       File.write(smplayer_prefs_file, new_prefs)
-      p 'wrote', new_prefs.length, smplayer_prefs_file, to_this
-      # no worky doze File.write(File.expand_path('~/.mplayer/config'), to_this)
       smplayer_prefs_file
     end
     
     def create_brand_new_edl
-      drive, volume, dvd_id = choose_dvd_drive
+      drive, volume, dvd_id = choose_dvd_drive_or_file true
       english_name = get_user_input("Enter a human readable DVD description for #{volume}", volume.gsub('_', ' ').downcase)
       input = <<-EOL
 # comments can go after a # on any line, for example this one.
@@ -454,7 +442,7 @@ module SensibleSwing
     def play_dvd_smplayer_unedited use_mplayer_instead = false
       # LODO really even if there are 2 it should still pick out the title track...hmm...on demand :P
       # lodo mac os x 'ify'
-      drive, dvd_volume_name, dvd_id, edl_path_maybe_nil, descriptors_maybe_nil = choose_dvd_and_edl_for_it false
+      drive, dvd_volume_name, dvd_id, edl_path_maybe_nil, descriptors_maybe_nil = choose_dvd_or_file_and_edl_for_it false
       if descriptors_maybe_nil
         title_track_maybe_nil = get_title_track(descriptors_maybe_nil, false)
       end
@@ -479,14 +467,14 @@ module SensibleSwing
     EdlTempFile = Dir.tmpdir + '/mplayer.temp.edl'
     
     def do_mplayer_edl play_this_mplayer = nil, add_secs_end = 0, add_secs_beginning = 0.5
-      drive, dvd_volume_name, dvd_id, edl_path, descriptors = choose_dvd_and_edl_for_it
+      drive_or_file, dvd_volume_name, dvd_id, edl_path, descriptors = choose_dvd_or_file_and_edl_for_it
+      if dvd_id == NonDvd
+        play_this_mplayer ||= "mplayer \"#{drive_or_file}\"" # play the file instead...
+      end
       descriptors = EdlParser.parse_file edl_path
       splits = descriptors['mplayer_dvd_splits']
       if splits == nil && !play_this_mplayer
-        # don't display warning if they are watching the .fast file, since it doesn't need these
-        if !play_this_mplayer
-          show_blocking_message_dialog("warning: delete list does not contain mplayer replay information [mplayer_dvd_splits] so edits past a certain time period might not won't work ( http://goo.gl/yMfqX ).")
-        end
+        show_blocking_message_dialog("warning: delete list does not contain mplayer replay information [mplayer_dvd_splits] so edits past a certain time period might not won't work ( http://goo.gl/yMfqX ).")
         splits = []
       end
       splits.map!{|s|  EdlParser.translate_string_to_seconds(s) }
@@ -494,7 +482,7 @@ module SensibleSwing
       File.write(EdlTempFile, edl_contents)
       title_track = get_title_track(descriptors)
       # oh the insanity of the console UI...LODO more user friendly player
-      @popup ||= show_non_blocking_message_dialog("About to run mplayer DVD.  To control it, use\n space for pause,\n f for full screen,\n arrow keys to seek.")
+      @popup ||= show_non_blocking_message_dialog("About to run mplayer EDL.  To control it, use\n space for pause,\n f for full screen,\n arrow keys to seek.")
       # LODO dry up mplayer dvd opts...
       if OS.windows?
         play_this_mplayer ||= "mplayer -nocache dvdnav://#{title_track} "
@@ -507,11 +495,16 @@ module SensibleSwing
         play_this_mplayer += " -vo direct3d "
         play_this_mplayer += " -font #{ENV['SystemRoot']}\\fonts\\ARIAL.TTF"
       end
-      command =  "#{play_this_mplayer} -framedrop -alang en -sid 1000 -edl #{File.expand_path EdlTempFile} -dvd-device #{drive}"
+      command =  "#{play_this_mplayer} -framedrop -alang en -sid 1000 -edl #{File.expand_path EdlTempFile} -dvd-device #{drive_or_file}"
       # -hardframedrop might help but hurts just too much
       p command
       Thread.new { system_blocking command; @popup.dispose }
     end
+    
+    def show_assert_dialog message
+      returned = JOptionPane.showConfirmDialog self, message, message, JOptionPane::YES_NO_CANCEL_OPTION
+      assert_confirmed_dialog returned
+    end
       
     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
@@ -529,7 +522,14 @@ module SensibleSwing
         separate program, with its own distribution, license, ownership and copyright.  
         You agree that you are responsible for the download and use of this program, within sensible cinema or otherwise."
       
-      returned = JOptionPane.showConfirmDialog nil, message, title, JOptionPane::YES_NO_CANCEL_OPTION
+      returned = JOptionPane.showConfirmDialog self, message, title, JOptionPane::YES_NO_CANCEL_OPTION
+      assert_confirmed_dialog returned
+      p 'confirmed license noted: ' + license_name
+      throw unless returned == 0
+      old.each{|name, old_setting| UIManager.put(name, old_setting)}
+    end
+    
+    def assert_confirmed_dialog returned
       # 1 is view button was clicked
       # 0 is accept
       # 2 is cancel
@@ -546,10 +546,8 @@ module SensibleSwing
         p 'license exited early...exiting'
         System.exit 1
       end
-      p 'confirmed license noted: ' + license_name
-      throw unless returned == 0
-      old.each{|name, old_setting| UIManager.put(name, old_setting)}
     end
+
     
     def print *args
       Kernel.print *args # avoid bin\sensible-cinema.rb:83:in `system_blocking': cannot convert instance of class org.jruby.RubyString to class java.awt.Graphics (TypeError)
@@ -657,8 +655,9 @@ module SensibleSwing
       generate_and_run_bat_file *Storage['last_params']
     end
 
-    def new_filechooser default_dir = nil
+    def new_nonexisting_filechooser title = nil, default_dir = nil
       out = JFileChooser.new
+      out.set_title title
       if default_dir
         out.set_current_directory JFile.new(default_dir)
       end
@@ -696,22 +695,31 @@ module SensibleSwing
       JFile.new(File.dirname(path)).get_usable_space
     end
     
-    def choose_dvd_and_edl_for_it choose_file = true
-      drive, dvd_volume_name, dvd_id = choose_dvd_drive
-      unless @_edit_list_path
+    def new_existing_file_selector_and_select_file title, dir=nil
+      out = FileDialog.new(self)
+      out.set_title title
+      dir ||= Storage[caller.inspect]
+      out.set_directory dir
+      got = out.go
+      raise 'cancelled choosing existing file' unless got # I think we always want to raise here...
+      Storage[caller.inspect] = File.dirname(got) # I think these work...
+      got
+    end
+    
+    def choose_dvd_or_file_and_edl_for_it force_choose_edl_file = true
+      drive_or_file, dvd_volume_name, dvd_id = choose_dvd_drive_or_file false
+      
+      unless @_edit_list_path # cache file selection...
         edit_list_path = single_edit_list_matches_dvd(dvd_id)
-        if !edit_list_path && choose_file
-          fc = FileDialog.new(self)
-          fc.set_title "Please pick a DVD Delete List File (none found that seem to match #{dvd_volume_name})--or create one for it"
-          fc.set_directory EDL_DIR
-          edit_list_path = fc.go
+        if !edit_list_path && force_choose_edl_file
+          edit_list_path = new_existing_file_selector_and_select_file("Please pick a DVD Delete List File (none were found that seem to match #{dvd_volume_name})--may need to create one for it", EDL_DIR)
           raise 'cancelled choosing an EDL' unless edit_list_path
         end
         @_edit_list_path = edit_list_path
       end
       
       if @_edit_list_path
-        # reload it just in case it has changed on disk
+        # reload it every time just in case it has changed on disk
         descriptors = nil
         while(!descriptors)
           begin
@@ -722,7 +730,7 @@ module SensibleSwing
           end
         end
       end
-      [drive, dvd_volume_name, dvd_id, @_edit_list_path, descriptors]
+      [drive_or_file, dvd_volume_name, dvd_id, @_edit_list_path, descriptors]
     end
     
     def get_title_track descriptors, use_default_of_one = true
@@ -734,19 +742,14 @@ module SensibleSwing
     def get_import_from_filename dvd_title, dvd_title_track
       @_get_import_from_filename ||=
       begin
-        file_from_chooser = new_filechooser Storage['get_import_from_filename_dir']
-        file_from_chooser.set_title "Please choose the file that is your ripped version of #{dvd_title} title ##{dvd_title_track} (.mpg or .ts--see documentation/how_to_get_files_from_dvd.txt file)"
-        outgoing = file_from_chooser.go
-        Storage['get_import_from_filename_dir'] = File.dirname(outgoing)
-        outgoing
+        new_existing_file_selector_and_select_file "Please choose the file that is your ripped version of #{dvd_title} title ##{dvd_title_track} (.mpg or .ts--see documentation/how_to_get_files_from_dvd.txt file)"
       end
     end
     
     def get_save_to_filename dvd_title
       @_get_save_to_filename ||=
       begin
-        fc = new_filechooser
-        fc.set_title "Pick where to save #{dvd_title} edited version as"
+        fc = new_nonexisting_filechooser "Pick where to save #{dvd_title} edited version as"
         save_to_file_name = dvd_title + ' edited version'
         save_to_file_name = save_to_file_name.gsub(' ', '_').gsub( /\W/, '') # no punctuation or spaces for now...
         fc.set_file(get_drive_with_most_space_with_slash + save_to_file_name)
@@ -765,7 +768,7 @@ module SensibleSwing
     end
 
     def do_copy_dvd_to_hard_drive should_prompt_for_start_and_end_times, exit_early_if_fulli_exists = false, watch_unedited = false
-      drive, dvd_volume_name, dvd_id, edit_list_path, descriptors = choose_dvd_and_edl_for_it
+      drive_or_file, dvd_volume_name, dvd_id, edit_list_path, descriptors = choose_dvd_or_file_and_edl_for_it
       
       descriptors = parse_edl(edit_list_path)
       if watch_unedited
@@ -799,10 +802,14 @@ module SensibleSwing
         Storage['end_time'] = end_time
       end
       dvd_friendly_name = descriptors['name']
-      raise 'no name?' unless dvd_friendly_name
+      raise 'no dvd name in EDL?' unless dvd_friendly_name
       
       dvd_title_track = get_title_track(descriptors)
-      file_from = get_import_from_filename dvd_friendly_name, dvd_title_track
+      if dvd_id == NonDvd
+         file_from = drive_or_file
+      else
+        file_from = get_import_from_filename dvd_friendly_name, dvd_title_track # we don't even care about the drive letter anymore...
+      end
       save_to_edited = get_save_to_filename dvd_friendly_name
       fulli = MencoderWrapper.calculate_fulli_filename save_to_edited
       if exit_early_if_fulli_exists
@@ -861,7 +868,10 @@ module SensibleSwing
       
       if !start_time
         # assume a full run..
-        popup_message += "NB that the created file will be playable only with VLC (possibly also with smplayer), but probably not with windows media player."
+        popup_message += <<-EOL
+          NB that the created file will be playable only with VLC (possibly also with smplayer), 
+          but probably not with windows media player.
+        EOL
       end
       
       popup = show_non_blocking_message_dialog(popup_message, "OK")
@@ -913,44 +923,59 @@ module SensibleSwing
         show_blocking_message_dialog("Failed--please examine console output and report back!\nAlso consult the troubleshooting section of the README file.", "Failed", JOptionPane::ERROR_MESSAGE)
       end
     end
+    
+    def get_disk_chooser_window names
+      GetDisk.new(self, names)
+    end
+    
+    NonDvd = 'non dvd has no dvdid'
 
-    # returns e:\, volume, dvd_id
-    def choose_dvd_drive
+    # returns e:\, volume_name, dvd_id
+    # or full_path.mkv, filename, ''
+    def choose_dvd_drive_or_file force_choose_only_dvd_drive
       opticals = DriveInfo.get_dvd_drives_as_openstruct
       if @saved_opticals == opticals
-        # memoize...kind of :)
-        return @_choose_dvd_drive
+        # memoize...if disks haven't changed :)
+        return @_choose_dvd_drive_or_file
       end
-      unless opticals.find{|d| d.VolumeName }
+      has_at_least_one_dvd_inserted = opticals.find{|d| d.VolumeName }
+      if !has_at_least_one_dvd_inserted && force_choose_only_dvd_drive
         show_blocking_message_dialog 'insert a dvd first' 
-        exit 1
+        raise 'no dvd found'
       end
       names = opticals.map{|d| d.Name + "\\" + " (" +  (d.VolumeName || 'Insert DVD to use') + ")"}
-
-      if opticals.length != 1
-        count = 0
-        opticals.each{|d| count += 1 if d.VolumeName}
-        if count == 1
-         # just choose it if there's only one disk in there
-         p 'selecting only disk present in the various DVD drives'
-         selected_idx = opticals.index{|d| d.VolumeName}
-        else
-          dialog = GetDisk.new(self, names)
-          dialog.setSize 200,125
-          dialog.show
-          selected_idx = dialog.selected_idx
-        end
+      if !force_choose_only_dvd_drive && !has_at_least_one_dvd_inserted
+        names += ['No DVD so choose Local File']
+        used_local_file_option = true
+      end
+      
+      count = 0
+      opticals.each{|d| count += 1 if d.VolumeName}
+      if count == 1 && force_choose_only_dvd_drive
+       # just choose it if there's only one disk available..
+       p 'selecting only disk present in the various DVD drives'
+       selected_idx = opticals.index{|d| d.VolumeName}
       else
-        selected_idx = 0
-        p 'selecting user\'s only DVD drive ' + names[0]
+        dialog = get_disk_chooser_window names
+        dialog.setSize 200, 125
+        dialog.show
+        selected_idx = dialog.selected_idx
       end
-
+      
       if selected_idx
-        disk = opticals[selected_idx]
-        dvd_id = DriveInfo.md5sum_disk(disk.MountPoint)
-        @_choose_dvd_drive = [disk.MountPoint, opticals[selected_idx].VolumeName, dvd_id]
-        @saved_opticals = opticals # since we force them to have their disc already in there...guess this is ok for os x :)
-        return @_choose_dvd_drive
+        if used_local_file_option
+          raise unless selected_idx == 0 # it was our only option...
+          filename = new_existing_file_selector_and_select_file("Select yer previously grabbed from DVD file")
+          show_assert_dialog "Do you certify you own the DVD this came of and have it in your possession?"
+          @_choose_dvd_drive_or_file = [filename, File.basename(filename), NonDvd]
+        else
+          disk = opticals[selected_idx]
+          dvd_id = DriveInfo.md5sum_disk(disk.MountPoint)
+          @_choose_dvd_drive_or_file = [disk.MountPoint, opticals[selected_idx].VolumeName, dvd_id]
+        end
+        @saved_opticals = opticals # save currently mounted disk list, so we know if we should re-select later... 
+        # is this ok for os x?
+        return @_choose_dvd_drive_or_file
       else
         raise 'did not select a drive...'
       end

data/change_log_with_feature_list.txt

@@ -1,3 +1,7 @@
+== 0.23.4 ==
+
+Can process by filename now if no DVD is inserted (warns and asserts they must own it).
+
 == 0.23.3 ==
 
 Revamp look of the create mode, add some buttons, revamp some docu.

data/documentation/README.TXT

@@ -0,0 +1,40 @@
+These files contain instructions on how to do various things.
+
+See also the real project "README" file in the root folder of the project (the parent folder to the one containing this file)
+for description and installation instructions, etc.
+
+There is also more "advanced" documentation in the root of the project.
+It contains the LICENSE file, gplv3.txt, change_log_with_feature_list.txt, developer_how_to_contribute_to_the_project.txt file,
+experimental_online_player_ocr_readme.txt file, history_and_related_works_list.txt file.
+
+== Contact ==
+
+contact: http://groups.google.com/group/sensible-cinema
+or email to sensible-cinema@googlegroups.com
+
+== Troubleshooting ==
+
+If you run into some snag, try cleaning your DVD and starting over (delete all files, start again). 
+Baking soda toothpaste might help with cleaning it.
+If it still errs, report it, along with a screen snapshot and steps of
+how to reproduce the problem, preferably.  See the feedback section.
+
+It can fail also because a deletion is past end of DVD, or 
+Also make sure you aren't out of disk space.
+
+Try playback in "VLC Media Player"
+
+You try to play back a sensible cinema-ized video file and it plays back without
+ audio or video (example: windows media player)?
+
+ This probably means you're using windows media player, and don't have "codecs" installed
+   to handle this type of audio.  Not to fear, just download the "ffdshow tryouts" (google for it)
+   and, when it gives you the option, be sure to check "mpeg2 video" and then
+   it should "just work."  You could also optionally just play the file in VLC Media Player or smplayer
+   (there's a button for that).  Installing "AC3Filter" may help if you can hear no audio.  
+   Really VLC Media Player is your best bet though.
+
+If the end result picture is too grainy/pixelated or if the overall process is too slow, let me know and I'll work on
+making it better.  No really, I have some ideas, but want to see if there's need first for improvement in those areas.
+
+Finally, report back! If there are problems that arise, I want to hear about them so we can help you through it.

data/documentation/troubleshooting.txt

@@ -0,0 +1,27 @@
+== Troubleshooting ==
+
+If you run into some snag, try cleaning your DVD and starting over (delete all files, start again). 
+Baking soda toothpaste might help with cleaning it.
+If it still errs, report it, along with a screen snapshot and steps of
+how to reproduce the problem, preferably.
+
+It can fail also because a deletion is past end of DVD, or 
+Also make sure you aren't out of disk space.
+
+Try your playback in "VLC Media Player".
+
+You try to play back a sensible cinema-ized video file and it plays back without
+ audio or video (example: windows media player)?
+
+ This probably means you're using windows media player, and don't have "codecs" installed
+   to handle this type of audio.  Not to fear, just download the "ffdshow tryouts" (google for it)
+   and, when it gives you the option, be sure to check "mpeg2 video" and then
+   it should "just work."  You could also optionally just play the file in VLC Media Player or smplayer
+   (there's a button for that).  Installing "AC3Filter" may help if you can hear no audio.  
+   Really VLC Media Player is your best bet though.
+
+If the end result picture is too grainy/pixelated or if the overall process is too slow, let me know and I'll work on
+making it better.  No really, I have some ideas, but want to see if there's need first for improvement in those areas.
+
+Finally, report back! If there are problems that arise, I want to hear about them so we can help you through it.  
+See README for contact info

data/history_and_related_works_list.txt

@@ -91,3 +91,5 @@ AviSynth can script dvd playback http://forum.doom9.org/archive/index.php/t-1095
 ps3 media server has edl support: https://github.com/chocolateboy/PMS-EDL maybe would work with DVD's dunno
 Anydvd HD's "magic file replacement" for DVD's/blu-ray's
 RiffTrax allows for an audio "overlay" to a DVD playback, have their own player to coordinate the two.
+dove.org worked with New Line Cinemas to release edited versions of a few films (the mask etc.) http://betterlogic.com/roger/2011/06/dove-edited-films/
+Avatar DVD was released with an audio track that was "euphemized" of the profanity.

data/lib/drive_info.rb

@@ -29,7 +29,7 @@ class DriveInfo
      command = "#{__DIR__}/../vendor/dvdid.exe #{dir}"
    end
    output = `#{command}`
-   puts 'dvdid command failed?' + command unless $?.exitstatus == 0 # hope this accomodates for it barfing...
+   raise 'dvdid command failed?' + command unless $?.exitstatus == 0
    output.strip
  end
 

data/lib/media_info_parser.rb

@@ -0,0 +1,27 @@
+module MediaInfoParser
+  def self.parse_with_convert_command media_info, filename
+    video = audio = nil
+    media_info.split("Track ID").each{ |section|
+      section =~ /:(\W+)(\d+)/
+      id = $2
+      section =~  /Stream ID:   (\S+)/ # like V_MPEG-2
+      stream_type = $1
+      if stream_type
+        raise unless id
+        if section =~ /Frame rate/ && !video
+          section =~ /Frame rate: ([\d\.]+)/
+          fps = $1
+          raise unless fps
+          raise unless section =~ /lang: eng/ # expect...
+          video = "#{stream_type}, \"#{filename}\", fps=#{fps}, track=#{id}, lang=eng"
+        elsif section =~ /Channels:/ && !audio
+          raise unless section =~ /lang: eng/ # hope english audio track comes first...
+          # A_AC3, "G:\Video\Sintel_NTSC\title01.mkv", track=2, lang=eng
+          audio = "#{stream_type}, \"#{filename}\", track=#{id}, lang=eng"
+        end
+      end
+    }
+    raise unless video && audio
+    return "MUXOPT --no-pcr-on-video-pid --new-audio-pes --vbr  --vbv-len=500\n#{video}\n#{audio}"
+  end
+end

data/sensible-cinema.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.23.3"
+  s.version = "0.23.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
-  s.date = %q{2011-06-28}
+  s.date = %q{2011-06-30}
   s.email = %q{rogerdpack@gmail.com}
   s.executables = ["sensible-cinema", "sensible-cinema-cli"]
   s.extra_rdoc_files = [
@@ -29,9 +29,11 @@ Gem::Specification.new do |s|
     "business_ideas.txt",
     "change_log_with_feature_list.txt",
     "developer_how_to_contribute_to_the_project.txt",
+    "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",
+    "documentation/troubleshooting.txt",
     "experimental_online_player_ocr_readme.txt",
     "go.bat",
     "go.sh",
@@ -53,6 +55,7 @@ Gem::Specification.new do |s|
     "lib/file_chooser.rb",
     "lib/frame_accurate.rb",
     "lib/keyboard_input.rb",
+    "lib/media_info_parser.rb",
     "lib/mencoder_wrapper.rb",
     "lib/mouse.rb",
     "lib/mouse_forever.rb",
@@ -80,8 +83,8 @@ Gem::Specification.new do |s|
     "spec/edl_parser.spec.rb",
     "spec/frame_accurate.spec.rb",
     "spec/go_line.bat",
-    "spec/how_to",
     "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",
@@ -94,6 +97,7 @@ Gem::Specification.new do |s|
     "spec/subtitle_profanity_finder.spec.rb",
     "spec/swing_helpers.spec.rb",
     "spec/test_yaml.yml",
+    "spec/tsmuxer.output",
     "spec/vlc_programmer.spec.rb",
     "template_bats/RUN SENSIBLE CINEMA CLICK HERE.bat",
     "template_bats/advanced--create or edit sensible cinema delete list files.bat",
@@ -113,6 +117,7 @@ Gem::Specification.new do |s|
     "vendor/mac_dvdid/lib/libdvdid.la",
     "vendor/monkey.png",
     "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",

data/spec/media_info_parser.spec.rb

@@ -0,0 +1,29 @@
+=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.dirname(__FILE__) + "/common"
+require_relative '../lib/media_info_parser'
+
+describe MediaInfoParser do
+  
+  it "should parse" do
+    out = MediaInfoParser.parse_with_convert_command(File.read('tsmuxer.output'), "G:\\Video\\Sintel_NTSC\\title01.mkv")
+    out.should == "MUXOPT --no-pcr-on-video-pid --new-audio-pes --vbr  --vbv-len=500\nV_MPEG-2, \"G:\\Video\\Sintel_NTSC\\title01.mkv\", fps=29.97, track=1, lang=eng\nA_AC3, \"G:\\Video\\Sintel_NTSC\\title01.mkv\", track=2, lang=eng"
+    print out
+  end
+  
+end

data/spec/notes

@@ -1,6 +1,10 @@
 up next:
   lighning exact frame to compare the two fulli's...
 
+== WMC ==
+  apparently mymovies can use power dvd, which seems an external app... http://www.mymovies.dk/forum.aspx?g=posts&m=127771#127771
+
+
 == EDL plugins ==
 
   http://forum.xbmc.org/showthread.php?t=28795 XBMC doesn't support real-time DVD EDL playback at all <sniff> oh wait maybe it does now... http://forum.xbmc.org/archive/index.php/t-69388.html

data/spec/sensible_cinema_gui.spec.rb

@@ -52,7 +52,7 @@ module SensibleSwing
           "stuff"
         end
       }
-      @subject.choose_dvd_and_edl_for_it
+      @subject.choose_dvd_or_file_and_edl_for_it
       @show_blocking_message_dialog_last_arg.should_not be nil
     end
     
@@ -115,7 +115,7 @@ module SensibleSwing
     
     before do
       @subject = MainWindow.new
-      @subject.stub!(:choose_dvd_drive) {
+      @subject.stub!(:choose_dvd_drive_or_file) {
         ["mock_dvd_drive", "Volume", Test_DVD_ID] # happiest baby on the block
       }
       @subject.stub!(:get_mencoder_commands) { |*args|
@@ -123,7 +123,10 @@ module SensibleSwing
         @get_mencoder_commands_args = args
         'fake get_mencoder_commands'
       }
-      @subject.stub!(:new_filechooser) {
+      @subject.stub!(:new_existing_file_selector_and_select_file) {
+        'abc'
+      }
+      @subject.stub!(:new_nonexisting_filechooser) {
         FakeFileChooser.new
       }
       @subject.stub!(:get_drive_with_most_space_with_slash) {
@@ -186,13 +189,18 @@ module SensibleSwing
       File.exist?('test_file_to_see_if_we_have_permission_to_write_to_this_folder').should be false
     end
     
-    it "should prompt twice for filenames--once for the 'to' filename, once for the 'from' filename" do
+    it "should only prompt twice for filenames--once for the 'save to' filename, once for the 'from' filename" do
       count = 0
-      @subject.stub!(:new_filechooser) {
+      @subject.stub!(:new_nonexisting_filechooser) {
         count += 1
         FakeFileChooser.new
       }
+      @subject.stub!(:new_existing_file_selector_and_select_file) {
+        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) }
       count.should == 2
     end
     
@@ -343,15 +351,15 @@ module SensibleSwing
     def should_allow_for_changing_file corrupt_the_file = false
        with_clean_edl_dir_as 'temp' do
         File.binwrite('temp/a.txt', "\"disk_unique_id\" => \"abcdef1234\"")
-        @subject.stub!(:choose_dvd_drive) {
+        @subject.stub!(:choose_dvd_drive_or_file) {
           ["mock_dvd_drive", "Volume", "abcdef1234"]
         }
-        @subject.choose_dvd_and_edl_for_it[4]['mutes'].should == []
+        @subject.choose_dvd_or_file_and_edl_for_it[4]['mutes'].should == []
         new_file_contents = '"disk_unique_id" => "abcdef1234","mutes"=>["0:33", "0:34"]'
         new_file_contents = '"a syntax error' if corrupt_the_file
         File.binwrite('temp/a.txt', new_file_contents)
         # file has been modified!
-        @subject.choose_dvd_and_edl_for_it[4]['mutes'].should_not == []
+        @subject.choose_dvd_or_file_and_edl_for_it[4]['mutes'].should_not == []
       end
     end
     
@@ -368,17 +376,7 @@ module SensibleSwing
       @got_here.should == true
     end
     
-    it "should only prompt for save to filename once" do
-      count = 0
-      @subject.stub!(:new_filechooser) {
-        count += 1
-        FakeFileChooser.new
-      }
-      3.times { @subject.do_copy_dvd_to_hard_drive(false) }
-      count.should == 2 # else would have been 6...
-    end
-    
-    describe 'with unstubbed choose_dvd_drive' do
+    describe 'with unstubbed choose_dvd_drive_or_file' do
       before do
         DriveInfo.stub!(:get_dvd_drives_as_openstruct) {
           a = OpenStruct.new
@@ -386,28 +384,61 @@ module SensibleSwing
           a.Name = 'a path location'
           [a] 
         }
-        @subject.unstub!(:choose_dvd_drive)
+        @subject.unstub!(:choose_dvd_drive_or_file)
       end
-      
-      it "should only prompt for drive once" do
+
+      def yo select_a_dvd
         count = 0
         DriveInfo.stub!(:md5sum_disk) {
           count += 1
           Test_DVD_ID
         }
-        @subject.choose_dvd_and_edl_for_it
-        @subject.choose_dvd_and_edl_for_it
-        count.should == 1
+        if !select_a_dvd
+          DriveInfo.stub!(:get_dvd_drives_as_openstruct) { [] } # no DVD disks inserted...        
+        end
+        @subject.stub(:get_disk_chooser_window) {|names|
+          a = OpenStruct.new
+          def a.setSize x,y; end
+          a.stub(:selected_idx) { 0 } # first entry is either DVD name *or* file, and is apparently "0" weird weird weird
+          # ruby bug [?] always return nil
+          # def a.selected_idx; p 'returning', select_this_idx; select_this_idx; end
+          a
+        }
+        @subject.stub(:new_nonexisting_filechooser) {|a, b|
+           a = ''
+           def a.go; 'selected_filename'; end
+           a
+        }
+        @subject.stub(:new_existing_file_selector_and_select_file) {
+          'selected_edl'
+        }
+        FileUtils.touch 'selected_edl' # blank file is ok :P
+        @subject.choose_dvd_or_file_and_edl_for_it
+        @subject.choose_dvd_or_file_and_edl_for_it
+        count
+      end
+
+      it "should only prompt for disk selection once" do
+        yo( true ).should == 1 # choose the 'a dvd name' DVD
+      end
+
+      it "should only prompt for file selection once" do
+        prompted = false
+        @subject.stub(:show_assert_dialog) {
+          prompted = true
+        }
+        yo( false ).should == 0 # choose a file, so never dvdid any dvd...
+        assert prompted
       end
   
       it "should prompt you if you need to insert a dvd" do
         DriveInfo.stub!(:get_dvd_drives_as_openstruct) {
           a = OpenStruct.new
-          #a.VolumeName = 'a dvd name' # we "don't have one" for this test...
+          #a.VolumeName = 'a dvd name' # we "don't have a disk in" for this test...
           a.Name = 'a path location'
-          [a] 
+          [a]
         }
-        proc {@subject.choose_dvd_drive}.should raise_error(SystemExit)
+        proc {@subject.choose_dvd_drive_or_file true}.should raise_error(/no dvd found/)
         @show_blocking_message_dialog_last_arg.should_not be nil
       end
     end
@@ -431,7 +462,7 @@ module SensibleSwing
     it "should warn if there are no DVD splits and you try to use EDL" do
       with_clean_edl_dir_as 'temp' do
         File.binwrite('temp/a.txt', "\"disk_unique_id\" => \"abcdef1234\"")
-        @subject.stub!(:choose_dvd_drive) {
+        @subject.stub!(:choose_dvd_drive_or_file) {
            ["mock_dvd_drive", "mockVolume", "abcdef1234"]
         }
         @subject.do_mplayer_edl(nil, 0, 0)
@@ -440,12 +471,8 @@ module SensibleSwing
    end
   
    it "should be able to parse an srt for ya" do
-     @subject.stub!(:new_filechooser) {
-       fc = FakeFileChooser.new
-       fc.stub!(:go) {
-         'spec/dragon.srt'
-       }
-       fc
+     @subject.stub!(:new_existing_file_selector_and_select_file) {
+       'spec/dragon.srt'
      }
      file = SensibleSwing::MainWindow::EdlTempFile
      FileUtils.rm_rf file
@@ -453,6 +480,16 @@ module SensibleSwing
      assert File.read(file).contain? "deitys"
    end
   
+  it "should have a created play unedited smplayer button" do
+    @subject.stub(:show_non_blocking_message_dialog) {
+       # don't display the popup message...
+    }
+    @subject.stub(:single_edit_list_matches_dvd) {
+      nil
+    }
+    click_button(:@play_smplayer)
+  end
+  
   end # describe MainWindow
   
 end

data/spec/tsmuxer.output

@@ -0,0 +1,33 @@
+SmartLabs tsMuxeR.  Version 1.10.6  http://www.smlabs.net
+Track ID:    1
+Stream type: MPEG-2
+Stream ID:   V_MPEG-2
+Stream info: Profile: Main@8. Resolution: 720:480i. Frame rate: 29.97
+Stream lang: eng
+Track ID:    2
+Stream type: AC3
+Stream ID:   A_AC3
+Stream info: Bitrate: 448Kbps Sample Rate: 48KHz Channels: 6
+Stream lang: eng
+Track ID:    3
+Can't detect stream type
+Track ID:    4
+Can't detect stream type
+Track ID:    5
+Can't detect stream type
+Track ID:    6
+Can't detect stream type
+Track ID:    7
+Can't detect stream type
+Track ID:    8
+Can't detect stream type
+Track ID:    9
+Can't detect stream type
+Track ID:    10
+Can't detect stream type
+Track ID:    11
+Can't detect stream type
+
+Marks: 00:00:00.000 00:01:42.669 00:02:29.215 00:05:50.383 00:07:14.967 
+Marks: 00:11:19.979 00:12:24.276 00:14:17.389 
+

data/vendor/tsmuxer_1.10.6/licence.txt

@@ -0,0 +1,42 @@
+(c) SmartLabs LLC, 2008-2009
+
+Freeware Licence Agreement
+This licence agreement only applies to the free version of this software.
+
+Terms and Conditions
+BY DOWNLOADING, INSTALLING, USING, TRANSMITTING, DISTRIBUTING OR COPYING THIS SOFTWARE ("THE SOFTWARE"), YOU AGREE TO THE TERMS OF THIS AGREEMENT (INCLUDING THE SOFTWARE LICENCE AND DISCLAIMER OF WARRANTY) WITH SmartLabs LLC (with the business address at 72, Oktyabrskata str., 127521 Moscow, Russia) THE OWNER OF ALL RIGHTS IN RESPECT OF THE SOFTWARE. 
+
+PLEASE READ THIS DOCUMENT CAREFULLY BEFORE USING THE SOFTWARE. 
+
+IF YOU DO NOT AGREE TO ANY OF THE TERMS OF THIS LICENCE THEN DO NOT DOWNLOAD, INSTALL, USE, TRANSMIT, DISTRIBUTE OR COPY THE SOFTWARE. 
+
+THIS DOCUMENT CONSTITUES A LICENCE TO USE THE SOFTWARE ON THE TERMS AND CONDITIONS APPEARING BELOW. 
+
+The Software is licensed to you without charge for use only upon the terms of this licence, and SmartLabs LLC reserves all rights not expressly granted to you. SmartLabs LLC retains ownership of all copies of the Software. 
+
+1. Licence
+You may use the Software without charge. 
+
+You may distribute exact copies of the Software to anyone. 
+
+2. Restrictions
+SmartLabs LLC reserves the right to revoke the above distribution right at any time, for any or no reason. 
+
+YOU MAY NOT MODIFY, ADAPT, TRANSLATE, RENT, LEASE, LOAN, SELL, REQUEST DONATIONS OR CREATE DERIVATE WORKS BASED UPON THE SOFTWARE OR ANY PART THEREOF. 
+
+The Software contains trade secrets and to protect them you may not decompile, reverse engineer, disassemble or otherwise reduce the Software to a humanly perceivable form. You agree not to divulge, directly or indirectly, until such trade secrets cease to be confidential, for any reason not your own fault. 
+
+3. Termination
+This licence is effective until terminated. The Licence will terminate automatically without notice from SmartLabs LLC if you fail to comply with any provision of this Licence. Upon termination you must destroy the Software and all copies thereof. You may terminate this Licence at any time by destroying the Software and all copies thereof. Upon termination of this licence for any reason you shall continue to be bound by the provisions of Section 2 above. Termination will be without prejudice to any rights SmartLabs LLC may have as a result of this agreement. 
+
+4. Disclaimer of Warranty, Limitation of Remedies
+TO THE FULL EXTENT PERMITTED BY LAW, SmartLabs LLC HEREBY EXCLUDES ALL CONDITIONS AND WARRANTIES, WHETHER IMPOSED BY STATUTE OR BY OPERATION OF LAW OR OTHERWISE, NOT EXPRESSLY SET OUT HEREIN. THE SOFTWARE, AND ALL ACCOMPANYING FILES, DATA AND MATERIALS ARE DISTRIBUTED "AS IS" AND WITH NO WARRANTIES OF ANY KIND, WHETHER EXPRESS OR IMPLIED. SmartLabs LLC DOES NOT WARRANT, GUARANTEE OR MAKE ANY REPRESENTATIONS REGARDING THE USE, OR THE RESULTS OF THE USE, OF THE SOFTWARE WITH RESPECT TO ITS CORRECTNESS, ACCURACY, RELIABILITY, CURRENTNESS OR OTHERWISE. THE ENTIRE RISK OF USING THE SOFTWARE IS ASSUMED BY YOU. SmartLabs LLC MAKES NO EXPRESS OR IMPLIED WARRANTIES OR CONDITIONS INCLUDING, WITHOUT LIMITATION, THE WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE WITH RESPECT TO THE SOFTWARE. NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY SmartLabs LLC, IT'S DISTRIBUTORS, AGENTS OR EMPLOYEES SHALL CREATE A WARRANTY, AND YOU MAY NOT RELY ON ANY SUCH INFORMATION OR ADVICE. 
+
+IMPORTANT NOTE: Nothing in this Agreement is intended or shall be construed as excluding or modifying any statutory rights, warranties or conditions which by virtue of any national or state Fair Trading, Trade Practices or other such consumer legislation may not be modified or excluded. If permitted by such legislation, however, SmartLabs LLC' liability for any breach of any such warranty or condition shall be and is hereby limited to the supply of the Software licensed hereunder again as SmartLabs LLC at its sole discretion may determine to be necessary to correct the said breach. 
+
+IN NO EVENT SHALL SmartLabs LLC BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, AND THE LOSS OF BUSINESS INFORMATION OR COMPUTER PROGRAMS), EVEN IF SmartLabs LLC OR ANY SmartLabs LLC REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN ADDITION, IN NO EVENT DOES SmartLabs LLC AUTHORISE YOU TO USE THE SOFTWARE IN SITUATIONS WHERE FAILURE OF THE SOFTWARE TO PERFORM CAN REASONABLY BE EXPECTED TO RESULT IN A PHYSICAL INJURY, OR IN LOSS OF LIFE. ANY SUCH USE BY YOU IS ENTIRELY AT YOUR OWN RISK, AND YOU AGREE TO HOLD SmartLabs LLC HARMLESS FROM ANY CLAIMS OR LOSSES RELATING TO SUCH UNAUTHORISED USE. 
+
+5. General
+All rights of any kind in the Software which are not expressly granted in this Agreement are entirely and exclusively reserved to and by SmartLabs LLC. 
+
+This agreement contains the entire Agreement between the parties hereto with respect to the subject matter hereof, and supersedes all prior agreements and/or understandings (oral or written). Failure or delay by SmartLabs LLC in enforcing any right or provision hereof shall not be deemed a waiver of such provision or right with respect to the instant or any subsequent breach. If any provision of this Agreement shall be held by a court of competent jurisdiction to be contrary to law, that provision will be enforced to the maximum extent permissible, and the remaining provisions of this Agreement will remain in force and effect.

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.23.3
+  version: 0.23.4
 platform: ruby
 authors: 
   - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -06:00
+date: 2011-06-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -223,9 +223,11 @@ files:
   - business_ideas.txt
   - change_log_with_feature_list.txt
   - developer_how_to_contribute_to_the_project.txt
+  - 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
+  - documentation/troubleshooting.txt
   - experimental_online_player_ocr_readme.txt
   - go.bat
   - go.sh
@@ -247,6 +249,7 @@ files:
   - lib/file_chooser.rb
   - lib/frame_accurate.rb
   - lib/keyboard_input.rb
+  - lib/media_info_parser.rb
   - lib/mencoder_wrapper.rb
   - lib/mouse.rb
   - lib/mouse_forever.rb
@@ -274,8 +277,8 @@ files:
   - spec/edl_parser.spec.rb
   - spec/frame_accurate.spec.rb
   - spec/go_line.bat
-  - spec/how_to
   - 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
@@ -288,6 +291,7 @@ files:
   - spec/subtitle_profanity_finder.spec.rb
   - spec/swing_helpers.spec.rb
   - spec/test_yaml.yml
+  - spec/tsmuxer.output
   - spec/vlc_programmer.spec.rb
   - template_bats/RUN SENSIBLE CINEMA CLICK HERE.bat
   - template_bats/advanced--create or edit sensible cinema delete list files.bat
@@ -307,6 +311,7 @@ files:
   - vendor/mac_dvdid/lib/libdvdid.la
   - vendor/monkey.png
   - 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

data/spec/how_to

@@ -1,13 +0,0 @@
-grab:
-vlc --qt-start-minimized dvdsimple://d:\@1 --sout "#standard{access=file,mux=ts,dst=dvdout.%1.mpg}" vlc://quit
-
-split:
-ffmpeg -i dvdout.8.mpg -vcodec copy -acodec copy -ss 3595 -t 10 ffmpegdvdout.8.mpeg
-mencoder1 -hr-edl-seek -ss 3595 -endpos 10  -oac copy -ovc copy dvdoutmplayer.mpg -o mencoder.dvdoutmplayer.mpg
-
-fulli:
-
-mencoder filename.whatever -of mpeg -mpegopts format=dvd:tsaf -alang en -nocache -sid 1000 -oac copy -vf scale=720:480,harddup -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 -o output.mpeg 
-
-
-$ mplayer dvd://1 -dumpstream -dumpfile c.mpg -dvd-device e: