blob: f5d8755826dd22256eb4b600f34c50a85b4588d6 (
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
34
|
Fix support for cdrdao image files. Debian #338697.
diff -urN jack-3.1.1~/jack_main_loop.py jack-3.1.1/jack_main_loop.py
--- jack-3.1.1~/jack_main_loop.py 2005-11-12 16:50:35.000000000 +0000
+++ jack-3.1.1/jack_main_loop.py 2005-11-12 17:52:31.000000000 +0000
@@ -392,10 +392,11 @@
#jack_term.tmod.dae_stat_upd(i['track'][NUM], None, i['percent'])
elif i['type'] == "image_reader":
- line = string.strip(jack_status.get_2_line(i['buf']))
- jack_status.dae_stat_upd(i['track'][NUM], line)
- if line.startswith("Error"):
- global_error = global_error + 1
+ line = string.strip(jack_status.get_2_line(i['buf'], default=""))
+ if line:
+ jack_status.dae_stat_upd(i['track'][NUM], line)
+ if line.startswith("Error"):
+ global_error = global_error + 1
else:
error("unknown subprocess type \"" + i['type'] + "\".")
diff -urN jack-3.1.1~/jack_workers.py jack-3.1.1/jack_workers.py
--- jack-3.1.1~/jack_workers.py 2005-11-12 16:50:35.000000000 +0000
+++ jack-3.1.1/jack_workers.py 2005-11-12 16:50:49.000000000 +0000
@@ -315,7 +315,7 @@
#
## set up output wav file:
#
- wav = wave.open(track[NAME].decode(cf['_charset'], "replace") + ".wav", 'w')
+ wav = wave.open(track[NAME] + ".wav", 'w')
wav.setnchannels(2)
wav.setsampwidth(2)
wav.setframerate(44100)
|
