$OpenBSD: patch-pacpl,v 1.3 2012/04/28 09:02:36 sthen Exp $
--- pacpl.orig	Sat Feb 14 17:04:50 2009
+++ pacpl	Sat Apr 28 09:59:59 2012
@@ -130,8 +130,8 @@ my %config = (
              );
 
 # location of configuration file
-my $conf_path = "/etc/pacpl";
-my $po_dir    = "/usr/share/pacpl/locale";
+my $conf_path = "${SYSCONFDIR}/pacpl";
+my $po_dir    = "${PREFIX}/share/pacpl/locale";
 my $mod_dir   = "$conf_path/modules";
 
 my $conf_file;
@@ -908,7 +908,7 @@ my $opts;
 
        aac  => {
 
-                DEFAULT_ENCODER => "faac",
+                DEFAULT_ENCODER => "ffmpeg",
                 DEFAULT_DECODER => "faad",
                 
                 ENCODER => {
@@ -927,7 +927,7 @@ my $opts;
                                         ESTR => sub { 
                                                       $opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
                                                       $opts = '' if $defopts == 0;
-                                                      "$eopts -y -i %i $opts %o" 
+                                                      "$eopts -y -i %i $opts -strict experimental %o" 
                                                     },
                                         
                                         PROMPT => {
@@ -941,7 +941,7 @@ my $opts;
                 DECODER => {
                               faad => {
                                         NAME => "faad",
-                                        DSTR => sub { "$dopts -o %i %o" },
+                                        DSTR => sub { "$dopts -o %o %i" },
                                       },
                               
                             ffmpeg => {
@@ -964,7 +964,7 @@ my $opts;
 
        mp4  => {
 
-                DEFAULT_ENCODER => "faac",
+                DEFAULT_ENCODER => "ffmpeg",
                 DEFAULT_DECODER => "faad",
                 
                 ENCODER => {
@@ -984,7 +984,7 @@ my $opts;
                                       ESTR => sub { 
                                                     $opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
                                                     $opts = '' if $defopts == 0;
-                                                    "$eopts -y -i %i $opts %o" 
+                                                    "$eopts -y -i %i $opts -strict experimental %o" 
                                                   },
                                       
                                       PROMPT => {
@@ -1022,7 +1022,7 @@ my $opts;
 
        m4a  => {
 
-                DEFAULT_ENCODER => "faac",
+                DEFAULT_ENCODER => "ffmpeg",
                 DEFAULT_DECODER => "faad",
                 
                 ENCODER => {
@@ -1042,7 +1042,7 @@ my $opts;
                                       ESTR => sub { 
                                                     $opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
                                                     $opts = '' if $defopts == 0;
-                                                    "$eopts -y -i %i $opts %o" 
+                                                    "$eopts -y -i %i $opts -strict experimental %o" 
                                                   },
                                       
                                       PROMPT => {
@@ -2050,11 +2050,11 @@ sub format_tags {
      
                 $tag_name{track} = 0 if not $tag_name{track};
                 $tag_name{year}  = 0 if not $tag_name{year};
-                return "-title \"$tag_name{title}\" -track \"$tag_name{track}\" -author \"$tag_name{artist}\" -album \"$tag_name{album}\" -comment \"$tag_name{comment}\" -year \"$tag_name{year}\" -genre \"$tag_name{genre}\"";
+                return "-metadata title=\"$tag_name{title}\" -metadata track=\"$tag_name{track}\" -metadata author=\"$tag_name{artist}\" -metadata album=\"$tag_name{album}\" -metadata comment=\"$tag_name{comment}\" -metadata year=\"$tag_name{year}\" -metadata genre=\"$tag_name{genre}\"";
 
             } else {
                 
-              return "--title \"$tag_name{title}\" --track \"$tag_name{track}\" --artist \"$tag_name{artist}\" --ablum \"$tag_name{album}\" --comment \"$tag_name{comment}\" --year \"$tag_name{year}\" --genre \"$tag_name{genre}\"";
+              return "--title \"$tag_name{title}\" --track \"$tag_name{track}\" --artist \"$tag_name{artist}\" --album \"$tag_name{album}\" --comment \"$tag_name{comment}\" --year \"$tag_name{year}\" --genre \"$tag_name{genre}\"";
 
               }
         } 
