[FFADO-svn] r1209 - in branches/libffado-2.0: . src/motu

[<tr...@ff...>]

Author: holin
Date: 2008-05-25 00:13:10 -0700 (Sun, 25 May 2008)
New Revision: 1209

Modified:
   branches/libffado-2.0/SConstruct
   branches/libffado-2.0/src/motu/motu_avdevice.cpp
Log:
merge from trunk 1207,1208


Modified: branches/libffado-2.0/SConstruct
===================================================================
--- branches/libffado-2.0/SConstruct	2008-05-25 05:20:28 UTC (rev 1208)
+++ branches/libffado-2.0/SConstruct	2008-05-25 07:13:10 UTC (rev 1209)
@@ -130,7 +130,7 @@
 	return ret
 
 def CheckForApp( context, app ):
-	context.Message( "Checking wether '" + app + "' executes " )
+	context.Message( "Checking whether '" + app + "' executes " )
 	ret = context.TryAction( app )
 	context.Result( ret[0] )
 	return ret[0]

Modified: branches/libffado-2.0/src/motu/motu_avdevice.cpp
===================================================================
--- branches/libffado-2.0/src/motu/motu_avdevice.cpp	2008-05-25 05:20:28 UTC (rev 1208)
+++ branches/libffado-2.0/src/motu/motu_avdevice.cpp	2008-05-25 07:13:10 UTC (rev 1209)
@@ -690,7 +690,7 @@
  * control register.  If samplingFrequency <= 0 it remains unchanged.  If
  * clock_source is MOTU_CLKSRC_UNCHANGED the clock source remains unchanged.
  */
-    char *src_name;
+    const char *src_name;
     quadlet_t q, new_rate=0xffffffff;
     int i, supported=true, cancel_adat=false;
     quadlet_t reg;