1 files changed, 7 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index 70912ba98..1907074c0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -5,10 +5,12 @@ using System;
 using Tango.Integration.Services;
 using Tango.Logging;
 using Tango.MachineStudio.Common.Authentication;
+using Tango.MachineStudio.Common.Diagnostics;
 using Tango.MachineStudio.Common.Modules;
 using Tango.MachineStudio.Common.Navigation;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
+using Tango.MachineStudio.Common.Video;
 using Tango.MachineStudio.UI.Authentication;
 using Tango.MachineStudio.UI.Modules;
 using Tango.MachineStudio.UI.Navigation;
@@ -17,6 +19,7 @@ using Tango.MachineStudio.UI.StudioApplication;
 using Tango.MachineStudio.UI.SupervisingController;
 using Tango.MachineStudio.UI.ViewModels;
 using Tango.MachineStudio.UI.Views;
+using Tango.Settings;
 
 namespace Tango.MachineStudio.UI
 {
@@ -50,6 +53,8 @@ namespace Tango.MachineStudio.UI
             SimpleIoc.Default.Unregister<IStudioModuleLoader>();
             SimpleIoc.Default.Unregister<IStudioApplicationManager>();
             SimpleIoc.Default.Unregister<ExternalBridgeScanner>();
+            SimpleIoc.Default.Unregister<IVideoCaptureProvider>();
+            SimpleIoc.Default.Unregister<IDiagnosticsFrameProvider>();
 
             SimpleIoc.Default.Register<INotificationProvider, DefaultNotificationProvider>();
             SimpleIoc.Default.Register<IAuthenticationProvider, DefaultAuthenticationProvider>();
@@ -57,6 +62,8 @@ namespace Tango.MachineStudio.UI
             SimpleIoc.Default.Register<IStudioModuleLoader, DefaultStudioModuleLoader>();
             SimpleIoc.Default.Register<IStudioApplicationManager, DefaultStudioApplicationManager>();
             SimpleIoc.Default.Register<ExternalBridgeScanner, ExternalBridgeScanner>();
+            SimpleIoc.Default.Register<IVideoCaptureProvider, DefaultVideoCaptureProvider>();
+            SimpleIoc.Default.Register<IDiagnosticsFrameProvider, DefaultDiagnosticsFrameProvider>();
 
             SimpleIoc.Default.Register<MainViewVM>();
             SimpleIoc.Default.Register<LoadingViewVM>();
@@ -65,9 +72,6 @@ namespace Tango.MachineStudio.UI
             SimpleIoc.Default.Register<MachineConnectionViewVM>();
             SimpleIoc.Default.Register<MachineLoginViewVM>();
 
-            LogManager.RegisterLogger(new VSOutputLogger());
-            LogManager.RegisterLogger(new FileLogger());
-
             //Register View (Supervising Controller Pattern).
             if (!ViewModelBase.IsInDesignModeStatic)
             {