Small patch

This commit is contained in:
EnderIce2 2021-06-25 00:38:07 +03:00
parent d7997418c0
commit 06e389b035

View File

@ -50,29 +50,6 @@ namespace EnderIce2.SDRSharpPlugin
_controlPanel = new SettingsPanel(); _controlPanel = new SettingsPanel();
windowMessages = new TopWindowMessages(); // TODO: do something when "EnableRPCInvite" is set to false windowMessages = new TopWindowMessages(); // TODO: do something when "EnableRPCInvite" is set to false
_control = control; _control = control;
try
{
if (Utils.GetBooleanSetting("EnableRPCInvite", false))
{
_control.RegisterFrontControl(windowMessages, PluginPosition.Top);
presence.Secrets = new Secrets()
{
JoinSecret = "invalid_secret"
};
presence.Party = new Party()
{
ID = Secrets.CreateFriendlySecret(new Random()),
Size = 1,
Max = 100
};
windowMessages.Show();
client.SetSubscription(EventType.Join | EventType.JoinRequest);
}
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString());
}
if (Utils.GetBooleanSetting("EnableRPC", true)) if (Utils.GetBooleanSetting("EnableRPC", true))
{ {
@ -104,6 +81,29 @@ namespace EnderIce2.SDRSharpPlugin
client.SetPresence(presence); client.SetPresence(presence);
client.Initialize(); client.Initialize();
try
{
//if (Utils.GetBooleanSetting("EnableRPCInvite", false))
//{
// _control.RegisterFrontControl(windowMessages, PluginPosition.Top);
// presence.Secrets = new Secrets()
// {
// JoinSecret = "invalid_secret"
// };
// presence.Party = new Party()
// {
// ID = Secrets.CreateFriendlySecret(new Random()),
// Size = 1,
// Max = 100
// };
// windowMessages.Show();
// client.SetSubscription(EventType.Join | EventType.JoinRequest);
//}
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString());
}
_ = MainLoop(); _ = MainLoop();
} }
else else
@ -122,21 +122,21 @@ namespace EnderIce2.SDRSharpPlugin
LogWriter.WriteToFile($"MainLoop called {isRunning} {client.IsInitialized}"); LogWriter.WriteToFile($"MainLoop called {isRunning} {client.IsInitialized}");
while (client != null && isRunning) while (client != null && isRunning)
{ {
if (Utils.GetBooleanSetting("EnableRPCInvite", false)) //if (Utils.GetBooleanSetting("EnableRPCInvite", false))
{ //{
LogWriter.WriteToFile("Setting secret..."); // LogWriter.WriteToFile("Setting secret...");
try // try
{ // {
// TODO: Get spy server host + port address // // TODO: Get spy server host + port address
//string sdr_url = "sdr://" + host + ":" + port + "/"; // //string sdr_url = "sdr://" + host + ":" + port + "/";
//LogWriter.WriteToFile(sdr_url); // //LogWriter.WriteToFile(sdr_url);
//presence.Secrets.JoinSecret = sdr_url; // //presence.Secrets.JoinSecret = sdr_url;
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
LogWriter.WriteToFile(ex.ToString()); // LogWriter.WriteToFile(ex.ToString());
} // }
} //}
LogWriter.WriteToFile("Waiting 500ms in loop..."); LogWriter.WriteToFile("Waiting 500ms in loop...");
await Task.Delay(500).ConfigureAwait(false); await Task.Delay(500).ConfigureAwait(false);
if (_control.RdsRadioText != null) if (_control.RdsRadioText != null)