View | Details | Raw Unified | Return to bug 59013
Collapse All | Expand All

(-)files/patch-aa (-9 / +25 lines)
Lines 1-5 Link Here
1
--- ripit.pl.orig	Sat Aug 25 18:20:06 2001
1
--- ripit.pl.orig	Thu Nov  6 16:53:13 2003
2
+++ ripit.pl	Fri May 24 14:16:20 2002
2
+++ ripit.pl	Thu Nov  6 16:53:23 2003
3
@@ -1,4 +1,4 @@
4
-#!/usr/bin/perl
5
+#!/usr/local/bin/perl
6
 #
7
 # ripit.pl - Rips CD Audio and creates MP3 files
8
 #            Does the following:
3
@@ -9,41 +9,47 @@
9
@@ -9,41 +9,47 @@
4
 #		Create an M3U file
10
 #		Create an M3U file
5
 #
11
 #
Lines 132-138 Link Here
132
 #
138
 #
133
 # Create the track selection from the parameters passed
139
 # Create the track selection from the parameters passed
134
 # on the command line
140
 # on the command line
135
@@ -280,7 +302,6 @@
141
@@ -206,7 +228,8 @@
142
  
143
   #Configure CDDB_get parameters
144
   $config{CDDB_HOST} = $CDDB_HOST;      
145
-  $config{CDDB_PORT} = $CDDB_PORT;       
146
+  $config{CDDB_PORT} = $CDDB_PORT;      
147
+  $config{HTTP_PROXY}=$ENV{http_proxy} if $ENV{http_proxy}; # Use proxy if available
148
   $config{CDDB_MODE} = $CDDB_MODE; 
149
   $config{CD_DEVICE} = $cddev;
150
   $config{input} = $CDDB_INPUT;
151
@@ -280,7 +303,6 @@
136
 #
152
 #
137
 sub create_dirs {
153
 sub create_dirs {
138
   # Directory created will be: /outputdir/Artist - Album/
154
   # Directory created will be: /outputdir/Artist - Album/
Lines 140-146 Link Here
140
 
156
 
141
   $mp3dir = $outputdir.$artist." - ".$album."/";
157
   $mp3dir = $outputdir.$artist." - ".$album."/";
142
 
158
 
143
@@ -336,31 +357,37 @@
159
@@ -336,31 +358,37 @@
144
     $riptrackname = &get_trackname($_, $tracklist[$_ - 1]);
160
     $riptrackname = &get_trackname($_, $tracklist[$_ - 1]);
145
     $riptrackno = $_;
161
     $riptrackno = $_;
146
 
162
 
Lines 182-188 Link Here
182
       }
198
       }
183
     }
199
     }
184
     elsif ($cdripper == 4) {
200
     elsif ($cdripper == 4) {
185
@@ -369,9 +396,37 @@
201
@@ -369,9 +397,37 @@
186
       $cdd_dev =~ s/c$//;
202
       $cdd_dev =~ s/c$//;
187
       if (system("cdd -t $riptrackno -q -f $cdd_dev - 2>/dev/null | sox -t cdr -x - \"$riptrackname.rip\"")) {
203
       if (system("cdd -t $riptrackno -q -f $cdd_dev - 2>/dev/null | sox -t cdr -x - \"$riptrackname.rip\"")) {
188
         &printflush(RIPLOG,"cdd failed on $tracklist[$_ - 1]\n");
204
         &printflush(RIPLOG,"cdd failed on $tracklist[$_ - 1]\n");
Lines 220-226 Link Here
220
     else {
236
     else {
221
       die "No CD Ripper defined";
237
       die "No CD Ripper defined";
222
     }
238
     }
223
@@ -381,11 +436,13 @@
239
@@ -381,11 +437,13 @@
224
     rename "$riptrackname.rip","$riptrackname.wav";
240
     rename "$riptrackname.rip","$riptrackname.wav";
225
 
241
 
226
     &printflush(RIPLOG,"Rip complete $tracklist[$_ - 1]\n");
242
     &printflush(RIPLOG,"Rip complete $tracklist[$_ - 1]\n");
Lines 238-244 Link Here
238
     }
254
     }
239
 
255
 
240
   }
256
   }
241
@@ -407,24 +464,37 @@
257
@@ -407,24 +465,37 @@
242
     $riptrackno = $_;
258
     $riptrackno = $_;
243
     $ncount++;
259
     $ncount++;
244
  
260
  
Lines 281-287 Link Here
281
     }
297
     }
282
 
298
 
283
     if ( ! system("$enc >$enclog 2>&1 </dev/null")) {
299
     if ( ! system("$enc >$enclog 2>&1 </dev/null")) {
284
@@ -438,7 +508,8 @@
300
@@ -438,7 +509,8 @@
285
       &printflush(RIPLOG,"MP3 Encoder Failed on $tracklist[$_ - 1]\n");
301
       &printflush(RIPLOG,"MP3 Encoder Failed on $tracklist[$_ - 1]\n");
286
       die "MP3 Encoder Failed on $tracklist[$_ - 1]";
302
       die "MP3 Encoder Failed on $tracklist[$_ - 1]";
287
     }
303
     }
Lines 291-297 Link Here
291
   }
307
   }
292
   exit ;
308
   exit ;
293
 }
309
 }
294
@@ -452,10 +523,10 @@
310
@@ -452,10 +524,10 @@
295
   $file="$artist.m3u";
311
   $file="$artist.m3u";
296
   if ($use_underscore == 1) { $file =~ s/ /_/g; }
312
   if ($use_underscore == 1) { $file =~ s/ /_/g; }

Return to bug 59013