blob: 93948d7d9e0c95ddb8c6aebc79ada1f75c9b272a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
Make the search for files in jack_prepare case insensitive (like
jack_function) does, and use the same error message in jack_function and
jack_prepare.
diff -urN orig/jack_functions.py jack-3.1.1+cvs20050801/jack_functions.py
--- orig/jack_functions.py 2006-02-27 13:50:37.000000000 +0000
+++ jack-3.1.1+cvs20050801/jack_functions.py 2006-02-27 13:52:10.000000000 +0000
@@ -232,7 +232,7 @@
else:
error("The FLAC Python bindings are not installed.")
else:
- error("this is neither .mp3 nor .ogg nor .wav nor .flac: %s" % i)
+ error("don't know how to handle %s files." % i_ext)
if cf['_name'] % num != i_name:
progr.append([num, "ren", cf['_name'] % num + "-->" + unicode(i_name, cf['_charset'], "replace")])
num = num + 1
diff -urN jack-3.1.1+cvs20050801~/jack_prepare.py jack-3.1.1+cvs20050801/jack_prepare.py
--- jack-3.1.1+cvs20050801~/jack_prepare.py 2006-04-04 23:36:28.000000000 +0200
+++ jack-3.1.1+cvs20050801/jack_prepare.py 2006-04-04 23:37:10.000000000 +0200
@@ -339,10 +339,10 @@
jack_functions.progress(num, "dae", status[num]['dae'])
if not status[num]['enc']:
if os.path.exists(i[NAME] + ext):
- if ext == ".mp3":
+ if ext.upper() == ".MP3":
x = jack_mp3.mp3format(i[NAME] + ext)
temp_rate = x['bitrate']
- elif ext == ".ogg":
+ elif ext.upper() == ".OGG" and ogg:
x = ogg.vorbis.VorbisFile(i[NAME] + ext)
temp_rate = int(x.raw_total(0) * 8 / x.time_total(0) / 1000 + 0.5)
else:
|
