[SCM] caps/master: Merge resolve
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Thu Aug 15 19:30:27 UTC 2013
The following commit has been merged in the master branch:
commit c0f50edc8da633baa216c367e4dd58ace5e91ca5
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Thu Aug 15 21:25:31 2013 +0200
Merge resolve
diff --git a/Makefile b/Makefile
index 462bd84..d2d7947 100644
--- a/Makefile
+++ b/Makefile
@@ -54,10 +54,7 @@ tags: $(SOURCES) $(HEADERS)
@-if [ -x /usr/bin/ctags ]; then ctags $(SOURCES) $(HEADERS) >/dev/null 2>&1 ; fi
install: all
-<<<<<<< HEAD
-=======
@$(STRIP) $(PLUG).so > /dev/null
->>>>>>> upstream/0.9.10
install -d $(DEST)
install -m 644 $(PLUG).so $(DEST)
install -d $(RDFDEST)
diff --git a/tags b/tags
deleted file mode 100644
index 6cb2e20..0000000
--- a/tags
+++ /dev/null
@@ -1,193 +0,0 @@
-AmpIII::init Amp.cc /^AmpIII::init()$/
-AmpIII::one_cycle Amp.cc /^AmpIII::one_cycle (int frames)$/
-AmpIV::init Amp.cc /^AmpIV::init()$/
-AmpIV::one_cycle Amp.cc /^AmpIV::one_cycle (int frames)$/
-AmpStub::init Amp.cc /^AmpStub::init (bool adjust_downsampler)$/
-AmpV::init Amp.cc /^AmpV::init()$/
-AmpV::one_cycle Amp.cc /^AmpV::one_cycle (int frames)$/
-AmpVTS::init Amp.cc /^AmpVTS::init()$/
-AmpVTS::one_cycle Amp.cc /^AmpVTS::one_cycle (int frames)$/
-AutoWah::activate SweepVF.cc /^AutoWah::activate()$/
-AutoWah::init SweepVF.cc /^AutoWah::init()$/
-AutoWah::one_cycle SweepVF.cc /^AutoWah::one_cycle (int frames)$/
-BIT dsp/White.h /^# define BIT(y) ((b << (31 - y)) & 0x80000000)$/
-BIT dsp/White.h /^# define BIT(y) ((b << (30 - y)) & 0x40000000)$/
-CEO::init Click.cc /^CEO::init()$/
-CabinetI::activate Cabinet.cc /^CabinetI::activate()$/
-CabinetI::init Cabinet.cc /^CabinetI::init()$/
-CabinetI::one_cycle Cabinet.cc /^CabinetI::one_cycle (int frames)$/
-CabinetI::switch_model Cabinet.cc /^CabinetI::switch_model (int m)$/
-CabinetII::activate Cabinet.cc /^CabinetII::activate()$/
-CabinetII::init Cabinet.cc /^CabinetII::init()$/
-CabinetII::one_cycle Cabinet.cc /^CabinetII::one_cycle (int frames)$/
-CabinetII::switch_model Cabinet.cc /^CabinetII::switch_model (int m)$/
-ChorusI::one_cycle Chorus.cc /^ChorusI::one_cycle (int frames)$/
-ChorusII::one_cycle Chorus.cc /^ChorusII::one_cycle (int frames)$/
-Click::init Click.cc /^Click::init()$/
-ClickStub::init Click.cc /^ClickStub::init (float * _wave, int _N)$/
-ClickStub::one_cycle Click.cc /^ClickStub::one_cycle (int frames)$/
-Clip::clip Clip.cc /^Clip::clip (d_sample a)$/
-Clip::init Clip.cc /^Clip::init()$/
-Clip::one_cycle Clip.cc /^Clip::one_cycle (int frames)$/
-Compress::one_cycle Compress.cc /^Compress::one_cycle (int frames)$/
-DSP dsp/sinc.h /^namespace DSP {$/
-DSP dsp/util.h /^namespace DSP {$/
-DSP::Delay Reverb.h /^: public DSP::Delay$/
-Dirac::init Click.cc /^Dirac::init()$/
-Eq2x2::activate Eq.cc /^Eq2x2::activate()$/
-Eq2x2::init Eq.cc /^Eq2x2::init()$/
-Eq2x2::one_cycle Eq.cc /^Eq2x2::one_cycle (int frames)$/
-Eq::activate Eq.cc /^Eq::activate()$/
-Eq::init Eq.cc /^Eq::init()$/
-Eq::one_cycle Eq.cc /^Eq::one_cycle (int frames)$/
-HRTF::init HRTF.cc /^HRTF::init()$/
-HRTF::one_cycle HRTF.cc /^HRTF::one_cycle (int frames)$/
-HRTF::set_pan HRTF.cc /^HRTF::set_pan (int p)$/
-JVRev::activate Reverb.cc /^JVRev::activate()$/
-JVRev::init Reverb.cc /^JVRev::init()$/
-JVRev::one_cycle Reverb.cc /^JVRev::one_cycle (int frames)$/
-JVRev::set_t60 Reverb.cc /^JVRev::set_t60 (d_sample t)$/
-L Reverb.cc /^# define L(i) ((int) (l[i] * fs))$/
-LADSPA_IS_HARD_RT_CAPABLE ladspa.h /^#define LADSPA_IS_HARD_RT_CAPABLE(x) ((x) & LADSPA/
-LADSPA_IS_HINT_BOUNDED_ABOVE ladspa.h /^#define LADSPA_IS_HINT_BOUNDED_ABOVE(x) ((x) & LAD/
-LADSPA_IS_HINT_BOUNDED_BELOW ladspa.h /^#define LADSPA_IS_HINT_BOUNDED_BELOW(x) ((x) & LAD/
-LADSPA_IS_HINT_DEFAULT_0 ladspa.h /^#define LADSPA_IS_HINT_DEFAULT_0(x) (((x) &/
-LADSPA_IS_HINT_DEFAULT_1 ladspa.h /^#define LADSPA_IS_HINT_DEFAULT_1(x) (((x) &/
-LADSPA_IS_HINT_DEFAULT_100 ladspa.h /^#define LADSPA_IS_HINT_DEFAULT_100(x) (((x) &/
-LADSPA_IS_HINT_DEFAULT_440 ladspa.h /^#define LADSPA_IS_HINT_DEFAULT_440(x) (((x) &/
-LADSPA_IS_HINT_DEFAULT_HIGH ladspa.h /^#define LADSPA_IS_HINT_DEFAULT_HIGH(x) (((x) &/
-LADSPA_IS_HINT_DEFAULT_LOW ladspa.h /^#define LADSPA_IS_HINT_DEFAULT_LOW(x) (((x) &/
-LADSPA_IS_HINT_DEFAULT_MAXIMUM ladspa.h /^#define LADSPA_IS_HINT_DEFAULT_MAXIMUM(x) (((x) &/
-LADSPA_IS_HINT_DEFAULT_MIDDLE ladspa.h /^#define LADSPA_IS_HINT_DEFAULT_MIDDLE(x) (((x) &/
-LADSPA_IS_HINT_DEFAULT_MINIMUM ladspa.h /^#define LADSPA_IS_HINT_DEFAULT_MINIMUM(x) (((x) &/
-LADSPA_IS_HINT_HAS_DEFAULT ladspa.h /^#define LADSPA_IS_HINT_HAS_DEFAULT(x) ((x) & LAD/
-LADSPA_IS_HINT_INTEGER ladspa.h /^#define LADSPA_IS_HINT_INTEGER(x) ((x) & LAD/
-LADSPA_IS_HINT_LOGARITHMIC ladspa.h /^#define LADSPA_IS_HINT_LOGARITHMIC(x) ((x) & LAD/
-LADSPA_IS_HINT_SAMPLE_RATE ladspa.h /^#define LADSPA_IS_HINT_SAMPLE_RATE(x) ((x) & LAD/
-LADSPA_IS_HINT_TOGGLED ladspa.h /^#define LADSPA_IS_HINT_TOGGLED(x) ((x) & LAD/
-LADSPA_IS_INPLACE_BROKEN ladspa.h /^#define LADSPA_IS_INPLACE_BROKEN(x) ((x) & LADSPA/
-LADSPA_IS_PORT_AUDIO ladspa.h /^#define LADSPA_IS_PORT_AUDIO(x) ((x) & LADSPA_PO/
-LADSPA_IS_PORT_CONTROL ladspa.h /^#define LADSPA_IS_PORT_CONTROL(x) ((x) & LADSPA_PO/
-LADSPA_IS_PORT_INPUT ladspa.h /^#define LADSPA_IS_PORT_INPUT(x) ((x) & LADSPA_PO/
-LADSPA_IS_PORT_OUTPUT ladspa.h /^#define LADSPA_IS_PORT_OUTPUT(x) ((x) & LADSPA_PO/
-LADSPA_IS_REALTIME ladspa.h /^#define LADSPA_IS_REALTIME(x) ((x) & LADSPA/
-LENGTH Click.cc /^#define LENGTH(W) ((int) (sizeof (W) \/ sizeof (flo/
-Lorenz::init Lorenz.cc /^Lorenz::init()$/
-Lorenz::one_cycle Lorenz.cc /^Lorenz::one_cycle (int frames)$/
-Pan::activate Pan.cc /^Pan::activate()$/
-Pan::init Pan.cc /^Pan::init()$/
-Pan::one_cycle Pan.cc /^Pan::one_cycle (int frames)$/
-Pan::set_pan Pan.cc /^Pan::set_pan (d_sample p)$/
-PeakShelve dsp/RBJ.h /^: public PeakShelve$/
-PeakShelve dsp/RBJ.h /^: public PeakShelve$/
-PeakShelve dsp/RBJ.h /^: public PeakShelve$/
-PhaserI::one_cycle Phaser.cc /^PhaserI::one_cycle (int frames)$/
-PhaserII::one_cycle Phaser.cc /^PhaserII::one_cycle (int frames)$/
-Plate2x2::one_cycle Reverb.cc /^Plate2x2::one_cycle (int frames)$/
-Plate::one_cycle Reverb.cc /^Plate::one_cycle (int frames)$/
-PlateStub::init Reverb.cc /^PlateStub::init()$/
-PlateStub::process Reverb.cc /^PlateStub::process (d_sample x, d_sample decay, d_/
-PreampIII::init Preamp.cc /^PreampIII::init()$/
-PreampIII::one_cycle Preamp.cc /^PreampIII::one_cycle (int frames)$/
-PreampIV::activate Preamp.cc /^PreampIV::activate()$/
-PreampIV::init Preamp.cc /^PreampIV::init()$/
-PreampIV::one_cycle Preamp.cc /^PreampIV::one_cycle (int frames)$/
-RBJ dsp/RBJ.h /^: public RBJ$/
-RBJ dsp/RBJ.h /^: public RBJ$/
-RBJ dsp/RBJ.h /^: public RBJ$/
-RBJ dsp/RBJ.h /^: public RBJ$/
-Roessler::init Roessler.cc /^Roessler::init()$/
-Roessler::one_cycle Roessler.cc /^Roessler::one_cycle (int frames)$/
-Scape::activate Scape.cc /^Scape::activate()$/
-Scape::one_cycle Scape.cc /^Scape::one_cycle (int frames)$/
-Sin::init Sin.cc /^Sin::init()$/
-Sin::one_cycle Sin.cc /^Sin::one_cycle (int frames)$/
-StereoChorusI::one_cycle Chorus.cc /^StereoChorusI::one_cycle (int frames)$/
-StereoChorusII::one_cycle Chorus.cc /^StereoChorusII::one_cycle (int frames)$/
-SweepVFI::activate SweepVF.cc /^SweepVFI::activate()$/
-SweepVFI::init SweepVF.cc /^SweepVFI::init()$/
-SweepVFI::one_cycle SweepVF.cc /^SweepVFI::one_cycle (int frames)$/
-SweepVFII::activate SweepVF.cc /^SweepVFII::activate()$/
-SweepVFII::init SweepVF.cc /^SweepVFII::init()$/
-SweepVFII::one_cycle SweepVF.cc /^SweepVFII::one_cycle (int frames)$/
-T Reverb.cc /^# define T(i) ((int) (t[i] * fs))$/
-ToneControls::activate ToneControls.cc /^ToneControls::activate (d_sample ** ports)$/
-ToneControls::get_band_gain ToneControls.cc /^ToneControls::get_band_gain (int i, double g)$/
-ToneControls::init ToneControls.cc /^ToneControls::init (double fs)$/
-ToneControls::set_band_gain ToneControls.cc /^ToneControls::set_band_gain (int i, float g)$/
-ToneStack::activate ToneStack.cc /^ToneStack::activate()$/
-ToneStack::one_cycle ToneStack.cc /^ToneStack::one_cycle (int frames)$/
-ToneStackLT::one_cycle ToneStack.cc /^ToneStackLT::one_cycle (int frames)$/
-VCOd::init VCO.cc /^VCOd::init()$/
-VCOd::one_cycle VCO.cc /^VCOd::one_cycle (int frames)$/
-VCOs::init VCO.cc /^VCOs::init()$/
-VCOs::one_cycle VCO.cc /^VCOs::one_cycle (int frames)$/
-White::one_cycle White.cc /^White::one_cycle (int frames)$/
-_fini interface.cc /^void _fini()$/
-_init interface.cc /^void _init()$/
-adding_func basics.h /^adding_func (d_sample * s, int i, d_sample x, d_sa/
-adjust_gain Eq.cc /^adjust_gain (int i, double g)$/
-apply_window dsp/windows.h /^apply_window (d_sample &d, d_sample s)$/
-besseli dsp/windows.h /^besseli (double x)$/
-blackman dsp/windows.h /^blackman (d_sample * s, int n)$/
-blackman_harris dsp/windows.h /^blackman_harris (d_sample * s, int n)$/
-clamp basics.h /^T clamp (T value, T lower, T upper)$/
-db2lin dsp/util.h /^db2lin (double db)$/
-fistp dsp/FPTruncateMode.h /^ #define fistp(f,i) \\$/
-fistp dsp/FPTruncateMode.h /^ #define fistp(f,i) \\$/
-fldcw dsp/FPTruncateMode.h /^ #define fldcw(i) \\$/
-fldcw dsp/FPTruncateMode.h /^ #define fldcw(i)$/
-frandom basics.h /^frandom()$/
-frandom2 Scape.cc /^frandom2()$/
-fstcw dsp/FPTruncateMode.h /^ #define fstcw(i) \\$/
-fstcw dsp/FPTruncateMode.h /^ #define fstcw(i)$/
-hanning dsp/windows.h /^hanning (d_sample * s, int n)$/
-is_denormal basics.h /^is_denormal (float & f)$/
-is_denormal basics.h /^is_denormal (double & f)$/
-isprime dsp/util.h /^isprime (int v)$/
-kaiser dsp/windows.h /^kaiser (d_sample * s, int n, double beta)$/
-ladspa_descriptor interface.cc /^ladspa_descriptor (unsigned long i)$/
-lin2db dsp/util.h /^lin2db (double lin)$/
-max basics.h /^X max (X x, Y y)$/
-min basics.h /^X min (X x, Y y)$/
-processor_specific_denormal_measures Descriptor.h /^processor_specific_denormal_measures()$/
-seed interface.cc /^seed()$/
-setup Amp.cc /^Descriptor<AmpIII>::setup()$/
-setup Amp.cc /^Descriptor<AmpIV>::setup()$/
-setup Amp.cc /^Descriptor<AmpV>::setup()$/
-setup Amp.cc /^Descriptor<AmpVTS>::setup()$/
-setup Cabinet.cc /^Descriptor<CabinetI>::setup()$/
-setup Cabinet.cc /^Descriptor<CabinetII>::setup()$/
-setup Chorus.cc /^Descriptor<ChorusI>::setup()$/
-setup Chorus.cc /^Descriptor<StereoChorusI>::setup()$/
-setup Chorus.cc /^Descriptor<ChorusII>::setup()$/
-setup Chorus.cc /^Descriptor<StereoChorusII>::setup()$/
-setup Click.cc /^Descriptor<Click>::setup()$/
-setup Click.cc /^Descriptor<CEO>::setup()$/
-setup Click.cc /^Descriptor<Dirac>::setup()$/
-setup Clip.cc /^Descriptor<Clip>::setup()$/
-setup Compress.cc /^Descriptor<Compress>::setup()$/
-setup Eq.cc /^Descriptor<Eq>::setup()$/
-setup Eq.cc /^Descriptor<Eq2x2>::setup()$/
-setup HRTF.cc /^Descriptor<HRTF>::setup()$/
-setup Lorenz.cc /^Descriptor<Lorenz>::setup()$/
-setup Pan.cc /^Descriptor<Pan>::setup()$/
-setup Phaser.cc /^Descriptor<PhaserI>::setup()$/
-setup Phaser.cc /^Descriptor<PhaserII>::setup()$/
-setup Preamp.cc /^Descriptor<PreampIII>::setup()$/
-setup Preamp.cc /^Descriptor<PreampIV>::setup()$/
-setup Reverb.cc /^Descriptor<JVRev>::setup()$/
-setup Reverb.cc /^Descriptor<Plate>::setup()$/
-setup Reverb.cc /^Descriptor<Plate2x2>::setup()$/
-setup Roessler.cc /^Descriptor<Roessler>::setup()$/
-setup Scape.cc /^Descriptor<Scape>::setup()$/
-setup Sin.cc /^Descriptor<Sin>::setup()$/
-setup SweepVF.cc /^Descriptor<SweepVFI>::setup()$/
-setup SweepVF.cc /^Descriptor<SweepVFII>::setup()$/
-setup SweepVF.cc /^Descriptor<AutoWah>::setup()$/
-setup ToneStack.cc /^Descriptor<ToneStack>::setup()$/
-setup ToneStack.cc /^Descriptor<ToneStackLT>::setup()$/
-setup VCO.cc /^Descriptor<VCOs>::setup()$/
-setup VCO.cc /^Descriptor<VCOd>::setup()$/
-setup White.cc /^Descriptor<White>::setup()$/
-store_func basics.h /^store_func (d_sample * s, int i, d_sample x, d_sam/
--
caps packaging
More information about the pkg-multimedia-commits
mailing list