Merged revisions 588:623 from tag/presndfile.

Minor scons fixes.
CoreAudioSource updates.


git-svn-id: svn://localhost/ardour2/trunk@625 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 24 insertions, 23 deletions

diff --git a/SConstruct b/SConstruct
index 157d7c0b8f..6d2fea7c18 100644
--- a/SConstruct
+++ b/SConstruct
@@ -14,7 +14,7 @@ import SCons.Node.FS
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
-version = '2.0beta1'
+version = '2.0beta2'
 
 subst_dict = { }
 
@@ -25,20 +25,20 @@ subst_dict = { }
 opts = Options('scache.conf')
 opts.AddOptions(
   ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),
-    BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
+    BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
     BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
     PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
-    BoolOption('NLS', 'Set to turn on i18n support', 1),
-    PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
-    BoolOption('VST', 'Compile with support for VST', 0),
-    BoolOption('VERSIONED', 'Add version information to ardour/gtk executable name inside the build directory', 0),
     EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2),
-    BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
-    BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),
-    BoolOption('SURFACES', 'Build support for control surfaces', 0),
     BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0),
+    BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),
+    BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
     BoolOption('LIBLO', 'Compile with support for liblo library', 1),
-    BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library -- UNSTABLE', 0)
+    BoolOption('NLS', 'Set to turn on i18n support', 1),
+    PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
+    BoolOption('SURFACES', 'Build support for control surfaces', 0),
+    BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
+    BoolOption('VERSIONED', 'Add version information to ardour/gtk executable name inside the build directory', 0),
+    BoolOption('VST', 'Compile with support for VST', 0)
 )
 
 #----------------------------------------------------------------------
@@ -58,8 +58,8 @@ class LibraryInfo(Environment):
             self.Append (LINKFLAGS = other.get('LINKFLAGS', []))
 	self.Replace(LIBPATH = list(Set(self.get('LIBPATH', []))))
 	self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[]))))
-	#doing LINKFLAGS breaks -framework
-    #doing LIBS break link order dependency
+        #doing LINKFLAGS breaks -framework
+        #doing LIBS break link order dependency
 
 
 env = LibraryInfo (options = opts,
@@ -793,7 +793,7 @@ else:
 # warnings flags
 #
 
-env.Append(CCFLAGS="-Wall -Woverloaded-virtual")
+env.Append(CXXFLAGS="-Wall -Woverloaded-virtual")
 
 if env['LIBLO']:
     env.Append(CCFLAGS="-DHAVE_LIBLO")
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 5361354962..605911d7ef 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -179,15 +179,14 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/Core
 if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h') and ardour['COREAUDIO'] == 1:
     ardour.Append(CXXFLAGS="-DHAVE_COREAUDIO")    
     ardour.Append(LINKFLAGS="-framework AudioToolbox")
+    extra_sources += coreaudio_files
     
 
 if env['CONFIG_ARCH'] == 'apple':
     # this next line avoids issues with circular dependencies between libardour and libardour_cp.
     # it is based on the (entirely reasonable) assumption that a system with CoreAudio is OS X
     #
-    print 'APPLE CONFIG'
     ardour.Append(LINKFLAGS='-undefined suppress -flat_namespace') 
-    extra_sources += coreaudio_files
 
 ardour = conf.Finish ()
 
diff --git a/libs/ardour/ardour/coreaudio_source.h b/libs/ardour/ardour/coreaudio_source.h
index 82533de950..81f1a14050 100644
--- a/libs/ardour/ardour/coreaudio_source.h
+++ b/libs/ardour/ardour/coreaudio_source.h
@@ -20,12 +20,12 @@
 #ifndef __coreaudio_source_h__ 
 #define __coreaudio_source_h__
 
-#include <ardour/externalsource.h>
+#include <ardour/audiofilesource.h>
 #include <AudioToolbox/ExtendedAudioFile.h>
 
 namespace ARDOUR {
 
-class CoreAudioSource : public ExternalSource {
+class CoreAudioSource : public AudioFileSource {
   public:
 	CoreAudioSource (const string& path_plus_channel, bool build_peak = true);
 	CoreAudioSource (const XMLNode&);
diff --git a/libs/ardour/coreaudio_source.cc b/libs/ardour/coreaudio_source.cc
index 67aaabfb88..7674462653 100644
--- a/libs/ardour/coreaudio_source.cc
+++ b/libs/ardour/coreaudio_source.cc
@@ -28,19 +28,19 @@
 using namespace ARDOUR;
 
 CoreAudioSource::CoreAudioSource (const XMLNode& node)
-	: ExternalSource (node)
+	: AudioFileSource (node)
 {
 	init (_name, true);
-	SourceCreated (this); /* EMIT SIGNAL */
+	AudioSourceCreated (this); /* EMIT SIGNAL */
 }
 
 CoreAudioSource::CoreAudioSource (const string& idstr, bool build_peak)
-	: ExternalSource(idstr, build_peak)
+	: AudioFileSource(idstr, build_peak)
 {
 	init (idstr, build_peak);
 
 	if (build_peak) {
-		 SourceCreated (this); /* EMIT SIGNAL */
+		 AudioSourceCreated (this); /* EMIT SIGNAL */
 	}
 }
 
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index bd5741959c..37237bd1e1 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -3601,7 +3601,9 @@ Session::write_one_audio_track (AudioTrack& track, jack_nframes_t start, jack_nf
 	jack_nframes_t to_do;
 	vector<Sample*> buffers;
 	char *  workbuf = 0;
-	const jack_nframes_t chunk_size = (256 * 1024)/4;
+
+	// any bigger than this seems to cause stack overflows in called functions
+	const jack_nframes_t chunk_size = (128 * 1024)/4;
 
 	g_atomic_int_set (&processing_prohibited, 1);
 	
diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc
index 15d0c6be81..2d9fccf9d7 100644
--- a/libs/ardour/utils.cc
+++ b/libs/ardour/utils.cc
@@ -177,7 +177,7 @@ tokenize_fullpath (string fullpath, string& path, string& name)
 int
 touch_file (string path)
 {
-	int fd = open (path.c_str(), O_RDONLY|O_CREAT);
+	int fd = open (path.c_str(), O_RDWR|O_CREAT, 0660);
 	if (fd >= 0) {
 		close (fd);
 		return 0;