From c7c07b28e94bc9d0b6aa0ac767e39aacb84c0b8c Mon Sep 17 00:00:00 2001
From: NeetBhagat <neet.bhagat@volansystech.com>
Date: Thu, 1 Jun 2017 12:14:54 +0530
Subject: [PATCH] Resolve the reviewed comments of @ZappoMan

---
 interface/src/Application.cpp                 | 8 +-------
 libraries/plugins/src/plugins/DisplayPlugin.h | 1 +
 plugins/oculus/src/OculusBaseDisplayPlugin.h  | 1 +
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index ac39f51d7e..b8bfff8c5f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -245,7 +245,6 @@ Setting::Handle<int> maxOctreePacketsPerSecond("maxOctreePPS", DEFAULT_MAX_OCTRE
 
 static const QString MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com";
 static const int INTERVAL_TO_CHECK_HMD_WORN_STATUS = 500; // milliseconds
-static const QString DISPLAY_PLUGIN_NAME_OCULUS_RIFT = "Oculus Rift";
 static const QString DESKTOP_DISPLAY_PLUGIN_NAME = "Desktop";
 
 const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensions {
@@ -1344,12 +1343,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         _autoSwitchDisplayModeSupportedHMDPlugin = nullptr;
         foreach(DisplayPluginPointer displayPlugin, PluginManager::getInstance()->getDisplayPlugins()) {
             if (displayPlugin->isHmd() && 
-                displayPlugin->getName() == DISPLAY_PLUGIN_NAME_OCULUS_RIFT) {
-                
-                // Currently auto switch display mode support is only for Oculus Rift                
-                // To support other plugins, add a condition
-                // (|| displayPlugin->getName() == "Other HMD Display Plugin Name")
-
+                displayPlugin->getSupportsAutoSwitch()) {
                 _autoSwitchDisplayModeSupportedHMDPlugin = displayPlugin;
                 _autoSwitchDisplayModeSupportedHMDPluginName = 
                     _autoSwitchDisplayModeSupportedHMDPlugin->getName();
diff --git a/libraries/plugins/src/plugins/DisplayPlugin.h b/libraries/plugins/src/plugins/DisplayPlugin.h
index 754c919fd4..297bdb2cca 100644
--- a/libraries/plugins/src/plugins/DisplayPlugin.h
+++ b/libraries/plugins/src/plugins/DisplayPlugin.h
@@ -200,6 +200,7 @@ public:
     virtual float newFramePresentRate() const { return -1.0f; }
     // Rate at which rendered frames are being skipped
     virtual float droppedFrameRate() const { return -1.0f; }
+    virtual bool getSupportsAutoSwitch() { return false; }
     
     // Hardware specific stats
     virtual QJsonObject getHardwareStats() const { return QJsonObject(); }
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.h b/plugins/oculus/src/OculusBaseDisplayPlugin.h
index 1f54742c2d..bfdcc5db1e 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.h
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.h
@@ -26,6 +26,7 @@ public:
     void resetSensors() override final;
     bool beginFrameRender(uint32_t frameIndex) override;
     float getTargetFrameRate() const override { return _hmdDesc.DisplayRefreshRate; }
+    bool getSupportsAutoSwitch() override final { return true; }
     
 
 protected: