return value from AUDupdate

Author: camilleg

cli/cliMsg.c

@@ -90,29 +90,24 @@ OBJ BgnMsgsend(const char *hostname, int channel)
 	o->addr.sin_family = AF_INET;
 	o->addr.sin_addr.s_addr = inet_addr(hostname);
 	o->addr.sin_port = htons(channel);
-	if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) >= 0)
-		{
-		memset((char *)&cl_addr, 0, sizeof(cl_addr));
-		cl_addr.sin_family = AF_INET;
-		cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-		cl_addr.sin_port = htons(0);
-		if (bind(sockfd, (struct sockaddr *)&cl_addr,
-			sizeof(cl_addr)) < 0)
-			{
-			perror("can't bind");
-			close(sockfd);
-			sockfd = -1;
-			}
-		}
-	else
-		printf("unable to make socket\n");
+	if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+		printf("Failed to make socket.\n");
+		return (OBJ)0;
+	}
+	memset((char *)&cl_addr, 0, sizeof(cl_addr));
+	cl_addr.sin_family = AF_INET;
+	cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+	cl_addr.sin_port = htons(0);
+	if (bind(sockfd, (struct sockaddr *)&cl_addr, sizeof(cl_addr)) < 0) {
+		close(sockfd);
+		perror("failed to bind socket");
+		return (OBJ)0;
+	}
 
 	fcntl(sockfd, F_SETFL, FNDELAY); // Non-blocking I/O
 	o->sockfd = sockfd;
 	o->len = sizeof(o->addr);
-#ifdef NOISY
-	printf("will send to %s:%d\n", inet_ntoa(o->addr.sin_addr), o->channel);
-#endif
+	// printf("will send to %s:%d\n", inet_ntoa(o->addr.sin_addr), o->channel);
 	return o;
 }
 
@@ -195,7 +190,7 @@ void MsgsendObj(OBJ obj, struct sockaddr_in* paddr, const char* msg)
 		paddr = &o->addr;
 	VSS_StripZerosInPlace(msg);
 	const size_t cb = strlen(msg) + 1; // +1 is the terminating null.
-#ifdef VERBOSE
+#ifdef NOISY
 printf("\t\033[32msend \"%s\"\033[0m\n", msg);
 #endif
 	if (!sendudp(paddr, o->sockfd, cb, msg))

cli/parseMsg.y

@@ -533,6 +533,13 @@ float AUDupdateFloats(int fdT, char* szActor, int numFloats, ...)
 
 extern "C" void VSS_StripZerosInPlace(char*); // in cliMsg.c
 
+// Call AUDupdateWaitForReply(true) before AUDupdateXXX'ing a MG to which you'd added
+// BeginSound's or Create's, whose returned handles you want.
+static int vfAUDupdateWaitForReply = false;
+extern "C" void AUDupdateWaitForReply(int fWait) {
+	vfAUDupdateWaitForReply = fWait;
+}
+
 // Send a data array to the message group called szActor at server fdT.
 // Complain if there is no such message group at fdT.
 extern "C" float AUDupdate(int fdT, char* szActor, int numFloats, float* floatArray)
@@ -563,7 +570,10 @@ extern "C" float AUDupdate(int fdT, char* szActor, int numFloats, float* floatAr
 	}
 	strcat(szT, "]");
 	VSS_StripZerosInPlace(szT);
-	return actorMessageRetval(szT);
+	if (vfAUDupdateWaitForReply) // Set only by AUDupdateWaitForReply.
+		return actorMessageRetval(szT);
+	actorMessage(szT);
+	return hNil; // ignored
 }
 
 // Call AUDupdate for two servers, e.g. for wet and dry localization.

cli/vssClient.h

@@ -28,6 +28,7 @@ float AUDupdateFloats(int fdT, char* szActor, int numFloats, ...);
 float AUDupdate(int fileHandle, char *messageGroupName, int numFloats, float *floatArray);
 void AUDupdateTwo(int theFirst, int theSecond, char *messageGroupName, int numFloats, float *floatArray);
 void AUDupdateMany(int numHandles, int * handleArray, char *messageGroupName, int numFloats, float *floatArray);
+void AUDupdateWaitForReply(int fWait);
 void AUDqueue(int, float*, float);
 void AUDflushQueue(int, char *, int fPreserveQueueData );
 void actorMessage(const char* messagename);

util/dynamic.aud

@@ -7,18 +7,18 @@ later = Create LaterActor;
 
 // Create a sound.
 NewX = Create MessageGroup;
-AddMessage NewX BeginSound fm SetAmp 0.05 SetCarFreq *0;
+AddMessage NewX BeginSound fm SetAmp 0.12 SetCarFreq *0;
 
-// Fade out and then delete a sound.
+// Modify it.
+ChangeFreqX = Create MessageGroup;
+AddMessage ChangeFreqX SetCarFreq *0 *1;
+
+// Fade out and then delete it.
 DeleteX = Create MessageGroup;
 AddMessage DeleteX SetAmp *0 0 .15;
 AddMessage DeleteX AddMessage later .16 Delete *0;
 
-// Modify a sound.
-ChangeFreqX = Create MessageGroup;
-AddMessage ChangeFreqX SetCarFreq *0 *1;
-
-// Save the output to an audio file.
+// Save to /tmp/audio-out.raw.aiff.
 EnableOfile 1 "/tmp/audio-out.raw";
 Done = Create MessageGroup;
 AddMessage Done EnableOfile 0;

util/dynamic.c

@@ -1,4 +1,4 @@
-// An example of using AUDupdate()'s return value.
+// An example using AUDupdate's return value, via AUDupdateWaitForReply.
 
 #include "vssClient.h"
 
@@ -9,34 +9,33 @@ int main(int argc, char* argv[])
 	if (!BeginSoundServer())
 		return -1;
 
-	// Ignore AUDinit()'s return value, and thus also don't bother to AUDterminate().
+	// Ignore the return value, and thus also don't bother to AUDterminate().
 	(void)AUDinit("dynamic.aud");
 
-	// Create sounds.
-	for (i=0; i<10; i++)
-		{
+	// Create 10 sounds.
+	AUDupdateWaitForReply(1);
+	for (i=0; i<10; i++) {
 		sounds[i] = AUDupdateSimpleFloats("NewX", 1, (float)(300 + 100 * i));
-		usleep(30000);
-		}
+		usleep(40000);
+	}
+	AUDupdateWaitForReply(0);
 	usleep(250000);
 
-	// Modify sounds.
-	for (i=0; i<10; i++)
-		{
+	// Modify them.
+	for (i=0; i<10; i++) {
 		AUDupdateSimpleFloats("ChangeFreqX", 2, sounds[i], (float)(80+40*i));
-		usleep(50000);
-		}
+		usleep(60000);
+	}
 	usleep(500000);
 
-	// Delete sounds.
-	for (i=0; i<10; i++)
-		{
+	// Delete them.
+	for (i=0; i<10; i++) {
 		AUDupdateSimpleFloats("DeleteX", 1, sounds[i]);
-		sounds[i] = hNil; // Prevent "dangling" handles.
-		}
-	usleep(300000);
+	}
+	usleep(200000);
 
 	AUDupdateSimple("Done", 0, NULL);
+	usleep(200000);
 	EndSoundServer();
 	return 0;
 }

util/dynamic.rb

@@ -0,0 +1,86 @@
+#!/usr/bin/env ruby
+
+require 'socket'
+$sock = UDPSocket.new
+$sock.connect 'localhost', 7999
+
+def send(s) $sock.send(s, 0) end
+
+def get() $sock.recvfrom(500)[0] end  # e.g., "AckNoteMsg 7.00"
+
+def gethandle(s) send(s); get.split[1].to_i end
+
+def done() $sock.close end
+
+send 'SetPrintCommands 2'
+send 'EnableOfile 1 /tmp/audio-out.raw'
+fm = gethandle 'Create FmActor'
+
+UseMessageGroups = false
+if UseMessageGroups
+
+  # AUDupdateSimpleFloats()
+  def update(hMG, floats, fGetReply=false)
+    msg = "SendData #{hMG} [ " + floats.join(' ') + "]";
+    fGetReply ? gethandle(msg) : send(msg)
+  end
+
+  newX = gethandle 'Create MessageGroup'
+  send "AddMessage #{newX} BeginSound #{fm} SetAmp 0.12 SetCarFreq *0"
+
+  changeFreqX = gethandle 'Create MessageGroup'
+  send "AddMessage #{changeFreqX} SetCarFreq *0 *1"
+
+  deleteX = gethandle 'Create MessageGroup'
+  later = gethandle 'Create LaterActor'
+  send "AddMessage #{deleteX} SetAmp *0 0 .15"
+  send "AddMessage #{deleteX} AddMessage #{later} .16 Delete *0"
+
+  # Create 10 sounds.
+  sounds = (0..10).map {|i|
+    sleep 0.04
+    update newX, [300 + 100 * i], true
+  }
+  sleep 0.25
+
+  # Modify them.
+  sounds.each_with_index {|h,i|
+    sleep 0.06
+    update changeFreqX, [h, 80+40*i]
+  }
+  sleep 0.5
+
+  # Fade out and delete them.
+  sounds.each {|h|
+    update deleteX, [h]
+  }
+  sleep 0.2
+
+else
+
+  # Create 10 sounds.
+  sounds = (0..10).map {|i|
+    sleep 0.04
+    gethandle "BeginSound #{fm} SetAmp 0.12 SetCarFreq #{300 + 100 * i}"
+  }
+  sleep 0.25
+
+  # Modify them.
+  sounds.each_with_index {|h,i|
+    sleep 0.06
+    send "SetCarFreq #{h} #{80+40*i}"
+  }
+  sleep 0.5
+
+  # Fade out and delete them.
+  sounds.each {|h| send "SetAmp #{h} 0 .15" }
+  sleep 0.16
+  sounds.each {|h| send "Delete #{h}" }
+  sleep 0.2
+
+end
+
+# Save the output to /tmp/audio-out.raw.aiff.
+send 'EnableOfile 0'
+sleep 0.05
+done

vssSrv.c++

@@ -443,21 +443,21 @@ int actorMessageHandler(const char* Message)
 	if (!fKeepRunning)
 		return 0;
 
-	if (printCommands >= 2 && !vfAlreadyLogged)
+	const auto fInternal = !vfAlreadyLogged; // Not already handled by LiveTick > actorMessageMM > actorMessageHandler.
+	if (fInternal && printCommands >= 2)
 		cerr << Message << " (internal)\n";
 	vfAlreadyLogged = false; // This was the 2nd time.  Permit later msgs to be printed.
 
 	switch (caught)
 		{
 	case 0:
 		cerr << "vss: ignored message with garbled args: " << Message << "\n";
-		return 1;
 	case 1:
 		return 1;
 	case 2:
 		break;
 	default:
-		cerr << "vss: actorMessageHandler internal error.\n";
+		cerr << "vss: actorMessageHandlerCore internal error.\n";
 		return 1;
 		}
 
@@ -478,10 +478,22 @@ int actorMessageHandler(const char* Message)
 		cerr << "vss: ignored message with unknown actor handle " << h << ": " << Message << "\n";
 		return 1;
 	}
+	// Infer whether or not to ReturnFloatMsgToClient, copied from actorMessageMM.
+	const auto fReturnToClient = fInternal &&
+	    (!strncmp(Message, "Create ", 7) || !strncmp(Message, "BeginSound", 10 /* or BeginSoundPaused */));
+	if (fInternal) cerr << "\nInternal msg will reply.\n";
 	if (!a->receiveMessage(Message)) {
 		// VActor::receiveMessage complained already.
 		return 1;
 	}
+	if (fReturnToClient) {
+		// hNil may mean an AUDupdate() "SendData mgFoo [...]" that wants a "*?".
+		if (vzReturnToClient == hNil)
+			vzReturnToClient = vzMessageGroupRecentHandle;
+		ReturnFloatMsgToClient(vzReturnToClient, "AckNoteMsg");
+		if (printCommands >= 1)
+			cerr << "  = " << vzReturnToClient << "\n";
+	}
 	if (a->delete_me() /* set by VActor::receiveMessage */)
 		delete a;
 	return 1;