Attachment #316047 for bug #414033

View | Details | Raw Unified | Return to bug 414033
Collapse All | Expand All




 */
class LadspaEffectControl : public EffectControl {
public:
    using EffectControl::SetDefaultValue;
    using EffectControl::SetMinValue;
    using EffectControl::SetMaxValue;
    using EffectControl::SetType;
    using EffectControl::SetDescription;
    using EffectControl::SetPossibilities;
};

////////////////////////////////////////////////////////////////////////////

Lines 3-9 Link Here

(-)src/common/Pool.h (-2 / +2 lines)
3	* LinuxSampler - modular, streaming capable sampler *	3	* LinuxSampler - modular, streaming capable sampler *
4	* *	4	* *
5	* Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck *	5	* Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck *
6	* Copyright (C) 2005 - 2008 Christian Schoenebeck *	6	* Copyright (C) 2005 - 2012 Christian Schoenebeck *
7	* *	7	* *
8	* This program is free software; you can redistribute it and/or modify *	8	* This program is free software; you can redistribute it and/or modify *
9	* it under the terms of the GNU General Public License as published by *	9	* it under the terms of the GNU General Public License as published by *
Lines 406-412 Link Here
406	inline Iterator allocAppend() {	406	inline Iterator allocAppend() {
407	if (pPool->poolIsEmpty()) return RTListBase<T>::begin();	407	if (pPool->poolIsEmpty()) return RTListBase<T>::begin();
408	Iterator element = pPool->alloc();	408	Iterator element = pPool->alloc();
409	append(element);	409	this->append(element);
410	#if CONFIG_DEVMODE	410	#if CONFIG_DEVMODE
411	element.list = this;	411	element.list = this;
412	#endif // CONFIG_DEVMODE	412	#endif // CONFIG_DEVMODE

Lines 219-225 Link Here

(-)src/engines/EngineChannelBase.h (-2 / +2 lines)
219	pEvents->clear();	219	pEvents->clear();
220	// empty MIDI key specific event lists	220	// empty MIDI key specific event lists
221	ClearEventListsHandler handler;	221	ClearEventListsHandler handler;
222	ProcessActiveVoices(&handler);	222	this->ProcessActiveVoices(&handler);
223		223
224	// empty exclusive group specific event lists	224	// empty exclusive group specific event lists
225	ClearGroupEventLists();	225	ClearGroupEventLists();
Lines 263-269 Link Here
263		263
264	void RenderActiveVoices(uint Samples) {	264	void RenderActiveVoices(uint Samples) {
265	RenderVoicesHandler handler(this, Samples);	265	RenderVoicesHandler handler(this, Samples);
266	ProcessActiveVoices(&handler);	266	this->ProcessActiveVoices(&handler);
267		267
268	SetVoiceCount(handler.VoiceCount);	268	SetVoiceCount(handler.VoiceCount);
269	SetDiskStreamCount(handler.StreamCount);	269	SetDiskStreamCount(handler.StreamCount);




                    RegionInfo[*i].refCount++;
                    SampleRefCount[(*i)->pSample]++;
                }
                this->HandBack(pResource, pConsumer, true);
                RegionInfoMutex.Unlock();
            }



            virtual void SetMode(const InstrumentManager::instrument_id_t& ID, InstrumentManager::mode_t Mode) {
                dmsg(2,("InstrumentManagerBase: setting mode for %s (Index=%d) to %d\n",ID.FileName.c_str(),ID.Index,Mode));
                this->SetAvailabilityMode(ID, static_cast<typename ResourceManager<instrument_id_t, I>::mode_t>(Mode));
            }

    protected:


                if (pEntry->MaxSamplesPerCycle < maxSamplesPerCycle) {
                    dmsg(1,("Completely reloading instrument due to insufficient precached samples ...\n"));
                    this->Update(pResource, pConsumer);
                }
            }
    };

Lines 18-23 Link Here

(-)ChangeLog (+1 lines)
18	- Mac OS X: made it possible to specify plugin installation dir to	18	- Mac OS X: made it possible to specify plugin installation dir to
19	configure	19	configure
20	- Mac OS X: Makefile fix for the install-strip target	20	- Mac OS X: Makefile fix for the install-strip target
		21	- fixed compilation with gcc 4.7
21		22
22	* general changes:	23	* general changes:
23	- Refactoring: moved the independent code from	24	- Refactoring: moved the independent code from

Return to bug 414033

Lines 90-96 Link Here

(-)src/engines/InstrumentManagerBase.h (-3 / +3 lines)
90	RegionInfo[*i].refCount++;	90	RegionInfo[*i].refCount++;
91	SampleRefCount[(*i)->pSample]++;	91	SampleRefCount[(*i)->pSample]++;
92	}	92	}
93	HandBack(pResource, pConsumer, true);	93	this->HandBack(pResource, pConsumer, true);
94	RegionInfoMutex.Unlock();	94	RegionInfoMutex.Unlock();
95	}	95	}
96		96
Lines 126-132 Link Here
126		126
127	virtual void SetMode(const InstrumentManager::instrument_id_t& ID, InstrumentManager::mode_t Mode) {	127	virtual void SetMode(const InstrumentManager::instrument_id_t& ID, InstrumentManager::mode_t Mode) {
128	dmsg(2,("InstrumentManagerBase: setting mode for %s (Index=%d) to %d\n",ID.FileName.c_str(),ID.Index,Mode));	128	dmsg(2,("InstrumentManagerBase: setting mode for %s (Index=%d) to %d\n",ID.FileName.c_str(),ID.Index,Mode));
129	SetAvailabilityMode(ID, static_cast<typename ResourceManager<instrument_id_t, I>::mode_t>(Mode));	129	this->SetAvailabilityMode(ID, static_cast<typename ResourceManager<instrument_id_t, I>::mode_t>(Mode));
130	}	130	}
131		131
132	protected:	132	protected:
Lines 241-247 Link Here
241		241
242	if (pEntry->MaxSamplesPerCycle < maxSamplesPerCycle) {	242	if (pEntry->MaxSamplesPerCycle < maxSamplesPerCycle) {
243	dmsg(1,("Completely reloading instrument due to insufficient precached samples ...\n"));	243	dmsg(1,("Completely reloading instrument due to insufficient precached samples ...\n"));
244	Update(pResource, pConsumer);	244	this->Update(pResource, pConsumer);
245	}	245	}
246	}	246	}
247	};	247	};

Lines 64-75 Link Here

(-)src/effects/LadspaEffect.cpp (-6 / +6 lines)
64	*/	64	*/
65	class LadspaEffectControl : public EffectControl {	65	class LadspaEffectControl : public EffectControl {
66	public:	66	public:
67	EffectControl::SetDefaultValue;	67	using EffectControl::SetDefaultValue;
68	EffectControl::SetMinValue;	68	using EffectControl::SetMinValue;
69	EffectControl::SetMaxValue;	69	using EffectControl::SetMaxValue;
70	EffectControl::SetType;	70	using EffectControl::SetType;
71	EffectControl::SetDescription;	71	using EffectControl::SetDescription;
72	EffectControl::SetPossibilities;	72	using EffectControl::SetPossibilities;
73	};	73	};
74		74
75	////////////////////////////////////////////////////////////////////////////	75	////////////////////////////////////////////////////////////////////////////