Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD

8 files changed, 216 insertions, 106 deletions

diff --git a/abs/core-testing/LinHES-system/LinHES-run b/abs/core-testing/LinHES-system/LinHES-run
index 776bdc4..9e975ac 100644
--- a/abs/core-testing/LinHES-system/LinHES-run
+++ b/abs/core-testing/LinHES-system/LinHES-run
@@ -10,10 +10,10 @@ xdotool mousemove -10 -10
 /usr/X11R6/bin/unclutter -root -idle 1 -jitter 200 -noevents  &
 if [ x"$Screensavertype" = "xgscreensaver" ]
 then
-  	gnome-screensaver &
+    gnome-screensaver &
 elif  [ x"$Screensavertype" = "xxscreensaver" ]
 then
-	xscreensaver  -no-splash &
+    xscreensaver  -no-splash &
 fi
 
 /usr/bin/xvattr -a XV_COLORKEY -v 0
@@ -29,45 +29,45 @@ fi
 
 if [ !  $SystemType = "Frontend_only" ]
 then
-  if [  -f ~/.configure ]
-  then
+    if [  -f ~/.configure ]
+    then
         sudo -E tweaker.pl
     	/bin/rm /tmp/fps # ??? clean up a temp file that will eventually be obsolete anyway
         sudo sv stop mythbackend
         xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
         sudo sv start mythbackend
-		sudo chown -R mythtv.mythtv /home/mythtv
+	sudo chown -R mythtv.mythtv /home/mythtv
         nice -n 19 mythfilldatabase --quiet &
         rm ~/.configure
-   fi
+    fi
 fi
 
 
 if [ x"$UseMythWelcome" = "x1" ]
 then
-        STARTCMD="/usr/bin/mythwelcome"
+    STARTCMD="/usr/bin/mythwelcome"
 else
-        STARTCMD="/usr/bin/mythfrontend -d -l /var/log/mythtv/mythfrontend.log"
+    STARTCMD="/usr/bin/mythfrontend -d -l /var/log/mythtv/mythfrontend.log"
 fi
 
 echo "====================================================================="
 echo "Starting $STARTCMD"
 firstboot.sh &
 
-        if [ -f /tmp/nomfe ]
-        then
-		   exit 0
-        else
-           if [ -f /tmp/debug ]
-           then
-                echo "using gbd/debug"
-                gdb /usr/bin/mythfrontend -x $MV_ROOT/mfegdbcommands.txt
-                mv gdb.txt gdb.txt.mythfrontend
-                sleep 10
-            else
-                killall -9 irexec
-                /usr/bin/irexec -d
-                $STARTCMD 2>&1
-           fi
-        fi
+if [ -f /tmp/nomfe ]
+then
+    exit 0
+else
+    if [ -f /tmp/debug ]
+    then
+        echo "using gbd/debug"
+        gdb /usr/bin/mythfrontend -x $MV_ROOT/mfegdbcommands.txt
+        mv gdb.txt gdb.txt.mythfrontend
+        sleep 10
+    else
+        killall -9 irexec
+        /usr/bin/irexec -d
+        $STARTCMD 2>&1
+    fi
+fi
 
diff --git a/abs/core-testing/gtk2/PKGBUILD b/abs/core-testing/gtk2/PKGBUILD
index 4279aee..6cdc6e1 100644
--- a/abs/core-testing/gtk2/PKGBUILD
+++ b/abs/core-testing/gtk2/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gtk2
 pkgver=2.16.1
-pkgrel=5
+pkgrel=6
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index 01f4291..a2adaa5 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=18
+pkgrel=19
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/abs/core-testing/tweaker/PKGBUILD b/abs/core-testing/tweaker/PKGBUILD
index 75c893a..662ee75 100644
--- a/abs/core-testing/tweaker/PKGBUILD
+++ b/abs/core-testing/tweaker/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=tweaker
 pkgver=1
-pkgrel=49
+pkgrel=50
 pkgdesc="applies tweaks to the baseline configuration and attempts to optimize settings for the hardware it finds"
 arch=('i686' 'x86_64')
 
diff --git a/abs/core-testing/tweaker/bin/twk_dragon.pl b/abs/core-testing/tweaker/bin/twk_dragon.pl
index 314c299..be94988 100755
--- a/abs/core-testing/tweaker/bin/twk_dragon.pl
+++ b/abs/core-testing/tweaker/bin/twk_dragon.pl
@@ -31,10 +31,6 @@ sub implement_option {
     $dbconnectionstring = get_mythtv_connection_string();
 	
     if (connect_to_db("DBI:mysql:$dbconnectionstring")) {
-	# Overrides SQL changes made in twk_general.pl
-	change_or_make_setting('mythdvd.DVDPlayerCommand', 'mplayer dvd:\/\/ -dvd-device %d -fs -zoom -vc mpeg12,ffmpeg12-vo xv -vf pp=lb') || return -1;
-	change_or_make_setting('VCDPlayerCommand', 'mplayer vcd:\/\/ -cdrom-device %d -fs -zoom -vo xv -vf pp=lb') || return -1;
-
 	# Overrides SQL changes made in twk_tuners.pl
 	# WARNING: Very big harccoded hack that chooses ATSC tuning over QAM.
 	do_query("UPDATE cardinput SET sourceid='10' WHERE sourceid='20'") || return -1;
diff --git a/abs/core-testing/v4l-dvb/PKGBUILD b/abs/core-testing/v4l-dvb/PKGBUILD
index 03508eb..21c82e4 100644
--- a/abs/core-testing/v4l-dvb/PKGBUILD
+++ b/abs/core-testing/v4l-dvb/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=v4l-dvb
 _kernver=2.6.28-LinHES
 pkgver=1
-pkgrel=9
+pkgrel=10
 pkgdesc="V4L-DVB drivers from mercurial"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/abs/extra-testing/mythappletrailers/PKGBUILD b/abs/extra-testing/mythappletrailers/PKGBUILD
index a740fe5..68381d2 100644
--- a/abs/extra-testing/mythappletrailers/PKGBUILD
+++ b/abs/extra-testing/mythappletrailers/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mythappletrailers
 pkgver=0.04.3
-pkgrel=24
+pkgrel=25
 pkgdesc="Unofficial Add-on for MythTV to get Apple.com Movie Trailers."
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/abs/extra-testing/mythappletrailers/appletrailer.xml b/abs/extra-testing/mythappletrailers/appletrailer.xml
index 269f1f3..8b4d8e5 100644
--- a/abs/extra-testing/mythappletrailers/appletrailer.xml
+++ b/abs/extra-testing/mythappletrailers/appletrailer.xml
@@ -31,8 +31,8 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>After Last Season</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/afterlastseason/afterlastseason_h640w.mov</action>
+		<text>Alice In Wonderland</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/disney/aliceinwonderland/aliceinwonderland-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
@@ -49,6 +49,18 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
+		<text>Alvin and the Chipmunks: the Squeakquel</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox/alvinandthechipmunks2/alvinsqueekquel-tlrd_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Amelia</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox_searchlight/amelia/amelia-tlra_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
 		<text>The Answer Man</text>
 		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/magnolia_pictures/theanswerman/theanswerman_h640w.mov</action>
 	</button>
@@ -67,12 +79,6 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Away We Go</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/focus_features/awaywego/awaywego_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
 		<text>Bandslam</text>
 		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/summit/bandslam/bandslam-tlr1_h640w.mov</action>
 	</button>
@@ -85,14 +91,32 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
+		<text>Big Fan</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/bigfan/bigfan_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>The Blue Tooth Virgin</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/thebluetoothvirgin/thebluetoothvirgin_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
 		<text>The Boat That Rocked</text>
 		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/universal/theboatthatrocked/theboatthatrocked-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Boys: the Sherman Brothers’ Story</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/disney/theboys/theboys-tlr1_h640w.mov</action>
+		<text>The Book of Eli</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/thebookofeli/thebookofeli-tlr1a_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>The Box</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/thebox/thebox-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
@@ -103,8 +127,32 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Brothers Bloom</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/summit/thebrothersbloom/thebrothersbloom-tlr2_h640w.mov</action>
+		<text>Brothers</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/lionsgate/brothers/brothers-tlr1a_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Capitalism: a Love Story</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/untitledmichaelmooreproject/untitledmichaelmoore-tsr_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Captain Abu Raed</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/captainaburaed/captainaburaed_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Carriers</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount_vantage/carriers/carriers-tlr1_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Casi Divas</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/casidivas/casidivas_h640w.mov</action>
 	</button>
 
 	<button>
@@ -116,7 +164,13 @@
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Cloudy With a Chance of Meatballs</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/cloudywithachanceofmeatballs/cloudywithachanceofmeatballs-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/cloudywithachanceofmeatballs/cloudywithachance-tlr3_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Coco Before Chanel</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/cocobeforechanel/cocobeforechanel_h640w.mov</action>
 	</button>
 
 	<button>
@@ -127,6 +181,12 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
+		<text>The Collector</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/thecollector/thecollector_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
 		<text>Couples Retreat</text>
 		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/universal/couplesretreat/couplesretreat-tlr_h640w.mov</action>
 	</button>
@@ -145,20 +205,26 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Dance Flick</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount/danceflick/danceflick-tlr1_h640w.mov</action>
+		<text>The Damned United</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/thedamnedunited/thedamnedunited_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Daybreakers</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/lionsgate/daybreakers/daybreakers-tlr1c_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Departures</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/departures/departures_h640w.mov</action>
+		<text>Despicable Me</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/universal/despicableme/despicableme-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>District 9</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/district9/district9-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/district9/district9-tlr4_h640w.mov</action>
 	</button>
 
 	<button>
@@ -169,8 +235,8 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Easy Virtue</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/easyvirtue/easyvirtue_h640w.mov</action>
+		<text>An Education</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/aneducation/aneducation_h640w.mov</action>
 	</button>
 
 	<button>
@@ -193,8 +259,8 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Food, Inc.</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/magnolia_pictures/foodinc/foodinc_h640w.mov</action>
+		<text>Five Minutes of Heaven</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/ifc_films/fiveminutesofheaven/fiveminutesofheaven_h640w.mov</action>
 	</button>
 
 	<button>
@@ -229,20 +295,20 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Girlfriend Experience</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/magnolia_pictures/thegirlfriendexperience/thegirlfriendexperience_h640w.mov</action>
+		<text>The Goods: Live Hard. Sell Hard.</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount_vantage/thegoods/thegoods-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Goods: Live Hard. Sell Hard.</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount_vantage/thegoods/thegoods-tlr1_h640w.mov</action>
+		<text>Grace</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/grace/grace_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>H2: Halloween 2</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/weinstein/halloween2/halloween2-tlr1r_h640w.mov</action>
+		<text>Halloween 2</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/weinstein/halloween2/halloweenii-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
@@ -272,7 +338,7 @@
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>I Can Do Bad All by Myself</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/lionsgate/icandobadallbymyself/icandobadallbymyself-tlr1a_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/lionsgate/icandobadallbymyself/icandobadallbymyself-tlr2a_h640w.mov</action>
 	</button>
 
 	<button>
@@ -289,6 +355,12 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
+		<text>I Sell the Dead</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/ifc_films/isellthedead/isellthedead_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
 		<text>Ice Age: Dawn of the Dinosaurs</text>
 		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox/ice_age_iii/iceage3-tlrn_h640w.mov</action>
 	</button>
@@ -301,6 +373,12 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
+		<text>In the Loop</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/ifc_films/intheloop/intheloop_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
 		<text>The Informant!</text>
 		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/theinformant/theinformant-tlr1_h640w.mov</action>
 	</button>
@@ -308,7 +386,13 @@
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Inglourious Basterds</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/weinstein/inglouriousbasterds/inglouriousbasterds-tlr2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/weinstein/inglouriousbasterds/inglouriousbasterds-tlr4_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>The Invention of Lying</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/theinventionoflying/theinventionoflying-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
@@ -343,32 +427,38 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Lorna’s Silence</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/lornassilence/lornassilence_h640w.mov</action>
+		<text>Live Music</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/livemusic/livemusic_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Monsters Vs. Aliens</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/dreamworks/monstersvsaliens/monstersvsaliens-tlr2_h640w.mov</action>
+		<text>Local Color</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/localcolor/localcolor_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Moon</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/moon/moon_h640w.mov</action>
+		<text>Lorna’s Silence</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/lornassilence/lornassilence_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>More Than a Game</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/lionsgate/morethanagame/morethanagame-tlr1a_h640w.mov</action>
+		<text>Love Happens</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/universal/lovehappens/lovehappens-tlr1_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Monsters Vs. Aliens</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/dreamworks/monstersvsaliens/monstersvsaliens-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>My Life In Ruins</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox_searchlight/mylifeinruins/mylifeinruins-tlr1_h640w.mov</action>
+		<text>More Than a Game</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/lionsgate/morethanagame/morethanagame-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
@@ -391,8 +481,8 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>O’Horten</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/ohorten/ohorten_h640w.mov</action>
+		<text>Ninja Assassin</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/ninjaassassin/ninjaassassin-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
@@ -403,14 +493,26 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
+		<text>Old Dogs</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/disney/olddogs/olddogs_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
 		<text>Orphan</text>
 		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/orphan/orphan-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
+		<text>The Other Man</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/theotherman/theotherman_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
 		<text>Pandorum</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/pandorum/pandorum_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/pandorum/pandorum-tl1_h640w.mov</action>
 	</button>
 
 	<button>
@@ -421,8 +523,20 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
+		<text>A Perfect Getaway</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/universal/aperfectgetaway/aperfectgetaway_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
 		<text>Planet 51</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/planet51/planet51-tlr1r_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/planet51/planet51-tlr2_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Play the Game</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/playthegame/playthegame_h640w.mov</action>
 	</button>
 
 	<button>
@@ -469,20 +583,20 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Sex Positive</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/sexpositive/sexpositive_h640w.mov</action>
+		<text>The September Issue</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/theseptemberissue/theseptemberissue_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Sherlock Holmes</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/sherlockholmes/sherlockholmes-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/sherlockholmes/sherlockholmes-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Shorts</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/shorts/shorts-tlr2a_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/shorts/shorts-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
@@ -499,12 +613,6 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Soloist</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount/thesoloist/thesoloist-tlr1r_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
 		<text>Sorority Row</text>
 		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/summit/sororityrow/sororityrow-tlr1_h640w.mov</action>
 	</button>
@@ -541,12 +649,6 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Street Dreams</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/streetdreams/streetdreams_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
 		<text>Surrogates</text>
 		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/touchstone/surrogates/surrogates-tlr2_h640w.mov</action>
 	</button>
@@ -559,8 +661,8 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Taking of Pelham 123</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/thetakingofpelham123/thetakingofpelham123-tlr2_h640w.mov</action>
+		<text>Surviving Crooked Lake</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/survivingcrookedlake/survivingcrookedlake_h640w.mov</action>
 	</button>
 
 	<button>
@@ -571,12 +673,6 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Terminator Salvation</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/terminatorsalvation/terminatorsalvation-tlr3_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
 		<text>The Time Traveler’s Wife</text>
 		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/newline/timetravelerswife/timetravelerswife-tlr1_h640w.mov</action>
 	</button>
@@ -607,14 +703,14 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Untitled Michael Moore Project</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/untitledmichaelmooreproject/untitledmichaelmoore-tsr_h640w.mov</action>
+		<text>Walt  El Grupo</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/waltandelgrupo/waltandelgrupo_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Up</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/disney/up/up-tlr3r_h640w.mov</action>
+		<text>Weather Girl</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/weathergirl/weathergirl_h640w.mov</action>
 	</button>
 
 	<button>
@@ -632,7 +728,25 @@
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Where the Wild Things Are</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/wherethewildthingsare/wherethewildthingsare-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/wherethewildthingsare/wtwta-tlr3_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Whip It</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox_searchlight/whipit/whipit_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>White On Rice</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/whiteonrice/whiteonrice_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>World’s Greatest Dad</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/magnolia_pictures/worldsgreatestdad/worldsgreatestdad_h640w.mov</action>
 	</button>
 
 	<button>