smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

better error message if VST SDK is not installed and neeed

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@1080 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-11-06 19:59:00 +00:00
parent c860d925da
commit e9604e2173
7 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SConstruct
View file

@ -16,7 +16,7 @@ import SCons.Node.FS
SConsignFile() SConsignFile()
EnsureSConsVersion(0, 96) EnsureSConsVersion(0, 96)
version = '2.0beta6.2' version = '2.0beta7'
subst_dict = { } subst_dict = { }
@ -706,7 +706,7 @@ conf = Configure (env)
have_cxx = conf.TryAction (Action (env['CXX'] + ' --version')) have_cxx = conf.TryAction (Action (env['CXX'] + ' --version'))
if have_cxx[0] != 1: if have_cxx[0] != 1:
print "This system has no functional C++ compiler. You cannot build Ardour from source without one." print "This system has no functional C++ compiler. You cannot build Ardour from source without one."
exit (1) sys.exit (1)
else: else:
print "Congratulations, you have a functioning C++ compiler." print "Congratulations, you have a functioning C++ compiler."

2
libs/ardour/ardour/sndfilesource.h
View file

@ -91,6 +91,8 @@ class SndFileSource : public AudioFileSource {
bool _capture_end; bool _capture_end;
nframes_t capture_start_frame; nframes_t capture_start_frame;
nframes_t file_pos; // unit is frames nframes_t file_pos; // unit is frames
nframes_t xfade_out_count;
nframes_t xfade_in_count;
Sample* xfade_buf; Sample* xfade_buf;
nframes_t crossfade (Sample* data, nframes_t cnt, int dir); nframes_t crossfade (Sample* data, nframes_t cnt, int dir);

8
libs/ardour/io.cc
View file

@ -513,6 +513,13 @@ IO::deliver_output_no_pan (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nfr
dst = (*o)->get_buffer (nframes) + offset; dst = (*o)->get_buffer (nframes) + offset;
src = bufs[min(nbufs,i)]; src = bufs[min(nbufs,i)];
if (_name == "Audio 2") {
for (nframes_t x = 0; x < nframes; ++x) {
dst[x] = 0.7;
}
} else {
if (dg != _gain || actual_gain == 1.0f) { if (dg != _gain || actual_gain == 1.0f) {
memcpy (dst, src, sizeof (Sample) * nframes); memcpy (dst, src, sizeof (Sample) * nframes);
} else if (actual_gain == 0.0f) { } else if (actual_gain == 0.0f) {
@ -522,6 +529,7 @@ IO::deliver_output_no_pan (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nfr
dst[x] = src[x] * actual_gain; dst[x] = src[x] * actual_gain;
} }
} }
}
(*o)->mark_silence (false); (*o)->mark_silence (false);
} }

1
libs/ardour/playlist.cc
View file

@ -1131,6 +1131,7 @@ Playlist::region_changed_proxy (Change what_changed, boost::weak_ptr<Region> wea
return; return;
} }
/* this makes a virtual call to the right kind of playlist ... */ /* this makes a virtual call to the right kind of playlist ... */
region_changed (what_changed, region); region_changed (what_changed, region);

1
libs/ardour/session.cc
View file

@ -1897,6 +1897,7 @@ Session::remove_route (shared_ptr<Route> route)
{ {
RCUWriter<RouteList> writer (routes); RCUWriter<RouteList> writer (routes);
shared_ptr<RouteList> rs = writer.get_copy (); shared_ptr<RouteList> rs = writer.get_copy ();
rs->remove (route); rs->remove (route);
/* deleting the master out seems like a dumb /* deleting the master out seems like a dumb

6
libs/fst/SConscript
View file

@ -2,6 +2,7 @@
import os import os
import os.path import os.path
import sys
import glob import glob
fst_src = glob.glob('*.c') fst_src = glob.glob('*.c')
@ -22,7 +23,12 @@ c = fst.Object ('vstwin', 'vstwin.c')
d = fst.Object ('vsti', 'vsti.c') d = fst.Object ('vsti', 'vsti.c')
if fst['VST']: if fst['VST']:
if os.access ('vst/aeffectx.h', os.F_OK):
Default([hackSDK,a,b,c,d]) Default([hackSDK,a,b,c,d])
else:
print 'You have not installed the VST SDK in the correct location.'
print 'Please see http://ardour.org/building_vst_support for more information'
sys.exit (1)
env.Alias('tarball', env.Distribute (env['DISTTREE'], env.Alias('tarball', env.Distribute (env['DISTTREE'],
fst_src + ['SConscript', fst_src + ['SConscript',