b6 listener and submodules updates

JuceLibraryCode/AppConfig.h

@@ -337,6 +337,13 @@
  #define   JUCE_IP_AND_PORT_DETECTION 1
 #endif
 
+//==============================================================================
+// juce_sharedtexture flags:
+
+#ifndef    SHAREDTEXTURE_USE_CPU_IMAGE
+ //#define SHAREDTEXTURE_USE_CPU_IMAGE 1
+#endif
+
 //==============================================================================
 // juce_timeline flags:
 

Source/LightBlock/LightBlock.h

@@ -16,7 +16,7 @@ class ParamLinkContainer;
 class LightBlock :
 	public ControllableContainer,
 	public BaseColorProvider,
-	public LightBlockColorProvider::ProviderListener
+	public LightBlockColorProvider::ColorProviderListener
 {
 public:
 	LightBlock(LightBlockColorProvider * provider = nullptr);
@@ -55,9 +55,7 @@ class LightBlock :
 		//virtual void colorsUpdated() {}
 	};
 
-	ListenerList<LightBlockListener> blockListeners;
-	void addLightBlockListener(LightBlockListener* newListener) { blockListeners.add(newListener); }
-	void removeLightBlockListener(LightBlockListener* listener) { blockListeners.remove(listener); }
+	DECLARE_INSPECTACLE_CRITICAL_LISTENER(LightBlock, block)
 
 
 

Source/LightBlock/model/LightBlockColorProvider.h

@@ -65,18 +65,16 @@ class LightBlockColorProvider :
 
 	virtual void handleEnterExit(bool enter, Array<Prop *> props) {}
 
-	class ProviderListener
+	class ColorProviderListener
 	{
 	public:
-		virtual ~ProviderListener() {}
+		virtual ~ColorProviderListener() {}
 		virtual void providerParametersChanged(LightBlockColorProvider *) {}
 		virtual void providerParameterValueUpdated(LightBlockColorProvider *, Parameter *) {}
 		virtual void providerPlaybackControlUpdate(PlaybackControl control, var data = var()) {}
 	};
 
-	ListenerList<ProviderListener> providerListeners;
-	void addColorProviderListener(ProviderListener* newListener) { providerListeners.add(newListener); }
-	void removeColorProviderListener(ProviderListener* listener) { providerListeners.remove(listener); }
+	DECLARE_INSPECTACLE_CRITICAL_LISTENER(ColorProvider, provider)
 
 
 	InspectableEditor* getEditorInternal(bool isRoot, Array<Inspectable*> inspectables) override;

Source/LightBlock/model/LightBlockModel.cpp

@@ -97,10 +97,10 @@ LightBlockModelUI * LightBlockModel::createUI()
 void LightBlockModel::onControllableFeedbackUpdateInternal(ControllableContainer * cc, Controllable * c)
 {
 	if (Engine::mainEngine->isClearing) return;
-	if (cc == paramsContainer.get()) providerListeners.call(&ProviderListener::providerParameterValueUpdated, this, dynamic_cast<Parameter *>(c));
+	if (cc == paramsContainer.get()) providerListeners.call(&ColorProviderListener::providerParameterValueUpdated, this, dynamic_cast<Parameter *>(c));
 }
 
 void LightBlockModel::childStructureChanged(ControllableContainer * cc)
 {
-	if (cc == paramsContainer.get()) providerListeners.call(&ProviderListener::providerParametersChanged, this);
+	if (cc == paramsContainer.get()) providerListeners.call(&ColorProviderListener::providerParametersChanged, this);
 }

Source/LightBlock/model/blocks/node/NodeBlock.cpp

@@ -49,7 +49,7 @@ void NodeBlock::itemAdded(Node* n)
 	p->addParameterListener(this);
 	paramsContainer->addParameter(p);
 
-	providerListeners.call(&ProviderListener::providerParametersChanged, this);
+	providerListeners.call(&ColorProviderListener::providerParametersChanged, this);
 }
 
 void NodeBlock::itemsAdded(Array<Node*> nodes)
@@ -72,7 +72,7 @@ void NodeBlock::itemsAdded(Array<Node*> nodes)
 		paramsContainer->addParameter(p);
 	}
 
-	providerListeners.call(&ProviderListener::providerParametersChanged, this);
+	providerListeners.call(&ColorProviderListener::providerParametersChanged, this);
 }
 
 void NodeBlock::itemRemoved(Node* n)
@@ -91,7 +91,7 @@ void NodeBlock::itemRemoved(Node* n)
 	paramsContainer->removeControllable(p.get());
 	pn->removeControllableContainerListener(this);
 
-	providerListeners.call(&ProviderListener::providerParametersChanged, this);
+	providerListeners.call(&ColorProviderListener::providerParametersChanged, this);
 }
 
 void NodeBlock::itemsRemoved(Array<Node*> nodes)
@@ -114,7 +114,7 @@ void NodeBlock::itemsRemoved(Array<Node*> nodes)
 
 	}
 
-	providerListeners.call(&ProviderListener::providerParametersChanged, this);
+	providerListeners.call(&ColorProviderListener::providerParametersChanged, this);
 }
 
 void NodeBlock::childAddressChanged(ControllableContainer* cc)

Source/LightBlock/model/blocks/sequence/SequenceBlock.cpp

@@ -86,7 +86,7 @@ void BentoSequenceBlock::sequenceCurrentTimeChanged(Sequence*, float prevTime, b
 {
 	if (sequence->isSeeking)
 	{
-		providerListeners.call(&ProviderListener::providerPlaybackControlUpdate, SEEK, sequence->currentTime->floatValue());
+		providerListeners.call(&ColorProviderListener::providerPlaybackControlUpdate, SEEK, sequence->currentTime->floatValue());
 	}
 
 	//OSCMessage msg("/" + shortName + "/currentTime");
@@ -98,7 +98,7 @@ void BentoSequenceBlock::sequenceCurrentTimeChanged(Sequence*, float prevTime, b
 
 void BentoSequenceBlock::sequencePlayStateChanged(Sequence* s)
 {
-	providerListeners.call(&ProviderListener::providerPlaybackControlUpdate, sequence->isPlaying->boolValue() ? PLAY : PAUSE, sequence->currentTime->floatValue());
+	providerListeners.call(&ColorProviderListener::providerPlaybackControlUpdate, sequence->isPlaying->boolValue() ? PLAY : PAUSE, sequence->currentTime->floatValue());
 }
 
 void BentoSequenceBlock::sequenceEditingStateChanged(Sequence* s)
@@ -108,7 +108,7 @@ void BentoSequenceBlock::sequenceEditingStateChanged(Sequence* s)
 
 void BentoSequenceBlock::sequenceLooped(Sequence* s)
 {
-	providerListeners.call(&ProviderListener::providerPlaybackControlUpdate, PLAY, 0);
+	providerListeners.call(&ColorProviderListener::providerPlaybackControlUpdate, PLAY, 0);
 }
 
 void BentoSequenceBlock::onContainerTriggerTriggered(Trigger* t)
@@ -126,7 +126,7 @@ void BentoSequenceBlock::onControllableFeedbackUpdateInternal(ControllableContai
 	LightBlockModel::onControllableFeedbackUpdateInternal(cc, c);
 	if (c == sequence->identityMode)
 	{
-		providerListeners.call(&ProviderListener::providerPlaybackControlUpdate, SHOW_ID, sequence->identityMode->boolValue());
+		providerListeners.call(&ColorProviderListener::providerPlaybackControlUpdate, SHOW_ID, sequence->identityMode->boolValue());
 	} 
 }
 

Source/LightBlock/model/blocks/streamingscript/StreamingScriptBlock.cpp

@@ -72,12 +72,12 @@ void StreamingScriptBlock::getColorsInternal(Array<Colour>* result, Prop* p, dou
 
 void StreamingScriptBlock::onControllableFeedbackUpdateInternal(ControllableContainer* cc, Controllable* c)
 {
-	if (cc == &script && script.state == Script::SCRIPT_LOADED) providerListeners.call(&ProviderListener::providerParameterValueUpdated, this, dynamic_cast<Parameter*>(c));
+	if (cc == &script && script.state == Script::SCRIPT_LOADED) providerListeners.call(&ColorProviderListener::providerParameterValueUpdated, this, dynamic_cast<Parameter*>(c));
 }
 
 void StreamingScriptBlock::childStructureChanged(ControllableContainer* cc)
 {
-	if (cc == &script && script.state == Script::SCRIPT_LOADED) providerListeners.call(&ProviderListener::providerParametersChanged, this);
+	if (cc == &script && script.state == Script::SCRIPT_LOADED) providerListeners.call(&ColorProviderListener::providerParametersChanged, this);
 }
 
 void StreamingScriptBlock::handleEnterExit(bool enter, Array<Prop *> props)
@@ -112,7 +112,7 @@ void StreamingScriptBlock::newMessage(const Script::ScriptEvent& e)
 		setCustomThumbnail(script.filePath->getFile().withFileExtension("png").getFullPathName());
 		setNiceName(script.niceName);
 
-		if (script.state == Script::SCRIPT_LOADED) providerListeners.call(&ProviderListener::providerParametersChanged, this);
+		if (script.state == Script::SCRIPT_LOADED) providerListeners.call(&ColorProviderListener::providerParametersChanged, this);
 		break;
 	}
 }

Source/LightBlock/model/preset/LightBlockModelPreset.cpp

@@ -73,7 +73,7 @@ void LightBlockModelPreset::childStructureChanged(ControllableContainer * cc)
 
 void LightBlockModelPreset::onControllableFeedbackUpdateInternal(ControllableContainer * cc, Controllable * c)
 {
-	if(cc == &paramsContainer) providerListeners.call(&ProviderListener::providerParameterValueUpdated, this, dynamic_cast<Parameter *>(c));
+	if(cc == &paramsContainer) providerListeners.call(&ColorProviderListener::providerParameterValueUpdated, this, dynamic_cast<Parameter *>(c));
 }
 
 var LightBlockModelPreset::getJSONData()

Source/MainComponent.cpp

@@ -20,7 +20,6 @@
 MainComponent::MainComponent() :
 	OrganicMainContentComponent()
 {
-	getCommandManager().registerAllCommandsForTarget(this);
 	SharedTextureManager::getInstance(); //create the main instance
 }
 

Source/Node/Node.h

@@ -1,9 +1,9 @@
 /*
   ==============================================================================
 
-    Node.h
-    Created: 14 Apr 2018 2:11:31am
-    Author:  Ben
+	Node.h
+	Created: 14 Apr 2018 2:11:31am
+	Author:  Ben
 
   ==============================================================================
 */
@@ -20,26 +20,26 @@ class Node :
 	public NodeConnectionSlot::SlotListener
 {
 public:
-	Node(const String &name = "Node", var params = var());
+	Node(const String& name = "Node", var params = var());
 	virtual ~Node();
 
 	OwnedArray<NodeConnectionSlot, CriticalSection> inSlots;
 	OwnedArray<NodeConnectionSlot, CriticalSection> outSlots;
 
-	ParameterSlot * addParameterSlot(bool isInput, Parameter * p);
-	ColorSlot * addColorSlot(bool isInput, const String &name);
-	void removeSlot(bool isInput, const String &name);
-	void removeSlot(bool isInput, NodeConnectionSlot * s);
+	ParameterSlot* addParameterSlot(bool isInput, Parameter* p);
+	ColorSlot* addColorSlot(bool isInput, const String& name);
+	void removeSlot(bool isInput, const String& name);
+	void removeSlot(bool isInput, NodeConnectionSlot* s);
 
-	NodeConnectionSlot * getSlotWithName(bool isInput, const String &name);
-	Array<NodeConnectionSlot *> getSlotsWithType(bool isInput, ConnectionType  type);
-	ParameterSlot * getParameterSlot(Parameter * p, bool isInput);
+	NodeConnectionSlot* getSlotWithName(bool isInput, const String& name);
+	Array<NodeConnectionSlot*> getSlotsWithType(bool isInput, ConnectionType  type);
+	ParameterSlot* getParameterSlot(Parameter* p, bool isInput);
 
-	var getParameterValue(Parameter * p, var params, var localParams);
+	var getParameterValue(Parameter* p, var params, var localParams);
 
 	var getLocalParams(var params);
-	
-	virtual NodeViewUI * createUI();
+
+	virtual NodeViewUI* createUI();
 
 
 	//Listener
@@ -48,13 +48,11 @@ class Node :
 	public:
 		/** Destructor. */
 		virtual ~NodeListener() {}
-		virtual void slotAdded(Node *, NodeConnectionSlot *, bool /*isInput*/) {}
-		virtual void slotRemoved(Node *, NodeConnectionSlot *, bool /*isInput*/) {}
+		virtual void slotAdded(Node*, NodeConnectionSlot*, bool /*isInput*/) {}
+		virtual void slotRemoved(Node*, NodeConnectionSlot*, bool /*isInput*/) {}
 	};
 
-	ListenerList<NodeListener> nodeListeners;
-	void addNodeListener(NodeListener* newListener) { nodeListeners.add(newListener); }
-	void removeNodeListener(NodeListener* listener) { nodeListeners.remove(listener); }
+	DECLARE_INSPECTACLE_CRITICAL_LISTENER(Node, node);
 
 
 	// ASYNC
@@ -63,12 +61,12 @@ class Node :
 	public:
 		enum Type { INSLOT_ADDED, OUTSLOT_ADDED, INSLOT_REMOVED, OUTSLOT_REMOVED };
 
-		NodeEvent(Type t, Node * n, NodeConnectionSlot * slot, var params = var()) :
+		NodeEvent(Type t, Node* n, NodeConnectionSlot* slot, var params = var()) :
 			type(t), node(n), slot(slot), params(params) {}
 
 		Type type;
-		Node * node;
-		NodeConnectionSlot * slot;
+		Node* node;
+		NodeConnectionSlot* slot;
 		var params;
 	};
 
@@ -77,7 +75,7 @@ class Node :
 
 	void addAsynNodeListener(AsyncListener* newListener) { nodeNotifier.addListener(newListener); }
 	void addAsyncCoalescedNodeListener(AsyncListener* newListener) { nodeNotifier.addAsyncCoalescedListener(newListener); }
-	void removeAsyncNodeListener(AsyncListener* listener) { nodeNotifier.removeListener(listener); }
+	void removeAsyncNodeListener(AsyncListener* listener) { if (!isClearing && !isBeingDestroyed) nodeNotifier.removeListener(listener); }
 
 private:
 	WeakReference<Node>::Master masterReference;

Source/Node/NodeConnection.h

@@ -41,9 +41,7 @@ class NodeConnection :
 	};
 
 
-	ListenerList<ConnectionListener> connectionListeners;
-	void addConnectionListener(ConnectionListener* newListener) { connectionListeners.add(newListener); }
-	void removeConnectionListener(ConnectionListener* listener) { connectionListeners.remove(listener); }
+	DECLARE_INSPECTACLE_CRITICAL_LISTENER(Connection, connection);
 
 
 	var getJSONData() override;

Source/ParameterLink/ParameterLink.cpp

@@ -19,18 +19,15 @@ ParameterLink::ParameterLink(WeakReference<Parameter> p) :
 	linkType(NONE),
 	parameter(p),
 	isLinkable(true),
-	//replacementHasMappingInputToken(false),
+	isLinkBeingDestroyed(false),
 	paramLinkNotifier(5)
 {
 
 }
 
 ParameterLink::~ParameterLink()
 {
-	//if (list != nullptr && !listRef.wasObjectDeleted())
-	//{
-	//	list->removeListListener(this);
-	//}
+	isLinkBeingDestroyed = true;
 }
 
 void ParameterLink::setLinkType(LinkType type)

Source/ParameterLink/ParameterLink.h

@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include "JuceHeader.h"
 #include "Prop/PropIncludes.h"
 
 class ParameterLink :
@@ -26,6 +25,7 @@ class ParameterLink :
 	WeakReference<Parameter> parameter;
 
 	bool isLinkable;
+	bool isLinkBeingDestroyed;
 
 	//links
 	WeakReference<Parameter> linkedCustomParam; //from ObjectManger custom params
@@ -61,9 +61,9 @@ class ParameterLink :
 
 	ListenerList<ParameterLinkListener> parameterLinkListeners;
 	void addParameterLinkListener(ParameterLinkListener* newListener) { parameterLinkListeners.add(newListener); }
-	void removeParameterLinkListener(ParameterLinkListener* listener) { parameterLinkListeners.remove(listener); }
+	void removeParameterLinkListener(ParameterLinkListener* listener) { if(!isLinkBeingDestroyed) parameterLinkListeners.remove(listener); }
 
-	DECLARE_ASYNC_EVENT(ParameterLink, ParameterLink, paramLink, ENUM_LIST(LINK_UPDATED, PREVIEW_UPDATED))
+	DECLARE_ASYNC_EVENT(ParameterLink, ParameterLink, paramLink, ENUM_LIST(LINK_UPDATED, PREVIEW_UPDATED), !isLinkBeingDestroyed )
 };
 
 class ParamLinkContainer :

Source/Prop/Prop.h

@@ -16,7 +16,7 @@ class Prop :
 	public BaseItem,
 	public Inspectable::InspectableListener,
 	public Thread,
-	public LightBlockColorProvider::ProviderListener
+	public LightBlockColorProvider::ColorProviderListener
 {
 public:
 	enum Shape { CLUB, BALL, POI, HOOP, RING, BUGGENG, BOX, CUSTOM };
@@ -123,6 +123,8 @@ class Prop :
 	virtual void uploadFileQueue();
 	virtual void uploadFile(FileToUpload f);
 
+	virtual void deleteAllFiles() {}
+
 	virtual void updatePlaybackModeOnProp();
 	virtual void setPlaybackEnabled(bool value) {}
 	virtual void setStreamingEnabled(bool value) {}
@@ -156,9 +158,7 @@ class Prop :
 		virtual void colorsUpdated(Prop*) {}
 	};
 
-	ListenerList<PropListener> propListeners;
-	void addPropListener(PropListener* newListener) { propListeners.add(newListener); }
-	void removePropListener(PropListener* listener) { propListeners.remove(listener); }
+	DECLARE_INSPECTACLE_CRITICAL_LISTENER(Prop, prop);
 
 	// ASYNC
 	class  PropEvent
@@ -179,7 +179,7 @@ class Prop :
 
 	void addAsyncPropListener(AsyncListener* newListener) { propNotifier.addListener(newListener); }
 	void addAsyncCoalescedPropListener(AsyncListener* newListener) { propNotifier.addAsyncCoalescedListener(newListener); }
-	void removeAsyncPropListener(AsyncListener* listener) { propNotifier.removeListener(listener); }
+	void removeAsyncPropListener(AsyncListener* listener) { if(!isClearing && !isBeingDestroyed) propNotifier.removeListener(listener); }
 
 	virtual void run() override;