Changeset 1801

Show
Ignore:
Timestamp:
02/16/10 15:19:19 (6 months ago)
Author:
arnonym
Message:

Finally make the nickname work. The saffires use a special place in application-space to store the nickname. but it doesn't work if you don't name the functions correctly.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1794 r1801  
    145145} 
    146146 
    147 bool SaffirePro24::setNickName( std::string name ) { 
     147bool SaffirePro24::setNickname( std::string name ) { 
    148148    return getEAP()->writeRegBlock( Dice::EAP::eRT_Application, 0x40, (fb_quadlet_t*)name.c_str(), name.size() ); 
    149149} 
    150150 
    151 std::string SaffirePro24::getNickName() { 
     151std::string SaffirePro24::getNickname() { 
    152152    char name[16]; 
    153153    getEAP()->readRegBlock( Dice::EAP::eRT_Application, 0x40, (fb_quadlet_t*)name, 16 ); 

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

    r1775 r1801  
    4646 
    4747    bool canChangeNickname() { return true; } 
    48     bool setNickName( std::string name ); 
    49     std::string getNickName(); 
     48    bool setNickname( std::string name ); 
     49    std::string getNickname(); 
    5050 
    5151private: 

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

    r1794 r1801  
    9595} 
    9696 
    97 bool SaffirePro40::setNickName(std::string name) { 
     97bool SaffirePro40::setNickname(std::string name) { 
    9898    return getEAP()->writeRegBlock(Dice::EAP::eRT_Application, 0x44, (quadlet_t*)name.c_str(), name.size()); 
    9999} 
    100 std::string SaffirePro40::getNickName() { 
     100std::string SaffirePro40::getNickname() { 
    101101    char name[16]; 
    102102    getEAP()->readRegBlock(Dice::EAP::eRT_Application, 0x44, (quadlet_t*)name, 16); 

  • trunk/libffado/src/dice/focusrite/saffire_pro40.h

    r1794 r1801  
    4545 
    4646    bool canChangeNickname() { return true; } 
    47     bool setNickName(std::string); 
    48     std::string getNickName(); 
     47    bool setNickname(std::string); 
     48    std::string getNickname(); 
    4949 
    5050private: