Show
Ignore:
Timestamp:
01/18/10 13:38:33 (11 years ago)
Author:
arnonym
Message:

This might (or might not) fix #256 by actually implementing EAP-support for the Pro40.

Please someone test this and report back.

Everything should work except:

  • The volume knob doesn't seem to have an effect on the Pro24, don't know about the Pro40. It writes to the right registers but somehow the hardware doesn't recognise it.
  • The "Use ADAT-Out as S/PDIF" and "Pad Output" are not implemented yet.
  • I don't know whether changing to nickname works with the Pro40. It doesn't with the Pro24 altough the correct registers are written to. Probably sending an OP-code is missing...
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice.py

    r1736 r1794  
    255255            widget.chkLevel4.setChecked(self.ch4level.selected()) 
    256256            self.connect(widget.chkLevel4, QtCore.SIGNAL("toggled(bool)"), self.ch4level.select) 
     257            widget.chkSpdif.deleteLater() 
     258            widget.btnPad.deleteLater() 
    257259        else: 
    258260            widget.chkInst1.deleteLater() 

  • trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice_monitoring.ui

    r1736 r1794  
    3030     <widget class="QWidget" name="layoutWidget"> 
    3131      <layout class="QGridLayout" name="gridLayout"> 
    32        <item row="2" column="0"> 
     32       <item row="3" column="0"> 
    3333        <widget class="QLabel" name="label"> 
    3434         <property name="text"> 
    …… 
    4343        </widget> 
    4444       </item> 
    45        <item row="2" column="1"> 
     45       <item row="3" column="1"> 
    4646        <widget class="QSpinBox" name="dimLevel"> 
    4747         <property name="sizePolicy"> 
    …… 
    6565        </widget> 
    6666       </item> 
    67        <item row="0" column="2" rowspan="5"> 
     67       <item row="0" column="2" rowspan="6"> 
    6868        <widget class="QGroupBox" name="groupBox"> 
    6969         <property name="sizePolicy"> 
    …… 
    118118        </widget> 
    119119       </item> 
    120        <item row="3" column="0" colspan="2"> 
     120       <item row="4" column="0" colspan="2"> 
    121121        <widget class="QPushButton" name="btnDim"> 
    122122         <property name="sizePolicy"> 
    123123          <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> 
    124124           <horstretch>0</horstretch> 
    125            <verstretch>4</verstretch> 
     125           <verstretch>10</verstretch> 
    126126          </sizepolicy> 
    127127         </property> 
    …… 
    140140        </widget> 
    141141       </item> 
    142        <item row="4" column="0" colspan="2"> 
     142       <item row="5" column="0" colspan="2"> 
    143143        <widget class="QPushButton" name="btnMute"> 
    144144         <property name="sizePolicy"> 
    145145          <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> 
    146146           <horstretch>0</horstretch> 
    147            <verstretch>4</verstretch> 
     147           <verstretch>10</verstretch> 
    148148          </sizepolicy> 
    149149         </property> 
    …… 
    164164       <item row="0" column="0"> 
    165165        <widget class="QCheckBox" name="chkInst1"> 
     166         <property name="sizePolicy"> 
     167          <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> 
     168           <horstretch>0</horstretch> 
     169           <verstretch>0</verstretch> 
     170          </sizepolicy> 
     171         </property> 
    166172         <property name="text"> 
    167173          <string>Ch 1 Instrument</string> 
    …… 
    171177       <item row="0" column="1"> 
    172178        <widget class="QCheckBox" name="chkLevel3"> 
     179         <property name="sizePolicy"> 
     180          <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> 
     181           <horstretch>0</horstretch> 
     182           <verstretch>0</verstretch> 
     183          </sizepolicy> 
     184         </property> 
    173185         <property name="text"> 
    174186          <string>Ch 3 High Level</string> 
    …… 
    178190       <item row="1" column="0"> 
    179191        <widget class="QCheckBox" name="chkInst2"> 
     192         <property name="sizePolicy"> 
     193          <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> 
     194           <horstretch>0</horstretch> 
     195           <verstretch>0</verstretch> 
     196          </sizepolicy> 
     197         </property> 
    180198         <property name="text"> 
    181199          <string>Ch 2 Instrument</string> 
    …… 
    185203       <item row="1" column="1"> 
    186204        <widget class="QCheckBox" name="chkLevel4"> 
     205         <property name="sizePolicy"> 
     206          <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> 
     207           <horstretch>0</horstretch> 
     208           <verstretch>0</verstretch> 
     209          </sizepolicy> 
     210         </property> 
    187211         <property name="text"> 
    188212          <string>Ch 4 High Level</string> 
     213         </property> 
     214        </widget> 
     215       </item> 
     216       <item row="2" column="0"> 
     217        <widget class="QCheckBox" name="chkSpdif"> 
     218         <property name="sizePolicy"> 
     219          <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> 
     220           <horstretch>0</horstretch> 
     221           <verstretch>0</verstretch> 
     222          </sizepolicy> 
     223         </property> 
     224         <property name="text"> 
     225          <string>Use ADAT-Out as S/PDIF</string> 
     226         </property> 
     227        </widget> 
     228       </item> 
     229       <item row="2" column="1"> 
     230        <widget class="QPushButton" name="btnPad"> 
     231         <property name="sizePolicy"> 
     232          <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> 
     233           <horstretch>0</horstretch> 
     234           <verstretch>0</verstretch> 
     235          </sizepolicy> 
     236         </property> 
     237         <property name="text"> 
     238          <string>Pad Output</string> 
    189239         </property> 
    190240        </widget>