diff --git a/ChangeLog b/ChangeLog index f34c613ad..15d20ab2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2008-09-20 Tobias Doerffel + + * plugins/sid/envelope.h: + * plugins/sid/extfilt.h: + * plugins/sid/wave.h: + * plugins/sid/voice.h: + * plugins/sid/sid.cc: + * plugins/sid/sid.h: + * plugins/sid/filter.h: + * plugins/sid/sid_instrument.cpp: + renamed class SID to cSID for not conflicting with data structure SID + in win32 headers + + * include/ladspa_base.h: + * src/core/ladspa_control.cpp: + * src/gui/widgets/ladspa_control_view.cpp: + * plugins/ladspa_effect/ladspa_effect.cpp: + renamed FLOAT constant to FLOATING for not conflicting with FLOAT type + in win32 headers + + * include/midi_time.h: + export MIDI class - DLL version of midiImport plugin needs it + 2008-09-19 Tobias Doerffel * data/locale/pt_br.qm: diff --git a/plugins/sid/envelope.h b/plugins/sid/envelope.h index 0bbe1f0d0..63a30578b 100644 --- a/plugins/sid/envelope.h +++ b/plugins/sid/envelope.h @@ -74,7 +74,7 @@ protected: // The 16 selectable sustain levels. static reg8 sustain_level[]; -friend class SID; +friend class cSID; }; diff --git a/plugins/sid/extfilt.h b/plugins/sid/extfilt.h index 0ab105235..adf602f19 100644 --- a/plugins/sid/extfilt.h +++ b/plugins/sid/extfilt.h @@ -66,7 +66,7 @@ protected: sound_sample w0lp; sound_sample w0hp; -friend class SID; +friend class cSID; }; diff --git a/plugins/sid/filter.h b/plugins/sid/filter.h index 90f3c439b..8d8aece3d 100644 --- a/plugins/sid/filter.h +++ b/plugins/sid/filter.h @@ -196,7 +196,7 @@ protected: fc_point* f0_points; int f0_count; -friend class SID; +friend class cSID; }; diff --git a/plugins/sid/sid.cc b/plugins/sid/sid.cc index 73d5c2bb3..08ac866d1 100644 --- a/plugins/sid/sid.cc +++ b/plugins/sid/sid.cc @@ -23,7 +23,7 @@ // ---------------------------------------------------------------------------- // Constructor. // ---------------------------------------------------------------------------- -SID::SID() +cSID::cSID() { // Initialize pointers. sample = 0; @@ -45,7 +45,7 @@ SID::SID() // ---------------------------------------------------------------------------- // Destructor. // ---------------------------------------------------------------------------- -SID::~SID() +cSID::~cSID() { delete[] sample; delete[] fir; @@ -55,7 +55,7 @@ SID::~SID() // ---------------------------------------------------------------------------- // Set chip model. // ---------------------------------------------------------------------------- -void SID::set_chip_model(chip_model model) +void cSID::set_chip_model(chip_model model) { for (int i = 0; i < 3; i++) { voice[i].set_chip_model(model); @@ -69,7 +69,7 @@ void SID::set_chip_model(chip_model model) // ---------------------------------------------------------------------------- // SID reset. // ---------------------------------------------------------------------------- -void SID::reset() +void cSID::reset() { for (int i = 0; i < 3; i++) { voice[i].reset(); @@ -88,7 +88,7 @@ void SID::reset() // Note that to mix in an external audio signal, the signal should be // resampled to 1MHz first to avoid sampling noise. // ---------------------------------------------------------------------------- -void SID::input(int sample) +void cSID::input(int sample) { // Voice outputs are 20 bits. Scale up to match three voices in order // to facilitate simulation of the MOS8580 "digi boost" hardware hack. @@ -99,7 +99,7 @@ void SID::input(int sample) // Read sample from audio output. // Both 16-bit and n-bit output is provided. // ---------------------------------------------------------------------------- -int SID::output() +int cSID::output() { const int range = 1 << 16; const int half = range >> 1; @@ -113,7 +113,7 @@ int SID::output() return sample; } -int SID::output(int bits) +int cSID::output(int bits) { const int range = 1 << bits; const int half = range >> 1; @@ -145,7 +145,7 @@ int SID::output(int bits) // value instead). With this in mind we return the last value written to // any SID register for $2000 cycles without modeling the bit fading. // ---------------------------------------------------------------------------- -reg8 SID::read(reg8 offset) +reg8 cSID::read(reg8 offset) { switch (offset) { case 0x19: @@ -165,7 +165,7 @@ reg8 SID::read(reg8 offset) // ---------------------------------------------------------------------------- // Write registers. // ---------------------------------------------------------------------------- -void SID::write(reg8 offset, reg8 value) +void cSID::write(reg8 offset, reg8 value) { bus_value = value; bus_value_ttl = 0x2000; @@ -255,7 +255,7 @@ void SID::write(reg8 offset, reg8 value) // ---------------------------------------------------------------------------- // Constructor. // ---------------------------------------------------------------------------- -SID::State::State() +cSID::State::State() { int i; @@ -283,7 +283,7 @@ SID::State::State() // ---------------------------------------------------------------------------- // Read state. // ---------------------------------------------------------------------------- -SID::State SID::read_state() +cSID::State cSID::read_state() { State state; int i, j; @@ -343,7 +343,7 @@ SID::State SID::read_state() // ---------------------------------------------------------------------------- // Write state. // ---------------------------------------------------------------------------- -void SID::write_state(const State& state) +void cSID::write_state(const State& state) { int i; @@ -371,7 +371,7 @@ void SID::write_state(const State& state) // ---------------------------------------------------------------------------- // Enable filter. // ---------------------------------------------------------------------------- -void SID::enable_filter(bool enable) +void cSID::enable_filter(bool enable) { filter.enable_filter(enable); } @@ -380,7 +380,7 @@ void SID::enable_filter(bool enable) // ---------------------------------------------------------------------------- // Enable external filter. // ---------------------------------------------------------------------------- -void SID::enable_external_filter(bool enable) +void cSID::enable_external_filter(bool enable) { extfilt.enable_filter(enable); } @@ -390,7 +390,7 @@ void SID::enable_external_filter(bool enable) // I0() computes the 0th order modified Bessel function of the first kind. // This function is originally from resample-1.5/filterkit.c by J. O. Smith. // ---------------------------------------------------------------------------- -double SID::I0(double x) +double cSID::I0(double x) { // Max error acceptable in I0. const double I0e = 1e-6; @@ -433,7 +433,7 @@ double SID::I0(double x) // to slightly below 20kHz. This constraint ensures that the FIR table is // not overfilled. // ---------------------------------------------------------------------------- -bool SID::set_sampling_parameters(double clock_freq, sampling_method method, +bool cSID::set_sampling_parameters(double clock_freq, sampling_method method, double sample_freq, double pass_freq, double filter_scale) { @@ -571,7 +571,7 @@ bool SID::set_sampling_parameters(double clock_freq, sampling_method method, // that any adjustment of the sampling frequency will change the // characteristics of the resampling filter, since the filter is not rebuilt. // ---------------------------------------------------------------------------- -void SID::adjust_sampling_frequency(double sample_freq) +void cSID::adjust_sampling_frequency(double sample_freq) { cycles_per_sample = cycle_count(clock_frequency/sample_freq*(1 << FIXP_SHIFT) + 0.5); @@ -582,7 +582,7 @@ void SID::adjust_sampling_frequency(double sample_freq) // Return array of default spline interpolation points to map FC to // filter cutoff frequency. // ---------------------------------------------------------------------------- -void SID::fc_default(const fc_point*& points, int& count) +void cSID::fc_default(const fc_point*& points, int& count) { filter.fc_default(points, count); } @@ -591,7 +591,7 @@ void SID::fc_default(const fc_point*& points, int& count) // ---------------------------------------------------------------------------- // Return FC spline plotter object. // ---------------------------------------------------------------------------- -PointPlotter SID::fc_plotter() +PointPlotter cSID::fc_plotter() { return filter.fc_plotter(); } @@ -600,7 +600,7 @@ PointPlotter SID::fc_plotter() // ---------------------------------------------------------------------------- // SID clocking - 1 cycle. // ---------------------------------------------------------------------------- -void SID::clock() +void cSID::clock() { int i; @@ -636,7 +636,7 @@ void SID::clock() // ---------------------------------------------------------------------------- // SID clocking - delta_t cycles. // ---------------------------------------------------------------------------- -void SID::clock(cycle_count delta_t) +void cSID::clock(cycle_count delta_t) { int i; @@ -727,7 +727,7 @@ void SID::clock(cycle_count delta_t) // } // // ---------------------------------------------------------------------------- -int SID::clock(cycle_count& delta_t, short* buf, int n, int interleave) +int cSID::clock(cycle_count& delta_t, short* buf, int n, int interleave) { switch (sampling) { default: @@ -746,7 +746,7 @@ int SID::clock(cycle_count& delta_t, short* buf, int n, int interleave) // SID clocking with audio sampling - delta clocking picking nearest sample. // ---------------------------------------------------------------------------- RESID_INLINE -int SID::clock_fast(cycle_count& delta_t, short* buf, int n, +int cSID::clock_fast(cycle_count& delta_t, short* buf, int n, int interleave) { int s = 0; @@ -783,7 +783,7 @@ int SID::clock_fast(cycle_count& delta_t, short* buf, int n, // sampling noise. // ---------------------------------------------------------------------------- RESID_INLINE -int SID::clock_interpolate(cycle_count& delta_t, short* buf, int n, +int cSID::clock_interpolate(cycle_count& delta_t, short* buf, int n, int interleave) { int s = 0; @@ -865,7 +865,7 @@ int SID::clock_interpolate(cycle_count& delta_t, short* buf, int n, // implementation dependent in the C++ standard. // ---------------------------------------------------------------------------- RESID_INLINE -int SID::clock_resample_interpolate(cycle_count& delta_t, short* buf, int n, +int cSID::clock_resample_interpolate(cycle_count& delta_t, short* buf, int n, int interleave) { int s = 0; @@ -948,7 +948,7 @@ int SID::clock_resample_interpolate(cycle_count& delta_t, short* buf, int n, // SID clocking with audio sampling - cycle based with audio resampling. // ---------------------------------------------------------------------------- RESID_INLINE -int SID::clock_resample_fast(cycle_count& delta_t, short* buf, int n, +int cSID::clock_resample_fast(cycle_count& delta_t, short* buf, int n, int interleave) { int s = 0; diff --git a/plugins/sid/sid.h b/plugins/sid/sid.h index 3292cd8fc..d5aaee244 100644 --- a/plugins/sid/sid.h +++ b/plugins/sid/sid.h @@ -26,11 +26,11 @@ #include "extfilt.h" #include "pot.h" -class SID +class cSID { public: - SID(); - ~SID(); + cSID(); + ~cSID(); void set_chip_model(chip_model model); void enable_filter(bool enable); diff --git a/plugins/sid/sid_instrument.cpp b/plugins/sid/sid_instrument.cpp index 272012b9c..59e7a3b8c 100644 --- a/plugins/sid/sid_instrument.cpp +++ b/plugins/sid/sid_instrument.cpp @@ -240,7 +240,7 @@ f_cnt_t sidInstrument::desiredReleaseFrames( void ) const -static int sid_fillbuffer(unsigned char* sidreg, SID *sid, int tdelta, short *ptr, int samples) +static int sid_fillbuffer(unsigned char* sidreg, cSID *sid, int tdelta, short *ptr, int samples) { int tdelta2; int result; @@ -305,7 +305,7 @@ void sidInstrument::playNote( notePlayHandle * _n, bool, if ( tfp == 0 ) { - SID *sid = new SID(); + cSID *sid = new cSID(); sid->set_sampling_parameters( clockrate, SAMPLE_FAST, samplerate ); sid->set_chip_model( MOS8580 ); sid->enable_filter( true ); @@ -314,7 +314,7 @@ void sidInstrument::playNote( notePlayHandle * _n, bool, } const fpp_t frames = _n->framesLeftForCurrentPeriod(); - SID *sid = static_cast( _n->m_pluginData ); + cSID *sid = static_cast( _n->m_pluginData ); int delta_t = clockrate * frames / samplerate + 4; short buf[frames]; unsigned char sidreg[NUMSIDREGS]; diff --git a/plugins/sid/voice.h b/plugins/sid/voice.h index d248f32ae..599a77ab4 100644 --- a/plugins/sid/voice.h +++ b/plugins/sid/voice.h @@ -49,7 +49,7 @@ protected: // Multiplying D/A DC offset. sound_sample voice_DC; -friend class SID; +friend class cSID; }; diff --git a/plugins/sid/wave.h b/plugins/sid/wave.h index b86de99b3..9101b3085 100644 --- a/plugins/sid/wave.h +++ b/plugins/sid/wave.h @@ -113,7 +113,7 @@ protected: reg8* wave_PST; friend class Voice; -friend class SID; +friend class cSID; };