Fixed effect adding

Author: FangCunWuChang

src/ui/component/mixer/EffectComponent.cpp

@@ -1,4 +1,4 @@
-#include "EffectComponent.h"
+#include "EffectComponent.h"
 #include "../../lookAndFeel/LookAndFeelFactory.h"
 #include "../../misc/CoreActions.h"
 #include "../../misc/PluginEditorHub.h"
@@ -273,19 +273,14 @@ enum EffectMenuActionType {
 
 void EffectComponent::showMenu() {
 	/** Callback */
-	auto addCallback = [comp = juce::Component::SafePointer{ this }](const juce::PluginDescription& pluginDes) {
-		if (comp) {
-			comp->addEffect(pluginDes);
-		}
-		};
 	auto editCallback = [comp = juce::Component::SafePointer{ this }](const juce::PluginDescription& pluginDes) {
 		if (comp) {
 			comp->replaceEffect(pluginDes);
 		}
 		};
 
 	/** Create Menu */
-	auto menu = this->createMenu(addCallback, editCallback);
+	auto menu = this->createMenu(editCallback);
 	int result = menu.show();
 
 	switch (result) {
@@ -324,7 +319,7 @@ void EffectComponent::startDrag() {
 void EffectComponent::addEffect(
 	const juce::PluginDescription& pluginDes) {
 	CoreActions::insertEffect(
-		(quickAPI::TrackType)this->type, this->track, this->index + 1,
+		(quickAPI::TrackType)this->type, this->track, this->index,
 		pluginDes.createIdentifierString());
 }
 
@@ -370,11 +365,9 @@ juce::String EffectComponent::createToolTip() const {
 }
 
 juce::PopupMenu EffectComponent::createMenu(
-	const std::function<void(const juce::PluginDescription&)>& addCallback,
 	const std::function<void(const juce::PluginDescription&)>& editCallback) const {
 	juce::PopupMenu menu;
 
-	menu.addSubMenu(TRANS("Add"), this->createAddMenu(addCallback));
 	menu.addSubMenu(TRANS("Replace"), this->createAddMenu(editCallback));
 	menu.addItem(EffectMenuActionType::Bypass, TRANS("Bypass"), true, !(this->bypassButton->getToggleState()));
 	menu.addItem(EffectMenuActionType::Remove, TRANS("Remove"));

src/ui/component/mixer/EffectComponent.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <JuceHeader.h>
 
@@ -50,7 +50,6 @@ class EffectComponent final
 	juce::var getDragSourceDescription() const;
 	juce::String createToolTip() const;
 	juce::PopupMenu createMenu(
-		const std::function<void(const juce::PluginDescription&)>& addCallback,
 		const std::function<void(const juce::PluginDescription&)>& editCallback) const;
 	juce::PopupMenu createAddMenu(
 		const std::function<void(const juce::PluginDescription&)>& callback) const;