Modular: removed some uses of kTTValNone, project now builds

jamoma · Sep 18, 2013 · 2eb9b52 · 2eb9b52
1 parent da0e052
commit 2eb9b52
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/Modular/library/PeerObject/TTApplicationManager.cpp b/Modular/library/PeerObject/TTApplicationManager.cpp
@@ -731,9 +731,6 @@ TTErr TTApplicationManager::ReadFromXml(const TTValue& inputValue, TTValue& outp
 
 		// stop protocol reception threads
 		ProtocolStop(v, dummy);
-
-		// stop protocol reception threads
-		ProtocolStop(v, kTTValNONE);
 
         // unregister all applications from all protocols
         mProtocols->getKeys(protocolNames);

diff --git a/Modular/library/PeerObject/TTCueManager.cpp b/Modular/library/PeerObject/TTCueManager.cpp
@@ -1179,7 +1179,7 @@ TTErr TTCueManager::ReadFromText(const TTValue& inputValue, TTValue& outputValue
 	TTTextHandlerPtr aTextHandler;
 	TTDictionaryPtr	line;
 	TTSymbol		flagName;
-	TTValue			v;
+	TTValue			v, aReturnWeDontCareAbout;
 
 	aTextHandler = TTTextHandlerPtr((TTObjectBasePtr)inputValue[0]);
 
@@ -1213,7 +1213,7 @@ TTErr TTCueManager::ReadFromText(const TTValue& inputValue, TTValue& outputValue
 
                         // Create a new cue
                         mCurrentCue = NULL;
-                        TTObjectBaseInstantiate(kTTSym_Cue, TTObjectBaseHandle(&mCurrentCue), kTTValNONE);
+                        TTObjectBaseInstantiate(kTTSym_Cue, TTObjectBaseHandle(&mCurrentCue), aReturnWeDontCareAbout);
 
                         mCurrentCue->setAttributeValue(kTTSym_name, mCurrent);
 

diff --git a/Modular/library/PeerObject/TTMirror.cpp b/Modular/library/PeerObject/TTMirror.cpp
@@ -114,15 +114,15 @@ TTSymbol TTMirror::getName()
 
 TTErr TTMirror::getMirrorAttribute(TTAttribute& anAttribute, TTValue& value)
 {
-	TTValue data;
+	TTValue data, aReturnWeDontCareAbout;
 
 	if (mGetAttributeCallback) {
 
 		data.append(anAttribute.name);
 		data.append((TTPtr)&value);
 
 		return mGetAttributeCallback->deliver(data);
-		mGetAttributeCallback->notify(data, kTTValNONE);
+		mGetAttributeCallback->notify(data, aReturnWeDontCareAbout);
 
         if (value.size() > 0)
             return kTTErrNone;

diff --git a/Modular/library/ProtocolLib/Protocol.cpp b/Modular/library/ProtocolLib/Protocol.cpp
@@ -400,10 +400,11 @@ TTErr Protocol::ReceiveListenRequest(TTSymbol from, TTAddress address, TTBoolean
 
 		err = mApplicationManager->sendMessage(TTSymbol("ApplicationListen"), v, kTTValNONE);
 
+        // NW: wondering why this happens twice?
 		if (err)
 			return SendListenAnswer(from, address, dummy, err);
-		if (err && mRunning)
-			return SendListenAnswer(from, address, kTTValNONE, err);
+		if (err && mRunning) 
+			return SendListenAnswer(from, address, dummy, err);
 	}
 
 	return kTTErrGeneric;
@@ -427,10 +428,11 @@ TTErr Protocol::ReceiveListenAnswer(TTSymbol from, TTAddress address, TTValue& n
 		// TODO
 		err = mApplicationManager->sendMessage(TTSymbol("ApplicationListenAnswer"), v, kTTValNONE);
 
+        // NW: wondering why this happens twice?
 		if (err)
 			return SendListenAnswer(from, address, dummy, err);
 		if (err && mRunning)
-			return SendListenAnswer(from, address, kTTValNONE, err);
+			return SendListenAnswer(from, address, dummy, err);
 	}
 
 	return kTTErrGeneric;