Changeset 1313

Show
Ignore:
Timestamp:
08/17/08 18:43:17 (12 years ago)
Author:
jwoithe
Message:

MOTU: fix ordering of AES/EBU and MainOut? items in mix bus destination and phones assign control.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/support/mixer/mixer_motu.py

    r1312 r1313  
    613613            self.mix4_tab.page(2).setEnabled(False); 
    614614 
    615         # Devices without AES/EBU inputs/outputs have dedicated "MainOut" 
    616         # outputs instead. 
    617         if (not(self.has_aesebu_inputs)): 
     615        # Devices without AES/EBU inputs/outputs (normally ID 6 in the 
     616        # destination lists) have dedicated "MainOut" outputs instead.  The 
     617        # 896HD is an exception: it uses ID 6 for MainOut and ID 7 
     618        # (nominally SPDIF) for AES/EBU. 
     619        if (not(self.has_aesebu_inputs) or self.model==MOTU_MODEL_896HD): 
    618620            self.mix1_dest.changeItem("MainOut", 6) 
    619621            self.mix2_dest.changeItem("MainOut", 6) 
     
    621623            self.mix4_dest.changeItem("MainOut", 6) 
    622624            self.phones_src.changeItem("MainOut", 6) 
    623         # The 896HD doesn't have SPDIF outputs but instead uses that "slot" 
    624         # for its MainOut.  There's no conflict with the previous setting 
    625         # here because the 896HD has AES/EBU outputs. 
     625        # Change the SPDIF destination to AES/EBU for the 896HD. 
    626626        if (self.model == MOTU_MODEL_896HD): 
    627             self.mix1_dest.changeItem("MainOut", 7) 
    628             self.mix2_dest.changeItem("MainOut", 7) 
    629             self.mix3_dest.changeItem("MainOut", 7) 
    630             self.mix4_dest.changeItem("MainOut", 7) 
     627            self.mix1_dest.changeItem("AES/EBU", 7) 
     628            self.mix2_dest.changeItem("AES/EBU", 7) 
     629            self.mix3_dest.changeItem("AES/EBU", 7) 
     630            self.mix4_dest.changeItem("AES/EBU", 7) 
     631            self.phones_src.changeItem("AES/EBU", 7) 
    631632 
    632633        # Some devices don't have the option of selecting an optical SPDIF