[xiph-commits] r7765 - trunk/BlueberryArmageddon

[xiphmont at motherfish-iii.xiph.org]

Author: xiphmont
Date: 2004-09-15 13:38:10 -0700 (Wed, 15 Sep 2004)
New Revision: 7765

Modified:
   trunk/BlueberryArmageddon/blueberry_armageddon
Log:
Minor parsing fix to repair status update on modern oggenc.


Modified: trunk/BlueberryArmageddon/blueberry_armageddon
===================================================================
--- trunk/BlueberryArmageddon/blueberry_armageddon	2004-09-15 16:36:39 UTC (rev 7764)
+++ trunk/BlueberryArmageddon/blueberry_armageddon	2004-09-15 20:38:10 UTC (rev 7765)
@@ -16,7 +16,7 @@
 
 $query='cdparanoia -d $device -Q 2>&1';
 $rip='cdparanoia -ez -d $device $track -w $wavfile';
-$encode='oggenc -q 4.99 -a {$metaartist} -t {$metatitle} -l {$metaalbum} $wavfile -o $outfile';
+$encode='oggenc -q 4.9 -a {$metaartist} -t {$metatitle} -l {$metaalbum} $wavfile -o $outfile';
 $playrip='cdparanoia -vZd $device $playstatus $pipe';
 $play='play -t wav $pipe ';
 
@@ -596,7 +596,8 @@
 	Skip();
     }
 
-    push my at lines, split /[\n\r]/, $saved_stderr.$scalar;
+    $scalar=~s/\r/\n/;
+    push my at lines, split /[\n|\r]/, $saved_stderr.$scalar;
     if((chomp $scalar)==0){
 	$saved_stderr=$lines[$#lines];
     }else{