From b982dbb8fdead40f306ca5c2818a63c96717a008 Mon Sep 17 00:00:00 2001 From: alexanderkershaw Date: Fri, 20 Jan 2023 16:05:55 +0000 Subject: [PATCH 1/3] remove some encoders --- docs/CHANGELOG.md | 1 + src/settings/AdvancedSettings.tsx | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index ac24de9d..96c65d97 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [Issue 275](https://github.com/aza547/wow-recorder/issues/275) - Increase retail log timeout for better handling of M+. - [Issue 251](https://github.com/aza547/wow-recorder/issues/251) - Fix text overflow clipping in video selection buttons. - [Issue 293](https://github.com/aza547/wow-recorder/issues/293) - Fix to prevent adding too many audio devices in the settings. +- [Issue 294](https://github.com/aza547/wow-recorder/issues/294) - Remove a bunch of encoders that don't work with WR. ## [3.3.3] - 2023-01-14 ### Fixed diff --git a/src/settings/AdvancedSettings.tsx b/src/settings/AdvancedSettings.tsx index 4ab6150c..124be0ff 100644 --- a/src/settings/AdvancedSettings.tsx +++ b/src/settings/AdvancedSettings.tsx @@ -17,6 +17,9 @@ const obsAvailableEncoders: string[] = ipc.sendSync('settingsWindow', [ ]); const encoderMap = obsAvailableEncoders + .filter((encoder) => !encoder.includes('hevc')) + .filter((encoder) => !encoder.includes('svt')) + .filter((encoder) => !encoder.includes('aom')) .map((encoder) => { const isHardwareEncoder = encoder.includes('amd') || @@ -26,7 +29,8 @@ const encoderMap = obsAvailableEncoders const encoderType = isHardwareEncoder ? 'Hardware' : 'Software'; return { name: encoder, type: encoderType }; }) - .sort((a, b) => a.type.localeCompare(b.type)); + .sort((a, b) => a.type.localeCompare(b.type)) + export default function GeneralSettings(props: ISettingsPanelProps) { const { config, onChange } = props; From 0000bb0de7e00ae0b07c678ac337f478d4cea07a Mon Sep 17 00:00:00 2001 From: alexanderkershaw Date: Fri, 20 Jan 2023 16:09:38 +0000 Subject: [PATCH 2/3] encoders --- src/settings/AdvancedSettings.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/settings/AdvancedSettings.tsx b/src/settings/AdvancedSettings.tsx index 124be0ff..3f8e5a0f 100644 --- a/src/settings/AdvancedSettings.tsx +++ b/src/settings/AdvancedSettings.tsx @@ -29,8 +29,7 @@ const encoderMap = obsAvailableEncoders const encoderType = isHardwareEncoder ? 'Hardware' : 'Software'; return { name: encoder, type: encoderType }; }) - .sort((a, b) => a.type.localeCompare(b.type)) - + .sort((a, b) => a.type.localeCompare(b.type)); export default function GeneralSettings(props: ISettingsPanelProps) { const { config, onChange } = props; From 0746766f605069b83f1cd24a8e95fa3b0415375e Mon Sep 17 00:00:00 2001 From: alexanderkershaw Date: Fri, 20 Jan 2023 16:19:44 +0000 Subject: [PATCH 3/3] include raid difficulty in file --- docs/CHANGELOG.md | 1 + src/activitys/RaidEncounter.ts | 2 +- src/main/constants.ts | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 96c65d97..d3a5d2a7 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - [Issue 296](https://github.com/aza547/wow-recorder/issues/296) - Add Ulduar classic support. +- [Issue 300](https://github.com/aza547/wow-recorder/issues/300) - Add difficulty to raid file names. ### Changed ### Fixed diff --git a/src/activitys/RaidEncounter.ts b/src/activitys/RaidEncounter.ts index b42d1554..95fa39dd 100644 --- a/src/activitys/RaidEncounter.ts +++ b/src/activitys/RaidEncounter.ts @@ -137,6 +137,6 @@ export default class RaidEncounter extends Activity { } getFileName(): string { - return `${this.raid.name}, ${this.encounterName} (${this.resultInfo})`; + return `${this.raid.name}, ${this.encounterName} [${this.difficulty.difficulty}] (${this.resultInfo})`; } } diff --git a/src/main/constants.ts b/src/main/constants.ts index fb336b02..9665e31e 100644 --- a/src/main/constants.ts +++ b/src/main/constants.ts @@ -666,9 +666,9 @@ const instanceEncountersById: NumberKeyToStringValueMapType = { }; type InstanceDifficultyPartyType = 'party' | 'raid' | 'pvp'; -type ImstanceDifficultyIdType = 'lfr' | 'normal' | 'heroic' | 'mythic' | 'pvp'; +type InstanceDifficultyIdType = 'lfr' | 'normal' | 'heroic' | 'mythic' | 'pvp'; type InstanceDifficultyType = { - difficultyID: ImstanceDifficultyIdType; + difficultyID: InstanceDifficultyIdType; difficulty: string; partyType: InstanceDifficultyPartyType; };