# HG changeset patch # User diego # Date 1223590801 0 # Node ID bba82ef5d75a69aa3414c57dcbe3a451da671977 # Parent 0a5a6f03b029d094d0941feca076747b2199bca3 cosmetics: Remove all trailing whitespace. diff -r 0a5a6f03b029 -r bba82ef5d75a FELLOWSHIP.map --- a/FELLOWSHIP.map Sun Sep 14 20:31:43 2008 +0000 +++ b/FELLOWSHIP.map Thu Oct 09 22:20:01 2008 +0000 @@ -7,7 +7,7 @@ domain 2, title 1, program 1, start 0x11ff3, end 0x1272c # gore #domain 2, title 1, program 1, start 0x173f1, end 0x185d6 # violence/death -# hobbiton +# hobbiton domain 2, title 1, program 2, start 0x30373, end 0x31946 # vices/smoking domain 2, title 1, program 2, start 0x32942, end 0x34426 # vices/smoking domain 2, title 1, program 2, start 0x34895, end 0x34ad1 # vices/smoking @@ -20,7 +20,7 @@ # party domain 2, title 1, program 4, start 0x53ee0, end 0x54396 # vices/drinking domain 2, title 1, program 4, start 0x58851, end 0x5ae3d # imitative/theft -domain 2, title 1, program 4, start 0x5cd0a, end 0x5e216 # jump +domain 2, title 1, program 4, start 0x5cd0a, end 0x5e216 # jump # gandalf departs domain 2, title 1, program 6, start 0x7f05d, end 0x7f1b3 # jump diff -r 0a5a6f03b029 -r bba82ef5d75a README.MAP --- a/README.MAP Sun Sep 14 20:31:43 2008 +0000 +++ b/README.MAP Thu Oct 09 22:20:01 2008 +0000 @@ -10,22 +10,22 @@ Map files are an experimental feature that lets you customize the way you watch DVDs. If you are opposed to violence, are sickened by gore, -or would rather your two year old didn't ask you just yet why that -woman in the movie was naked, you might want to create a map file. +or would rather your two year old didn't ask you just yet why that +woman in the movie was naked, you might want to create a map file. Map files identify sections of the movie that will be skipped during playback. You can skip any section you like with the only restriction -(right now) that the movie player must play at least the last VOBU +(right now) that the movie player must play at least the last VOBU (about a fifth of a second) of each chapter in the movie in order -to detect chapter changes correctly. +to detect chapter changes correctly. Included with this patch is an example map file that describes most -of the potentially objectionable content in the new "The Lord of the -Rings" DVD. I've added a comment after each block that identifies +of the potentially objectionable content in the new "The Lord of the +Rings" DVD. I've added a comment after each block that identifies what content it contains so that you can customize the file to your preferences. The map file looks something like this: - # The Lord of the Rings: Fellowship of the Ring + # The Lord of the Rings: Fellowship of the Ring # (Widescreen Theatrical Release) debug domain 8, title 1, program 1, start 0x0000, end 0x1f0a # Introduction @@ -55,7 +55,7 @@ To create your own map files you would create a new map file using the title of the disk as the filename, and add the debug line to it. The map file should be placed in your '.xine' directory and have a '.map' -extension added. For example "The Lord Of The Rings" map must be stored +extension added. For example "The Lord Of The Rings" map must be stored in the file ~/.xine/FELLOWSHIP.map After you create the file with the DEBUG line you will see output that @@ -77,7 +77,7 @@ domain 8, title 1, program 1, start 0x2205, end 0x248a # 4 blocks Xine uses a buffered input chain so that if you pause the viewer you -won't find the same VOBU being displayed on the terminal as is +won't find the same VOBU being displayed on the terminal as is currently on the screen. In my testing the correct VOBU to use if you pause exactly on the section you want to cut will be about five or six lines above the last one printed to the screen. Replay the @@ -96,10 +96,10 @@ ============= If the patch doesn't work for you (and you want it to) you can contact -me at 'kevin_smathers@hp.com'. +me at 'kevin_smathers@hp.com'. -If the patch works for you and you don't want it to, remember that -not everyone in the world has the same needs. The freedom to censor -movies in our own homes is quite different from the government -interfering into libraries and other public forums to censor movies +If the patch works for you and you don't want it to, remember that +not everyone in the world has the same needs. The freedom to censor +movies in our own homes is quite different from the government +interfering into libraries and other public forums to censor movies for us. diff -r 0a5a6f03b029 -r bba82ef5d75a vm/Makefile.am --- a/vm/Makefile.am Sun Sep 14 20:31:43 2008 +0000 +++ b/vm/Makefile.am Thu Oct 09 22:20:01 2008 +0000 @@ -11,6 +11,6 @@ libdvdvm_la_LDFLAGS = $(THREAD_LIBS) -include_HEADERS = +include_HEADERS = noinst_HEADERS = decoder.h vm.h vmcmd.h