— mplayer-resume 2006-11-19 23:59:52.000000000 +0100
+++ mplayer-resume-old 2006-09-16 04:20:05.000000000 +0200
@@ -43,10 +43,7 @@

// grep the filename to play
// add more extensions if you like
- $movies = preg_grep(’/\.(mk[av]|vob|mpeg|mp[34g]|og[gm]|avi|wav|midi?|wm[av]|mov|asf|yuv|ram?|aac|nuv|m4a|divx)$/i’, $argv);
- $movie = end($movies);
- // save arraykey where filename is in arguments array (PHP >= 4.0.3)
- $movie_key = key($movies);
+ $movie = end(preg_grep(’/\.(mk[av]|vob|mpeg|mp[34g]|og[gm]|avi|wav|midi?|wm[av]|mov|asf|yuv|ram?|aac|nuv|m4a)$/i’, $argv));

// If we can’t get the movie name, just quit
if(empty($movie)) {
@@ -56,11 +53,6 @@

// Drop the binary command
unset($argv[0]);
-
- // quote filename to maintain spaces in filename
- $escaped_filename = escapeshellarg($argv[$movie_key]);
- // and remove filename from paramterlist
- unset($argv[$movie_key]);

// Put the arguments back together again
$str_args = implode(’ ‘, $argv);
@@ -78,7 +70,7 @@
}

// Build the execution string
- $exec = escapeshellcmd(”mplayer $flags $str_args -quiet”).” $escaped_filename”;
+ $exec = escapeshellcmd(”mplayer $flags $str_args -quiet”);

// Execute the command, save output to an array
exec($exec, $arr);