fly/fgdata
1
0
Fork 0
Code Activity

Fix so that the callsign is a method as most of the MP properties probably won't be fully populated when the incoming bridge is created.

Browse source
This commit is contained in:
Richard Harrison 2016-04-16 15:14:16 +02:00
parent db7ddba8ba
commit 1efe01a452
1 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
Nasal/emesary_mp_bridge.nas
View file

@ -116,7 +116,7 @@ var OutgoingMPBridge =
if (notification.FromIncomingBridge) if (notification.FromIncomingBridge)
return emesary.Transmitter.ReceiptStatus_NotProcessed; return emesary.Transmitter.ReceiptStatus_NotProcessed;
print("Receive ",notification.NotificationType," ",notification.Ident); #print("Receive ",notification.NotificationType," ",notification.Ident);
for (var idx = 0; idx < size(me.NotificationsToBridge); idx += 1) for (var idx = 0; idx < size(me.NotificationsToBridge); idx += 1)
{ {
if(me.NotificationsToBridge[idx].NotificationType == notification.NotificationType) if(me.NotificationsToBridge[idx].NotificationType == notification.NotificationType)
@ -230,14 +230,16 @@ var IncomingMPBridge =
new_class.Connect = func(_root) new_class.Connect = func(_root)
{ {
me.MpVariable = _root~"sim/multiplay/generic/string["~new_class.MPidx~"]"; me.MpVariable = _root~"sim/multiplay/generic/string["~new_class.MPidx~"]";
me.Callsign = getprop(_root~"callsign"); me.CallsignPath = _root~"callsign";
print("bridge ",me.MpVariable, " callsign ",me.Callsign);
setlistener(me.MpVariable, func(v) setlistener(me.MpVariable, func(v)
{ {
me.ProcessIncoming(v.getValue()); me.ProcessIncoming(v.getValue());
}); });
}; };
new_class.GetCallsign = func
{
return getprop(me.CallsignPath);
};
new_class.AddMessage = func(m) new_class.AddMessage = func(m)
{ {
append(me.NotificationsToBridge, m); append(me.NotificationsToBridge, m);
@ -275,37 +277,34 @@ var IncomingMPBridge =
{ {
var msg = me.NotificationsToBridge[msg_type_id]; var msg = me.NotificationsToBridge[msg_type_id];
var msg_notify = encoded_notification[3]; var msg_notify = encoded_notification[3];
print("received idx=",msg_idx," ",msg_type_id,":",msg.NotificationType); # print("received idx=",msg_idx," ",msg_type_id,":",msg.NotificationType);
if(msg_idx <= me.IncomingMessageIndex) if (msg_idx > me.IncomingMessageIndex)
print(" **Already processed"); {
else # raise notification
{ var bridged_notification = msg; #emesary.Notification.new(msg.NotificationType,"BridgedMessage");
# raise notification # populate fields
var bridged_notification = msg; #emesary.Notification.new(msg.NotificationType,"BridgedMessage"); var bridgedProperties = msg.bridgeProperties();
# populate fields var encvals=split(";", msg_notify);
var bridgedProperties = msg.bridgeProperties();
var encvals=split(";", msg_notify);
for (var bpi = 0; bpi < size(encvals); bpi += 1) { for (var bpi = 0; bpi < size(encvals); bpi += 1) {
if (bpi < size(bridgedProperties)) { if (bpi < size(bridgedProperties)) {
var bp = bridgedProperties[bpi]; var bp = bridgedProperties[bpi];
print("encval ",bpi,"=",encvals[bpi]); if (encvals[bpi] != ";" and encvals[bpi] != "") {
if (encvals[bpi] != ";" and encvals[bpi] != "") { var bp = bridgedProperties[bpi];
var bp = bridgedProperties[bpi]; bp.setValue(encvals[bpi]);
bp.setValue(encvals[bpi]); }
} #else
#else #print("EMPTY encoded ",bpi," empty");
#print("EMPTY encoded ",bpi," empty"); } else
} else print("Error: emesary.IncomingBridge.ProcessIncoming: supplementary encoded value at",bpi);
print("Error: emesary.IncomingBridge.ProcessIncoming: supplementary encoded value at",bpi); }
} if (bridged_notification.Ident == "none")
if (bridged_notification.Ident == "none") bridged_notification.Ident = "mp-bridge";
bridged_notification.Ident = "mp-bridge"; bridged_notification.FromIncomingBridge = 1;
bridged_notification.FromIncomingBridge = 1; bridged_notification.Callsign = me.GetCallsign();
bridged_notification.Callsign = me.Callsign; me.Transmitter.NotifyAll(bridged_notification);
me.Transmitter.NotifyAll(bridged_notification); me.IncomingMessageIndex = msg_idx;
me.IncomingMessageIndex = msg_idx; }
}
} }
} }
} }
@ -336,12 +335,13 @@ var IncomingMPBridge =
# Ensure we only handle multiplayer elements # Ensure we only handle multiplayer elements
if (find("/multiplayer",path) > 0) if (find("/multiplayer",path) > 0)
{ {
print("Callsign path ",path~"/callsign");
var callsign = getprop(path~"/callsign"); var callsign = getprop(path~"/callsign");
print("Creating Emesary MPBridge for ",callsign); print("Creating Emesary MPBridge for ",callsign);
if (callsign == "" or callsign == nil) if (callsign == "" or callsign == nil)
callsign = path; callsign = path;
var incomingBridge = emesary_mp_bridge.IncomingMPBridge.new(callsign~"mp", notification_list, 18); var incomingBridge = emesary_mp_bridge.IncomingMPBridge.new(path, notification_list, 18);
incomingBridge.Connect(path~"/"); incomingBridge.Connect(path~"/");
incomingBridgeList[path] = incomingBridge; incomingBridgeList[path] = incomingBridge;