Minor changes I forgot to commit previously
This commit is contained in:
+19
-8
@@ -16,7 +16,7 @@ namespace NightScoutAlert
|
||||
if (args.Any(arg => arg.Equals("--test-audio")))
|
||||
{
|
||||
Console.WriteLine("Starting audio test...");
|
||||
RaspberryPiAudioAlert alerter = new RaspberryPiAudioAlert();
|
||||
RaspberryPiAudioAlert alerter = SetupAudioAlert();
|
||||
alerter.StartAlert();
|
||||
Thread.Sleep(3000);
|
||||
alerter.StopAlerts();
|
||||
@@ -48,20 +48,15 @@ namespace NightScoutAlert
|
||||
{}
|
||||
|
||||
NightscoutDataSource dataSource =null;
|
||||
RaspberryPiAudioAlert audioAlerter = null;
|
||||
RaspberryPiAudioAlert audioAlerter = SetupAudioAlert(buttonSource);
|
||||
|
||||
if (buttonSource != null)
|
||||
{
|
||||
dataSource = new NightscoutDataSource(configuration,
|
||||
log4net.LogManager.GetLogger("NightscoutAlert"), buttonSource);
|
||||
audioAlerter = new RaspberryPiAudioAlert(buttonSource);
|
||||
}
|
||||
else
|
||||
{
|
||||
dataSource = new NightscoutDataSource(configuration,
|
||||
log4net.LogManager.GetLogger("NightscoutAlert"));
|
||||
audioAlerter = new RaspberryPiAudioAlert();
|
||||
}
|
||||
|
||||
ILog log = log4net.LogManager.GetLogger("NightscoutAlertMain");
|
||||
log.Debug("Log started");
|
||||
ConsoleAlerter consoleAlerter = new ConsoleAlerter();
|
||||
@@ -123,5 +118,21 @@ namespace NightScoutAlert
|
||||
Console.WriteLine("Started");
|
||||
Console.ReadLine();
|
||||
}
|
||||
private static RaspberryPiAudioAlert SetupAudioAlert(RaspberryPIButtonSource buttonSource = null)
|
||||
{
|
||||
RaspberryPiAudioAlert alerter;
|
||||
if (buttonSource != null)
|
||||
alerter = new RaspberryPiAudioAlert(buttonSource);
|
||||
else
|
||||
alerter = new RaspberryPiAudioAlert();
|
||||
|
||||
String ALSADeviceNumber = ConfigurationManager.AppSettings["ALSADeviceNumber"];
|
||||
Int32 devNumber = 0;
|
||||
if(!String.IsNullOrEmpty(ALSADeviceNumber) && Int32.TryParse(ALSADeviceNumber, out devNumber))
|
||||
{ //Set device
|
||||
alerter.SetALSAAudioDevice(devNumber);
|
||||
}
|
||||
return alerter;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user