|
Lines 1-6
Link Here
|
| 1 |
--- ripit.pl.orig Wed Sep 1 13:51:06 1999 |
1 |
--- ripit.pl.orig Fri Apr 21 12:11:23 2000 |
| 2 |
+++ ripit.pl Wed Sep 1 13:53:12 1999 |
2 |
+++ ripit.pl Fri Apr 21 12:16:20 2000 |
| 3 |
@@ -26,10 +26,10 @@ |
3 |
@@ -26,12 +26,12 @@ |
| 4 |
# User configurable variables |
4 |
# User configurable variables |
| 5 |
# |
5 |
# |
| 6 |
|
6 |
|
|
Lines 9-43
Link Here
|
| 9 |
+$cddev = "/dev/rcd0c"; # CD Audio device |
9 |
+$cddev = "/dev/rcd0c"; # CD Audio device |
| 10 |
+$outputdir = "/home/mp3/"; # Where the MP3s should go |
10 |
+$outputdir = "/home/mp3/"; # Where the MP3s should go |
| 11 |
$bitrate = 160; # Bitrate for MP3s |
11 |
$bitrate = 160; # Bitrate for MP3s |
| 12 |
-$encoder = 1; # 0 - Bladeenc, 1 - Lame |
12 |
$encoder = 1; # 0 - Bladeenc, 1 - Lame |
| 13 |
+$encoder = 0; # 0 - Bladeenc, 1 - Lame |
13 |
$encopt = ""; # options for mp3 encoder |
|
|
14 |
-$cdripper = 0; # 0 - cdparanoia, 1 - cdda2wav |
| 15 |
+$cdripper = 2; # 0 - cdparanoia, 1 - cdda2wav, 2 - tosha |
| 16 |
$cdopt = ""; # options for cdaudio ripper |
| 14 |
|
17 |
|
| 15 |
$use_underscore = 0; # Use _ instead of spaces in filenames (1 yes, 0 no) |
18 |
$use_underscore = 0; # Use _ instead of spaces in filenames (1 yes, 0 no) |
| 16 |
|
19 |
@@ -340,12 +340,18 @@ |
| 17 |
@@ -329,14 +329,11 @@ |
20 |
die "cdparanoia failed on $tracklist[$_ - 1]"; |
| 18 |
|
21 |
} |
| 19 |
&printflush(RIPLOG,"Ripping $tracklist[$_ - 1]...\n"); |
|
|
| 20 |
|
| 21 |
- if (system("cdparanoia -d $cddev $riptrackno \"$riptrackname.rip\"")) { |
| 22 |
- &printflush(RIPLOG,"cdparanoia failed on $tracklist[$_ - 1]\n"); |
| 23 |
- die "cdparanoia failed on $tracklist[$_ - 1]"; |
| 24 |
+ if (system("tosha -d $cddev -f wav -t $riptrackno -o \"$riptrackname.wav\"")) { |
| 25 |
+ &printflush(RIPLOG,"tosha failed on $tracklist[$_ - 1]\n"); |
| 26 |
+ die "tosha failed on $tracklist[$_ - 1]"; |
| 27 |
} |
22 |
} |
| 28 |
|
23 |
- else { |
| 29 |
- # Rename rip file to a wav for encoder |
24 |
+ elsif ($cdripper == 1) { |
| 30 |
- rename "$riptrackname.rip","$riptrackname.wav"; |
25 |
if (system("cdda2wav -D $cddev -Q -H $cdopt -t $riptrackno \"$riptrackname.rip\"")) { |
| 31 |
- |
26 |
&printflush(RIPLOG,"cdda2wav failed on $tracklist[$_ - 1]\n"); |
| 32 |
&printflush(RIPLOG,"Rip complete $tracklist[$_ - 1]\n"); |
27 |
die "cdda2wav failed on $tracklist[$_ - 1]"; |
| 33 |
|
28 |
} |
| 34 |
# Start the Encoder in the background. but only once |
29 |
} |
| 35 |
@@ -367,7 +364,7 @@ |
30 |
+ else { |
|
|
31 |
+ if (system("tosha -d $cddev -f wav -t $riptrackno -o \"$riptrackname.rip\"")) { |
| 32 |
+ &printflush(RIPLOG,"tosha failed on $tracklist[$_ - 1]\n"); |
| 33 |
+ die "tosha failed on $tracklist[$_ - 1]"; |
| 34 |
+ } |
| 35 |
+ } |
| 36 |
|
| 37 |
# Rename rip file to a wav for encoder |
| 38 |
rename "$riptrackname.rip","$riptrackname.wav"; |
| 39 |
@@ -380,7 +386,7 @@ |
| 36 |
print "\nMP3 Encoding track ".$ncount." of ".($#seltrack + 1)."\n"; |
40 |
print "\nMP3 Encoding track ".$ncount." of ".($#seltrack + 1)."\n"; |
| 37 |
&printflush(RIPLOG,"Encoding $tracklist[$_ - 1]...\n"); |
41 |
&printflush(RIPLOG,"Encoding $tracklist[$_ - 1]...\n"); |
| 38 |
|
42 |
|
| 39 |
- # Keep looping until the file appears, ie wait for cdparanoia |
43 |
- # Keep looping until the file appears, ie wait for cdparanoia |
| 40 |
+ # Keep looping until the file appears, ie wait for tosha |
44 |
+ # Keep looping until the file appears, ie wait for cdripper |
| 41 |
# timeout after 30 minutes |
45 |
# timeout after 30 minutes |
| 42 |
$x=0; |
46 |
$x=0; |
| 43 |
while( ! -r "$riptrackname.wav" ){ |
47 |
while( ! -r "$riptrackname.wav" ){ |