From c85219e56fd07b11192ce28d605ee1cb24047914 Mon Sep 17 00:00:00 2001
From: Nathan Harris <nharris@eoimaging.com>
Date: Thu, 20 Aug 2009 09:46:45 -0400
Subject: mythtv-svn: fix pretty script

---
 abs/core-testing/mythtv/trunk/mythtv/PKGBUILD | 3 +--
 abs/core-testing/mythtv/trunk/mythtv/pretty   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 abs/core-testing/mythtv/trunk/mythtv/pretty

diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
index df4afb8..422ec64 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
@@ -86,7 +86,6 @@ build() {
 	mkdir -p $startdir/pkg/etc/logrotate.d
 	cp $startdir/src/*.lr $startdir/pkg/etc/logrotate.d
 	mkdir -p $startdir/pkg/etc/cron.hourly/
-	cp $startdir/src/pretty $startdir/pkg/etc/cron.hourly/
-
+	install -m0755 $startdir/src/pretty $startdir/pkg/etc/cron.hourly/
 }
 
diff --git a/abs/core-testing/mythtv/trunk/mythtv/pretty b/abs/core-testing/mythtv/trunk/mythtv/pretty
old mode 100644
new mode 100755
index e47aaec..24b7658
--- a/abs/core-testing/mythtv/trunk/mythtv/pretty
+++ b/abs/core-testing/mythtv/trunk/mythtv/pretty
@@ -1,2 +1,2 @@
 #!/bin/bash
-su mythtv -c "perl /usr/share/mythtv/contrib/mythrename.pl --link /myth/pretty"
+su mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty"
-- 
cgit v0.12


From 348ed005f1ba2e77ded656fe2209a58197571b2d Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 20 Aug 2009 19:51:35 -0500
Subject: mv-core: bring more stuff up to date

---
 abs/mv-core/MythVantage-config/PKGBUILD            |   2 +-
 .../MythVantage-config/install_functions.sh        |   2 +-
 abs/mv-core/mythvantage-live/PKGBUILD              |   2 +-
 abs/mv-core/mythvantage-live/etc/live-shutdown     |  66 ++++++--
 abs/mv-core/mythvantage-live/etc/live-sysinit      |  21 ++-
 abs/mv-core/mythvantage-live/etc/rc.shutdown-live  |   1 +
 abs/mv-core/mythvantage-live/etc/rc.sysinit-live   |   7 +-
 .../mythvantage-live/lib/initcpio/hooks/larch3     |   4 +
 abs/mv-core/runit-scripts-mv/PKGBUILD              |   2 +-
 abs/mv-core/runit-scripts-mv/runitscripts/1        |  16 +-
 abs/mv-core/runit-scripts-mv/runitscripts/1.local  |   3 +
 .../runitscripts/services/Xvfb/run                 |   6 +
 .../runitscripts/services/Xvfb/supervise/lock      |   0
 .../runitscripts/services/Xvfb/supervise/pid       |   0
 .../runitscripts/services/Xvfb/supervise/stat      |   1 -
 .../runitscripts/services/Xvfb/supervise/status    | Bin 20 -> 0 bytes
 .../runitscripts/services/acpid/log/run            |   8 +
 .../runitscripts/services/acpid/run                |   6 +-
 .../runitscripts/services/alsa-utils/run           |   2 +-
 .../runitscripts/services/apache/run               |   6 +
 .../runitscripts/services/avahi/run                |   6 +
 .../runitscripts/services/cron/run                 |   6 +
 .../runitscripts/services/dbus/run                 |   6 +
 .../runitscripts/services/dhcpd/run                |   8 +
 .../runitscripts/services/dnsmasq/run              |   6 +
 .../runitscripts/services/evrouter/run             |   7 +
 .../runitscripts/services/frontend/finish          |  13 +-
 .../runitscripts/services/frontend/run             |  16 +-
 .../runitscripts/services/funcd/run                |   4 +
 .../runitscripts/services/ghosd/run                |   4 +
 .../runit-scripts-mv/runitscripts/services/gpm/run |   6 +
 .../runit-scripts-mv/runitscripts/services/hal/run |   6 +-
 .../runitscripts/services/hobbit-client/run        |   5 +-
 .../runitscripts/services/hobbit/run               |   4 +
 .../runitscripts/services/igdaemon/run             |   9 ++
 .../runitscripts/services/lcdd/run                 |   6 +
 .../runitscripts/services/lighttpd/run             |   6 +
 .../runitscripts/services/lircd/finish             |   6 +-
 .../runitscripts/services/lircd/run                | 169 ++++++++++++++++-----
 .../runitscripts/services/mdadm/finish             |  17 +++
 .../runitscripts/services/mdadm/run                |  19 +++
 .../runitscripts/services/mysql/run                |  19 ++-
 .../runitscripts/services/mythbackend/run          |   4 +
 .../runitscripts/services/ncid/run                 |   9 ++
 .../runitscripts/services/ncidd/run                |   6 +
 .../runitscripts/services/netfs/run                |   1 +
 .../runitscripts/services/nfsd/run                 |   7 +
 .../runitscripts/services/nfslock/run              |   6 +-
 .../runitscripts/services/nmbd/run                 |   6 +
 .../runitscripts/services/ntpd/run                 |  11 +-
 .../runit-scripts-mv/runitscripts/services/oss/run |   3 +
 .../runitscripts/services/portmap/run              |   4 +
 .../runitscripts/services/smartd/finish            |   9 ++
 .../runitscripts/services/smartd/run               |  13 ++
 .../runitscripts/services/smbd/run                 |   6 +
 .../runitscripts/services/sshd/run                 |  17 +--
 .../runitscripts/services/syslog-ng/run            |   7 +
 .../runitscripts/services/tatir/run                |   9 ++
 .../runitscripts/services/tftpd/run                |   8 +
 .../runitscripts/services/tty2/run                 |   5 +
 .../runitscripts/services/tty3/run                 |   4 +
 61 files changed, 534 insertions(+), 104 deletions(-)
 create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/1.local
 delete mode 100644 abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/lock
 delete mode 100644 abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/pid
 delete mode 100644 abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/stat
 delete mode 100644 abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/status
 create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run
 create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run
 create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run
 create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish
 create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run
 create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish
 create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run
 create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run
 create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run

diff --git a/abs/mv-core/MythVantage-config/PKGBUILD b/abs/mv-core/MythVantage-config/PKGBUILD
index 8d6766e..ce01f18 100755
--- a/abs/mv-core/MythVantage-config/PKGBUILD
+++ b/abs/mv-core/MythVantage-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=MythVantage-config
 pkgver=3.2
-pkgrel=163
+pkgrel=165
 pkgdesc="The Gui-installer"
 
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted 
diff --git a/abs/mv-core/MythVantage-config/install_functions.sh b/abs/mv-core/MythVantage-config/install_functions.sh
index 0bc0591..72023bd 100755
--- a/abs/mv-core/MythVantage-config/install_functions.sh
+++ b/abs/mv-core/MythVantage-config/install_functions.sh
@@ -283,7 +283,7 @@ function request_dhcp(){
         if [ $status -eq 1 ]
         then
             #interface is down, lets see if dhcp responds
-            dhcpcd -Td -t2 $ndev -h "" > /tmp/dhcpinfo.$ndev
+            dhcpcd -Td -t2 $ndev -h "" > /tmp/dhcpinfo.$ndev 2>/dev/null
             #check for hostname here
 
             TEMPVAR=`grep new_ip_address /tmp/dhcpinfo.$ndev |cut -d\= -f2`
diff --git a/abs/mv-core/mythvantage-live/PKGBUILD b/abs/mv-core/mythvantage-live/PKGBUILD
index d23d8e7..1039b71 100644
--- a/abs/mv-core/mythvantage-live/PKGBUILD
+++ b/abs/mv-core/mythvantage-live/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythvantage-live
 pkgver=5.3.3
-pkgrel=8
+pkgrel=10
 provides="linhes-live"
 pkgdesc="components for the Live System."
 
diff --git a/abs/mv-core/mythvantage-live/etc/live-shutdown b/abs/mv-core/mythvantage-live/etc/live-shutdown
index 99c4c10..75c540d 100644
--- a/abs/mv-core/mythvantage-live/etc/live-shutdown
+++ b/abs/mv-core/mythvantage-live/etc/live-shutdown
@@ -9,12 +9,12 @@ f_saveclock ()
 f_swapoff ()
 {
     ############################# Include session saving functions
-    . /opt/mythvantage-live/session-save/shutdown2
-    if [ -f /tmp/checkse ]; then
-        . /tmp/checkse
-    else
-        checkse
-    fi
+#    . /opt/mythvantage-live/session-save/shutdown2
+#    if [ -f /tmp/checkse ]; then
+#        . /tmp/checkse
+#    else
+#        checkse
+#    fi
 
     if [ -n "${saving}" ] && ! session_save; then
         echo
@@ -37,14 +37,54 @@ f_swapoff ()
 
 f_remountro ()
 {
-    if [ -n "${ejectdev}" ]; then
-        echo "Ejecting live CD"
-        eject ${ejectdev}
-        echo "========================================"
-        echo "It's safe to switch the computer off now"
-        echo -ne "Press Enter to continue"
-        read junk
+    bootdev=`cat /.livesys/bootdevice`
+    echo "Boot device was $bootdev"
+    #bootdev=`basename $bootdev`
+    for i in `ls  /dev/cd/*`
+    do
+        cdrom=`readlink -f $i`
+        if [ x$cdrom = x$bootdev ]
+        then
+            ejectdev=$cdrom
+	    break
+        fi
+        
+    done
+    lspci |grep -q VMware
+    if [ !   $? = 0 ]
+    then
+        if [ -n "${ejectdev}" ]
+        then
+            echo "Ejecting CD $ejectdev"
+            eject ${ejectdev}
+            echo "========================================"
+            echo "Tray will retract after 10 seconds"
+            for timer in `seq -w 10 -1 0`
+            do
+                #echo -n  $timer '\x08'
+                echo -ne   "\t"$timer '\010\010\010\010'
+                sleep 1
+            done
+            echo
+            echo "========================================"
+            eject -t ${ejectdev}
+            echo
+            echo "It's safe to switch the computer off now"
+            #echo -ne "Press Enter to continue"
+            #read junk
+        else
+            echo "Boot device is not a cdrom, no need to eject"
+        fi
+    else
+        echo "VMWARE detected, not ejecting the CD"
     fi
 }
+#Preloads these commands so we can eject the CD.
+#
+seq --help >/dev/null 2>&1
+eject --help >/dev/null 2>&1
+halt --help >/dev/null 2>&1
+poweroff --help >/dev/null 2>&1
+reboot --help >/dev/null 2>&1
 
 # End
diff --git a/abs/mv-core/mythvantage-live/etc/live-sysinit b/abs/mv-core/mythvantage-live/etc/live-sysinit
index 8e2813b..4cf36f2 100644
--- a/abs/mv-core/mythvantage-live/etc/live-sysinit
+++ b/abs/mv-core/mythvantage-live/etc/live-sysinit
@@ -6,7 +6,7 @@ f_header ()
     cR='\e[31m' cY='\e[1;33m'  cN='\e[0m'  cW='\e[1;37m'
     echo " "
     printsep
-    printf "   ${cR}MythVantage ${cY}Installation${cN}/${cY}Live${cW}. "
+    printf "   ${cR}MythVantage ${cY}Installation${cN}/${cY}Live${cW} CDROM${cN}. "
     printsep
     echo " "
 }
@@ -52,3 +52,22 @@ f_swapon ()
         status "Activating Swap" /sbin/swapon -a
     fi
 }
+f_loadmodules()
+{
+    CMDLINE=$(cat /proc/cmdline)
+    echo $CMDLINE | grep -q modules
+    if [ $? -eq 0 ]
+    then
+        TEMPVAR=${CMDLINE#* modules=}
+        CMDMODULES=${TEMPVAR%% *}
+        mymod=`echo $CMDMODULES|/bin/sed 's|-|_|g' |/bin/sed 's|,| |g'`
+        stat_busy "Loading CMD module"
+        for mod in $mymod
+        do
+              /sbin/modprobe $mod
+        done
+        stat_done
+    fi
+
+
+}
diff --git a/abs/mv-core/mythvantage-live/etc/rc.shutdown-live b/abs/mv-core/mythvantage-live/etc/rc.shutdown-live
index bba263c..58988f3 100755
--- a/abs/mv-core/mythvantage-live/etc/rc.shutdown-live
+++ b/abs/mv-core/mythvantage-live/etc/rc.shutdown-live
@@ -149,6 +149,7 @@ fi
 
 #F Remount / ro
 f_remountro
+#Eject the CD
 
 # Power off or reboot
 if [ "$RUNLEVEL" = "0" ]; then
diff --git a/abs/mv-core/mythvantage-live/etc/rc.sysinit-live b/abs/mv-core/mythvantage-live/etc/rc.sysinit-live
index 3f72a50..b3b91de 100755
--- a/abs/mv-core/mythvantage-live/etc/rc.sysinit-live
+++ b/abs/mv-core/mythvantage-live/etc/rc.sysinit-live
@@ -12,7 +12,7 @@
 
 ###############################################################
 ### These functions have been separated out, so that they can be
-### replaced in linhes live systems.
+### replaced in mythvantage live systems.
 
 f_header ()
 {
@@ -98,7 +98,7 @@ f_swapon ()
 
 ###############################################################
 
-### Override above functions if running linhes live system
+### Override above functions if running mythvantage live system
 [ -f /etc/live-sysinit ] && . /etc/live-sysinit
 
 #F Print header
@@ -176,6 +176,9 @@ fi
 # Load modules from the MODULES array defined in rc.conf
 if ! [ "$load_modules" = "off" ]; then
     if [ -f /proc/modules ]; then
+############Added by jm to load modules from /proc/cmdline
+	f_loadmodules
+##############
         stat_busy "Loading Modules"
         for mod in "${MODULES[@]}"; do
             if [ "$mod" = "${mod#!}" ]; then
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3 b/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3
index 47be81a..b301aa9 100644
--- a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3
+++ b/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3
@@ -96,6 +96,8 @@ run_hook ()
 
     msg_ ":: Mounting squashed images"
     /bin/mkdir /tfs/system
+    #added sleep for 3 seconds, because well i don't know but it seems to fix things
+    sleep 3
     # The klibc mount command doesn't support '-o loop'
     /bin/losetup /dev/loop0 ${sysSqf}
     /bin/mount -r -t squashfs /dev/loop0 /tfs/system
@@ -107,11 +109,13 @@ run_hook ()
     export LD_LIBRARY_PATH=/tfs/system/lib:/tfs/system/usr/lib
 
     /bin/mkdir /tfs/mods
+    
     # The klibc mount command doesn't support '-o loop'
     /bin/losetup /dev/loop1 ${modsSqf}
     /bin/mount -r -t squashfs /dev/loop1 /tfs/mods
 
     # Unpack the overlay
+
     msg_ ":: Initializing writable layer for union (overlay)"
     /tfs/system/usr/bin/lzop -d < ${overlay} | \
             /tfs/system/bin/tar -C /tfs -xf -
diff --git a/abs/mv-core/runit-scripts-mv/PKGBUILD b/abs/mv-core/runit-scripts-mv/PKGBUILD
index ae85623..04b2c92 100755
--- a/abs/mv-core/runit-scripts-mv/PKGBUILD
+++ b/abs/mv-core/runit-scripts-mv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts-mv
 pkgver=1.8.0
-pkgrel=4
+pkgrel=7
 pkgdesc="collection of startup scripts for runit MythVantage styel"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/1 b/abs/mv-core/runit-scripts-mv/runitscripts/1
index 748930f..6e4425d 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/1
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/1
@@ -1,14 +1,26 @@
 #!/bin/bash
 /etc/rc.sysinit
+. /etc/rc.conf
+. /etc/rc.d/functions
 hostname `cat /etc/hostname`
 /sbin/sysctl -p 2>/dev/null >/dev/null
-#/usr/bin/load-modules-mythvantage.sh
+#yes it's needed the 2nd time
+/usr/LH/bin/load-modules-mythvantage.sh >/dev/null
 rm /etc/dhcpc/dhcpcd*.pid  2>/dev/null
 rm -f /etc/sv/frontend/.runtime/* 2>/dev/null
 rm -f /etc/runit/reboot 2>/dev/null
+stat_busy "Starting network"
 /etc/net/scripts/network.init start 2>/var/log/network.init.error >/var/log/network.init
+stat_done
 /usr/sbin/ethtool -s  eth0 wol g 2>/dev/null
 /usr/sbin/ethtool -s  eth1 wol g 2>/dev/null
 /usr/sbin/ethtool -s  eth2 wol g 2>/dev/null
+#user added stuff for level 1 of runit
+if [ -e /etc/runit/1.local ]
+then
+    #exec the file
+    stat_busy  /etc/runit/1.local
+    /etc/runit/1.local
+    stat_done
+fi
 
-#/bin/su mythtv -c /usr/bin/grabkey.py 2>/dev/null 1>/devn/null &
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/1.local b/abs/mv-core/runit-scripts-mv/runitscripts/1.local
new file mode 100755
index 0000000..f79a0c6
--- /dev/null
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/1.local
@@ -0,0 +1,3 @@
+#!/bin/bash
+#local user startup script, run at the end of runit 1
+
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run
index 823916d..71ffedd 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run
@@ -1,5 +1,11 @@
 #!/bin/bash
 . /etc/profile
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting XVFB"
+
+
 VIRTUAL_DISPLAY=":50"
 Xvfb_parm="$VIRTUAL_DISPLAY -screen 0 800x600x16"
 Xvfb $Xvfb_parm 
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/lock b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/lock
deleted file mode 100644
index e69de29..0000000
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/pid b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/pid
deleted file mode 100644
index e69de29..0000000
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/stat b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/stat
deleted file mode 100644
index eb0e904..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/stat
+++ /dev/null
@@ -1 +0,0 @@
-down
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/status b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/status
deleted file mode 100644
index 2254c38..0000000
Binary files a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/status and /dev/null differ
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run
new file mode 100755
index 0000000..20c892e
--- /dev/null
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+exec 2>&1
+#export TERM=linux
+#. /etc/rc.conf
+#. /etc/rc.d/functions
+#stat_runit "Starting MythBackend logger"
+/usr/bin/logger -p info -t acpid
+
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run
index daf9859..80cc65a 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run
@@ -1,3 +1,7 @@
 #!/bin/sh
 exec 2>&1
-exec /usr/sbin/acpid  -f -c /etc/acpi/events 2>/dev/null >/dev/null
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting acpid"
+exec /usr/sbin/acpid  -f -c /etc/acpi/events  >2 /dev/null 1>/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run
index 0a97cfa..17f5f99 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 exec 2>&1
-exec /etc/rc.d/alsa-utils start all
+exec /etc/rc.d/alsa start
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run
index 130d870..95d5cc4 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run
@@ -1,2 +1,8 @@
 #!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Apache"
+
+
 exec /usr/local/apache/bin/httpd -DNO_DETACH
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run
index 323d242..b9b4905 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run
@@ -1,4 +1,10 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Avahi"
+
+
 exec /usr/sbin/avahi-daemon  >/dev/null 2>/dev/null
 
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run
index 99dc014..0894236 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run
@@ -1,3 +1,9 @@
 #!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Cron"
+
+
 exec 2>&1
 exec /usr/sbin/crond -f  >/dev/null 2>/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run
index 872ca77..a9af150 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run
@@ -1,3 +1,9 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting dbus"
+
+
 exec /usr/bin/dbus-daemon --system --nofork 2>/dev/null >/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run
new file mode 100755
index 0000000..38ae40a
--- /dev/null
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting dhcpd"
+
+
+exec /usr/sbin/dhcpd -f &> /var/log/dhcpd.log
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run
index 451dda4..f14c51a 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run
@@ -1,4 +1,10 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting dns services"
+
+
 exec /usr/sbin/dnsmasq -k   >/dev/null 2>/dev/null
 
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run
index 5697f6f..56f7ae6 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run
@@ -1,13 +1,20 @@
 #!/bin/bash
 . /etc/profile
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
 which evrouter >/dev/null 2>/dev/null
 if [ $? = 0 ]
 then
+
+	stat_runit "Starting evrouter"
 	ps -ef |grep -v grep|grep -q "Xvfb :50"
 	if [ ! $?  = 0 ]
 	then
 		sv start Xvfb
 	fi
+	
 	su mythtv -c "DISPLAY=localhost:50 evrouter -c /etc/evrouter.cfg -f /dev/input/event*"
 fi
 
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish
index 3bbd374..4836b44 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish
@@ -1,12 +1,15 @@
 #!/bin/bash
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
 grep -q  noautologin /proc/cmdline
 STATUS=$?
- if  [ $STATUS = 0 ]
-      then
-        chvt 2
+if  [ $STATUS = 0 ]
+then
+    chvt 2
 else
-
 chvt 1
 touch /etc/sv/frontend/.runtime/`date +%s`
 sleep 0.5
@@ -19,6 +22,6 @@ if [ $numfiles -gt 2 ]
 then
  sv stop frontend
  rm -f /etc/sv/frontend/.runtime/*
- echo "Frontend is not able to start, disabling it"
+ printhl  "    Frontend is not able to start, disabling it."
 fi
 fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run
index 35d97d0..0c75b96 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run
@@ -1,15 +1,17 @@
 #!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
 exec 2>&1
 sv start dbus
 sv start hal
- grep -q  noautologin /proc/cmdline
- STATUS=$?
-  if  [ $STATUS = 0 ]
-   then
+grep -q  noautologin /proc/cmdline
+STATUS=$?
+if  [ $STATUS = 0 ]
+then
     sv down frontend
     exit 0
-  fi
-
-#exec /usr/bin/openvt -fec 7 -- /bin/su - mythtv -l -c STB-start
+fi
+stat_runit "Starting MythVantage frontend"
 exec  /bin/su - mythtv -l -c STB-start
 
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run
index f807822..8d364db 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run
@@ -1,2 +1,6 @@
 #!/bin/bash
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting func"
 exec  /usr/bin/funcd
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run
index fbe8ba0..faf4d59 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run
@@ -1,3 +1,7 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting ghosd"
 DISPLAY=localhost:0.0 exec  /usr/bin/osdServer.pl 5000  
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run
index 361fc43..c347c77 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run
@@ -1,4 +1,10 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting GPM"
+
+
 . /etc/sysconfig/mouse
 exec gpm -D -m $MDEVICE -t $PROTOCOL
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run
index f1362b2..a6d5c0e 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run
@@ -1,4 +1,8 @@
 #!/bin/sh
 exec 2>&1
-sv waitup dbus 2>/dev/null 1>/dev/null
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+svwaitup dbus 2>/dev/null 1>/dev/null
+stat_runit "Starting Hal"
 exec /usr/sbin/hald --daemon=no --use-syslog 2>/dev/null >/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run
index e45173d..520f720 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run
@@ -14,7 +14,10 @@
 #----------------------------------------------------------------------------#
 #
 # $Id: runclient.sh,v 1.13 2006/07/14 21:25:19 henrik Rel $
-
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting hobbit client"
 # Default settings for this client
 MACHINEDOTS="`uname -n`"			# This systems hostname
 BBOSTYPE="`uname -s | tr '[A-Z]' '[a-z]'`"	# This systems operating system in lowercase
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run
index 24ad9fe..19b8194 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run
@@ -1,3 +1,7 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting hobbit server"
 exec su nobody -c "/data/srv/hobbit/server/bin/hobbitlaunch --config=/data/srv/hobbit/server/etc/hobbitlaunch.cfg --env=/data/srv/hobbit/server/etc/hobbitserver.cfg --log=/var/log/hobbit/hobbitlaunch.log --pidfile=/var/log/hobbit/hobbitlaunch.pid --no-daemon"
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run
new file mode 100755
index 0000000..ea4f33b
--- /dev/null
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run
@@ -0,0 +1,9 @@
+#!/bin/sh
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting IguanaWorks IR daemon"
+
+
+exec /usr/bin/igdaemon --no-ids  -n -l /var/log/igdaemon.log
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run
index df71bf8..da2258b 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run
@@ -1,5 +1,11 @@
 #!/bin/sh
 . /etc/systemconfig
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting lcdproc"
+
+
 exec 2>&1
 if [ x$LCDtype = xxosd ]
 then
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run
index 70cb0a5..798690c 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run
@@ -1,2 +1,8 @@
 #!/bin/bash
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting lighttpd"
+
+
 exec /usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish
index 754bca1..1afc41c 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish
@@ -1,4 +1,8 @@
 #!/bin/bash
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
 killall -9 lircd 2>/dev/null 
 rm -f /var/run/lirc*.pid 
 [ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime
@@ -8,5 +12,5 @@ if [ $numfiles -gt 3 ]
 then
 	 rm -f /etc/sv/lircd/.runtime/* 2>/dev/null
 	 sv stop lircd
-	 echo "lircd is not able to start, disabling it"
+	 printhl "    lircd is not able to start, disabling it"
 fi     
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run
index ceda8db..0a398ac 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run
@@ -1,53 +1,138 @@
 #!/bin/bash
+
 exec 2>&1
-run_lircd2=false
-. /etc/systemconfig
-[ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime
+export TERM=linux
 
-function dvico_detect {
+. /etc/rc.conf
+. /etc/rc.d/functions
 
+#since what we do may not be enough
+#if your one of those people, this is where you place your stuff
 
-  if [ x$Remotetype = "xdvico" ]
-  then
-                DEVICE="/dev/usb/hiddev0"
-  fi
-}
+LOG=/tmp/lirc.log
 
-function imon_detect {
-if [ -e /dev/lirc_imon ]
+if [ -f $LOG ]
 then
-lircd2_cmd="/usr/sbin/lircd -d /dev/lirc_imon --output=/dev/lircd --pidfile=/var/run/lircd2.pid --connect=localhost:8765"
-run_lircd2=true
+    rm -f $LOG
 fi
-}
-
-
-
-case $ReceiverType in 
-	Serial)
-   		/usr/bin/setserial /dev/$ReceiverSerialport uart none
-	        /sbin/modprobe lirc_serial
-		DEVICE=`ls  /dev/lirc[0-9] 2>/dev/null |sort |sed '/./,$!d'|head -n 1 `
-		imon_detect		
-		;;
-	Usb-imon)
-		DEVICE=/dev/lirc_imon	
-	;;
-    Hauppauge)
-        DEVICE=/dev/lirc3
-        ;;
-	*) 
-
-		DEVICE=`ls  /dev/lirc[0-9] 2>/dev/null |sort |sed '/./,$!d'|head -n 1 `
-		imon_detect
-		dvico_detect
-	;;
-esac
-
-if [ "$run_lircd2" = "true" ] 
+
+if [ -f /etc/runit/lirc.sh ]
 then
-	$lircd2_cmd 2>/dev/null 1>/dev/null
-	exec /usr/sbin/lircd -n -d $DEVICE --output /dev/lircd1 --listen 2>/dev/null 1>/dev/null
+    #program must not terminate.
+
+    stat_runit "Starting lirc"
+	
+    /etc/runit/lirc.sh
 else
-	exec /usr/sbin/lircd -n -d $DEVICE 2>/dev/null 1>/dev/null
+    . /etc/systemconfig
+    stat_runit "Starting lirc"
+
+    [ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime
+
+    function dvico_detect {
+        if [ x$Remotetype = "xdvico" ] || [ x$Remotetype = "xDvico-Dual-Digital4-rev2" ]
+        then
+            RunDvico=true
+        else
+            RunDvico=false
+        fi
+    }
+
+    num_lirc=`ls -la /dev/lirc[0-9] 2>/dev/null |wc -l `
+    num_lirc=$((num_lirc-1))
+
+    serial_port=""
+
+    if [ x$ReceiverType = xSerial ]
+    then
+        serial_port=$ReceiverSerialport
+    elif [ x$HostBlasterType = xSerial ]
+    then
+        serial_port=$HostSerialPort_blasterlirc
+    fi
+
+    if [ -n "$serial_port" ]
+    then
+        #/dev/ttyS0 (COM1), port 0x3f8, irq 4
+        #/dev/ttyS1 (COM2), port 0x2f8, irq 3
+    	#/dev/ttyS2 (COM3), port 0x3e8, irq 4
+    	#/dev/ttyS3 (COM4), port 0x2e8, irq 3
+
+        case $serial_port in
+        ttyS0)
+               FLAGS="io=0x3f8  irq=4"
+               ;;
+        ttyS1)
+               FLAGS="io=0x2f8  irq=3"
+               ;;
+        ttyS2)
+               FLAGS="io=0x3e8  irq=4"
+               ;;
+        ttyS3)
+               FLAGS="io=0x2e8  irq=3"
+               ;;
+        esac
+        /usr/bin/setserial /dev/serial_port uart none
+	sleep 0.5
+        /sbin/modprobe lirc_serial $FLAGS
+	sleep 0.5
+    fi
+
+    dvico_detect
+
+    if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ]
+    then
+        CMD="/usr/sbin/lircd -n  --driver=commandir"
+	printhl "	Using commandir"
+        $CMD >>$LOG 2>>$LOG
+#echo $CMD
+    elif [  x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ]
+    then
+	sv start igdaemon
+        CMD="/usr/sbin/lircd -n  --driver=iguanaIR"
+	printhl "       Using iguanaIR usb"
+#echo $CMD
+        $CMD >>$LOG 2>>$LOG
+    else
+        LASTCMD=""
+
+        for i in `seq 1 $num_lirc`
+        do
+            CMD="/usr/sbin/lircd -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
+	    printhl "	Device $i"
+#echo $CMD
+            $CMD >>$LOG 2>>$LOG
+            LASTCMD="--connect=localhost:876$i   $LASTCMD    "
+        done
+
+	if [ $RunDvico = "true" ]
+	then
+	    if [ x$Remotetype = "xdvico" ]
+            then
+                LCMD="/usr/sbin/lircd -n -d /dev/usb/dvicoIR --driver=dvico  --output /dev/lircd"
+            else
+                LCMD="/usr/sbin/lircd -n -d /dev/input/irremote --driver=devinput  --output /dev/lircd"
+            fi
+
+	    if [ $num_lirc -lt 0 ]
+	    then
+		# Only run Dvico
+		printhl "   Device $Remotetype"
+#echo $LCMD
+            	exec $LCMD >>$LOG 2>>$LOG
+	    elif [ $num_lirc -gt -1  ]
+	    then
+                i=$((i+1))
+                CMD="$LCMD --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
+                $CMD >> $LOG
+                LASTCMD="--connect=localhost:876$i   $LASTCMD    "
+	        printhl "	Device Dvico"
+		/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD  >>$LOG 2>>$LOG
+	    fi
+	else
+	    LCMD="/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD"
+#echo $LCMD
+     	    exec $LCMD >>$LOG 2>>$LOG
+	fi
+    fi
 fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish
new file mode 100755
index 0000000..92782ba
--- /dev/null
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish
@@ -0,0 +1,17 @@
+#!/bin/bash
+#
+# Stop Monitoring software raid arrays
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /sbin/mdadm`
+    stat_runit "Stopping mdadm RAID Monitor"
+    [ ! -z "$PID" ] && kill $PID &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon mdadm
+      stat_done
+    fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run
new file mode 100755
index 0000000..0ab432e
--- /dev/null
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run
@@ -0,0 +1,19 @@
+#!/bin/bash
+#
+# Start Monitoring software raid arrays
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /sbin/mdadm`
+    stat_runit "Starting mdadm RAID Monitor"
+    if [ -z "$PID" ]; then
+       /sbin/mdadm -F -s
+    fi
+    if [ ! -z "$PID" -o $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon mdadm
+      stat_done
+    fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run
index 569230e..6b2f95a 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run
@@ -1,24 +1,28 @@
 #!/bin/bash
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Mysql"
 
 MYSQLD_ROOT="/data/srv/mysql"
 # source application-specific settings
 [ -f /etc/conf.d/mysqld ] && . /etc/conf.d/mysqld
 if [ ! `egrep '^mysql:' /etc/group` ]; then
-  stat_busy "Adding mysql group"
+  stat_runit "Adding mysql group"
   groupadd -g 89 mysql
-  stat_done
+  
 fi
 if [ ! `egrep '^mysql:' /etc/passwd` ]; then
-  stat_busy "Adding mysql user"
+  stat_runit "Adding mysql user"
   useradd -u 89 -g mysql -d $MYSQLD_ROOT -s /bin/false mysql
   [ -d $MYSQLD_ROOT ] && chown -R mysql.mysql $MYSQLD_ROOT
-  stat_done
+  
 fi
 
 if [ ! -d $MYSQLD_ROOT ]; then
-  mkdir $MYSQLD_ROOT
-  /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql
+  mkdir -p $MYSQLD_ROOT
+  /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql 2>/dev/null 1>/dev/null
   chown -R mysql.mysql $MYSQLD_ROOT
 fi
 
@@ -26,4 +30,5 @@ if [ ! -e /var/log/mysqld.log ]; then
   touch /var/log/mysqld.log
   chown mysql /var/log/mysqld.log
 fi
-exec /usr/sbin/mysqld -u mysql 2>/dev/null >/dev/null
+
+exec /usr/sbin/mysqld --skip-name-resolve  -u mysql 2>/dev/null >/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run
index 0868a01..692e7db 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run
@@ -2,6 +2,10 @@
 exec 2>&1
 . /etc/profile
 . /etc/systemconfig
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
 export HOME=/root
 if [ ! x$SystemType = xSlave_backend ]
 then
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run
index 7dbc8ba..44154c7 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run
@@ -1,12 +1,21 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+
 which ncid 2>/dev/null >/dev/null
+
 if [ $? = 0 ]
 then
 	if [ -f /var/service/ncidd/run ]
 	then
 		sv start ncidd
 	fi
+
+	stat_runit "Starting callerid client"
+	
 	exec /usr/bin/ncid --no-gui --all  --call-prog --program /usr/bin/ncid.py 127.0.0.1 3333
 fi
 
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run
index f1c710a..6fff089 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run
@@ -1,7 +1,13 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
 which ncidd > /dev/null 2>/dev/null
 if [ $? = 0 ]
 then
+	stat_runit "Starting CallerID"
+	
 	exec /usr/sbin/ncidd -D 2>&1 
 fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run
index f2c0813..28388b9 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run
@@ -1,5 +1,6 @@
 #!/bin/sh
 exec 2>&1
 sv start portmap
+sv start nfslock
 /etc/rc.d/netfs start
 
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run
index d8435a6..3b63077 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run
@@ -1,5 +1,9 @@
 #!/bin/bash
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting NFSD"
 
 # Make sure the statd daemon is up
 # (the statd service must ensure portmap is running first)
@@ -11,12 +15,15 @@ source /etc/conf.d/nfs
 /usr/sbin/exportfs -ra > /dev/null 2>/dev/null
 
 # start some nfsd threads
+printhl "	Using ${NFSD_OPTS} "
 /usr/sbin/rpc.nfsd -p  ${NFSD_OPTS} >/dev/null 2>/dev/null  
 
 # since we are running kernel 2.6 we should also
 # mount the nfsd virtual filesystem
+printhl "	mount nfsd"
 /bin/mount -t nfsd none /proc/fs/nfsd >/dev/null 2>/dev/null
 
 # Start the rpc.mountd daemon
+
 exec /usr/sbin/rpc.mountd --foreground  >/dev/null 2>/dev/null   
 
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run
index 0ec6f75..8d627ad 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run
@@ -1,4 +1,8 @@
 #!/bin/bash
 exec 2>&1
-sv start portmap  >/dev/null 2>/dev/null   
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting NFSlock"
+svwaitup portmap  >/dev/null 2>/dev/null   
 /usr/sbin/rpc.statd -F  >/dev/null 2>/dev/null   
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run
index 9aa27ec..9ed032b 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run
@@ -1,3 +1,9 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting NMBD"
+
+
 exec nmbd -F -S -d1  2>/dev/null >/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run
index 65e551c..146c4e0 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run
@@ -1,3 +1,10 @@
 #!/bin/sh
-/usr/bin/ntpdate pool.ntp.org
-exec /usr/bin/ntpd -n -p /var/run/ntpd.pid
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting NTPD"
+printhl "    Fetching time"
+msg=`/usr/bin/ntpdate pool.ntp.org `
+printhl "   $msg"
+
+exec /usr/bin/ntpd -n -p /var/run/ntpd.pid 2>/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run
index 687de8f..fe26e3f 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run
@@ -1,5 +1,8 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
 rm -f /usr/lib/oss/starting
 #exec /etc/rc.d/alsa-utils start all
 exec /usr/sbin/soundon
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run
index 561d65b..9e708e6 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run
@@ -1,3 +1,7 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting portmap"
 exec /sbin/portmap -d >/dev/null 2>/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish
new file mode 100755
index 0000000..7b77994
--- /dev/null
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+ . /etc/rc.conf
+ . /etc/rc.d/functions
+
+     stat_runit "Stopping smartd"
+     kill -9 `pidof /usr/sbin/smartd` &>/dev/null
+     rm_daemon smartd
+     stat_done
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run
new file mode 100755
index 0000000..15ed769
--- /dev/null
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+ . /etc/rc.conf
+ . /etc/rc.d/functions
+
+     stat_runit "Starting smartd"
+     /usr/sbin/smartd -n -c /etc/smartd.conf -q never &>/dev/null
+     if [ $? -ne 0 ]; then
+       stat_fail
+     else
+       add_daemon smartd
+       stat_done
+     fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run
index af77dcb..b4a545b 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run
@@ -1,3 +1,9 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Samba"
+
+
 exec smbd -F -S -d3 2>/dev/null >/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run
index a019e5d..fc22e3b 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run
@@ -1,20 +1,13 @@
 #!/bin/bash
 exec 2>&1
-nobodydir=/data/srv/.nobody_ssh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting SSH"
 
 [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; }
     [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; }
     [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; }
 
-if [ ! -f $nobodydir/id_dsa.pub ] 
-then
-	mkdir -p $nobodydir 
-	ssh-keygen -t dsa -N '' -f $nobodydir/id_dsa
-	mkdir -p /data/home/mythtv/.ssh
-	cp $nobodydir/id_dsa.pub /data/home/mythtv/.ssh/authorized_keys
-	chmod 700  /data/home/mythtv/.ssh/
-	chown -R mythtv:mythtv  /data/home/mythtv/.ssh/
-fi
-chown -R  nobody:nobody $nobodydir 
-chmod 700 $nobodydir 
+
 exec /usr/sbin/sshd -D >/dev/null 2>/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run
index eb56ace..8633a77 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run
@@ -1,3 +1,10 @@
 #!/bin/sh
 exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting syslog"
+
+
 exec /usr/sbin/syslog-ng -F
+
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run
new file mode 100755
index 0000000..d6fc863
--- /dev/null
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run
@@ -0,0 +1,9 @@
+#!/bin/sh
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting tatir" 
+
+
+exec /usr/bin/PyroUsb.py > /dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run
new file mode 100755
index 0000000..8f742ca
--- /dev/null
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting tftpd"
+
+
+exec /usr/sbin/in.tftpd --foreground -s /tftpboot
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run
index 3782aed..8db2924 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run
@@ -1,2 +1,7 @@
 #!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Agetty 2"
+
 exec /sbin/agetty 38400 vc/2 linux
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run
index ce66b0d..bdbec66 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run
@@ -1,2 +1,6 @@
 #!/bin/sh
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting Agetty 3"
 exec /sbin/agetty 38400 vc/3 linux
-- 
cgit v0.12


From 906cac4cb510655f9bde8d02dc40a684e448c705 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 20 Aug 2009 19:51:56 -0500
Subject: fftw2/gtk/glib: remove info dir

---
 abs/core-testing/fftw2/PKGBUILD   | 4 ++--
 abs/core-testing/glib/PKGBUILD    | 4 ++--
 abs/core-testing/glib/__changelog | 2 +-
 abs/core-testing/gtk/PKGBUILD     | 2 +-
 abs/core-testing/gtk/__changelog  | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/abs/core-testing/fftw2/PKGBUILD b/abs/core-testing/fftw2/PKGBUILD
index 4b95f97..18aa473 100644
--- a/abs/core-testing/fftw2/PKGBUILD
+++ b/abs/core-testing/fftw2/PKGBUILD
@@ -3,13 +3,13 @@
 
 pkgname=fftw2
 pkgver=2.1.5
-pkgrel=8
+pkgrel=9
 pkgdesc="FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. This is package is offering backwards compatibility version 2.x.y. of fftw."
 arch=(i686 x86_64)
 url="http://www.fftw.org/"
 license=('GPL2')
 depends=('glibc')
-options=(!libtool !emptydirs)
+options=(!libtool !emptydirs !docs)
 source=(http://www.fftw.org/fftw-${pkgver}.tar.gz)
 md5sums=('8d16a84f3ca02a785ef9eb36249ba433')
 
diff --git a/abs/core-testing/glib/PKGBUILD b/abs/core-testing/glib/PKGBUILD
index cb97a5b..42f4420 100644
--- a/abs/core-testing/glib/PKGBUILD
+++ b/abs/core-testing/glib/PKGBUILD
@@ -4,13 +4,13 @@
 
 pkgname=glib
 pkgver=1.2.10
-pkgrel=8
+pkgrel=10
 pkgdesc="Common C routines used by Gtk+ and other libs"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('LGPL')
 depends=('glibc')
-options=('!libtool' '!emptydirs')
+options=('!libtool' '!emptydirs' '!docs' )
 source=(ftp://ftp.gtk.org/pub/gtk/v1.2/$pkgname-$pkgver.tar.gz \
 	gcc340.patch \
 	aclocal-fixes.patch)
diff --git a/abs/core-testing/glib/__changelog b/abs/core-testing/glib/__changelog
index 93f6b06..f2439db 100644
--- a/abs/core-testing/glib/__changelog
+++ b/abs/core-testing/glib/__changelog
@@ -1 +1 @@
-added !emptydir to options
+added !emptydir !docs to options
diff --git a/abs/core-testing/gtk/PKGBUILD b/abs/core-testing/gtk/PKGBUILD
index bb47b2b..48c4972 100644
--- a/abs/core-testing/gtk/PKGBUILD
+++ b/abs/core-testing/gtk/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gtk
 pkgver=1.2.10
-pkgrel=10
+pkgrel=11
 pkgdesc="The GTK+ toolkit"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
diff --git a/abs/core-testing/gtk/__changelog b/abs/core-testing/gtk/__changelog
index 014bc64..5d6d4d6 100644
--- a/abs/core-testing/gtk/__changelog
+++ b/abs/core-testing/gtk/__changelog
@@ -1,2 +1,3 @@
 added !emptydir to options
+!docs
 
-- 
cgit v0.12


From 1f99f4fab216bf9e580c70dd80a591ab3b908dfb Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 20 Aug 2009 19:52:16 -0500
Subject: linhes-config: update mv_software.py for postfix

---
 abs/core-testing/LinHES-config/mv_software.py | 38 ++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/abs/core-testing/LinHES-config/mv_software.py b/abs/core-testing/LinHES-config/mv_software.py
index e5b96b2..7421e08 100755
--- a/abs/core-testing/LinHES-config/mv_software.py
+++ b/abs/core-testing/LinHES-config/mv_software.py
@@ -4,29 +4,47 @@ import os, re
 
 def setup_software(systemconfig, data_config):
     logging.info("____Start of Software install____")
-    default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews",
-                        "mythgame", "mythflix", "mythweather",
-                        "mythappletrailers", "mythstream", "mythvodka")
+    postfix=''
+    if data_config.SYSTEMTYPE == "MythVantage":
+      #look for the installed prefix
+      cmd="pacman -Q mythtv-release-fixes"
+      rc = mv_common.runcmd(cmd)
+      if rc == 0:
+        postfix = "-release-fixes"
+      else:
+        postfix = "-svn"
 
-    default_installed=("mythcontrols", "mythgallery", "mythmovies",
-                        "mythmusic", "mythsmolt", "mythvideo")
-    other_pkg=("miro", "xe", "romdb", "xine", "dvdcss", "webmin" , "fuppes")
+      default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews",
+                          "mythgame", "mythflix", "mythweather" )
+
+      default_installed=("mythcontrols", "mythgallery", "mythmovies",
+                          "mythmusic", "mythsmolt", "mythvideo")
+      other_pkg=("miro", "xe", "romdb", "xine", "dvdcss", "webmin" , "fuppes", "mythappletrailers", "mythstream", "mythvodka")
+    else:
+      default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews",
+                          "mythgame", "mythflix", "mythweather",
+                          "mythappletrailers", "mythstream", "mythvodka")
+
+      default_installed=("mythcontrols", "mythgallery", "mythmovies",
+                          "mythmusic", "mythsmolt", "mythvideo")
+      other_pkg=("miro", "xe", "romdb", "xine", "dvdcss", "webmin" , "fuppes")
 
     for pkg in default_disabled:
+        pkgname=pkg+postfix
         try:
             if systemconfig[pkg] == "1":
-                mv_common.pacinstall(pkg)
+                mv_common.pacinstall(pkgname)
             else:
-                mv_common.pacremove(pkg)
+                mv_common.pacremove(pkgname)
         except:
             logging.debug("  ERROR-- %s is not defined", pkg)
 
     for pkg in default_installed:
         try:
             if systemconfig[pkg] == "0":
-                mv_common.pacremove(pkg)
+                mv_common.pacremove(pkgname)
             else:
-                mv_common.pacinstall(pkg)
+                mv_common.pacinstall(pkgname)
         except:
             logging.debug("  ERROR-- %s is not defined", pkg)
 
-- 
cgit v0.12


From e067093b13fb71f9d928ccf7a1b3ce6dd0124795 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 21 Aug 2009 17:27:51 -0700
Subject: pciutils:Updated to fetch latest IDs.

---
 abs/core-testing/pciutils/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/core-testing/pciutils/PKGBUILD b/abs/core-testing/pciutils/PKGBUILD
index 9820582..d206022 100644
--- a/abs/core-testing/pciutils/PKGBUILD
+++ b/abs/core-testing/pciutils/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
 pkgver=3.0.0
-pkgrel=11
+pkgrel=12
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64)
 license=('GPL2')
-- 
cgit v0.12


From 079854f3f2d8eb546b08b5092f110c8e8fbae142 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 21 Aug 2009 17:30:40 -0700
Subject: mythappletrailers:Bumped.

---
 abs/extra-testing/mythappletrailers/PKGBUILD       |   2 +-
 .../mythappletrailers/appletrailer.xml             | 344 ++++++++++-----------
 .../mythappletrailers/myth_trailers_grabber        |   2 +-
 3 files changed, 159 insertions(+), 189 deletions(-)

diff --git a/abs/extra-testing/mythappletrailers/PKGBUILD b/abs/extra-testing/mythappletrailers/PKGBUILD
index ce1c793..87f3049 100644
--- a/abs/extra-testing/mythappletrailers/PKGBUILD
+++ b/abs/extra-testing/mythappletrailers/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mythappletrailers
 pkgver=0.04.3
-pkgrel=27
+pkgrel=28
 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 b7e5e6e..5ab84a7 100644
--- a/abs/extra-testing/mythappletrailers/appletrailer.xml
+++ b/abs/extra-testing/mythappletrailers/appletrailer.xml
@@ -2,781 +2,751 @@
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>2012</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/2012/2012-tlr2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/2012/2012-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>500 Days of Summer</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox_searchlight/500daysofsummer/500daysofsummer-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/500daysofsummer/500daysofsummer-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>9</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/focus_features/9/9-tlr2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/focus_features/9/9-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Adam</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox_searchlight/adam/adam-tlra_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/adam/adam-tlra_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/aliceinwonderland/aliceinwonderland-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Aliens In the Attic</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox/aliensintheattic/aliensintheattic-tlrg_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/aliensintheattic/aliensintheattic-tlrg_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>All About Steve</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox/allaboutsteve/allaboutsteve-tlra_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/allaboutsteve/allaboutsteve-tlrc_h640w.mov</action>
 	</button>
 
 	<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/theanswerman/theanswerman_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Armored</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/armored/armored-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/armored/armored-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Astro Boy</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/summit/astroboy/astroboy-tlr2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/astroboy/astroboy-tlr2_h640w.mov</action>
 	</button>
 
 	<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>
+		<text>Avatar</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/avatar/avatar2009aug0820a-tsr_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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/bandslam/bandslam-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Beyond a Reasonable Doubt</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/beyondareasonabledoubt/beyondareasonabledoubt_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/beyondareasonabledoubt/beyondareasonabledoubt_h640w.mov</action>
 	</button>
 
 	<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/thebluetoothvirgin/thebluetoothvirgin_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/thebox/thebox-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Brüno</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/universal/bruno/bruno-tlr_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/bruno/bruno-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Bright Star</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/brightstar/brightstar_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/brightstar/brightstar_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<text>The Burning Plain</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/theburningplain/theburningplain_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>
+		<text>Capitalism: a Love Story</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/untitledmichaelmooreproject/untitledmichaelmoore-tsr_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>
+		<text>Carriers</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount_vantage/carriers/carriers-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Cheri</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/miramax/cheri/cheri-tlr1_h640w.mov</action>
+		<text>Casi Divas</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/casidivas/casidivas_h640w.mov</action>
 	</button>
 
 	<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/cloudywithachance-tlr3_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/cocobeforechanel/cocobeforechanel_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Cold Souls</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/samuel_goldwyn/coldsouls/coldsouls_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/samuel_goldwyn/coldsouls/coldsouls_h640w.mov</action>
 	</button>
 
 	<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/couplesretreat/couplesretreat-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Cove</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/thecove/thecove_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Crypt</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/thecrypt/thecrypt_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/thecove/thecove_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/daybreakers/daybreakers-tlr1c_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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-tlr4_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/district9/district9-tlr4_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/aneducation/aneducation_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Extract</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/miramax/extract/extract-tsr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/miramax/extract/extract-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Fame</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/mgm/fame/fame-tlr2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/mgm/fame/fame-tlr4_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Fantastic Mr. Fox</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/fantasticmrfox/fantasticmrfox-tlra_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Final Destination</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/newline/thefinaldestination/thefinaldestination-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/newline/thefinaldestination/thefinaldestination-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/fiveminutesofheaven/fiveminutesofheaven_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Funny People</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/universal/funnypeople/funnypeople-tlr1r_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/funnypeople/funnypeople-tlr1r_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>G-Force</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/disney/gforce/gforce-tlr2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/gforce/gforce-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>G.I. Joe: Rise of Cobra</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount/gijoe/gijoetheriseofcobra-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/gijoe/gijoetheriseofcobra-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Gamer</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/lionsgate/gamer/gamer-tlr2a_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/gamer/gamer-tlr2a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Girl From Monaco</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/magnolia_pictures/girlfrommonaco/girlfrommonaco_h640w.mov</action>
+		<text>Gentlemen Broncos</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/gentlemenbroncos/gentlemenbroncos_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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount_vantage/thegoods/thegoods-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/grace/grace_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/halloween2/halloweenii-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Hangover</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/thehangover/thehangover-tlr2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/thehangover/thehangover-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Harry Potter and the Half-Blood Prince</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/wb/harrypotterandthehalfbloodprince/harrypotterhalfbloodprince-tlr4b_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/harrypotterandthehalfbloodprince/harrypotterhalfbloodprince-tlr4b_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Humpday</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/magnolia_pictures/humpday/humpday_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/humpday/humpday_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Hurt Locker</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/summit/thehurtlocker/thehurtlocker_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/thehurtlocker/thehurtlocker_h640w.mov</action>
 	</button>
 
 	<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-tlr2a_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>I Hate Valentine’s Day</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/ifc_films/ihatevalentinesday/ihatevalentinesday_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/icandobadallbymyself/icandobadallbymyself-tlr2a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>I Love You Beth Cooper</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox/iloveyoubethcooper/iloveyoubethcooper-tlra_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/iloveyoubethcooper/iloveyoubethcooper-tlra_h640w.mov</action>
 	</button>
 
 	<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Imagine That</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount/imaginethat/imaginethat-tlr2r_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/ice_age_iii/iceage3-tlrn_h640w.mov</action>
 	</button>
 
 	<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/theinformant/theinformant-tlr1_h640w.mov</action>
 	</button>
 
 	<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-tlr4_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/theinventionoflying/theinventionoflying-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>It Might Get Loud</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/itmightgetloud/itmightgetloud_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/itmightgetloud/itmightgetloud_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>It’s Complicated</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/universal/itscomplicated/itscomplicated_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/itscomplicated/itscomplicated_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Jennifer’s Body</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox/jennifersbody/jennifersbody-tlrc_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/jennifersbody/jennifersbody-tlrc_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Julie  Julia</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/julieandjulia/julieandjulia-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Land of the Lost</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/universal/landofthelost/landofthelost-tlr5_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/julieandjulia/julieandjulia-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Last Airbender</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount/thelastairbender/thelastairbender-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/thelastairbender/thelastairbender-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Life Is Hot In Cracktown</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/lifeishotincracktown/lifeishotincracktown_h640w.mov</action>
+		<text>Law Abiding Citizen</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/lawabidingcitizen/lawabidingcitizen_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<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>
+		<text>Legion</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/legion/legion-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<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>
+		<text>Live Music</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/livemusic/livemusic_h640w.mov</action>
 	</button>
 
 	<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/lornassilence/lornassilence_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/lovehappens/lovehappens-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Lovely Bones</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount/thelovelybones/thelovelybones_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/thelovelybones/thelovelybones_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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/morethanagame/morethanagame-tlr1a_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>My One and Only</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/myoneandonly/myoneandonly_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>My Sister’s Keeper</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/newline/mysisterskeeper/mysisterskeeper-tlr1_h640w.mov</action>
+		<text>New York, I Love You</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/newyorkiloveyou/newyorkiloveyou_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Night At the Museum: Battle of the Smithsonian</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox/nightatthemuseum2/nightatthemuseum2-tlro_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/nightatthemuseum2/nightatthemuseum2-tlro_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Nine</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/weinstein/nine/nine-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/nine/nine-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/ninjaassassin/ninjaassassin-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Oceans</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/disney/oceans/oceans-tsr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/oceans/oceans-tsr1_h640w.mov</action>
 	</button>
 
 	<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/olddogs/olddogs_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Ong Bak 2</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/magnolia_pictures/ongbak2/ongbak2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/ongbak2/ongbak2_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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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-tl1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/pandorum/pandorum-tl1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Paper Heart</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/paperheart/paperheart_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/paperheart/paperheart_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Paris</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/ifc_films/paris/paris_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/paris/paris_h640w.mov</action>
 	</button>
 
 	<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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-tlr2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/playthegame/playthegame_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Ponyo</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/disney/ponyo/ponyo_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/ponyo/ponyo_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Post Grad</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/fox_searchlight/postgrad/postgrad-tlra_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/postgrad/postgrad-tlra_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Precious</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/lionsgate/precious/precious-tlr2a_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/precious/precious-tlr2a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Princess and the Frog</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/disney/princessandthefrog/princessandthefrog-tsr2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/princessandthefrog/princessandthefrog-tsr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Proposal</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/touchstone/theproposal/theproposal-tlr3_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/touchstone/theproposal/theproposal-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Public Enemies</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/universal/publicenemies/publicenemies-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/publicenemies/publicenemies-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Road</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/weinstein/theroad/theroad_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/theroad/theroad_h640w.mov</action>
+	</button>
+
+	<button>
+		<type>VIDEO_BROWSER</type>
+		<text>Saw VI</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/saw6/sawvi_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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-tlr2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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-tlr3_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/shorts/shorts-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Shrink</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/lionsgate/shrink/shrink-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/shrink/shrink-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Shutter Island</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount/shutterisland/shutterisland-tlr1r_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/shutterisland/shutterisland-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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/sororityrow/sororityrow-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Soul Power</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/soulpower/soulpower_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/soulpower/soulpower_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Spread</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/spread/spread_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/spread/spread_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Star Trek</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount/star_trek/startrek-tlr3_h640w.mov</action>
+		<text>St. Trinian’s</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/sttrinians/sttrinians_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Stepfather</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/thestepfather/thestepfather_h640w.mov</action>
+		<text>Star Trek</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/star_trek/startrek-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Stoning of Soraya M.</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/thestoningofsorayam/thestoningofsorayam_h640w.mov</action>
+		<text>The Stepfather</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/thestepfather/thestepfather_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>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Surveillance</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/magnolia_pictures/surveillance/surveillance_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/touchstone/surrogates/surrogates-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/survivingcrookedlake/survivingcrookedlake_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Taking Woodstock</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/focus_features/takingwoodstock/takingwoodstock-tlr_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/focus_features/takingwoodstock/takingwoodstock-tlr_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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/newline/timetravelerswife/timetravelerswife-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Toy Story 3</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/disney/toystory3/toystory3-tsr_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Transformers: Revenge of the Fallen</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/paramount/transformers2/transformersrevengeofthefallen-tlr2r_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/toystory3/toystory3-tsr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Twilight Saga: New Moon</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/summit/newmoon/newmoon-tsr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/newmoon/newmoon-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Ugly Truth</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/theuglytruth/theuglytruth-tlr2_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/theuglytruth/theuglytruth-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/waltandelgrupo/waltandelgrupo_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/weathergirl/weathergirl_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>What Goes Up</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/independent/whatgoesup/whatgoesup-tlr_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Whatever Works</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony/whateverworks/whateverworks_h640w.mov</action>
+		<text>Where the Wild Things Are</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/wherethewildthingsare/wtwta-tlr2_h640w.mov</action>
 	</button>
 
 	<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/wtwta-tlr3_h640w.mov</action>
+		<text>Whip It</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/whipit/whipit_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>
+		<text>White On Rice</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/whiteonrice/whiteonrice_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>
+		<text>Whiteout</text>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/whiteout/whiteout-tlr1_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>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/worldsgreatestdad/worldsgreatestdad_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>X Games 3D: the Movie</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/disney/xgames3d/xgames3d_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/xgames3d/xgames3d_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Zombieland</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000 http://movies.apple.com/movies/sony_pictures/zombieland/zombieland-tlr1_h640w.mov</action>
+		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/zombieland/zombieland-tlr1_h640w.mov</action>
 	</button>
 
 </mythmenu>
diff --git a/abs/extra-testing/mythappletrailers/myth_trailers_grabber b/abs/extra-testing/mythappletrailers/myth_trailers_grabber
index 2039d7c..8743840 100755
--- a/abs/extra-testing/mythappletrailers/myth_trailers_grabber
+++ b/abs/extra-testing/mythappletrailers/myth_trailers_grabber
@@ -30,7 +30,7 @@
 // CONFIGURATION
 
 // command to use when streaming content from the internet - cache 50% before displaying and use 32MB of memory
-$STREAMING_EXEC_CMD		= 'mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent NSPlayer -cache 16000';
+$STREAMING_EXEC_CMD		= 'mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000';
 $APPLE_FEED = 'http://www.apple.com/trailers/home/xml/current.xml';
 /************************************************************************/
 // Shouldn't Need To modify anything beyond here
-- 
cgit v0.12


From 7c50483a24f3972c6de42dbd9b8d7dfdbd9f82c9 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 21 Aug 2009 22:16:31 -0700
Subject: mythappletrailers:Loading . . .

---
 abs/extra-testing/mythappletrailers/PKGBUILD       |   6 +-
 .../mythappletrailers/appletrailer.xml             | 250 ++++++++++-----------
 abs/extra-testing/mythappletrailers/loading.sh     |   2 +
 .../mythappletrailers/myth_trailers_grabber        |   2 +-
 4 files changed, 132 insertions(+), 128 deletions(-)
 create mode 100755 abs/extra-testing/mythappletrailers/loading.sh

diff --git a/abs/extra-testing/mythappletrailers/PKGBUILD b/abs/extra-testing/mythappletrailers/PKGBUILD
index 87f3049..7cb7f7a 100644
--- a/abs/extra-testing/mythappletrailers/PKGBUILD
+++ b/abs/extra-testing/mythappletrailers/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mythappletrailers
 pkgver=0.04.3
-pkgrel=28
+pkgrel=29
 pkgdesc="Unofficial Add-on for MythTV to get Apple.com Movie Trailers."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -11,7 +11,7 @@ url="http://www.mythtv.org/wiki/index.php/Myth_Apple_Trailers"
 depends=('php' 'mythtv' 'mplayer-wrapper')
 install=mythappletrailers.install
 source=('myth_trailers_grabber' 'appletrailer.xml'
-	'trailers')
+	'trailers' 'loading.sh')
 
 build() {
   mkdir -p $startdir/pkg/usr/bin
@@ -22,6 +22,8 @@ build() {
   chown 1000:1000 $startdir/pkg/home/mythtv/appletrailer.xml
   chmod 755 trailers
   chmod 755 myth_trailers_grabber
+  chmod 755 loading.sh 
   cp myth_trailers_grabber $startdir/pkg/usr/bin/
+  cp loading.sh $startdir/pkg/usr/bin/
   cp trailers $startdir/pkg/etc/cron.daily/
 }
diff --git a/abs/extra-testing/mythappletrailers/appletrailer.xml b/abs/extra-testing/mythappletrailers/appletrailer.xml
index 5ab84a7..11f5f9d 100644
--- a/abs/extra-testing/mythappletrailers/appletrailer.xml
+++ b/abs/extra-testing/mythappletrailers/appletrailer.xml
@@ -2,751 +2,751 @@
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>2012</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/2012/2012-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/2012/2012-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>500 Days of Summer</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/500daysofsummer/500daysofsummer-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/500daysofsummer/500daysofsummer-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>9</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/focus_features/9/9-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/focus_features/9/9-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Adam</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/adam/adam-tlra_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/adam/adam-tlra_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Alice In Wonderland</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/aliceinwonderland/aliceinwonderland-tsr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/aliceinwonderland/aliceinwonderland-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Aliens In the Attic</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/aliensintheattic/aliensintheattic-tlrg_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/aliensintheattic/aliensintheattic-tlrg_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>All About Steve</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/allaboutsteve/allaboutsteve-tlrc_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/allaboutsteve/allaboutsteve-tlrc_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Alvin and the Chipmunks: the Squeakquel</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/alvinandthechipmunks2/alvinsqueekquel-tlrd_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/amelia/amelia-tlra_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/theanswerman/theanswerman_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/theanswerman/theanswerman_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Armored</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/armored/armored-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/armored/armored-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Astro Boy</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/astroboy/astroboy-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/astroboy/astroboy-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Avatar</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/avatar/avatar2009aug0820a-tsr_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/avatar/avatar2009aug0820a-tsr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Bandslam</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/bandslam/bandslam-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/bandslam/bandslam-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Beyond a Reasonable Doubt</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/beyondareasonabledoubt/beyondareasonabledoubt_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/beyondareasonabledoubt/beyondareasonabledoubt_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Big Fan</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/bigfan/bigfan_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/thebluetoothvirgin/thebluetoothvirgin_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/thebluetoothvirgin/thebluetoothvirgin_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Book of Eli</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/thebookofeli/thebookofeli-tlr1a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/thebox/thebox-tlr1a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/thebox/thebox-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Brüno</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/bruno/bruno-tlr_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/bruno/bruno-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Bright Star</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/brightstar/brightstar_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/brightstar/brightstar_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Brothers</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/brothers/brothers-tlr1a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/brothers/brothers-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Burning Plain</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/theburningplain/theburningplain_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/theburningplain/theburningplain_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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/untitledmichaelmooreproject/untitledmichaelmoore-tsr_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/untitledmichaelmooreproject/untitledmichaelmoore-tsr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Carriers</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount_vantage/carriers/carriers-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/casidivas/casidivas_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/casidivas/casidivas_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Cloudy With a Chance of Meatballs</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/cloudywithachanceofmeatballs/cloudywithachance-tlr3_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/cocobeforechanel/cocobeforechanel_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/cocobeforechanel/cocobeforechanel_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Cold Souls</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/samuel_goldwyn/coldsouls/coldsouls_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/samuel_goldwyn/coldsouls/coldsouls_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Collector</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/thecollector/thecollector_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/couplesretreat/couplesretreat-tlr_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/couplesretreat/couplesretreat-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Cove</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/thecove/thecove_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/thecove/thecove_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Damned United</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/thedamnedunited/thedamnedunited_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/daybreakers/daybreakers-tlr1c_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/daybreakers/daybreakers-tlr1c_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Despicable Me</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/despicableme/despicableme-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/district9/district9-tlr4_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/district9/district9-tlr4_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>An Education</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/aneducation/aneducation_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/aneducation/aneducation_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Extract</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/miramax/extract/extract-tsr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/miramax/extract/extract-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Fame</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/mgm/fame/fame-tlr4_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/mgm/fame/fame-tlr4_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Fantastic Mr. Fox</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/fantasticmrfox/fantasticmrfox-tlra_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/fantasticmrfox/fantasticmrfox-tlra_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Final Destination</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/newline/thefinaldestination/thefinaldestination-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/newline/thefinaldestination/thefinaldestination-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Five Minutes of Heaven</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/fiveminutesofheaven/fiveminutesofheaven_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/fiveminutesofheaven/fiveminutesofheaven_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Funny People</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/funnypeople/funnypeople-tlr1r_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/funnypeople/funnypeople-tlr1r_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>G-Force</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/gforce/gforce-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/gforce/gforce-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>G.I. Joe: Rise of Cobra</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/gijoe/gijoetheriseofcobra-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/gijoe/gijoetheriseofcobra-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Gamer</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/gamer/gamer-tlr2a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/gamer/gamer-tlr2a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Gentlemen Broncos</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/gentlemenbroncos/gentlemenbroncos_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/gentlemenbroncos/gentlemenbroncos_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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount_vantage/thegoods/thegoods-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount_vantage/thegoods/thegoods-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Grace</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/grace/grace_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/grace/grace_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Halloween 2</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/halloween2/halloweenii-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/halloween2/halloweenii-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Hangover</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/thehangover/thehangover-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/thehangover/thehangover-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Harry Potter and the Half-Blood Prince</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/harrypotterandthehalfbloodprince/harrypotterhalfbloodprince-tlr4b_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/harrypotterandthehalfbloodprince/harrypotterhalfbloodprince-tlr4b_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Humpday</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/humpday/humpday_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/humpday/humpday_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Hurt Locker</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/thehurtlocker/thehurtlocker_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/thehurtlocker/thehurtlocker_h640w.mov</action>
 	</button>
 
 	<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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/icandobadallbymyself/icandobadallbymyself-tlr2a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/icandobadallbymyself/icandobadallbymyself-tlr2a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>I Love You Beth Cooper</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/iloveyoubethcooper/iloveyoubethcooper-tlra_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/iloveyoubethcooper/iloveyoubethcooper-tlra_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>I Sell the Dead</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/isellthedead/isellthedead_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/ice_age_iii/iceage3-tlrn_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/ice_age_iii/iceage3-tlrn_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>In the Loop</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/intheloop/intheloop_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/theinformant/theinformant-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/theinformant/theinformant-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Inglourious Basterds</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/inglouriousbasterds/inglouriousbasterds-tlr4_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/theinventionoflying/theinventionoflying-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/theinventionoflying/theinventionoflying-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>It Might Get Loud</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/itmightgetloud/itmightgetloud_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/itmightgetloud/itmightgetloud_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>It’s Complicated</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/itscomplicated/itscomplicated_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/itscomplicated/itscomplicated_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Jennifer’s Body</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/jennifersbody/jennifersbody-tlrc_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/jennifersbody/jennifersbody-tlrc_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Julie  Julia</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/julieandjulia/julieandjulia-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/julieandjulia/julieandjulia-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Last Airbender</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/thelastairbender/thelastairbender-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/thelastairbender/thelastairbender-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Law Abiding Citizen</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/lawabidingcitizen/lawabidingcitizen_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/lawabidingcitizen/lawabidingcitizen_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Legion</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/legion/legion-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/legion/legion-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Live Music</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/livemusic/livemusic_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/livemusic/livemusic_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Lorna’s Silence</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/lornassilence/lornassilence_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/lornassilence/lornassilence_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Love Happens</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/lovehappens/lovehappens-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/lovehappens/lovehappens-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Lovely Bones</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/thelovelybones/thelovelybones_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/thelovelybones/thelovelybones_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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/morethanagame/morethanagame-tlr1a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/morethanagame/morethanagame-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>My One and Only</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/myoneandonly/myoneandonly_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/myoneandonly/myoneandonly_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>New York, I Love You</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/newyorkiloveyou/newyorkiloveyou_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/newyorkiloveyou/newyorkiloveyou_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Night At the Museum: Battle of the Smithsonian</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/nightatthemuseum2/nightatthemuseum2-tlro_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox/nightatthemuseum2/nightatthemuseum2-tlro_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Nine</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/nine/nine-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/nine/nine-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Ninja Assassin</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/ninjaassassin/ninjaassassin-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/ninjaassassin/ninjaassassin-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Oceans</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/oceans/oceans-tsr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/oceans/oceans-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Old Dogs</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/olddogs/olddogs_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/olddogs/olddogs_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Ong Bak 2</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/ongbak2/ongbak2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/ongbak2/ongbak2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Orphan</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/orphan/orphan-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/theotherman/theotherman_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/pandorum/pandorum-tl1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/pandorum/pandorum-tl1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Paper Heart</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/paperheart/paperheart_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/paperheart/paperheart_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Paris</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/paris/paris_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/ifc_films/paris/paris_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>A Perfect Getaway</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/aperfectgetaway/aperfectgetaway_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/planet51/planet51-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/playthegame/playthegame_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/playthegame/playthegame_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Ponyo</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/ponyo/ponyo_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/ponyo/ponyo_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Post Grad</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/postgrad/postgrad-tlra_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/postgrad/postgrad-tlra_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Precious</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/precious/precious-tlr2a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/precious/precious-tlr2a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Princess and the Frog</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/princessandthefrog/princessandthefrog-tsr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/princessandthefrog/princessandthefrog-tsr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Proposal</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/touchstone/theproposal/theproposal-tlr3_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/touchstone/theproposal/theproposal-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Public Enemies</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/publicenemies/publicenemies-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/universal/publicenemies/publicenemies-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Road</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/theroad/theroad_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/weinstein/theroad/theroad_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Saw VI</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/saw6/sawvi_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/saw6/sawvi_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The September Issue</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/theseptemberissue/theseptemberissue_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/sherlockholmes/sherlockholmes-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/shorts/shorts-tlr3_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/shorts/shorts-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Shrink</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/shrink/shrink-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/lionsgate/shrink/shrink-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Shutter Island</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/shutterisland/shutterisland-tlr1r_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/shutterisland/shutterisland-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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/sororityrow/sororityrow-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/sororityrow/sororityrow-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Soul Power</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/soulpower/soulpower_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony/soulpower/soulpower_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Spread</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/spread/spread_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/spread/spread_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>St. Trinian’s</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/sttrinians/sttrinians_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/sttrinians/sttrinians_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Star Trek</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/star_trek/startrek-tlr3_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/paramount/star_trek/startrek-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Stepfather</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/thestepfather/thestepfather_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/thestepfather/thestepfather_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Surrogates</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/touchstone/surrogates/surrogates-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/touchstone/surrogates/surrogates-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Surviving Crooked Lake</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/survivingcrookedlake/survivingcrookedlake_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/survivingcrookedlake/survivingcrookedlake_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Taking Woodstock</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/focus_features/takingwoodstock/takingwoodstock-tlr_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/focus_features/takingwoodstock/takingwoodstock-tlr_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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/newline/timetravelerswife/timetravelerswife-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/newline/timetravelerswife/timetravelerswife-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Toy Story 3</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/toystory3/toystory3-tsr_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/toystory3/toystory3-tsr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Twilight Saga: New Moon</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/newmoon/newmoon-tsr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/summit/newmoon/newmoon-tsr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>The Ugly Truth</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/theuglytruth/theuglytruth-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/theuglytruth/theuglytruth-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Walt  El Grupo</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/waltandelgrupo/waltandelgrupo_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/waltandelgrupo/waltandelgrupo_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Weather Girl</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/weathergirl/weathergirl_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/weathergirl/weathergirl_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Where the Wild Things Are</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/wherethewildthingsare/wtwta-tlr2_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/wherethewildthingsare/wtwta-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Whip It</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/fox_searchlight/whipit/whipit_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/whiteonrice/whiteonrice_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/independent/whiteonrice/whiteonrice_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Whiteout</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/whiteout/whiteout-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/wb/whiteout/whiteout-tlr1_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 "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/worldsgreatestdad/worldsgreatestdad_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/magnolia_pictures/worldsgreatestdad/worldsgreatestdad_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>X Games 3D: the Movie</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/xgames3d/xgames3d_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/disney/xgames3d/xgames3d_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Zombieland</text>
-		<action>EXEC mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/zombieland/zombieland-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://movies.apple.com/movies/sony_pictures/zombieland/zombieland-tlr1_h640w.mov</action>
 	</button>
 
 </mythmenu>
diff --git a/abs/extra-testing/mythappletrailers/loading.sh b/abs/extra-testing/mythappletrailers/loading.sh
new file mode 100755
index 0000000..d1ef680
--- /dev/null
+++ b/abs/extra-testing/mythappletrailers/loading.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo -e "Loading . . . " | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 10 -A centre
diff --git a/abs/extra-testing/mythappletrailers/myth_trailers_grabber b/abs/extra-testing/mythappletrailers/myth_trailers_grabber
index 8743840..ae32e75 100755
--- a/abs/extra-testing/mythappletrailers/myth_trailers_grabber
+++ b/abs/extra-testing/mythappletrailers/myth_trailers_grabber
@@ -30,7 +30,7 @@
 // CONFIGURATION
 
 // command to use when streaming content from the internet - cache 50% before displaying and use 32MB of memory
-$STREAMING_EXEC_CMD		= 'mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000';
+$STREAMING_EXEC_CMD		= 'loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000';
 $APPLE_FEED = 'http://www.apple.com/trailers/home/xml/current.xml';
 /************************************************************************/
 // Shouldn't Need To modify anything beyond here
-- 
cgit v0.12


From d02df784ac023ceef4394948111a921c4f860c44 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 22 Aug 2009 01:03:18 -0700
Subject: pmount:initial inclusion.

---
 abs/extra-testing/pmount/PKGBUILD                | 27 ++++++++++++++++++++++++
 abs/extra-testing/pmount/pmount-dbus-close.patch | 11 ++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 abs/extra-testing/pmount/PKGBUILD
 create mode 100644 abs/extra-testing/pmount/pmount-dbus-close.patch

diff --git a/abs/extra-testing/pmount/PKGBUILD b/abs/extra-testing/pmount/PKGBUILD
new file mode 100644
index 0000000..2270b07
--- /dev/null
+++ b/abs/extra-testing/pmount/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 29588 2009-03-10 06:17:31Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=pmount
+pkgver=0.9.19
+pkgrel=2
+pkgdesc="mount removable devices as normal user"
+arch=(i686 x86_64)
+license=('GPL2')
+url="http://pmount.alioth.debian.org/"
+backup=('etc/pmount.allow')
+depends=('sysfsutils>=2.0.0-1' 'bash' 'hal>=0.5.11')
+makedepends=('intltool')
+source=(http://alioth.debian.org/frs/download.php/2867/${pkgname}-${pkgver}.tar.gz
+	pmount-dbus-close.patch)
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # we have a shared connection! patch it to work correct
+  patch -Np1 -i ${srcdir}/pmount-dbus-close.patch || return 1
+  ./configure --prefix=/usr --with-cryptsetup-prog=/usr/sbin/cryptsetup || return 1
+  make || return 1 
+  make DESTDIR="${pkgdir}" install || return 1
+}
+
+md5sums=('2fd9fe103375dbd0c91af2f302250a8c'
+         'b7ea1afd82ffebf510dc89f74cd39f09')
diff --git a/abs/extra-testing/pmount/pmount-dbus-close.patch b/abs/extra-testing/pmount/pmount-dbus-close.patch
new file mode 100644
index 0000000..06ffa2b
--- /dev/null
+++ b/abs/extra-testing/pmount/pmount-dbus-close.patch
@@ -0,0 +1,11 @@
+diff -ruN pmount-0.9.13/src/pmount-hal.c pmount-0.9.13-new/src/pmount-hal.c
+--- pmount-0.9.13/src/pmount-hal.c	2006-08-15 22:31:02.000000000 +0200
++++ pmount-0.9.13-new/src/pmount-hal.c	2007-02-05 12:01:09.000000000 +0100
+@@ -361,7 +361,6 @@
+     /* shut down hal connection */
+     libhal_ctx_shutdown( hal_ctx, &error );
+     libhal_ctx_free( hal_ctx );
+-    dbus_connection_close( dbus_conn );
+     dbus_connection_unref( dbus_conn );
+ 
+     /* go */
-- 
cgit v0.12


From 18ae17328b876ce477b2f697c49da16f150f36c6 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 22 Aug 2009 01:03:45 -0700
Subject: skvm:initial inclusion.  lightweight volume manager.

---
 abs/core-testing/skvm-hg/PKGBUILD     | 52 +++++++++++++++++++++++++++++++++++
 abs/core-testing/skvm-hg/finish       |  3 ++
 abs/core-testing/skvm-hg/run          |  8 ++++++
 abs/core-testing/skvm-hg/skvm.install | 10 +++++++
 4 files changed, 73 insertions(+)
 create mode 100644 abs/core-testing/skvm-hg/PKGBUILD
 create mode 100755 abs/core-testing/skvm-hg/finish
 create mode 100755 abs/core-testing/skvm-hg/run
 create mode 100644 abs/core-testing/skvm-hg/skvm.install

diff --git a/abs/core-testing/skvm-hg/PKGBUILD b/abs/core-testing/skvm-hg/PKGBUILD
new file mode 100644
index 0000000..bd4c0f5
--- /dev/null
+++ b/abs/core-testing/skvm-hg/PKGBUILD
@@ -0,0 +1,52 @@
+# Contributor: Ondrej Martinak <omartinak@gmail.com>
+
+pkgname=skvm-hg
+pkgver=0.1
+pkgrel=2
+pkgdesc="A lightweight volume manager"
+arch=('i686' 'x86_64')
+url="http://code.suckless.org/hg/skvm"
+license=('MIT')
+depends=('hal' 'dbus')
+makedepends=('mercurial')
+conflicts=('skvm')
+provides=('skvm')
+source=('run' 'finish')
+install=skvm.install
+_hgroot="http://code.suckless.org/hg/skvm"
+_hgname="skvm"
+
+build() {
+	cd ${srcdir}
+	
+	msg "Connecting to mercurial server..."
+	
+	if [ -d $_hgname ]; then
+		cd $_hgname && hg pull
+		cd ..
+		msg "The local files are updated."
+	else
+		hg clone $_hgroot
+	fi
+	
+	msg "Mercurial checkout done or server timeout."
+	msg "Starting make..."
+	
+	rm -rf $_hgname-build
+	cp -r $_hgname $_hgname-build
+	cd $_hgname-build
+	
+	make || return 1
+	
+	mkdir -p ${startdir}/pkg/usr/bin
+	mkdir -p ${startdir}/pkg/etc/rc.d
+	mkdir -p ${startdir}/pkg/usr/local/share/man/man1
+	mkdir -p ${startdir}/pkg/etc/sv/skvm/supervise
+	
+	install -m 755 skvm ${startdir}/pkg/usr/bin/skvm
+	install -m 755 init/skvm ${startdir}/pkg/etc/rc.d/skvm
+	sed "s/VERSION/${pkgver}/g" < skvm.1 > ${startdir}/pkg/usr/local/share/man/man1/skvm.1
+	chmod 644 ${startdir}/pkg/usr/local/share/man/man1/skvm.1
+	install -m 755 ${startdir}/src/run ${startdir}/pkg/etc/sv/skvm
+	install -m 755 ${startdir}/src/finish ${startdir}/pkg/etc/sv/skvm
+}
diff --git a/abs/core-testing/skvm-hg/finish b/abs/core-testing/skvm-hg/finish
new file mode 100755
index 0000000..206250c
--- /dev/null
+++ b/abs/core-testing/skvm-hg/finish
@@ -0,0 +1,3 @@
+#!/bin/bash
+exec 2>&1
+sv down skvm
diff --git a/abs/core-testing/skvm-hg/run b/abs/core-testing/skvm-hg/run
new file mode 100755
index 0000000..188f5d8
--- /dev/null
+++ b/abs/core-testing/skvm-hg/run
@@ -0,0 +1,8 @@
+#!/bin/bash
+exec 2>&1
+export TERM=linux
+./etc/rc.conf
+./etc/rc.d/functions
+svwaitup hal 2>/dev/null 1>/dev/null
+stat_runit "Starting skvm"
+exec /etc/rc.d/skvm start
diff --git a/abs/core-testing/skvm-hg/skvm.install b/abs/core-testing/skvm-hg/skvm.install
new file mode 100644
index 0000000..1f82467
--- /dev/null
+++ b/abs/core-testing/skvm-hg/skvm.install
@@ -0,0 +1,10 @@
+# arg 1:  the new package version
+post_install() {
+  add_service.sh skvm
+  sv start skvm
+}
+
+post_remove() {
+	sv down skvm
+	remove_service.sh skvm
+}
-- 
cgit v0.12


From 0a8879b136ff2134bcaa608ab8d02ec50efbc23a Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 22 Aug 2009 19:05:40 -0700
Subject: udev:Let's make automounting just work for USB storage devices.

---
 abs/core-testing/udev/PKGBUILD          | 10 +++++--
 abs/core-testing/udev/__changelog       |  1 +
 abs/core-testing/udev/mount-usb         | 51 +++++++++++++++++++++++++++++++++
 abs/core-testing/udev/usb-storage.rules | 11 +++----
 4 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 abs/core-testing/udev/__changelog
 create mode 100644 abs/core-testing/udev/mount-usb

diff --git a/abs/core-testing/udev/PKGBUILD b/abs/core-testing/udev/PKGBUILD
index cd1a312..1acfb02 100644
--- a/abs/core-testing/udev/PKGBUILD
+++ b/abs/core-testing/udev/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=udev
 pkgver=135
-pkgrel=5
+pkgrel=6
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -24,7 +24,7 @@ conflicts=('initscripts<2008.02')
 options=(!makeflags)
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
         81-arch.rules load-modules.sh resolve-modalias.c cdsymlinks.sh root-link.sh
-        arch-udev-rules.patch readme-udev-arch.txt usb-storage.rules udev-ntfs-3g.patch)
+        arch-udev-rules.patch readme-udev-arch.txt usb-storage.rules udev-ntfs-3g.patch mount-usb)
 md5sums=('661b9df34e1304dad10f595d95b472bb'
          '3a955ca8e2122a48a223f9d8adf87b70'
          'f4951f61438d69894b728212dac7318b'
@@ -48,7 +48,11 @@ build() {
 
   # Non-stock rules still go in /etc
   install -D -m644 $srcdir/81-arch.rules $pkgdir/etc/udev/rules.d/81-arch.rules
-#  install -D -m644 $srcdir/usb-storage.rules $pkgdir/etc/udev/rules.d/usb-storage.rules
+  install -D -m644 $srcdir/usb-storage.rules $pkgdir/etc/udev/rules.d/usb-storage.rules
+
+  # Scripts needed
+  mkdir $pkgdir/etc/udev/scripts
+  install -D -m744 $srcdir/mount-usb $pkgdir/etc/udev/scripts
 
   # install our module loading subsystem
   install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh
diff --git a/abs/core-testing/udev/__changelog b/abs/core-testing/udev/__changelog
new file mode 100644
index 0000000..7e00323
--- /dev/null
+++ b/abs/core-testing/udev/__changelog
@@ -0,0 +1 @@
+Added usb-storage.rule and script to un/mount USB drives.
diff --git a/abs/core-testing/udev/mount-usb b/abs/core-testing/udev/mount-usb
new file mode 100644
index 0000000..2d3b3f5
--- /dev/null
+++ b/abs/core-testing/udev/mount-usb
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+
+DIR=/media
+DEVICE=$2
+LABEL=`/lib/udev/vol_id -L /dev/$DEVICE`
+FS=`/lib/udev/vol_id -t /dev/$DEVICE`
+
+
+mount_device () {
+    if [ "$LABEL" == "" ];
+      then
+      mkdir -p $DIR/usb-$DEVICE
+      case $FS in 
+        vfat)    /bin/mount -t vfat -o rw,noauto,flush,quiet,nodev,nosuid,noexec,noatime,dmask=000,fmask=111 /dev/$DEVICE $DIR/usb-$DEVICE
+        ;; 
+        *)    /bin/mount -t auto -o rw,noauto,sync,dirsync,noexec,nodev,noatime /dev/$DEVICE $DIR/usb-$DEVICE
+        ;;
+      esac
+    else
+	mkdir -p $DIR/$LABEL
+      echo $LABEL >$DIR/.$DEVICE
+      case $FS in 
+        vfat)    /bin/mount -t vfat -o rw,noauto,flush,quiet,nodev,nosuid,noexec,noatime,dmask=000,fmask=111 /dev/$DEVICE $DIR/$LABEL
+        ;; 
+        *)    /bin/mount -t auto -o rw,noauto,sync,dirsync,noexec,nodev,noatime /dev/$DEVICE $DIR/$LABEL
+        ;;
+      esac
+    fi
+}
+
+umount_device () {
+    if [ -e $DIR/usb-$DEVICE ];
+      then
+      umount -l $DIR/usb-$DEVICE
+      rmdir $DIR/usb-$DEVICE;
+    else
+      ULABEL=`cat $DIR/.$DEVICE`
+      umount -l $DIR/$ULABEL
+      rmdir $DIR/$ULABEL
+      rm $DIR/.$DEVICE;
+	fi
+}
+
+case $1 in 
+  mount) mount_device
+  ;;
+  umount) umount_device
+  ;;
+  *) echo "Usage: mount-usb mount/umount sdxY"
+esac
diff --git a/abs/core-testing/udev/usb-storage.rules b/abs/core-testing/udev/usb-storage.rules
index 97cdca3..86eca8e 100644
--- a/abs/core-testing/udev/usb-storage.rules
+++ b/abs/core-testing/udev/usb-storage.rules
@@ -1,7 +1,4 @@
-KERNEL=="sd[a-z]", NAME="%k", SYMLINK+="usb%m", GROUP="users", OPTIONS="last_rule"
-ACTION=="add", KERNEL=="sd[a-z][0-9]", SYMLINK+="usb%n", GROUP="users", NAME="%k"
-ACTION=="add", KERNEL=="sd[a-z][0-9]", RUN+="/bin/mkdir -p /media/usb%n"
-ACTION=="add", KERNEL=="sd[a-z][0-9]", PROGRAM=="/lib/udev/vol_id -t %N", RESULT=="vfat", RUN+="/bin/mount -t vfat -o rw,noauto,flush,quiet,nodev,nosuid,noexec,noatime,dmask=000,fmask=111 /dev/%k /media/usb%n", OPTIONS="last_rule"
-ACTION=="add", KERNEL=="sd[a-z][0-9]", RUN+="/bin/mount -t auto -o rw,noauto,sync,dirsync,noexec,nodev,noatime /dev/%k /media/usb%n", OPTIONS="last_rule"
-ACTION=="remove", KERNEL=="sd[a-z][0-9]", RUN+="/bin/umount -l /media/usb%n"
-ACTION=="remove", KERNEL=="sd[a-z][0-9]", RUN+="/bin/rmdir /media/usb%n", OPTIONS="last_rule"
+SUBSYSTEMS=="usb", KERNEL=="sd[b-z]", NAME="%k", SYMLINK+="usb-%k", GROUP="users", OPTIONS="last_rule"
+ACTION=="add", SUBSYSTEMS=="usb", KERNEL=="sd[b-z][0-9]", SYMLINK+="usb-%k", GROUP="users", NAME="%k"
+ACTION=="add", SUBSYSTEMS=="usb", KERNEL=="sd[b-z][0-9]", RUN+="/etc/udev/scripts/mount-usb mount %k", OPTIONS="last_rule"
+ACTION=="remove", SUBSYSTEMS=="usb", KERNEL=="sd[b-z][0-9]", RUN+="/etc/udev/scripts/mount-usb umount %k", OPTIONS="last_rule"#
-- 
cgit v0.12


From 5d63e8c8583f83341daa05aabbac7145037682c8 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 22 Aug 2009 20:34:41 -0700
Subject: skvm:removed, not needed.

---
 abs/core-testing/skvm-hg/PKGBUILD     | 52 -----------------------------------
 abs/core-testing/skvm-hg/finish       |  3 --
 abs/core-testing/skvm-hg/run          |  8 ------
 abs/core-testing/skvm-hg/skvm.install | 10 -------
 4 files changed, 73 deletions(-)
 delete mode 100644 abs/core-testing/skvm-hg/PKGBUILD
 delete mode 100755 abs/core-testing/skvm-hg/finish
 delete mode 100755 abs/core-testing/skvm-hg/run
 delete mode 100644 abs/core-testing/skvm-hg/skvm.install

diff --git a/abs/core-testing/skvm-hg/PKGBUILD b/abs/core-testing/skvm-hg/PKGBUILD
deleted file mode 100644
index bd4c0f5..0000000
--- a/abs/core-testing/skvm-hg/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Contributor: Ondrej Martinak <omartinak@gmail.com>
-
-pkgname=skvm-hg
-pkgver=0.1
-pkgrel=2
-pkgdesc="A lightweight volume manager"
-arch=('i686' 'x86_64')
-url="http://code.suckless.org/hg/skvm"
-license=('MIT')
-depends=('hal' 'dbus')
-makedepends=('mercurial')
-conflicts=('skvm')
-provides=('skvm')
-source=('run' 'finish')
-install=skvm.install
-_hgroot="http://code.suckless.org/hg/skvm"
-_hgname="skvm"
-
-build() {
-	cd ${srcdir}
-	
-	msg "Connecting to mercurial server..."
-	
-	if [ -d $_hgname ]; then
-		cd $_hgname && hg pull
-		cd ..
-		msg "The local files are updated."
-	else
-		hg clone $_hgroot
-	fi
-	
-	msg "Mercurial checkout done or server timeout."
-	msg "Starting make..."
-	
-	rm -rf $_hgname-build
-	cp -r $_hgname $_hgname-build
-	cd $_hgname-build
-	
-	make || return 1
-	
-	mkdir -p ${startdir}/pkg/usr/bin
-	mkdir -p ${startdir}/pkg/etc/rc.d
-	mkdir -p ${startdir}/pkg/usr/local/share/man/man1
-	mkdir -p ${startdir}/pkg/etc/sv/skvm/supervise
-	
-	install -m 755 skvm ${startdir}/pkg/usr/bin/skvm
-	install -m 755 init/skvm ${startdir}/pkg/etc/rc.d/skvm
-	sed "s/VERSION/${pkgver}/g" < skvm.1 > ${startdir}/pkg/usr/local/share/man/man1/skvm.1
-	chmod 644 ${startdir}/pkg/usr/local/share/man/man1/skvm.1
-	install -m 755 ${startdir}/src/run ${startdir}/pkg/etc/sv/skvm
-	install -m 755 ${startdir}/src/finish ${startdir}/pkg/etc/sv/skvm
-}
diff --git a/abs/core-testing/skvm-hg/finish b/abs/core-testing/skvm-hg/finish
deleted file mode 100755
index 206250c..0000000
--- a/abs/core-testing/skvm-hg/finish
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-exec 2>&1
-sv down skvm
diff --git a/abs/core-testing/skvm-hg/run b/abs/core-testing/skvm-hg/run
deleted file mode 100755
index 188f5d8..0000000
--- a/abs/core-testing/skvm-hg/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-./etc/rc.conf
-./etc/rc.d/functions
-svwaitup hal 2>/dev/null 1>/dev/null
-stat_runit "Starting skvm"
-exec /etc/rc.d/skvm start
diff --git a/abs/core-testing/skvm-hg/skvm.install b/abs/core-testing/skvm-hg/skvm.install
deleted file mode 100644
index 1f82467..0000000
--- a/abs/core-testing/skvm-hg/skvm.install
+++ /dev/null
@@ -1,10 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  add_service.sh skvm
-  sv start skvm
-}
-
-post_remove() {
-	sv down skvm
-	remove_service.sh skvm
-}
-- 
cgit v0.12


From 2a89218ad674729de4222cd1390215193ad1d92e Mon Sep 17 00:00:00 2001
From: Nathan Harris <nharris@eoimaging.com>
Date: Mon, 24 Aug 2009 14:40:51 -0400
Subject: nvidia-utils: bumped to 185.18.36

---
 abs/core-testing/nvidia-utils/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/core-testing/nvidia-utils/PKGBUILD b/abs/core-testing/nvidia-utils/PKGBUILD
index 614f0f0..b265eea 100644
--- a/abs/core-testing/nvidia-utils/PKGBUILD
+++ b/abs/core-testing/nvidia-utils/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=nvidia-utils
-pkgver=185.18.31
+pkgver=185.18.36
 pkgrel=1
 pkgdesc="NVIDIA beta drivers utilities and libraries."
 provides=('nvidia-utils' 'libgl')
-- 
cgit v0.12


From b298304c21575252f57fbb84d4ef2eaae5dbad0c Mon Sep 17 00:00:00 2001
From: Nathan Harris <nharris@eoimaging.com>
Date: Mon, 24 Aug 2009 14:41:16 -0400
Subject: nvidia: bumped to 185.18.36

---
 abs/core-testing/nvidia/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/abs/core-testing/nvidia/PKGBUILD b/abs/core-testing/nvidia/PKGBUILD
index 3fb97e4..8da003b 100644
--- a/abs/core-testing/nvidia/PKGBUILD
+++ b/abs/core-testing/nvidia/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer : Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia
-pkgver=185.18.31
+pkgver=185.18.36
 _kernver='2.6.28-LinHES'
 pkgrel=1
 pkgdesc="NVIDIA drivers for kernel26."
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/"
-depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-utils=185.18.31' 'vdpinfo')
+depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-utils=185.18.36' 'vdpinfo')
 conflicts=('nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy' 'nvidia-beta')
 license=('custom')
 install=nvidia.install
-- 
cgit v0.12


From a453b43dd40c73601cc86d7c1ca3136b9c759ab3 Mon Sep 17 00:00:00 2001
From: Nathan Harris <nharris@eoimaging.com>
Date: Mon, 24 Aug 2009 14:41:44 -0400
Subject: vdpinfo: bumped to 185.18.36

---
 abs/core-testing/vdpinfo/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/abs/core-testing/vdpinfo/PKGBUILD b/abs/core-testing/vdpinfo/PKGBUILD
index 845db3a..db7be03 100644
--- a/abs/core-testing/vdpinfo/PKGBUILD
+++ b/abs/core-testing/vdpinfo/PKGBUILD
@@ -2,7 +2,7 @@
 # the nvidia package.
 
 pkgname=vdpinfo
-pkgver=185.18.31
+pkgver=185.18.36
 pkgrel=1
 pkgdesc="polls the GPU for nVidia vdpau capabilities"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64')
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.cs.rug.nl/~wladimir/vdpinfo/"
 license=('MIT')
-depends=('nvidia-utils=185.18.31' 'nvidia=185.18.31')
+depends=('nvidia-utils=185.18.36' 'nvidia=185.18.36')
 # Just let the dependency on the right nvidia and nvidia-utils versions
 # handle conflicts via those packages conflicts.
 # conflicts=()
-- 
cgit v0.12


From 6ba090f1282f7a34d5ae396ef4b15610cd22f1c0 Mon Sep 17 00:00:00 2001
From: Nathan Harris <nharris@eoimaging.com>
Date: Mon, 24 Aug 2009 15:46:09 -0400
Subject: mythtv-svn: bumped to svn 21495

---
 abs/core-testing/mythtv/trunk/morethemes/PKGBUILD     | 2 +-
 abs/core-testing/mythtv/trunk/mp_all.sh               | 2 +-
 abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD    | 2 +-
 abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD    | 2 +-
 abs/core-testing/mythtv/trunk/mythflix/PKGBUILD       | 2 +-
 abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD    | 2 +-
 abs/core-testing/mythtv/trunk/mythgame/PKGBUILD       | 2 +-
 abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD     | 2 +-
 abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD      | 2 +-
 abs/core-testing/mythtv/trunk/mythnews/PKGBUILD       | 2 +-
 abs/core-testing/mythtv/trunk/myththemes/PKGBUILD     | 2 +-
 abs/core-testing/mythtv/trunk/mythtv/PKGBUILD         | 2 +-
 abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD      | 2 +-
 abs/core-testing/mythtv/trunk/mythweather/PKGBUILD    | 2 +-
 abs/core-testing/mythtv/trunk/mythweb/PKGBUILD        | 2 +-
 abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD b/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
index a3c5e9f..d3aad58 100644
--- a/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=morethemes-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Additional themes for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mp_all.sh b/abs/core-testing/mythtv/trunk/mp_all.sh
index 4f7042a..f9593ff 100755
--- a/abs/core-testing/mythtv/trunk/mp_all.sh
+++ b/abs/core-testing/mythtv/trunk/mp_all.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-pkgver=21333
+pkgver=21495
 pkgrel=1
 
 # NOTE: Make sure to build and install mythtv first BEFORE building anything else
diff --git a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
index d0a2419..75779a1 100644
--- a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mytharchive-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD b/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
index b9d97fc..7495407 100644
--- a/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythbrowser-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Mini web browser for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD b/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
index 6f37e1f..e4ffbbf 100644
--- a/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythflix-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Netflix access plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
index f731055..7480178 100644
--- a/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythgallery-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Image gallery plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
index 4dfdde0..8f2e582 100644
--- a/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythgame-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Emulation plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
index 4ea24ea..aca7c73 100644
--- a/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythmovies-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Displays information about movies playing in the area."
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
index cb0d2d5..df6d23d 100644
--- a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythmusic-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Music playing plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD b/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
index 28ee7be..b411e08 100644
--- a/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythnews-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="News checking plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD b/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
index ab6a93c..5d300e5 100755
--- a/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=myththemes-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Themes for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
index 422ec64..db119bd 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythtv-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="A personal video recorder for Linux"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD b/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
index bd8ed74..797b641 100644
--- a/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythvideo-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Video playback and browsing plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
index d98973e..0655236 100644
--- a/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythweather-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Weather checking plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
index 48236c8..8f472b7 100644
--- a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythweb-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Web interface for MythTV's backend"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD b/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
index abd7902..7ace30f 100644
--- a/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythzoneminder-svn
-pkgver=21333
+pkgver=21495
 pkgrel=1
 pkgdesc="Integrates ZoneMinder into MythTV"
 url="http://www.mythtv.org"
-- 
cgit v0.12


From 8a9438599b6a623814702b625d11a96e8bbdad69 Mon Sep 17 00:00:00 2001
From: Bob Igo <bob@stormlogic.com>
Date: Tue, 25 Aug 2009 12:17:35 -0400
Subject: made mythvideo ignore php files, for fresh installs

---
 abs/core-testing/tweaker/PKGBUILD           | 2 +-
 abs/core-testing/tweaker/bin/twk_general.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/abs/core-testing/tweaker/PKGBUILD b/abs/core-testing/tweaker/PKGBUILD
index 3259e81..79fc20d 100644
--- a/abs/core-testing/tweaker/PKGBUILD
+++ b/abs/core-testing/tweaker/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=tweaker
 pkgver=1
-pkgrel=54
+pkgrel=55
 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_general.pl b/abs/core-testing/tweaker/bin/twk_general.pl
index 7b0f1c7..23572bc 100755
--- a/abs/core-testing/tweaker/bin/twk_general.pl
+++ b/abs/core-testing/tweaker/bin/twk_general.pl
@@ -90,7 +90,7 @@ sub implement_option {
 	    foreach my $video_ext ("mp2", "tp", "ts", "m2p", "nuv", "mkv", "ogg", "theora") {
 		change_or_make_entry("videotypes", [["playcommand", "Default"], ["f_ignore", "0"], ["use_default", "1"]], [["extension", $video_ext]]);
 	    }
-	    foreach my $non_video_ext ("jpg", "par2") {
+	    foreach my $non_video_ext ("jpg", "par2", "php") {
 		change_or_make_entry("videotypes", [["f_ignore", "1"]], [["extension", $non_video_ext]]);
 	    }
 
-- 
cgit v0.12


From 568da1387066e54f0eceb57fd8f53bd0eba87974 Mon Sep 17 00:00:00 2001
From: Nathan Harris <nharris@eoimaging.com>
Date: Tue, 25 Aug 2009 19:08:43 -0400
Subject: mythtv-svn: fix pretty script

---
 abs/core-testing/mythtv/trunk/mythtv/pretty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/core-testing/mythtv/trunk/mythtv/pretty b/abs/core-testing/mythtv/trunk/mythtv/pretty
index 24b7658..1cfc57b 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/pretty
+++ b/abs/core-testing/mythtv/trunk/mythtv/pretty
@@ -1,2 +1,2 @@
 #!/bin/bash
-su mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty"
+su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty"
-- 
cgit v0.12