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
This commit is contained in:
Paul Davis
2007-02-27 14:02:22 +00:00
parent 9203cb8f66
commit ad55d36c56
3 changed files with 5 additions and 5 deletions

View File

@@ -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")

View File

@@ -964,10 +964,6 @@ AudioEngine::freewheel (bool onoff)
_freewheel_thread_registered = false;
}
if (!onoff) {
stacktrace (cout);
}
return jack_set_freewheel (_jack, onoff);
} else {

View File

@@ -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) {