Merge branch 'master' into treatment

revid/senders.go

@@ -95,19 +95,24 @@ func (s *httpSender) Write(d []byte) (int, error) {
 func (s *httpSender) Close() error { return nil }
 
 func httpSend(d []byte, client *netsender.Sender, log func(lvl int8, msg string, args ...interface{})) error {
-	// Only send if "V0" is configured as an input.
+	// Only send if "V0" or "S0" are configured as input.
 	send := false
 	ip := client.Param("ip")
 	log(logger.Debug, "making pins, and sending recv request", "ip", ip)
-	pins := netsender.MakePins(ip, "V")
+	pins := netsender.MakePins(ip, "V,S")
 	for i, pin := range pins {
-		if pin.Name == "V0" {
-			send = true
-			pins[i].Value = len(d)
-			pins[i].Data = d
+		switch pin.Name {
+		case "V0":
 			pins[i].MimeType = "video/mp2t"
-			break
+		case "S0":
+			pins[i].MimeType = "audio/x-wav"
+		default:
+			continue
 		}
+		pins[i].Value = len(d)
+		pins[i].Data = d
+		send = true
+		break
 	}
 
 	if !send {