Eq rack2

build/depends.py

@@ -581,7 +581,6 @@ def sources(self, build):
                    "engine/enginebufferscale.cpp",
                    "engine/enginebufferscaledummy.cpp",
                    "engine/enginebufferscalelinear.cpp",
-                   "engine/enginefilterblock.cpp",
                    "engine/enginefilterbiquad1.cpp",
                    "engine/enginefiltermoogladder4.cpp",
                    "engine/enginefilterbessel4.cpp",

res/skins/Shade/effect_parameter_knob.xml

@@ -38,7 +38,6 @@
 				<Size>38,26</Size>
 				<Children>
 					<Knob>			
-						<TooltipId>master_volume</TooltipId>
 						<Style></Style>
 						<NumberStates>64</NumberStates>
 						<Path>knobs/knob_rotary_s%1.png</Path>

res/skins/Shade/mixer_panel.xml

@@ -426,6 +426,10 @@
 								<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 								<ButtonState>LeftButton</ButtonState>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel1],filterHighKill_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</PushButton>
 						<PushButton>
 							<TooltipId>filterMidKill</TooltipId>
@@ -447,6 +451,10 @@
 								<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 								<ButtonState>LeftButton</ButtonState>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel1],filterMidKill_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</PushButton>
 						<PushButton>
 							<TooltipId>filterLowKill</TooltipId>
@@ -468,6 +476,10 @@
 								<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 								<ButtonState>LeftButton</ButtonState>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel1],filterLowKill_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</PushButton>
 
 						<PushButton>
@@ -490,6 +502,10 @@
 								<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 								<ButtonState>LeftButton</ButtonState>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel2],filterHighKill_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</PushButton>
 						<PushButton>
 							<TooltipId>filterMidKill</TooltipId>
@@ -511,6 +527,10 @@
 								<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 								<ButtonState>LeftButton</ButtonState>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel2],filterMidKill_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</PushButton>
 						<PushButton>
 							<TooltipId>filterLowKill</TooltipId>
@@ -532,6 +552,10 @@
 								<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
 								<ButtonState>LeftButton</ButtonState>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel2],filterLowKill_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</PushButton>
 
 						<!--
@@ -668,6 +692,10 @@
 							<Connection>
 								<ConfigKey>[Channel1],filterHigh</ConfigKey>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel1],filterHigh_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</Knob>
 						<Knob>
 							<TooltipId>filterMid</TooltipId>
@@ -678,6 +706,10 @@
 							<Connection>
 								<ConfigKey>[Channel1],filterMid</ConfigKey>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel1],filterMid_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</Knob>
 						<Knob>
 							<TooltipId>filterLow</TooltipId>
@@ -688,6 +720,10 @@
 							<Connection>
 								<ConfigKey>[Channel1],filterLow</ConfigKey>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel1],filterLow_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</Knob>
 
 						<Knob>
@@ -709,6 +745,10 @@
 							<Connection>
 								<ConfigKey>[Channel2],filterHigh</ConfigKey>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel2],filterHigh_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</Knob>
 						<Knob>
 							<TooltipId>filterMid</TooltipId>
@@ -719,6 +759,10 @@
 							<Connection>
 								<ConfigKey>[Channel2],filterMid</ConfigKey>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel2],filterMid_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</Knob>
 						<Knob>
 							<TooltipId>filterLow</TooltipId>
@@ -729,6 +773,10 @@
 							<Connection>
 								<ConfigKey>[Channel2],filterLow</ConfigKey>
 							</Connection>
+							<Connection>
+						        <ConfigKey>[Channel2],filterLow_loaded</ConfigKey>
+						        <BindProperty>visible</BindProperty>
+					        </Connection>
 						</Knob>
 
 						<!--

res/skins/Shade/skin.xml

@@ -545,8 +545,8 @@
 												<LibrarySidebar></LibrarySidebar>
 												<!--Cover Art-->
 												<CoverArt>
+													<MinimumSize>16,16</MinimumSize>
 													<SizePolicy>me,me</SizePolicy>
-													<MinimumSize>100,100</MinimumSize>
 													<Connection>
 														<ConfigKey persist="true">[Library],show_coverart</ConfigKey>
 														<BindProperty>visible</BindProperty>

src/basetrackplayer.cpp

@@ -27,7 +27,13 @@ BaseTrackPlayer::BaseTrackPlayer(QObject* pParent,
         : BasePlayer(pParent, group),
           m_pConfig(pConfig),
           m_pLoadedTrack(),
-          m_replaygainPending(false) {
+          m_replaygainPending(false),
+          m_pLowFilter(NULL),
+          m_pMidFilter(NULL),
+          m_pHighFilter(NULL),
+          m_pLowFilterKill(NULL),
+          m_pMidFilterKill(NULL),
+          m_pHighFilterKill(NULL) {
     m_pChannel = new EngineDeck(getGroup(), pConfig, pMixingEngine,
                                 pEffectsManager, defaultOrientation);
 
@@ -73,9 +79,7 @@ BaseTrackPlayer::BaseTrackPlayer(QObject* pParent,
 
     m_pEndOfTrack = new ControlObject(ConfigKey(group, "end_of_track"));
     m_pEndOfTrack->set(0.);
-    m_pLowFilter = new ControlObjectSlave(group,"filterLow");
-    m_pMidFilter = new ControlObjectSlave(group,"filterMid");
-    m_pHighFilter = new ControlObjectSlave(group,"filterHigh");
+
     m_pPreGain = new ControlObjectSlave(ConfigKey(group, "pregain"));
     //BPM of the current song
     m_pBPM = new ControlObjectThread(group, "file_bpm");
@@ -108,6 +112,9 @@ BaseTrackPlayer::~BaseTrackPlayer()
     delete m_pLowFilter;
     delete m_pMidFilter;
     delete m_pHighFilter;
+    delete m_pLowFilterKill;
+    delete m_pMidFilterKill;
+    delete m_pHighFilterKill;
     delete m_pPreGain;
 }
 
@@ -256,6 +263,9 @@ void BaseTrackPlayer::slotFinishLoading(TrackPointer pTrackInfoObject)
         m_pLowFilter->set(1.0);
         m_pMidFilter->set(1.0);
         m_pHighFilter->set(1.0);
+        m_pLowFilterKill->set(0.0);
+        m_pMidFilterKill->set(0.0);
+        m_pHighFilterKill->set(0.0);
         m_pPreGain->set(1.0);
     }
 
@@ -286,3 +296,13 @@ void BaseTrackPlayer::slotPlayToggled(double v) {
 EngineDeck* BaseTrackPlayer::getEngineDeck() const {
     return m_pChannel;
 }
+
+void BaseTrackPlayer::setupEqControlls() {
+    const QString group = getGroup();
+    m_pLowFilter = new ControlObjectSlave(group,"filterLow");
+    m_pMidFilter = new ControlObjectSlave(group,"filterMid");
+    m_pHighFilter = new ControlObjectSlave(group,"filterHigh");
+    m_pLowFilterKill = new ControlObjectSlave(group,"filterLowKill");
+    m_pMidFilterKill = new ControlObjectSlave(group,"filterMidKill");
+    m_pHighFilterKill = new ControlObjectSlave(group,"filterHighKill");
+}

src/basetrackplayer.h

@@ -34,6 +34,8 @@ class BaseTrackPlayer : public BasePlayer {
     // connected. Delete me when EngineMaster supports AudioInput assigning.
     EngineDeck* getEngineDeck() const;
 
+    void setupEqControlls();
+
   public slots:
     void slotLoadTrack(TrackPointer track, bool bPlay=false);
     void slotFinishLoading(TrackPointer pTrackInfoObject);
@@ -66,6 +68,9 @@ class BaseTrackPlayer : public BasePlayer {
     ControlObjectSlave* m_pLowFilter;
     ControlObjectSlave* m_pMidFilter;
     ControlObjectSlave* m_pHighFilter;
+    ControlObjectSlave* m_pLowFilterKill;
+    ControlObjectSlave* m_pMidFilterKill;
+    ControlObjectSlave* m_pHighFilterKill;
     ControlObjectSlave* m_pPreGain;
     EngineDeck* m_pChannel;
 

src/configobject.cpp

@@ -274,7 +274,6 @@ template <class ValueType> bool ConfigObject<ValueType>::Parse()
     return true;
 }
 
-
 template <class ValueType> void ConfigObject<ValueType>::clear()
 {
     //Delete the pointers, because that's what we did before we
@@ -398,7 +397,6 @@ QString ConfigObject<ValueType>::getResourcePath() {
     return qResourcePath;
 }
 
-
 template <class ValueType> ConfigObject<ValueType>::ConfigObject(QDomNode node) {
 
     if (!node.isNull() && node.isElement()) {

src/configobject.h

@@ -84,7 +84,6 @@ class ConfigValue {
     friend bool operator==(const ConfigValue& s1, const ConfigValue& s2);
 };
 
-
 class ConfigValueKbd : public ConfigValue {
   public:
     ConfigValueKbd();

src/controleffectknob.cpp

@@ -9,7 +9,7 @@ ControlEffectKnob::ControlEffectKnob(ConfigKey key, double dMinValue, double dMa
 
 void ControlEffectKnob::setBehaviour(EffectManifestParameter::ControlHint type,
                                      double dMinValue, double dMaxValue) {
-    if ( m_pControl == NULL) {
+    if (m_pControl == NULL) {
         return;
     }