diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-02-27 14:02:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-02-27 14:02:22 +0000 |
| commit | ad55d36c560ddb48b50343e334802b9e051d9992 (patch) | |
| tree | 0b9423ab35c48cc6a0d04b25db00a38a3763db3e | |
| parent | 9203cb8f66ca11b7e27335c61169656db763b774 (diff) | |
fix for build issue on Mandriva, #1180 ; remove stacktrace output when JACK freewheeling is turned off
git-svn-id: svn://localhost/ardour2/trunk@1525 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | libs/ardour/audioengine.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/import.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 78de60206b..ba34ec417d 100644 --- a/SConstruct +++ b/SConstruct @@ -667,8 +667,10 @@ opt_flags[:0] = [ if env['DEBUG'] == 1: env.Append(CCFLAGS=" ".join (debug_flags)) + env.Append(LINKFLAGS=" ".join (debug_flags)) else: env.Append(CCFLAGS=" ".join (opt_flags)) + env.Append(LINKFLAGS=" ".join (opt_flags)) if env['UNIVERSAL'] == 1: env.Append(CCFLAGS="-arch i386 -arch ppc") diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index eefa99262d..79ef344a1a 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -964,10 +964,6 @@ AudioEngine::freewheel (bool onoff) _freewheel_thread_registered = false; } - if (!onoff) { - stacktrace (cout); - } - return jack_set_freewheel (_jack, onoff); } else { diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index e6d3c5ba5e..643feb87ef 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -71,6 +71,7 @@ protected: class ResampledImportableSource : public ImportableSource { public: ResampledImportableSource (SNDFILE* sf, SF_INFO* info, nframes_t rate) : ImportableSource (sf, info) { + int err; sf_seek (in, 0, SEEK_SET) ; @@ -104,7 +105,6 @@ class ResampledImportableSource : public ImportableSource { float input[BLOCKSIZE]; SRC_STATE* src_state; SRC_DATA src_data; - int err; }; int @@ -334,6 +334,8 @@ Session::import_audiofile (import_status& status) nframes_t ResampledImportableSource::read (Sample* output, nframes_t nframes) { + int err; + /* If the input buffer is empty, refill it. */ if (src_data.input_frames == 0) { |