sensible-cinema 0.28.1 → 0.34.0

data/spec/sensible_cinema_gui.spec.rb

@@ -28,6 +28,8 @@ module SensibleSwing
       MainWindow.new.dispose# doesn't crash :)
     end
 
+   it "should have working is_dvd method for mac"
+
     Test_DVD_ID = 'deadbeef|8b27d001'
     
     it "should die if you file select a poorly formed edl" do
@@ -157,7 +159,8 @@ module SensibleSwing
     end
     
     after do
-      Thread.join_all_others
+      # too dangerous...if it ever joins on a swing thread lights out!
+      #Thread.join_all_others
       FileUtils.rm_rf EdlParser::EDL_DIR
       Dir.mkdir EdlParser::EDL_DIR
     end
@@ -337,6 +340,8 @@ module SensibleSwing
     end
     
     it "if the .done files exists, do_copy... should just call smplayer ja" do
+      require 'tracer'
+#      Tracer.on
       FileUtils.touch "selected_file.fulli_unedited.tmp.mpg.done"
       @subject.do_create_edited_copy_via_file(false, true, true).should == [true, "selected_file.fulli_unedited.tmp.mpg"]
     end
@@ -518,7 +523,7 @@ module SensibleSwing
       MplayerEdl.stub(:convert_to_edl) do |d,s,s2,splits|
         splits1 = splits
       end
-      @subject.play_mplayer_edl_non_blocking
+      @subject.play_smplayer_edl_non_blocking
       splits1.should == []
     end
     
@@ -528,7 +533,7 @@ module SensibleSwing
         @subject.stub!(:choose_dvd_drive_or_file) {
            ["mock_dvd_drive", "mockVolume", "abcdef1234"]
         }
-        @subject.play_mplayer_edl_non_blocking
+        @subject.play_smplayer_edl_non_blocking
         @show_blocking_message_dialog_last_arg.should =~ /does not contain mplayer replay information \[mplayer_dvd_splits\]/
       end
    end

data/spec/subtitle_profanity_finder.spec.rb

@@ -26,32 +26,33 @@ describe SubtitleProfanityFinder do
     
     output = SubtitleProfanityFinder.edl_output 'dragon.srt'
 
-    describe "he.." do
+    describe "h..." do
       it "should include the bad line with timestamp" do
-        output.should match(/0:00:54.93.*"he\.\."/)
+        output.should match(/0:00:54.93.*"h\.\.\."/)
       end
     
       it "should include the description in its output" do
-        output.should include("e [he..] b")
+        output.should include("e [h...] b")
       end
     end
     
     describe "deity various" do
+      
       it "should parse output plural deity" do
         output.should include("nordic [deitys] ")
       end
       
       it "should parse out deity singular and at very end" do
         output = SubtitleProfanityFinder.edl_output 'deity_end.srt'
-        output.should include("fortress is our [goodness]")
+        output.should include("fortress is our [vain use]")
       end
       
-      it "should parse out <i> et al " do
+      it "should remove <i> et al " do
         output = SubtitleProfanityFinder.edl_output 'deity_end.srt'
         output.should_not include(" i ")
         output.should_not include("<i")
         output.should_not include("huntingand")
-        output.should_not include("  ")
+        output.should_not include("   ")
       end
       
     end
@@ -59,9 +60,11 @@ describe SubtitleProfanityFinder do
     describe 'full word only profanities' do
       
       output2 =  SubtitleProfanityFinder.edl_output 'arse.srt'
+      
       it 'should not parse it if it\'s in other words' do
         output2.should_not include "a..ume"
-        output2.should_not include "he..o" # todo: positive ex: ... :P
+        output2.should_not include "h...o"
+        output2.should_not include "he..o"
       end
       
       it 'should parse them at EOL' do
@@ -82,6 +85,10 @@ describe SubtitleProfanityFinder do
         output2.should_not include "impa.."
       end
       
+      it 'should let them end with a .' do
+        output2.should include "line end full word"
+      end
+      
     end
     
   end
@@ -91,16 +98,41 @@ describe SubtitleProfanityFinder do
     out.should include "45.46"
     out.should include "51.59"
   end
-  
-  it "should accomodate lesser profanities" do
-    out = SubtitleProfanityFinder.edl_output_from_string <<-EOL, {}, 0, 0, 1.0
+
+  def test_this_added_text text, extra = {}
+    SubtitleProfanityFinder.edl_output_from_string(<<-EOL, extra, 0, 0, 0, 0, 100, 100)
 6
 00:00:55,068 --> 00:00:59,164
-a butt
+#{text}
 
     EOL
-    out.should include "55.0"
+  end
+  
+  it "should remove some punctuation" do
+    out = test_this_added_text " .- (ab\nc)."
+    out[1][0].single_line_text.should == "(ab c)."	
+    out = test_this_added_text "(abc)., "
+    out[1][0].single_line_text.should == "(abc)."	
+  end
 
+  it "should let you set replacement text" do
+    out = test_this_added_text "a good day", {'good' => ['replace with', :partial_word, 'category']}
+    good = "\n  \"0:00:55.07\" , \"0:00:59.16\", \"profanity\", \"category\", \"a [replace with] day\",\n\n"
+    out[0].should == good
+    out = test_this_added_text "a good day", {'good' => ['replace with', :full_word, 'category']}
+    out[0].should == good
+  end
+ 
+  it "should accomodate lesser profanities" do
+    out = test_this_added_text "I believe in the Lord"
+    out[0].should include "55.0"
+    assert out[1][0].text =~ /l.../i
+  end
+  
+  it "should do full word with dashes" do
+    parsed, entries = test_this_added_text("I believe in heaven and-hell-")
+    assert parsed =~ /heaven/
+    assert parsed !~ /hel/
   end
   
   describe "it should take optional user params" do
@@ -121,43 +153,41 @@ a butt
 
   describe "it should let you re-factor the timestamps on the fly if desired"  do
 
-#  def self.edl_output_from_string subtitles, extra_profanity_hash, subtract_from_each_beginning_ts, add_to_end_each_ts, starting_timestamp_given, starting_timestamp_actual, ending_timestamp_given, ending_timestamp_actual^M
-
     it "should subtract from beginning etc. etc." do
-       normal = S.edl_output 'dragon.srt'
-       normal.should =~ /0:00:50.23/
-       normal.should =~ /0:00:54.93/
-       subtract = S.edl_output 'dragon.srt', {}, 1.0
-       subtract.should =~ /0:00:49.23/
-       normal.should =~ /0:00:54.93/
-       add = S.edl_output 'dragon.srt', {}, 0.0, 1.0
-       add.should =~ /0:00:55.93/
-       add.should =~ /0:00:50.23/
+      normal = S.edl_output 'dragon.srt'
+      normal.should =~ /0:00:50.23/
+      normal.should =~ /0:00:54.93/
+      subtract = S.edl_output 'dragon.srt', {}, 1.0
+      subtract.should =~ /0:00:49.23/
+      normal.should =~ /0:00:54.93/
+      add = S.edl_output 'dragon.srt', {}, 0.0, 1.0
+      add.should =~ /0:00:55.93/
+      add.should =~ /0:00:50.23/
     end
 
     it "should compensate for differing start timestamps" do
-       starts_ten_later_than_srt = S.edl_output 'dragon.srt', {}, 0.0, 0.0, "00:10", "00:20"
-       starts_ten_later_than_srt.should =~ /0:01:00.23/
-       starts_ten_later_than_srt.should =~ /0:01:04.93/
+      starts_ten_later_than_srt = S.edl_output 'dragon.srt', {}, 0.0, 0.0, 10.0, 20.0, 110, 120
+      starts_ten_later_than_srt.should =~ /0:01:00.23/ # 50.23 -> this
+      starts_ten_later_than_srt.should =~ /0:01:04.93/
     end
 
-   it "should compensate for differing end timestamps with a multiple" do
-     lasts_longer = S.edl_output 'dragon.srt', {}, 0.0, 0.0, "00:00", "00:00", "01:00", "01:30" # actual ends 50% later
-     lasts_longer.should =~ /0:01:15.34/
-     lasts_longer.should =~ /0:01:22.39/
-   end
+    it "should compensate for differing end timestamps with a multiple" do
+      lasts_longer = S.edl_output 'dragon.srt', {}, 0.0, 0.0, 0.0, 0.0, 60.0, 90.0 # actual ends 50% later
+      lasts_longer.should =~ /0:01:15.34/
+      lasts_longer.should =~ /0:01:22.39/
+    end
 
     describe "combining different initial time offsets with total times" do
 
      it "should combine different initial time offset with different total time" do
-      lasts_longer_with_initial_add =  S.edl_output 'dragon.srt', {}, 0.0, 0.0, begin_srt = "00:00", begin_actual = "00:10", end_srt = "00:55", end_actual = "00:55" 
-      # this one starts off weird, but then ends at almost exactly the same!
-      lasts_longer_with_initial_add.should =~ /0:00:51.10/
-      lasts_longer_with_initial_add.should =~ /0:00:54.94/ # note--almost on
+       lasts_longer_with_initial_add =  S.edl_output 'dragon.srt', {}, 0.0, 0.0, begin_srt = 0.0, begin_actual = 10.0, end_srt = 55.0, end_actual = 55.0
+       # this one starts off weird, but then ends at almost exactly the same!
+       lasts_longer_with_initial_add.should =~ /0:00:51.10/
+       lasts_longer_with_initial_add.should =~ /0:00:54.94/ # note--almost on
      end
 
      it "should be ok if they line up perfectly with just an offset" do
-       plus_ten = S.edl_output 'dragon.srt', {}, 0.0, 0.0, begin_srt = "00:00", begin_actual = "00:10", end_srt = "00:55", end_actual = "01:05"
+       plus_ten = S.edl_output 'dragon.srt', {}, 0.0, 0.0, begin_srt = 0.0, begin_actual = 10.0, end_srt = 55.0, end_actual = 65.0
        plus_ten.should =~ /0:01:00.23/
        plus_ten.should =~ /0:01:04.93/
      end
@@ -166,4 +196,29 @@ a butt
 
   end
   
+  it "should split to human friendlier entries" do
+    yo = S.split_to_entries File.read('dragon.srt')
+    for entry in yo
+      ts_begin = entry.beginning_time
+      ts_end = entry.ending_time
+      for timestamp in [ts_begin, ts_end]
+        assert timestamp.present?
+        assert timestamp.is_a? Float
+      end
+      assert ts_end > ts_begin
+      assert entry.text =~ /\n/m
+    end
+  end
+  
+  it "should capture times and tweak them, and keep punctuation" do
+    out = S.edl_output_from_string <<-EOL, {}, 0,0,88, 88.16, 7296.5, 7292.4, true
+1
+00:01:28,000 --> 00:01:29,036
+Grandpa(sris)! your's is here?!.,
+
+    EOL
+    assert out[1][0].beginning_time == 88.16
+    out[1][0].text.should match /\(sris\)!/
+  end
+  
 end

data/spec/zoom_player_max_edl.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/zoom_player_max_edl'
+
+describe ZoomPlayerMaxEdl do
+
+  it "should create an edl" do
+    specs = {"name"=>"national treasure", "mutes"=>[], "blank_outs"=>[["01:00:00.0", "01:00:10.0", "violence", "of some sort"]], "dvd_nav_packet_offset"=>[0.4, 0.6143], "volume_name"=>"NATIONAL_TREASURE", "disk_unique_id"=>"91a5aeec|5178a204", "dvd_title_track"=>"1", "dvd_title_track_length"=>7856.8, "dvd_start_offset"=>"0.28", "timestamps_relative_to"=>["dvd_start_offset", "29.97"]}
+    out = ZoomPlayerMaxEdl.convert_to_edl_string specs
+    assert out == "DVDTitle(1)\nCutSegment(\"Start=3596.6178964036\",\"End=3606.60790639361\")\n"
+  end
+  
+end

data/template_bats/README_DISTRO.TXT

@@ -3,4 +3,6 @@ For description of the program, see https://github.com/rdp/sensible-cinema/blob/
 For detailed installation/instructions, see http://rogerdpack.t28.net/sensible-cinema
 
   pc users, use the pc subdirectory
-  mac users, see http://rogerdpack.t28.net/sensible-cinema/content_editor.html for a list of prerequisites and use the mac subdirectory
+  mac users, see http://rogerdpack.t28.net/sensible-cinema/content_editor.html for a list of prerequisites and use the mac subdirectory
+  
+More documentation for it here: https://github.com/rdp/sensible-cinema/wiki

data/template_bats/RUN SENSIBLE CINEMA CLICK HERE WINDOWS.bat

@@ -0,0 +1,25 @@
+@echo Welcome to Sensible Cinema...
+@IF NOT EXIST sensible-cinema\VENDOR\CACHE GOTO NOVENDORDIR
+@echo This window will display lots of debug output 
+@echo   (you can just ignore this window or minimize it, but have to leave it open)
+@setlocal
+@rem disable any local rubyopt settings, just in case...
+@set RUBYOPT=
+@rem check for java installed...we will be needing that :)
+@java -version > NUL 2>&1 || echo need to install java JRE first please install it from java.com && pause && GOTO DONE
+
+@cd sensible-cinema
+@java -cp "./vendor/jruby-complete-1.6.2.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 ???
+
+GOTO DONE
+
+:NOVENDORDIR
+@echo "it appears you downloaded sensible cinema straight from github--please download it instead fromhttps://sourceforge.net/projects/sensible-cinema/files/ for it to work properly"
+@pause
+@start https://sourceforge.net/projects/sensible-cinema/files
+
+@rem fall through
+
+:DONE

data/template_bats/mac/RUN SENSIBLE CINEMA CLICK HERE.command

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
-cd ../sensible-cinema
+DIR="$( cd "$( dirname "$0" )" && pwd )"
+cd $DIR/../sensible-cinema
 java -Xdock:name="Sensible Cinema" -Xdock:icon="./vendor/profs.png" -cp "./vendor/jruby-complete-1.6.2.jar" org.jruby.Main bin/sensible-cinema $1 $2 $3 || (echo ERROR. Please look for error message, above, and report back the error you see, or fix it && read -p "Press any key to continue...")
 

data/template_bats/mac/advanced--create or edit sensible cinema edit list files.command

@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
-"./RUN SENSIBLE CINEMA CLICK HERE.sh" --create-mode
+DIR="$( cd "$( dirname "$0" )" && pwd )"
+"$DIR/RUN SENSIBLE CINEMA CLICK HERE.command" --create-mode

data/template_bats/mac/advanced--run-upconverting-video-player.command

@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
-"./RUN SENSIBLE CINEMA CLICK HERE.sh" --upconvert-mode
+DIR="$( cd "$( dirname "$0" )" && pwd )"
+"$DIR/RUN SENSIBLE CINEMA CLICK HERE.command" --upconvert-mode

data/template_bats/pc/advanced--create or edit sensible cinema edit list files.bat

@@ -0,0 +1,2 @@
+@cd ..
+@"RUN SENSIBLE CINEMA CLICK HERE WINDOWS.bat" --create-mode

data/template_bats/pc/advanced--run-upconverting-video-player.bat

@@ -0,0 +1,2 @@
+@cd ..
+@"RUN SENSIBLE CINEMA CLICK HERE WINDOWS.bat" --upconvert-mode

data/todo.inventionzy.txt

@@ -3,8 +3,14 @@
         more blu-ray stuff: can ID them, can playback (through...mkv? VLC? powerdvd OCr/scripted?)
         some blu-ray player descriptor somehow
       accomodate splits vs. blanks and work
-      
+
+    it can "resync" based on lipsync'ing or some user input (back, forward buttons to subtly resync edits with a currently playing back video) or
+      with user input "tell me where this subtitle is, for you, and also this one" to synchronize it (+- auto-playing to "around" that level so they can check more easily), 
+       or you can ask them manually for time entry for the same.
+    OCR'ing subtitles on the fly (or, cache'd OCR'ing them on the fly, to give it time to process) to synchronize or check for profanity or other "questionable" content
+    
     post a demo of it playing back blu-ray edited local computer, +- projector, +- playon (?)
+	can infer a rating based on (looking it upon imdb, letting people vote, etc.)
     I can forsee some browser window that pulls up some sweet player [mod vlc plugin?] somehow something quality anyway, to play local media, or remote
       or same thing but for upconverting...but how?
    bounty NACL VLC :P
@@ -17,6 +23,8 @@
     make it so an EDL can be "split" (or subtitles split, same way) so that it can span across multiple youtube videos that have been divided in some way.
     it can query the currently open browser window, check to see which movie it's playing, and auotmatically spawn off a correct player instance with EDL for that movie
       based on title or url.
+	when playing a movie, it identifies by colors/tones the movie or the scene, to edit accordingly
+	 when there's a profanity mute, to display some extra text on the screen like "and I really want you to be happy!"  I guess it could just be like a transparent overlay on the movie 
     netflix "try this srt, does it match?" no "what about this one, now?"
     it can "infer" where the thumb slider would be, and "drag" it to where it infers the new timestamp location should likely be, for skipping et al.
     people can "vote" on certain sections, if they're profanity or not, should be skipped or not
@@ -88,6 +96,65 @@
     maybe could just "play from x to y" [no exclude info?] instead of "here are the bad parts"
     stage one: query, auto-download when they hit a netflix movie of some type
       stage two: chrome plugin for the same, auto-detect, auto-user, auto-download, auto-watch edited :)
-    can insert deleted scenes et al [even external scenes :P] (already showed it somewhat)
+    can insert deleted scenes et al [even external scenes :P] (already showed it able to even do this somewhat)
+    can overlay with an alpha transparent other video, which video is sped up from its original form.
+      or which video is itself edited for content, or displayed with realtime content editing/edited movies.
+         it can overlay with enhanced/modified "other video image" files.
+      it can overlay audiobooks
+        it can overlay it with edited audiobooks/sped up/modified somehow audiobooks
+   it can "enhance" movies, like sharpen them, magnify, zoom, et al   
+   it can jump/insert a pre-recorded"clean" version of a certain scene.
+    
     many others were already completed and done from this list and removed
     there are some more ideas in the TODO file itself, and/or on the blog sites where I have posted other ideas too
+   fan editor, that can jump positions within the same DVD/insert audio overlays/insert videos et al
+   voice recognition for detection of profanity/violence/etc. etc.
+   detect subtitles for "what appears to be suggestive" content or lewd scenes, etc., based on the text, +- natural language processing
+   overlay with transparent movies (other movies)
+   "double check synchronize" button for making sure the edits line up, with or without text saved of subtitles, et al
+   auto-detect "dark scenes" or "skin tones" or "noises" or the like
+   can "fast forward" through scary/otherwise questionable scenes
+   can auto-compute/compare md5's (using any arbitrary hash function)/truncated md5's/streamline (faster) partial md5's/can md5 specific frames to detect times/to lookup correct EDL's on the fly.
+     can use the same or some other mnemonic to download something or to go to some online url for it/related to it.
+     can auto-lookup and display things like images/ratings/user reviews, dynamically, about a piece
+  can "auto-sync" "this EDL maps to this movie in this other player (hulu, for instance) which has synchronization points x,y, so it adjust the
+     timestamps in the EDL accordingly, for that one .
+  can work with compressed audio/video, or uncompressed
+  can work with encryped data/image/audio data, or unencrypted, with or without 3rd party player/codecs etc.
+  can have its "own" metadata stored off somewhere (like user contributed images/photos/comments/blogs/wikis)
+    can link videos to adds/adwords/add providers somehow/voice over/overlay adds, et al. 
+  can have overlay (+- transparent) of adds/off-screen/below the video, always, or every so often, based on timestamp (fixed, or specific to a video)
+    can have overlay text (ex: news ticker, adds, chats, comments from users) on a video.
+ integrate with google plus (+- api) somehow, and/or broadcast [?]/realtime "chat" while watching, voice/text, etc.
+    google TV too, and apple TV, as an app., etc. etc. (auto-download EDL's etc)
+ machine learning for video analysis for synchronization/detection of "questionable scenes/audio" [?]
+  can "blank out" or "obscure" certain parts of the screen based on skin color, or region, or region with vectors (moving region), based on timestamp, or pixel color, or hue, or YUV, or combination of the two ("this color in this region, within these time beginnings and endingses")
+  can OCR subtitles from DVD's on the fly, to screen them like tvguardian now does.  With or without in an embedded unit.
+  Everything else mentioned here, but in an embedded unit/side by side with other things/as an app in a console device.
+  people can send you a file and you send it back edited to them LOL (file meaning a rip of some DVD they own, +- requiring them to send in an original DVD too LOL.
+  see also business ideas.txt file
+  realtime chat while viewing/editing/use google wave
+  being able to coordinate/synchronize playing 2 dvd's when you're away
+  can display "user contributed" subtitles (edited, fan edit style, etc.)
+  can overlay them "transparently" above various players, arbitrarily, by tracking timestamps on screen, etc.
+  while synchronized, they can chat, like in a video game LOL
+  can overlay an srt file to an "online" OCR tracked player
+  right click on DVD "play edit with ..."
+  bookmarks within edited playback/remember where you last left off
+  you can record the screen of an "edited playback" in order to create an edited version. It's like recording off your TV, right?
+  each EDL can have a "type" specified, like "type a starts at time x, ends at time y" "type b starts at time z, ends at time mu" so that you can re-use the same EDL
+    cross several media types.
+  EDL action "zoom" to a certain part/portion of a movie, for a specified amount of time.
+  during a "tense" scene it can "darken" the scene more, or blur it, or shrink it to a fraction of its original size, or make it faster,
+    or turn down volume, or mute.  User preferences to "respond to EDl action type x with reaction y" (where y is blur, mute, skip)
+  have jump/jump to file to be able to insert alternate endings.
+  an avisynth script to "cut" the file to be able to cut out/mute out sections
+  an avisynth script to "cut" the file to be able to watch it playback edited without modifying the original.  +- DVD input too.
+  split EDL's based on DVD "title"
+    have some menu system for "choose, now, which path you'd like to take" (ex: which alternate ending)
+  when parsing a subtitle file, can specify an "extra buffer" to put around all of the subsequent mutes that it calculates for you, based on timestamp.
+  scan subtitles for text that "accompanies" violent or sex scenes, edit around those automatically.s
+  when playing they are presented with a list of "groups" of items that can be added to their EDL.
+    One for profanity, one for boredome, etc.  and can pick and choose, mix and match the ones that they will apply for that viewing.
+	  It then adds them together and uses them.
+  http://openplayback.blogspot.com/ lists some useful ideas

data/todo.propaganda

@@ -11,22 +11,45 @@ can I leverage "mymovies" or "xbmc" communities or some odd?
 
 own really long url movie bad scene skipper sensible cinema.t28.net add in there content editor or something lots of google SEO happy words
 
-clearplay 18000 
-edited movies 4400
+clearplay 33000
+clean movies/films 22000/14800
+edited movies 8000
+  edited dvds 1300, so prefer movies
+movie filters 9000
+clean flicks 1900 [flix 1600]
+safe cinema 9900 that is just too weird...
+play clean 22000 LOL
+edited films 6000
+edited video 14800 ?
+
+family edited 1600 (nah on family)
+clean player 18000 might be to actually clean it though.
+family friendly movies 3600 (too hard though)
+play cleaner
+
+clean editing movie player
+
+EditingPlayer
+EditingMoviePlayer
+MovieEditor
+MovieCleaner
+
+EditPlay
+PlayClean
+
+edited cinema 0
+sensible cinema 260 LOL
+content edited 0
+skip bad scenes 0 LOL (mute profanity, skip s. scene) all 0
 edited dvd 1000
-movie filter 1900
-clean flicks 1600 [flix 1900]
-clean movies 5400
-profanity filter 3600
-clean films 880
+profanity filter 3600 (don't think profanity is going to cut it)
 edited films 5400
-clearplay player 1300
 lds movies 2400
 lds videos 2900
-cleanflicks 1300
+cleanflicks 1600
 family friendly movies 2900
 family videos 135K
-cleanflix 2400
+cleanflix 800 [nah]
 good clean movies 720
 christian movies 74K "christian friendly" movies?
 family videos 135K
@@ -34,6 +57,7 @@ clean movies 5400
 blu-ray and blue ray have some (once I actually support that LOL)
 coupons
 
+
 some conglom of those ? :P
 
 http://www.millennialstar.org/unrated-vs-clean-it%E2%80%99s-time-to-demand-choose-your-own-rating-dvd-options/