Ticket #39: gutenbach_diff

 178c178
<   if ($filepath =~ m|http://www\.youtube\.com\/watch\?v=|) {
---
>   if ($filepath =~ m|http://www\.youtube\.com/watch\?v=|) {
226c226
<     if ($uri =~ m|http://www\.youtube\.com\/watch\?v=|) {
---
>     if ($uri =~ m|http://www\.youtube\.com/watch\?v=|) {
313,314c313,315
<     $artist = $fileinfo->{'Artist'};
<     $album = $fileinfo->{'Album'};
---
>     $artist = $fileinfo->{'AlbumArtist'} ||
>         $fileinfo->{'Artist'};
>     $album = $fileinfo->{'Album'} || "";
367,380c368,370
<     my ($fileinfo) = ImageInfo($filepath);
<     my $extension = $fileinfo->{FileType}; #try to get the extension from the file
<     if (! $extension) { # if that fails, maybe we can get it from the job title
<       $extension = $opts->{"job-title"};
<       $extension =~ s/.*\.//;
<     }
< 
<     exec("find -L /var/spool/cups/tmp -maxdepth 1 -type l -delete"); #delete broken symlinks
<     my $jobid = $opts->{"job-id"};
<     my $newpath = "/var/spool/cups/tmp/$jobid.$extension"; #make a properly named symlink in the tmp subdirectory
<     symlink($filepath,$newpath) or die "Couldn't symlink";
< 
<     my @args = (qw|/usr/bin/mplayer -fs -display :0.0 -vo x11 -zoom -x 1024 -y 768 -framedrop -nolirc -cache 512 -ao alsa -really-quiet |, $newpath);
<      exec(@args) ||
---
>     my @args = (qw|/usr/bin/mplayer -fs -display :0.0 -vo x11 -zoom -x 1024 -y 768 -framedrop -nolirc -cache 512 -ao alsa -really-quiet |, $filepath);
>     #print STDERR "About to exec: ", Dumper([@args]);
>     exec(@args) ||
382d371
<