|
Lines 1-5
Link Here
|
| 1 |
--- ./ogg2mp3.orig 2009-02-02 20:13:18.000000000 +0000 |
1 |
--- ./ogg2mp3.orig 2005-05-16 18:07:33.000000000 +0000 |
| 2 |
+++ ./ogg2mp3 2009-02-02 20:13:44.000000000 +0000 |
2 |
+++ ./ogg2mp3 2009-02-08 12:29:27.000000000 +0000 |
|
|
3 |
@@ -1,4 +1,4 @@ |
| 4 |
-#!/usr/bin/perl |
| 5 |
+#!/usr/local/bin/perl |
| 6 |
|
| 7 |
# ogg2mp3 |
| 8 |
# |
| 9 |
@@ -51,10 +51,10 @@ |
| 10 |
print " Thanks to all who took an interest. Have fun!\n"; |
| 11 |
print " ------------------------------------------------------------------- \n\n"; |
| 12 |
|
| 13 |
-my $MP3ENC = "/usr/bin/lame"; |
| 14 |
-#my $MP3INFO = "/usr/bin/mp3_check"; |
| 15 |
-my $OGGINFO = "/usr/bin/ogginfo"; |
| 16 |
-my $OGG123 = "/usr/bin/ogg123"; |
| 17 |
+my $MP3ENC = "/usr/local/bin/lame"; |
| 18 |
+#my $MP3INFO = "/usr/local/bin/mp3_check"; |
| 19 |
+my $OGGINFO = "/usr/local/bin/ogginfo"; |
| 20 |
+my $OGG123 = "/usr/local/bin/ogg123"; |
| 21 |
|
| 22 |
# check presence of executables |
| 23 |
stat($MP3ENC) or die "Error: $MP3ENC not present!\n"; |
| 3 |
@@ -68,7 +68,7 @@ |
24 |
@@ -68,7 +68,7 @@ |
| 4 |
|
25 |
|
| 5 |
# build genre hash |
26 |
# build genre hash |
|
Lines 9-11
Link Here
|
| 9 |
while(<GENRES>) { |
30 |
while(<GENRES>) { |
| 10 |
chomp; |
31 |
chomp; |
| 11 |
next if /^\s*$/; |
32 |
next if /^\s*$/; |
|
|
33 |
@@ -308,10 +308,8 @@ |
| 34 |
|
| 35 |
$mp3outputfile_escaped = shell_quote($mp3outputfile); |
| 36 |
$oggfile_escaped = shell_quote($oggfile); |
| 37 |
- # this took me some time to figure |
| 38 |
- # note that byte order is swapped by lame via -x option |
| 39 |
# TODO: somebody please tell me how to supress the "Assuming bla bla" output without devnull |
| 40 |
- $result = system("$OGG123 $decquiet -d raw -f - $oggfile_escaped | $MP3ENC $encquiet -r -x -q $quality -b $bitrate -s $frequency -m $channels $infostring - $mp3outputfile_escaped"); |
| 41 |
+ $result = system("$OGG123 $decquiet -d raw -f - $oggfile_escaped | $MP3ENC $encquiet -r -q $quality -b $bitrate -s $frequency -m $channels $infostring - $mp3outputfile_escaped"); |
| 42 |
|
| 43 |
# TODO: find some widely used mp3 checker |
| 44 |
# disabled the checking due to lack of checker |