Changeset 1209

Show
Ignore:
Timestamp:
05/25/08 00:13:10 (16 years ago)
Author:
holin
Message:

merge from trunk 1207,1208

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/SConstruct

    r1190 r1209  
    131131 
    132132def CheckForApp( context, app ): 
    133         context.Message( "Checking wether '" + app + "' executes " ) 
     133        context.Message( "Checking whether '" + app + "' executes " ) 
    134134        ret = context.TryAction( app ) 
    135135        context.Result( ret[0] ) 
  • branches/libffado-2.0/src/motu/motu_avdevice.cpp

    r1190 r1209  
    691691 * clock_source is MOTU_CLKSRC_UNCHANGED the clock source remains unchanged. 
    692692 */ 
    693     char *src_name; 
     693    const char *src_name; 
    694694    quadlet_t q, new_rate=0xffffffff; 
    695695    int i, supported=true, cancel_adat=false;