Kaydet (Commit) d55049ae authored tarafından Barry Warsaw's avatar Barry Warsaw

If the module SUNAUDIODEV was generated on an older version of

Solaris, the `CD' macro won't exist in the header file, so this will
raise a NameError.
üst 9ade9ddb
...@@ -95,19 +95,23 @@ class MainWindow: ...@@ -95,19 +95,23 @@ class MainWindow:
if not info.i_avail_ports & LINE_IN: if not info.i_avail_ports & LINE_IN:
btn.configure(state=DISABLED) btn.configure(state=DISABLED)
buttons.append(btn) buttons.append(btn)
## ## if SUNAUDIODEV was built on an older version of Solaris, the CD
btn = Radiobutton(frame, ## input device won't exist
text='CD', try:
variable=self.__inputvar, btn = Radiobutton(frame,
value=CD, text='CD',
command=self.__pushtodev, variable=self.__inputvar,
underline=0) value=CD,
btn.grid(row=2, column=1, sticky=W) command=self.__pushtodev,
root.bind('<Alt-c>', self.__cd) underline=0)
root.bind('<Alt-C>', self.__cd) btn.grid(row=2, column=1, sticky=W)
if not info.i_avail_ports & CD: root.bind('<Alt-c>', self.__cd)
btn.configure(state=DISABLED) root.bind('<Alt-C>', self.__cd)
buttons.append(btn) if not info.i_avail_ports & CD:
btn.configure(state=DISABLED)
buttons.append(btn)
except NameError:
pass
# #
# where does output go to? # where does output go to?
frame = Frame(root, bd=1, relief=RAISED) frame = Frame(root, bd=1, relief=RAISED)
...@@ -276,13 +280,18 @@ def main(): ...@@ -276,13 +280,18 @@ def main():
return return
# spec: LONG OPT, SHORT OPT, 0=input,1=output, MASK # spec: LONG OPT, SHORT OPT, 0=input,1=output, MASK
options = (('--microphone', '-m', 0, MICROPHONE), options = [('--microphone', '-m', 0, MICROPHONE),
('--linein', '-i', 0, LINE_IN), ('--linein', '-i', 0, LINE_IN),
('--cd', '-c', 0, CD),
('--headphones', '-p', 1, HEADPHONE), ('--headphones', '-p', 1, HEADPHONE),
('--speaker', '-s', 1, SPEAKER), ('--speaker', '-s', 1, SPEAKER),
('--lineout', '-o', 1, LINE_OUT), ('--lineout', '-o', 1, LINE_OUT),
) ]
# See the comment above about `CD'
try:
options.append(('--cd', '-c', 0, CD))
except NameError:
pass
info = device.getinfo() info = device.getinfo()
# first get the existing values # first get the existing values
for arg in sys.argv[1:]: for arg in sys.argv[1:]:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment