formatting and remove dummy call to learningmodelbuilder

Linnea May · Linnea May · commit f05b79931c34 · 2022-08-13T14:34:36.000-07:00
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/EncryptedModel/EncryptedModel.xaml.cs b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/EncryptedModel/EncryptedModel.xaml.cs
@@ -32,12 +32,6 @@ public EncryptedModel()
             this.InitializeComponent();
             initialized_ = true;
 
-            // TODO: Currently the WinMLSamplesGalleryNative component will load
-            // the wrong version of the Microsoft.AI.MachineLearning.dll.
-            // To work around this, we make a dummy call to the builder to
-            // ensure that the dll is loaded.
-            var builder = Microsoft.AI.MachineLearning.Experimental.LearningModelBuilder.Create(11);
-
             // Initialize the sample with the decrypted model
             DecryptAndEvauluate();
         }
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/StreamEffect/StreamEffect.xaml.cs b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/StreamEffect/StreamEffect.xaml.cs
@@ -30,15 +30,9 @@ public sealed partial class StreamEffect : Page
         public StreamEffect()
         {
             this.InitializeComponent();
-            // TODO: Currently the WinMLSamplesGalleryNative component will load
-            // the wrong version of the Microsoft.AI.MachineLearning.dll.
-            // To work around this, we make a dummy call to the builder to
-            // ensure that the dll is loaded.
-            var builder = Microsoft.AI.MachineLearning.Experimental.LearningModelBuilder.Create(11);
             demoHwnd = (IntPtr)WinMLSamplesGalleryNative.StreamEffect.CreateInferenceWindow();
 
             currentHwnd = GetForegroundWindow();
-            //var modelName = "mosaic.onnx";
             modelPath = Path.Join(Windows.ApplicationModel.Package.Current.InstalledLocation.Path, "Models");
             
         }
@@ -78,8 +72,6 @@ async private void ToggleInference(object sender, RoutedEventArgs e)
 
             }
         }
-
-
     }
     
 }
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/External/CSampleQueue.h b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/External/CSampleQueue.h
@@ -12,9 +12,7 @@ class CSampleQueue: public IUnknown
 public:
     class   ILockedSample;
 
-    static  HRESULT Create(
-                            CSampleQueue**   ppQueue
-                            );
+    static  HRESULT Create(CSampleQueue**   ppQueue);
 
 #pragma region IUnknown
     // IUnknown Implementations
@@ -26,26 +24,23 @@ class CSampleQueue: public IUnknown
     ULONG   __stdcall   Release();
 #pragma endregion IUnknown
 
-    // ILockedSampleCallback Implementation
-            
-            HRESULT AddSample(                      // Add a sample to the back of the queue
-                            IMFSample*  pSample
-                            );
-            HRESULT GetNextSample(                  // Remove a sample from the front of the queue
-                            IMFSample** pSample
-                            );
-            HRESULT RemoveAllSamples();
-            HRESULT MarkerNextSample(
-                            const ULONG_PTR pulID
-                            );
-            bool    IsQueueEmpty();
-
-            ULONG GetLength();
+    // ILockedSampleCallback Implementation     
+    HRESULT AddSample(                      // Add a sample to the back of the queue
+                    IMFSample*  pSample
+                    );
+    HRESULT GetNextSample(                  // Remove a sample from the front of the queue
+                    IMFSample** pSample
+                    );
+    HRESULT RemoveAllSamples();
+    HRESULT MarkerNextSample(const ULONG_PTR pulID);
+    bool    IsQueueEmpty();
+
+    ULONG GetLength();
 protected:
-                class CNode;
+    class CNode;
 
-                    CSampleQueue();
-                    ~CSampleQueue();
+    CSampleQueue();
+    ~CSampleQueue();
 
     volatile    ULONG               m_ulRef;
                 CNode*              m_pHead;
@@ -60,8 +55,6 @@ class CSampleQueue: public IUnknown
 class CSampleQueue::ILockedSample
 {
 public:
-    virtual HRESULT GetSample(
-                            IMFSample** ppSample
-                            )       = 0;
-    virtual HRESULT Unlock()    = 0;
+    virtual HRESULT GetSample(IMFSample** ppSample) = 0;
+    virtual HRESULT Unlock() = 0;
 };
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/Resource.rc b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/Resource.rc
@@ -60,10 +60,10 @@ END
 
 IDR_MENU1 MENU
 BEGIN
-    POPUP "Capture"
+    POPUP "Start"
     BEGIN
-        MENUITEM "Choose Device",               ID_CAPTURE_CHOOSEDEVICE
-        MENUITEM "Start Preview",               ID_CAPTURE_PREVIEW
+        MENUITEM "Choose Device",               ID_START_CHOOSEDEVICE
+        MENUITEM "Start Preview",               ID_START_PREVIEW
     END
 END
 
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/StreamEffect.cpp b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/StreamEffect.cpp
@@ -174,12 +174,11 @@ namespace MainWindow
             previewing = g_engine->IsPreviewing();
             if (previewing)
             {
-                _SetStatusText(L"Loading...");
-                EnableMenuItem(GetMenu(hwnd), ID_CAPTURE_PREVIEW, MF_DISABLED);
+                EnableMenuItem(GetMenu(hwnd), ID_START_PREVIEW, MF_DISABLED);
             }
             else
             {
-                SetMenuItemText(GetMenu(hwnd), ID_CAPTURE_PREVIEW, L"Start Preview");
+                SetMenuItemText(GetMenu(hwnd), ID_START_PREVIEW, L"Start Preview");
             }
         }
         else if (g_engine->IsPreviewing())
@@ -188,6 +187,7 @@ namespace MainWindow
         }
         else
         {
+            
             _SetStatusText(L"Please select a device or start preview (using the default device).");
         }
     }
@@ -326,23 +326,26 @@ namespace MainWindow
             ShowError(hwnd, IDS_ERR_CAPTURE, hr);
         }
         UpdateUI(hwnd);
+        _SetStatusText(L"Loading...");
+
     }
 
     void OnCommand(HWND hwnd, int id, HWND /*hwndCtl*/, UINT /*codeNotify*/)
     {
         switch (id)
         {
-        case ID_CAPTURE_CHOOSEDEVICE:
+        case ID_START_CHOOSEDEVICE:
             OnChooseDevice(hwnd);
             break;
 
-        case ID_CAPTURE_PREVIEW:
+        case ID_START_PREVIEW:
             if (g_engine->IsPreviewing())
             {
                 OnStopPreview(hwnd);
             }
             else
             {
+                _SetStatusText(L"Loading...");
                 OnStartPreview(hwnd);
             }
             break;
@@ -358,10 +361,7 @@ namespace MainWindow
             HANDLE_MSG(hwnd, WM_PAINT, OnPaint);
             HANDLE_MSG(hwnd, WM_SIZE, OnSize);
             HANDLE_MSG(hwnd, WM_DESTROY, OnDestroy);
-            //HANDLE_MSG(hwnd, WM_CLOSE, OnClose);
             HANDLE_MSG(hwnd, WM_COMMAND, OnCommand);
-        /*case WM_CLOSE:
-            DestroyWindow(hwnd);*/
         case WM_ERASEBKGND:
             return 1;
         
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/resource.h b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/resource.h
@@ -14,9 +14,9 @@
 #define IDS_ERR_CAPTURE                 109
 #define IDC_DEVICE_LIST                 1004
 #define IDC_STATUS_BAR					1005
-#define ID_CAPTURE_CHOOSEDEVICE         40001
-#define ID_CAPTURE_STARTPREVIEW         40002
-#define ID_CAPTURE_PREVIEW              40003
+#define ID_START_CHOOSEDEVICE         40001
+#define ID_START_STARTPREVIEW         40002
+#define ID_START_PREVIEW              40003
 #define IDD_CHOOSE_DEVICE               40003
 
 // Next default values for new objects

Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,9 @@ public sealed partial class StreamEffect : Page`
`30`	`30`	`public StreamEffect()`
`31`	`31`	`{`
`32`	`32`	`this.InitializeComponent();`
`33`		`- // TODO: Currently the WinMLSamplesGalleryNative component will load`
`34`		`- // the wrong version of the Microsoft.AI.MachineLearning.dll.`
`35`		`- // To work around this, we make a dummy call to the builder to`
`36`		`- // ensure that the dll is loaded.`
`37`		`- var builder = Microsoft.AI.MachineLearning.Experimental.LearningModelBuilder.Create(11);`
`38`	`33`	`demoHwnd = (IntPtr)WinMLSamplesGalleryNative.StreamEffect.CreateInferenceWindow();`
`39`	`34`
`40`	`35`	`currentHwnd = GetForegroundWindow();`
`41`		`- //var modelName = "mosaic.onnx";`
`42`	`36`	`modelPath = Path.Join(Windows.ApplicationModel.Package.Current.InstalledLocation.Path, "Models");`
`43`	`37`
`44`	`38`	`}`
`@@ -78,8 +72,6 @@ async private void ToggleInference(object sender, RoutedEventArgs e)`
`78`	`72`
`79`	`73`	`}`
`80`	`74`	`}`
`81`		`-`
`82`		`-`
`83`	`75`	`}`
`84`	`76`
`85`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,12 +174,11 @@ namespace MainWindow`
`174`	`174`	`previewing = g_engine->IsPreviewing();`
`175`	`175`	`if (previewing)`
`176`	`176`	`{`
`177`		`- _SetStatusText(L"Loading...");`
`178`		`- EnableMenuItem(GetMenu(hwnd), ID_CAPTURE_PREVIEW, MF_DISABLED);`
	`177`	`+ EnableMenuItem(GetMenu(hwnd), ID_START_PREVIEW, MF_DISABLED);`
`179`	`178`	`}`
`180`	`179`	`else`
`181`	`180`	`{`
`182`		`- SetMenuItemText(GetMenu(hwnd), ID_CAPTURE_PREVIEW, L"Start Preview");`
	`181`	`+ SetMenuItemText(GetMenu(hwnd), ID_START_PREVIEW, L"Start Preview");`
`183`	`182`	`}`
`184`	`183`	`}`
`185`	`184`	`else if (g_engine->IsPreviewing())`
`@@ -188,6 +187,7 @@ namespace MainWindow`
`188`	`187`	`}`
`189`	`188`	`else`
`190`	`189`	`{`
	`190`	`+`
`191`	`191`	`_SetStatusText(L"Please select a device or start preview (using the default device).");`
`192`	`192`	`}`
`193`	`193`	`}`
`@@ -326,23 +326,26 @@ namespace MainWindow`
`326`	`326`	`ShowError(hwnd, IDS_ERR_CAPTURE, hr);`
`327`	`327`	`}`
`328`	`328`	`UpdateUI(hwnd);`
	`329`	`+ _SetStatusText(L"Loading...");`
	`330`	`+`
`329`	`331`	`}`
`330`	`332`
`331`	`333`	`void OnCommand(HWND hwnd, int id, HWND /hwndCtl/, UINT /codeNotify/)`
`332`	`334`	`{`
`333`	`335`	`switch (id)`
`334`	`336`	`{`
`335`		`- case ID_CAPTURE_CHOOSEDEVICE:`
	`337`	`+ case ID_START_CHOOSEDEVICE:`
`336`	`338`	`OnChooseDevice(hwnd);`
`337`	`339`	`break;`
`338`	`340`
`339`		`- case ID_CAPTURE_PREVIEW:`
	`341`	`+ case ID_START_PREVIEW:`
`340`	`342`	`if (g_engine->IsPreviewing())`
`341`	`343`	`{`
`342`	`344`	`OnStopPreview(hwnd);`
`343`	`345`	`}`
`344`	`346`	`else`
`345`	`347`	`{`
	`348`	`+ _SetStatusText(L"Loading...");`
`346`	`349`	`OnStartPreview(hwnd);`
`347`	`350`	`}`
`348`	`351`	`break;`
`@@ -358,10 +361,7 @@ namespace MainWindow`
`358`	`361`	`HANDLE_MSG(hwnd, WM_PAINT, OnPaint);`
`359`	`362`	`HANDLE_MSG(hwnd, WM_SIZE, OnSize);`
`360`	`363`	`HANDLE_MSG(hwnd, WM_DESTROY, OnDestroy);`
`361`		`- //HANDLE_MSG(hwnd, WM_CLOSE, OnClose);`
`362`	`364`	`HANDLE_MSG(hwnd, WM_COMMAND, OnCommand);`
`363`		`- /*case WM_CLOSE:`
`364`		`- DestroyWindow(hwnd);*/`
`365`	`365`	`case WM_ERASEBKGND:`
`366`	`366`	`return 1;`
`367`	`367`