Skip to content

Commit 2e897b7

Browse files
CodectoryCodectory
committed
1.9.1
[Bug fixes] - Display action: Cannot changecolor depth when changing HDR was disabled - Unclear label for changing HDR - Backup settings file will no longer end with ".xml.bak"
1 parent ddda4d9 commit 2e897b7

File tree

12 files changed

+182
-149
lines changed

12 files changed

+182
-149
lines changed

‎Source/AutoHDR.ProjectResources/ProjectLocales.Designer.cs‎

Lines changed: 63 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/AutoHDR.ProjectResources/ProjectLocales.de.resx‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,27 @@
180180
<data name="BuyBeer" xml:space="preserve">
181181
<value>Kauf mir ein Bier!</value>
182182
</data>
183+
<data name="ChangeColorDepth" xml:space="preserve">
184+
<value>Farbtiefe ändern</value>
185+
</data>
186+
<data name="ChangeHDR" xml:space="preserve">
187+
<value>HDR ändern</value>
188+
</data>
183189
<data name="Changelog" xml:space="preserve">
184190
<value>Changelog</value>
185191
</data>
192+
<data name="ChangePlaybackDevice" xml:space="preserve">
193+
<value>Wiedergabegerät ändern</value>
194+
</data>
195+
<data name="ChangeRecordDevice" xml:space="preserve">
196+
<value>Aufnahmegerät ändern</value>
197+
</data>
198+
<data name="ChangeRefreshRate" xml:space="preserve">
199+
<value>Bildwiederholrate ändern</value>
200+
</data>
201+
<data name="ChangeResolution" xml:space="preserve">
202+
<value>Auflösung ändern</value>
203+
</data>
186204
<data name="CheckForNewVersion" xml:space="preserve">
187205
<value>Beim Start auf neuere Version prüfen</value>
188206
</data>
@@ -273,9 +291,6 @@
273291
<data name="Info" xml:space="preserve">
274292
<value>Info</value>
275293
</data>
276-
<data name="InputDevice" xml:space="preserve">
277-
<value>Eingangsgerät</value>
278-
</data>
279294
<data name="IsPrimaryMonitor" xml:space="preserve">
280295
<value>Hauptmonitor</value>
281296
</data>
@@ -300,6 +315,9 @@
300315
<data name="ManagedHDR" xml:space="preserve">
301316
<value>Automatischer HDR-Modus</value>
302317
</data>
318+
<data name="MessageInvalidSettings" xml:space="preserve">
319+
<value>Ungültige Einstellungen</value>
320+
</data>
303321
<data name="MessageMissingAudioDevice" xml:space="preserve">
304322
<value>Audiogerät fehlt.</value>
305323
</data>
@@ -342,9 +360,6 @@
342360
<data name="Open" xml:space="preserve">
343361
<value>Öffnen</value>
344362
</data>
345-
<data name="OutputDevice" xml:space="preserve">
346-
<value>Ausgangsgerät</value>
347-
</data>
348363
<data name="Priority" xml:space="preserve">
349364
<value>Priorität</value>
350365
</data>
@@ -390,18 +405,6 @@
390405
<data name="Save" xml:space="preserve">
391406
<value>Speichern</value>
392407
</data>
393-
<data name="SetColorDepth" xml:space="preserve">
394-
<value>Farbtiefe ändern</value>
395-
</data>
396-
<data name="SetHDR" xml:space="preserve">
397-
<value>HDR ändern</value>
398-
</data>
399-
<data name="SetRefreshRate" xml:space="preserve">
400-
<value>Bildwiederholrate ändern</value>
401-
</data>
402-
<data name="SetResolution" xml:space="preserve">
403-
<value>Auflösung ändern</value>
404-
</data>
405408
<data name="Settings" xml:space="preserve">
406409
<value>Einstellungen</value>
407410
</data>

‎Source/AutoHDR.ProjectResources/ProjectLocales.resx‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,27 @@
190190
<data name="BuyBeer" xml:space="preserve">
191191
<value>Buy me a beer!</value>
192192
</data>
193+
<data name="ChangeColorDepth" xml:space="preserve">
194+
<value>Change color depth</value>
195+
</data>
196+
<data name="ChangeHDR" xml:space="preserve">
197+
<value>Change HDR</value>
198+
</data>
193199
<data name="Changelog" xml:space="preserve">
194200
<value>Changelog</value>
195201
</data>
202+
<data name="ChangePlaybackDevice" xml:space="preserve">
203+
<value>Change playback device</value>
204+
</data>
205+
<data name="ChangeRecordDevice" xml:space="preserve">
206+
<value>Change record device</value>
207+
</data>
208+
<data name="ChangeRefreshRate" xml:space="preserve">
209+
<value>Change refresh rate</value>
210+
</data>
211+
<data name="ChangeResolution" xml:space="preserve">
212+
<value>Change resolution</value>
213+
</data>
196214
<data name="CheckForNewVersion" xml:space="preserve">
197215
<value>Check for new version on startup</value>
198216
</data>
@@ -307,9 +325,6 @@
307325
<data name="Info" xml:space="preserve">
308326
<value>Info</value>
309327
</data>
310-
<data name="InputDevice" xml:space="preserve">
311-
<value>Input device</value>
312-
</data>
313328
<data name="IsPrimaryMonitor" xml:space="preserve">
314329
<value>Primary</value>
315330
</data>
@@ -1016,6 +1031,9 @@ Public License instead of this License. But first, please read
10161031
<data name="ManagedHDR" xml:space="preserve">
10171032
<value>Automated HDR mode</value>
10181033
</data>
1034+
<data name="MessageInvalidSettings" xml:space="preserve">
1035+
<value>Invalid settings.</value>
1036+
</data>
10191037
<data name="MessageMissingAudioDevice" xml:space="preserve">
10201038
<value>Mssing audio device.</value>
10211039
</data>
@@ -1058,9 +1076,6 @@ Public License instead of this License. But first, please read
10581076
<data name="Open" xml:space="preserve">
10591077
<value>Open</value>
10601078
</data>
1061-
<data name="OutputDevice" xml:space="preserve">
1062-
<value>Output device</value>
1063-
</data>
10641079
<data name="Priority" xml:space="preserve">
10651080
<value>Priority</value>
10661081
</data>
@@ -1103,18 +1118,6 @@ Public License instead of this License. But first, please read
11031118
<data name="Save" xml:space="preserve">
11041119
<value>Save</value>
11051120
</data>
1106-
<data name="SetColorDepth" xml:space="preserve">
1107-
<value>Set color depth</value>
1108-
</data>
1109-
<data name="SetHDR" xml:space="preserve">
1110-
<value>Set HDR</value>
1111-
</data>
1112-
<data name="SetRefreshRate" xml:space="preserve">
1113-
<value>Set refresh rate</value>
1114-
</data>
1115-
<data name="SetResolution" xml:space="preserve">
1116-
<value>Set resolution</value>
1117-
</data>
11181121
<data name="Settings" xml:space="preserve">
11191122
<value>Settings</value>
11201123
</data>

‎Source/AutoHDR/Globals.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void LoadSettings()
7272
}
7373
catch (Exception ex)
7474
{
75-
string backupFile = $"{System.AppDomain.CurrentDomain.BaseDirectory}Backup_Settings_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xml.bak";
75+
string backupFile = $"{System.AppDomain.CurrentDomain.BaseDirectory}Backup_Settings_{DateTime.Now.ToString("yyyyMMddHHmmssfff")}.json";
7676
if (File.Exists(SettingsPath))
7777
{
7878
File.Move(SettingsPath, backupFile);

‎Source/AutoHDR/Profiles/Actions/AudioDeviceAction.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,43 @@ namespace AutoHDR.Profiles.Actions
1010
public class AudioDeviceAction : ProfileActionBase
1111
{
1212

13-
public override bool CanSave => (SetOutput && OutputDevice!=null) || (SetInput && InputDevice != null);
13+
public override bool CanSave => (ChangePlaybackDevice && PlaybackDevice!=null) || (ChangeRecordDevice && RecordDevice != null);
1414
public override string CannotSaveMessage => ProjectLocales.MessageMissingAudioDevice;
1515

1616
public override string ActionTypeName => ProjectLocales.AudioAction;
1717

1818

19-
private Guid _outputDeviceID = Guid.Empty;
19+
private Guid _playbackDeviceID = Guid.Empty;
2020

2121
[JsonProperty]
22-
public Guid OutputDeviceID { get => _outputDeviceID; set { _outputDeviceID = value; OnPropertyChanged(); OnPropertyChanged(nameof(OutputDevice)); } }
22+
public Guid PlaybackDeviceID { get => _playbackDeviceID; set { _playbackDeviceID = value; OnPropertyChanged(); OnPropertyChanged(nameof(PlaybackDevice)); } }
2323

2424

25-
public AudioDevice OutputDevice { get => AudioController.Instance.OutputAudioDevices.FirstOrDefault(d => d.ID.Equals(OutputDeviceID)); set { OutputDeviceID = value.ID; } }
25+
public AudioDevice PlaybackDevice { get => AudioController.Instance.OutputAudioDevices.FirstOrDefault(d => d.ID.Equals(PlaybackDeviceID)); set { PlaybackDeviceID = value.ID; } }
2626

2727

2828
private bool _setOutput = false;
2929

3030
[JsonProperty]
31-
public bool SetOutput { get => _setOutput; set { _setOutput = value; OnPropertyChanged(); } }
31+
public bool ChangePlaybackDevice { get => _setOutput; set { _setOutput = value; OnPropertyChanged(); } }
3232

3333

34-
private Guid _inputDeviceID =Guid.Empty;
34+
private Guid _recodDeviceID =Guid.Empty;
3535

3636
[JsonProperty]
37-
public Guid InputDeviceID { get => _inputDeviceID; set { _inputDeviceID = value; OnPropertyChanged(); OnPropertyChanged(nameof(InputDevice)); } }
37+
public Guid RecordDeviceID { get => _recodDeviceID; set { _recodDeviceID = value; OnPropertyChanged(); OnPropertyChanged(nameof(RecordDevice)); } }
3838

3939

4040

41-
public AudioDevice InputDevice { get => AudioController.Instance.InputAudioDevices.FirstOrDefault(d => d.ID.Equals(InputDeviceID)); set { InputDeviceID = value.ID; } }
41+
public AudioDevice RecordDevice { get => AudioController.Instance.InputAudioDevices.FirstOrDefault(d => d.ID.Equals(RecordDeviceID)); set { RecordDeviceID = value.ID; } }
4242

4343
private bool _setInput = false;
4444

4545
[JsonProperty]
46-
public bool SetInput { get => _setInput; set { _setInput = value; OnPropertyChanged(); } }
46+
public bool ChangeRecordDevice { get => _setInput; set { _setInput = value; OnPropertyChanged(); } }
4747

4848

49-
public override string ActionDescription => $"[{(OutputDevice != null && SetOutput ? OutputDevice.Name : string.Empty)} {(InputDevice != null && SetInput ? InputDevice.Name : string.Empty)}]";
49+
public override string ActionDescription => $"[{(PlaybackDevice != null && ChangePlaybackDevice ? PlaybackDevice.Name : string.Empty)} {(RecordDevice != null && ChangeRecordDevice ? RecordDevice.Name : string.Empty)}]";
5050

5151

5252
public AudioDeviceAction() : base()
@@ -57,15 +57,15 @@ public override ActionEndResult RunAction(ApplicationChangedType applicationChan
5757
{
5858
try
5959
{
60-
if (SetOutput)
60+
if (ChangePlaybackDevice)
6161
{
62-
CallNewLog(new CodectoryCore.Logging.LogEntry($"Setting output audio device to {OutputDevice.Name}"));
63-
OutputDevice.SetAsDefault();
62+
CallNewLog(new CodectoryCore.Logging.LogEntry($"Setting playback device to {PlaybackDevice.Name}"));
63+
PlaybackDevice.SetAsDefault();
6464
}
65-
if (SetInput)
65+
if (ChangeRecordDevice)
6666
{
67-
CallNewLog(new CodectoryCore.Logging.LogEntry($"Setting input audio device to {InputDevice.Name}"));
68-
InputDevice.SetAsDefault();
67+
CallNewLog(new CodectoryCore.Logging.LogEntry($"Setting record audio device to {RecordDevice.Name}"));
68+
RecordDevice.SetAsDefault();
6969
}
7070
return new ActionEndResult(true);
7171
}

0 commit comments

Comments
 (0)