Changeset 2126

Show
Ignore:
Timestamp:
04/24/12 20:29:02 (9 years ago)
Author:
jwoithe
Message:

dice: permit the Saffire pro24dsp to be treated the same as a pro24 so the streaming side of the latter can at least be used.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/src/dice/focusrite/saffire_pro24.cpp

    r2124 r2126  
    156156        getEAP()->readRegBlock(Dice::EAP::eRT_Application, 0x00, tmp, 1*sizeof(fb_quadlet_t)); 
    157157        //hexDumpQuadlets(tmp, 2); // DEBUG 
    158         if (tmp[0] != 0x00010004 ) { 
     158        // 0x00010004 is a pro24, 0x00010008 is the pro24dsp 
     159        if (tmp[0] != 0x00010004 && tmp[0] != 0x00010008) { 
    159160            debugError("This is a Focusrite Saffire Pro24 but not the right firmware. Better stop here before something goes wrong.\n"); 
    160             debugError("This device has firmware 0x%x while we only know about version 0x%x.\n", tmp[0], 0x10004); 
     161            debugError("This device has firmware 0x%x while we only know about versions 0x%x and 0x%x.\n", tmp[0], 0x10004, 0x10008); 
    161162            return false; 
    162163        } 

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

    r1827 r2126  
    229229        self.connect(widget.volumeKnob, QtCore.SIGNAL("valueChanged(int)"), self.volumeChanged) 
    230230 
    231         if self.configrom.getModelName() == "SAFFIRE_PRO_24": 
     231        if self.configrom.getModelName() == "SAFFIRE_PRO_24" or self.configrom.getModelName() == "SAFFIRE_PRO_24DSP": 
    232232            widget.stacked.setCurrentWidget(widget.pagePro24) 
    233233            self.ch1inst = BooleanControl(self.hw, self.hw.basepath + "/EAP/Ch1LineInst")