Remove flash injection feature (#655)

Author: planetchili

IntelPresentMon/AppCef/ipm-ui-vue/src/App.vue

@@ -41,7 +41,7 @@ function cyclePreset() {
 // === Computed ===
 const inSettings = computed(() => {
   const routeName = typeof route.name === 'symbol' ? route.name.toString() : route.name;
-  return ['capture-config', 'overlay-config', 'data-config', 'other-config', 'flash-config', 'logging-config', 'about-config']
+  return ['capture-config', 'overlay-config', 'data-config', 'other-config', 'logging-config', 'about-config']
     .includes(routeName ?? '')
 });
 const targetName = computed(() => {
@@ -173,9 +173,6 @@ watch(() => loadout.widgets, async () => {
             <v-list-item color="primary" :to="{ name: 'capture-config' }">
               <v-list-item-title class="nav-item">Capture</v-list-item-title>
             </v-list-item>
-            <v-list-item color="primary" :to="{ name: 'flash-config' }">
-              <v-list-item-title class="nav-item">Flash</v-list-item-title>
-            </v-list-item>
             <v-list-item color="primary" :to="{ name: 'logging-config' }">
               <v-list-item-title class="nav-item">Logging</v-list-item-title>
             </v-list-item>

IntelPresentMon/AppCef/ipm-ui-vue/src/core/preferences.ts

@@ -55,17 +55,6 @@ export interface Preferences {
         readonly axisSize: 10.0;
     };    
     adapterId: number;
-    enableFlashInjection:boolean;
-    flashInjectionEnableTargetOverride:boolean,
-    flashInjectionTargetOverride:string;
-    flashInjectionSize:number;
-    flashInjectionColor:RgbaColor;
-    flashInjectionBackgroundEnable:boolean;
-    flashInjectionBackgroundColor:RgbaColor;
-    flashInjectionRightShift:number;
-    flashInjectionFlashDuration:number;
-    flashInjectionUseRainbow:boolean;
-    flashInjectionBackgroundSize:number;
 };
 
 export function makeDefaultPreferences(): Preferences {
@@ -118,33 +107,12 @@ export function makeDefaultPreferences(): Preferences {
         enableAutotargetting: false,
         upscaleFactor: 2,        
         adapterId: 0,
-        enableFlashInjection: false,
-        flashInjectionEnableTargetOverride: false,
-        flashInjectionTargetOverride: '',
-        flashInjectionSize: 0.25,
-        flashInjectionColor: {
-            r: 255, 
-            g: 255, 
-            b: 255, 
-            a: 255, 
-        },
-        flashInjectionBackgroundEnable: false,
-        flashInjectionBackgroundColor: {
-            r: 0, 
-            g: 0, 
-            b: 0, 
-            a: 255, 
-        },
-        flashInjectionRightShift: 0.5,
-        flashInjectionFlashDuration: 0.05,
-        flashInjectionUseRainbow: false,
-        flashInjectionBackgroundSize:0.25,
     };
 }
 
 export const signature: Signature = {
     code: "p2c-cap-pref",
-    version: "1.0.1",
+    version: "1.1.0",
 };
 
 export interface PreferenceFile {
@@ -192,19 +160,6 @@ const migrations: Migration[] = [
             prefs.metricsOffset = def.metricsOffset;
         }
     },
-    {
-        version: '0.19.0',
-        migrate: (prefs: Preferences, _intro: PreferenceMigrationIntrospection | null) => {
-            console.info('Migrating preferences to 0.19.0 (flash injection)');
-            const def = makeDefaultPreferences();
-            prefs.enableFlashInjection = def.enableFlashInjection;
-            prefs.flashInjectionSize = def.flashInjectionSize;
-            prefs.flashInjectionColor = def.flashInjectionColor;
-            prefs.flashInjectionBackgroundEnable = def.flashInjectionBackgroundEnable;
-            prefs.flashInjectionBackgroundColor = def.flashInjectionBackgroundColor;
-            prefs.flashInjectionRightShift = def.flashInjectionRightShift;
-        }
-    },
     {
         version: '0.20.0',
         migrate: (prefs: Preferences, _intro: PreferenceMigrationIntrospection | null) => {
@@ -223,7 +178,7 @@ const migrations: Migration[] = [
                 console.info(`Migrating preferences to 0.21.0 (metricsOffset: ${prefs.metricsOffset} => ${def.metricsOffset})`);
                 prefs.metricsOffset = def.metricsOffset;
             }
-        }
+        },
     },
     {
         version: '1.0.0',
@@ -257,6 +212,24 @@ const migrations: Migration[] = [
             }
         },
     },
+    {
+        version: '1.1.0',
+        migrate: (prefs: Preferences, _intro: PreferenceMigrationIntrospection | null) => {
+            console.info('Migrating preferences to 1.1.0 (remove flash injection)');
+            const legacy = prefs as unknown as Record<string, unknown>;
+            delete legacy.enableFlashInjection;
+            delete legacy.flashInjectionEnableTargetOverride;
+            delete legacy.flashInjectionTargetOverride;
+            delete legacy.flashInjectionSize;
+            delete legacy.flashInjectionColor;
+            delete legacy.flashInjectionBackgroundEnable;
+            delete legacy.flashInjectionBackgroundColor;
+            delete legacy.flashInjectionRightShift;
+            delete legacy.flashInjectionFlashDuration;
+            delete legacy.flashInjectionUseRainbow;
+            delete legacy.flashInjectionBackgroundSize;
+        },
+    },
 ];
 
 migrations.sort((a, b) => compareVersions(a.version, b.version));

IntelPresentMon/AppCef/ipm-ui-vue/src/router/index.ts

@@ -6,7 +6,6 @@ import ReadoutConfigView from '@/views/ReadoutConfigView.vue'
 import DataConfigView from '@/views/DataConfigView.vue'
 import OverlayConfigView from '@/views/OverlayConfigView.vue'
 import CaptureConfigView from '@/views/CaptureConfigView.vue'
-import FlashConfigView from '@/views/FlashConfigView.vue'
 import OtherConfigView from '@/views/OtherConfigView.vue'
 import LoggingConfigView from '@/views/LoggingConfigView.vue'
 import AboutConfigView from '@/views/AboutConfigView.vue'
@@ -70,11 +69,6 @@ const router = createRouter({
       name: 'about-config',
       component: AboutConfigView,
     },
-    {
-      path: '/flash',
-      name: 'flash-config',
-      component: FlashConfigView,
-    },
   ],
 })
 

IntelPresentMon/AppCef/ipm-ui-vue/src/views/FlashConfigView.vue

@@ -52,13 +52,11 @@
     <ClInclude Include="source\gfx\prim\RectPrimitive.h" />
     <ClInclude Include="source\gfx\prim\TextPrimitive.h" />
     <ClInclude Include="source\gfx\prim\TextStylePrimitive.h" />
-    <ClInclude Include="source\iact\ActionClient.h" />
     <ClInclude Include="source\infra\Logging.h" />
     <ClInclude Include="source\infra\LogSetup.h" />
     <ClInclude Include="source\infra\util\CooldownTimer.h" />
     <ClInclude Include="source\infra\util\FolderResolver.h" />
     <ClInclude Include="source\kernel\DataFetchPack.h" />
-    <ClInclude Include="source\kernel\InjectorComplex.h" />
     <ClInclude Include="source\kernel\MetricPackMapper.h" />
     <ClInclude Include="source\pmon\DynamicQuery.h" />
     <ClInclude Include="source\pmon\metric\DynamicPollingFetcher.h" />
@@ -123,11 +121,9 @@
     <ClCompile Include="source\gfx\prim\RetainedPrimitive.cpp" />
     <ClCompile Include="source\gfx\prim\TextPrimitive.cpp" />
     <ClCompile Include="source\gfx\prim\TextStylePrimitive.cpp" />
-    <ClCompile Include="source\iact\ActionClient.cpp" />
     <ClCompile Include="source\infra\LogSetup.cpp" />
     <ClCompile Include="source\infra\util\CooldownTimer.cpp" />
     <ClCompile Include="source\infra\util\FolderResolver.cpp" />
-    <ClCompile Include="source\kernel\InjectorComplex.cpp" />
     <ClCompile Include="source\pmon\DynamicQuery.cpp" />
     <ClCompile Include="source\pmon\metric\DynamicPollingFetcher.cpp" />
     <ClCompile Include="source\pmon\StatisticsTracker.cpp" />

IntelPresentMon/Core/Core.vcxproj

@@ -84,8 +84,6 @@
     <ClInclude Include="source\infra\LogSetup.h" />
     <ClInclude Include="source\infra\Logging.h" />
     <ClInclude Include="source\win\HotkeyListener.h" />
-    <ClInclude Include="source\iact\ActionClient.h" />
-    <ClInclude Include="source\kernel\InjectorComplex.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="source\win\MessageMap.cpp" />
@@ -142,8 +140,6 @@
     <ClCompile Include="source\pmon\metric\DynamicPollingFetcher.cpp" />
     <ClCompile Include="source\infra\LogSetup.cpp" />
     <ClCompile Include="source\win\HotkeyListener.cpp" />
-    <ClCompile Include="source\iact\ActionClient.cpp" />
-    <ClCompile Include="source\kernel\InjectorComplex.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="cpp.hint" />