Only in csound-4.23a/: English.xmg Only in csound-4.23a/: FL_graph.o Only in csound-4.23a/: LINUXaudio.o diff -ur csound-orig/Makefile csound-4.23a/Makefile --- csound-orig/Makefile Thu Jan 16 05:53:36 2003 +++ csound-4.23a/Makefile Thu Mar 6 11:59:34 2003 @@ -11,7 +11,7 @@ CDEP = COBS = $(COBJS) -CC = cc +#CC = cc # choose either - # CDEP = for UNIX # COBS = $(COBJS) @@ -88,14 +88,14 @@ # uncomment these if HAVE_FLTK was enabled in DEFINES # -CXX = g++ +#CXX = g++ CXXFLAGS = -fno-exceptions -fno-rtti FLTKSRC = widgets.cpp FLTKOBJ = widgets.o # source and object files for FLTK widgets -#FLTKLIB = -lfltk -lpthread -lg++ -FLTKLIB = /usr/local/lib/libfltk.a /usr/lib/libpthread.a \ - /usr/lib/libstdc++-libc6.2-2.a.3 +FLTKLIB = -lfltk -lpthread -lstdc++ +#FLTKLIB = /usr/local/lib/libfltk.a /usr/lib/libpthread.a \ +# /usr/lib/libstdc++-libc6.2-2.a.3 # libraries required by widgets.cpp # -lfltk -lpthread -lg++ use dynamic libraries # @@ -105,7 +105,7 @@ # directiories and version # numbers are system-dependent) -LIBS = $(FLTKLIB) -L /usr/X11R6/lib -lX11 -ltcl -ltk -lm -ldl +LIBS = $(FLTKLIB) -L /usr/X11R6/lib -lX11 -ltcl8.4 -ltk8.4 -lm -ldl # -lefence # -lm required # -lX11 for X window calls @@ -124,7 +124,7 @@ # note: SuSE 7.3 users should use -ltcl8.3 -ltk8.3, but another # (probably better) solution is to create symbolic links -WINSRC = winFLTK.c FL_graph.cpp +WINSRC = winFLTK.cpp FL_graph.cpp WINOBJ = winFLTK.o FL_graph.o # ;if WINDOWS enabled in DEFINES, choose one of - # winX11.o for X11 window graphics @@ -434,7 +434,7 @@ cp MUSIC/csound/util2/sndinfo/sndinfo ~ftp/pub/dream/SGI depend: - gcc -M $(DEFINES) $(CSRCS) $(CSMS) $(UTIL3) > deps + $(CC) -M $(DEFINES) $(CSRCS) $(CSMS) $(UTIL3) > deps cat Makefile deps > makefile testlib.so: testlib.o Only in csound-4.23a/: aifc.o Only in csound-4.23a/: aiff.o Only in csound-4.23a/anal/adsyn: hetro Only in csound-4.23a/anal/adsyn: main.o diff -ur csound-orig/anal/adsyn/makef csound-4.23a/anal/adsyn/makef --- csound-orig/anal/adsyn/makef Tue Oct 8 07:49:08 2002 +++ csound-4.23a/anal/adsyn/makef Thu Mar 6 12:02:35 2003 @@ -12,7 +12,7 @@ adsyns: hetro hetro: $(OBJS) - cc $(CFLAGS) -o hetro $(OBJS) $(LIBS) + $(CC) $(CFLAGS) -o hetro $(OBJS) $(LIBS) install: hetro -strip hetro @@ -20,7 +20,7 @@ cp hetro $(DEST) main.o: $T/ustub.h $T/cs.h main.c - cc $(CFLAGS) -c main.c + $(CC) $(CFLAGS) -c main.c clean: -rm -f hetro Only in csound-4.23a/anal/convol: cvanal Only in csound-4.23a/anal/convol: main.o diff -ur csound-orig/anal/convol/makef csound-4.23a/anal/convol/makef --- csound-orig/anal/convol/makef Tue Oct 8 07:54:44 2002 +++ csound-4.23a/anal/convol/makef Thu Mar 6 12:03:03 2003 @@ -13,7 +13,7 @@ cvl: cvanal cvanal: $(OBJS) - cc $(CFLAGS) -o cvanal $(OBJS) $(LIBS) + $(CC) $(CFLAGS) -o cvanal $(OBJS) $(LIBS) install: cvanal -strip cvanal @@ -21,7 +21,7 @@ cp cvanal $(DEST) main.o: $T/ustub.h $T/cs.h main.c - cc $(CFLAGS) -c main.c + $(CC) $(CFLAGS) -c main.c clean: -rm -f cvanal Only in csound-4.23a/anal/lpc: lpanal Only in csound-4.23a/anal/lpc: main.o Only in csound-4.23a/anal/pvoc: main.o Only in csound-4.23a/anal/pvoc: pvanal Only in csound-4.23a/: aops.o Only in csound-4.23a/: argdecode.o Only in csound-4.23a/: auxfd.o Only in csound-4.23a/: babo.o Only in csound-4.23a/: bbcut.o Only in csound-4.23a/: biquad.o Only in csound-4.23a/: bowedbar.o Only in csound-4.23a/: butter.o Only in csound-4.23a/: clfilt.o Only in csound-4.23a/: cmath.o Only in csound-4.23a/: complex.o Only in csound-4.23a/: control.o Only in csound-4.23a/: cross2.o Only in csound-4.23a/: cscore.o Only in csound-4.23a/: cscorfns.o Only in csound-4.23a/: cscormai.o Only in csound-4.23a/: csound Only in csound-4.23a/: csound.patch-4.23a Only in csound-4.23a/: csound.xmg Only in csound-4.23a/: cvanal.o Only in csound-4.23a/: dam.o Only in csound-4.23a/: dcblockr.o Only in csound-4.23a/: diskin.o Only in csound-4.23a/: disprep.o Only in csound-4.23a/: dl_opcodes.o Only in csound-4.23a/: dnfft.o Only in csound-4.23a/: dnoise.o Only in csound-4.23a/: dsputil.o Only in csound-4.23a/: dumpf.o Only in csound-4.23a/: entry1.o Only in csound-4.23a/: entry2.o Only in csound-4.23a/: express.o Only in csound-4.23a/: extract.o Only in csound-4.23a/: fft.o Only in csound-4.23a/: fgens.o Only in csound-4.23a/: filopen.o Only in csound-4.23a/: filter.o Only in csound-4.23a/: flanger.o Only in csound-4.23a/: fm4op.o Only in csound-4.23a/: follow.o Only in csound-4.23a/: fout.o Only in csound-4.23a/: getstring.o Only in csound-4.23a/: grain.o Only in csound-4.23a/: grain4.o Only in csound-4.23a/: hetro.o Only in csound-4.23a/: hrtferX.o Only in csound-4.23a/: ieee80.o Only in csound-4.23a/: insert.o Only in csound-4.23a/: jpff_glue.o Only in csound-4.23a/: linevent.o Only in csound-4.23a/: locsig.o Only in csound-4.23a/: lowpassr.o Only in csound-4.23a/: lpanal.o Only in csound-4.23a/: lptrkfns.o Only in csound-4.23a/: main.o Only in csound-4.23a/: makedb Only in csound-4.23a/: mandolin.o Only in csound-4.23a/: memalloc.o Only in csound-4.23a/: memfiles.o Only in csound-4.23a/: mididevice.o Only in csound-4.23a/: midiinterop.o Only in csound-4.23a/: midiops.o Only in csound-4.23a/: midiops2.o Only in csound-4.23a/: midiops3.o Only in csound-4.23a/: midiout.o Only in csound-4.23a/: midirecv.o Only in csound-4.23a/: midisend.o Only in csound-4.23a/: modal4.o Only in csound-4.23a/: moog1.o Only in csound-4.23a/: musmon.o Only in csound-4.23a/: mxfft.o Only in csound-4.23a/: namedins.o Only in csound-4.23a/: natben.o Only in csound-4.23a/: nlfilt.o Only in csound-4.23a/: oload.o Only in csound-4.23a/: one_file.o Only in csound-4.23a/: opcode.o Only in csound-4.23a/: oscbnk.o Only in csound-4.23a/: oscils.o Only in csound-4.23a/: otran.o Only in csound-4.23a/: phisem.o Only in csound-4.23a/: physmod.o Only in csound-4.23a/: physutil.o Only in csound-4.23a/: pitch.o Only in csound-4.23a/: pluck.o Only in csound-4.23a/: pstream.o Only in csound-4.23a/: pvadd.o Only in csound-4.23a/: pvanal.o Only in csound-4.23a/: pvfileio.o Only in csound-4.23a/: pvinterp.o Only in csound-4.23a/: pvlook.o Only in csound-4.23a/: pvoc.o Only in csound-4.23a/: pvocext.o Only in csound-4.23a/: pvread.o Only in csound-4.23a/: pvsanal.o Only in csound-4.23a/: pvxanal.o Only in csound-4.23a/: rdorch.o Only in csound-4.23a/: rdscor.o Only in csound-4.23a/: repluck.o Only in csound-4.23a/: rtlinux.o Only in csound-4.23a/: scansyn.o Only in csound-4.23a/: scansynx.o Only in csound-4.23a/: schedule.o Only in csound-4.23a/: scot.o Only in csound-4.23a/: scsort.o Only in csound-4.23a/: scxtract.o Only in csound-4.23a/: sdif-mem.o Only in csound-4.23a/: sdif.o Only in csound-4.23a/: sdif2ad Only in csound-4.23a/: sdif2adsyn.o Only in csound-4.23a/: sfheader.o Only in csound-4.23a/: sfont.o Only in csound-4.23a/: shaker.o Only in csound-4.23a/: singwave.o Only in csound-4.23a/: sndinfUG.o Only in csound-4.23a/: sndinfo.o Only in csound-4.23a/: sndwarp.o Only in csound-4.23a/: sort.o Only in csound-4.23a/: soundin.o Only in csound-4.23a/: soundio.o Only in csound-4.23a/: space.o Only in csound-4.23a/: spat3d.o Only in csound-4.23a/: spectra.o Only in csound-4.23a/: sread.o Only in csound-4.23a/: swrite.o Only in csound-4.23a/: twarp.o Only in csound-4.23a/: ugens1.o Only in csound-4.23a/: ugens2.o Only in csound-4.23a/: ugens3.o Only in csound-4.23a/: ugens4.o Only in csound-4.23a/: ugens5.o Only in csound-4.23a/: ugens6.o Only in csound-4.23a/: ugens7.o Only in csound-4.23a/: ugens8.o Only in csound-4.23a/: ugens9.o Only in csound-4.23a/: ugensa.o Only in csound-4.23a/: uggab.o Only in csound-4.23a/: ugmoss.o Only in csound-4.23a/: ugrw1.o Only in csound-4.23a/: ugrw2.o Only in csound-4.23a/: ugsc.o Only in csound-4.23a/: ulaw.o Only in csound-4.23a/util1/cscore: cscore.a Only in csound-4.23a/util1/scot: main.o Only in csound-4.23a/util1/scot: scot Only in csound-4.23a/util1/sortex: MOD.o Only in csound-4.23a/util1/sortex: extract Only in csound-4.23a/util1/sortex: scsort Only in csound-4.23a/util1/sortex: smain.o Only in csound-4.23a/util1/sortex: xmain.o Only in csound-4.23a/util2/dnoise.dir: dnoise Only in csound-4.23a/util2/dnoise.dir: dnoise.o Only in csound-4.23a/util2/dnoise.dir: fft.o diff -ur csound-orig/util2/dnoise.dir/makef csound-4.23a/util2/dnoise.dir/makef --- csound-orig/util2/dnoise.dir/makef Fri Jan 5 05:53:24 2001 +++ csound-4.23a/util2/dnoise.dir/makef Thu Mar 6 12:00:37 2003 @@ -47,7 +47,7 @@ -rm *.bak *~ depend: - gcc -M $(DEFINES) $(CSRCS) > deps + $(CC) -M $(DEFINES) $(CSRCS) > deps cat Makefile deps > makefile # DO NOT DELETE THIS LINE Only in csound-4.23a/util2/dnoise.dir: srconv Only in csound-4.23a/util2/dnoise.dir: srconv.o diff -ur csound-orig/util2/exports/Makefile csound-4.23a/util2/exports/Makefile --- csound-orig/util2/exports/Makefile Fri Dec 27 07:39:44 1996 +++ csound-4.23a/util2/exports/Makefile Thu Mar 6 12:03:58 2003 @@ -14,40 +14,40 @@ pv_export: $(POBJS) - cc $(CFLAGS) -o pv_export $(POBJS) -lm + $(CC) $(CFLAGS) -o pv_export $(POBJS) -lm pv_export.u: pv_export.c - cc -O3 -I ../.. -j pv_export.c + $(CC) -O3 -I ../.. -j pv_export.c het_export: $(HOBJS) - cc $(CFLAGS) -o het_export $(HOBJS) -lm + $(CC) $(CFLAGS) -o het_export $(HOBJS) -lm het_export.u: het_export.c - cc -O3 -I ../.. -j het_export.c + $(CC) -O3 -I ../.. -j het_export.c lpc_export: $(LOBJS) - cc $(CFLAGS) -o lpc_export $(LOBJS) -lm + $(CC) $(CFLAGS) -o lpc_export $(LOBJS) -lm lpc_export.u: lpc_export.c - cc -O3 -I ../.. -j lpc_export.c + $(CC) -O3 -I ../.. -j lpc_export.c pv_import: pv_import.u - cc $(CFLAGS) -o pv_import pv_import.u -lm + $(CC) $(CFLAGS) -o pv_import pv_import.u -lm pv_import.u: pv_import.c - cc -O3 -I ../.. -j pv_import.c + $(CC) -O3 -I ../.. -j pv_import.c het_import: $(HIOBJS) - cc $(CFLAGS) -o het_import $(HIOBJS) -lm + $(CC) $(CFLAGS) -o het_import $(HIOBJS) -lm het_import.u: het_import.c - cc -O3 -I ../.. -j het_import.c + $(CC) -O3 -I ../.. -j het_import.c lpc_import: $(LIOBJS) - cc $(CFLAGS) -o lpc_import $(LIOBJS) -lm + $(CC) $(CFLAGS) -o lpc_import $(LIOBJS) -lm lpc_import.u: lpc_import.c - cc -O3 -I ../.. -j lpc_import.c + $(CC) -O3 -I ../.. -j lpc_import.c install: pv_export pv_import Only in csound-4.23a/util2/mixer: extractor Only in csound-4.23a/util2/mixer: mixer Only in csound-4.23a/util2/mixer: mixer.o Only in csound-4.23a/util2/mixer: xtrct.o Only in csound-4.23a/util2/pvlook.dir: pvlook Only in csound-4.23a/util2/scale.dir: scale Only in csound-4.23a/util2/scale.dir: scale.o Only in csound-4.23a/util2/sndinfo: main.o Only in csound-4.23a/util2/sndinfo: sndinfo Only in csound-4.23a/: vbap.o Only in csound-4.23a/: vbap_eight.o Only in csound-4.23a/: vbap_four.o Only in csound-4.23a/: vbap_sixteen.o Only in csound-4.23a/: vbap_zak.o Only in csound-4.23a/: vdelay.o Only in csound-4.23a/: vpvoc.o Only in csound-4.23a/: wave-terrain.o Only in csound-4.23a/: wave.o Only in csound-4.23a/: wavegde.o diff -ur csound-orig/widgets.cpp csound-4.23a/widgets.cpp --- csound-orig/widgets.cpp Wed Oct 9 08:49:13 2002 +++ csound-4.23a/widgets.cpp Thu Mar 6 09:37:17 2003 @@ -1275,7 +1275,7 @@ break; case EXP_: range = fld.max - fld.min; - base = pow(fld.max / fld.min, 1/range); + base = ::pow(fld.max / fld.min, 1/range); ((Fl_Positioner*) o)->xvalue(log(val/fld.min) / log(base)) ; break; default: @@ -1291,7 +1291,7 @@ break; case EXP_: range = fld.max2 - fld.min2; - base = pow(fld.max2 / fld.min2, 1/range); + base = ::pow(fld.max2 / fld.min2, 1/range); ((Fl_Positioner*) o)->yvalue(log(val/fld.min2) / log(base)) ; break; default: @@ -1335,7 +1335,7 @@ break; case EXP_: range = p->slider_data[j].max - p->slider_data[j].min; - base = pow(p->slider_data[j].max / p->slider_data[j].min, 1/range); + base = ::pow(p->slider_data[j].max / p->slider_data[j].min, 1/range); ((Fl_Valuator*) grup->child(j))-> value(log(val/p->slider_data[j].min) / log(base)) ; break; @@ -1356,7 +1356,7 @@ break; case EXP_: range = fld.max - fld.min; - base = pow(fld.max / fld.min, 1/range); + base = ::pow(fld.max / fld.min, 1/range); ((Fl_Valuator*) o)->value(log(val/fld.min) / log(base)) ; break; default: @@ -1639,7 +1639,7 @@ for (j=0; j< ss; j++) { snapshots[j].fields.erase(snapshots[j].fields.begin(), snapshots[j].fields.end()); - snapshots.push_back(); + snapshots.pop_back(); } if (isActivatedKeyb) { delete oKeyb; @@ -1791,7 +1791,7 @@ static void fl_callbackExponentialSlider(Fl_Valuator* w, void *a) { FLSLIDER *p = ((FLSLIDER*) a); - displ(*p->kout = p->min * pow (p->base, w->value()), *p->idisp); + displ(*p->kout = p->min * ::pow (p->base, w->value()), *p->idisp); } @@ -1826,7 +1826,7 @@ static void fl_callbackExponentialSliderBank(Fl_Valuator* w, void *a) { SLDBK_ELEMENT* p = (SLDBK_ELEMENT*) a; - *p->out = p->min * pow (p->base, w->value()); + *p->out = p->min * ::pow (p->base, w->value()); } @@ -1860,7 +1860,7 @@ val = j->xvalue(); break; case EXP_: - val = *p->iminx * pow (p->basex, j->xvalue()); + val = *p->iminx * ::pow (p->basex, j->xvalue()); break; default: if (iexpx > 0) { //interpolated @@ -1880,7 +1880,7 @@ val = j->yvalue(); break; case EXP_: - val = *p->iminy * pow (p->basey, j->yvalue()); + val = *p->iminy * ::pow (p->basey, j->yvalue()); break; default: if (iexpy > 0) { //interpolated @@ -1909,7 +1909,7 @@ static void fl_callbackExponentialRoller(Fl_Valuator* w, void *a) { FLROLLER *p = ((FLROLLER*) a); - displ(*p->kout = ((FLROLLER*) a)->min * pow (p->base, w->value()), *p->idisp); + displ(*p->kout = ((FLROLLER*) a)->min * ::pow (p->base, w->value()), *p->idisp); } @@ -1942,7 +1942,7 @@ static void fl_callbackExponentialKnob(Fl_Valuator* w, void *a) { FLKNOB *p = ((FLKNOB*) a); - displ( *p->kout = ((FLKNOB*) a)->min * pow (p->base, w->value()), *p->idisp); + displ( *p->kout = ((FLKNOB*) a)->min * ::pow (p->base, w->value()), *p->idisp); } @@ -2306,7 +2306,7 @@ break; case EXP_: //exponential range = v.max-v.min; - base = pow(v.max / v.min, 1/range); + base = ::pow(v.max / v.min, 1/range); val = (log(val/v.min) / log(base)) ; break; default: @@ -2687,7 +2687,7 @@ initerror("FLslider: zero is illegal in exponential operations"); range = max - min; o->range(0,range); - p->base = pow((max / min), 1/range); + p->base = ::pow((max / min), 1/range); o->callback((Fl_Callback*)fl_callbackExponentialSlider,(void *) p); break; default: @@ -2857,13 +2857,13 @@ initerror("FLsliderBank: zero is illegal in exponential operations"); range = max - min; o->range(0,range); - p->slider_data[j].base = pow((max / min), 1/range); + p->slider_data[j].base = ::pow((max / min), 1/range); o->callback((Fl_Callback*)fl_callbackExponentialSliderBank, (void *) &(p->slider_data[j])); { val = outable[j]; MYFLT range = max-min; - MYFLT base = pow(max / min, 1/range); + MYFLT base = ::pow(max / min, 1/range); val = (log(val/min) / log(base)) ; } break; @@ -2944,7 +2944,7 @@ initerror("FLjoy X axe: zero is illegal in exponential operations"); MYFLT range = *p->imaxx - *p->iminx; o->xbounds(0,range); - p->basex = pow((*p->imaxx / *p->iminx), 1/range); + p->basex = ::pow((*p->imaxx / *p->iminx), 1/range); } break; default: { @@ -2972,7 +2972,7 @@ initerror("FLjoy X axe: zero is illegal in exponential operations"); MYFLT range = *p->imaxy - *p->iminy; o->ybounds(0,range); - p->basey = pow((*p->imaxy / *p->iminy), 1/range); + p->basey = ::pow((*p->imaxy / *p->iminy), 1/range); } break; default: { @@ -3065,7 +3065,7 @@ initerror("FLknob: zero is illegal in exponential operations"); MYFLT range = max - min; o->range(0,range); - p->base = pow((max / min), 1/range); + p->base = ::pow((max / min), 1/range); o->callback((Fl_Callback*)fl_callbackExponentialKnob,(void *) p); } break; default: @@ -3333,7 +3333,7 @@ initerror("FLslider: zero is illegal in exponential operations"); MYFLT range = max - min; o->range(0,range); - p->base = pow((max / min), 1/range); + p->base = ::pow((max / min), 1/range); o->callback((Fl_Callback*)fl_callbackExponentialRoller,(void *) p); } break; Only in csound-4.23a/: widgets.o Only in csound-4.23a/: winEPS.o Only in csound-4.23a/: winFLTK.o Only in csound-4.23a/: winascii.o Only in csound-4.23a/: windin.o Only in csound-4.23a/: window.o