reflect changes from inc PR, main OF

Author: dimitre

addons/ofxiOS/src/utils/ofxiOSExternalDisplay.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include "ofConstants.h"
+#include <vector>
 
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
@@ -19,14 +20,14 @@ struct ofxiOSExternalDisplayMode{
 };
 
 class ofxiOSExternalDisplay {
-    
+
 public:
-    
+
     //-------------------------------------------------------
 	static void alertExternalDisplayConnected();
    	static void alertExternalDisplayDisconnected();
     static void alertExternalDisplayChanged();
-    
+
     //-------------------------------------------------------
     static std::vector<ofxiOSExternalDisplayMode> getExternalDisplayModes();
     static bool displayOnExternalScreen(ofxiOSExternalDisplayMode externalDisplayMode);
@@ -40,16 +41,16 @@ class ofxiOSExternalDisplay {
     static bool isDisplayingOnDeviceScreen();
     static bool isExternalScreenConnected();
     static bool isMirroring();
- 
+
     //-------------------------------------------------------
     ofxiOSExternalDisplay();
     ~ofxiOSExternalDisplay();
-    
+
     //-------------------------------------------------------
 	virtual void externalDisplayConnected(){}
 	virtual void externalDisplayDisconnected(){}
     virtual void externalDisplayChanged(){}
-    
+
 };
 
 #define ofxiPhoneExternalDisplay ofxiOSExternalDisplay

addons/ofxiOS/src/utils/ofxiOSExternalDisplay.mm

@@ -7,6 +7,7 @@
 
 #include "ofxiOSExternalDisplay.h"
 #include <TargetConditionals.h>
+#include <vector>
 
 using std::vector;
 
@@ -44,7 +45,7 @@
     }
     UIScreen * externalScreen;
     externalScreen = [[UIScreen screens] objectAtIndex:1];
-    
+
     for(int i = 0; i < [[externalScreen availableModes] count]; i++){
         UIScreenMode * screenMode = [[externalScreen availableModes] objectAtIndex:i];
         externalDislayModes.push_back(ofxiOSExternalDisplayMode());
@@ -61,21 +62,21 @@
     }
     UIScreen * externalScreen;
     externalScreen = [[UIScreen screens] objectAtIndex:1];
-    
+
     for(int i = 0; i < [[externalScreen availableModes] count]; i++){
         UIScreenMode * screenMode = [[externalScreen availableModes] objectAtIndex:i];
         if (screenMode.size.width == externalDisplayMode.width &&
             screenMode.size.height == externalDisplayMode.height &&
             screenMode.pixelAspectRatio == externalDisplayMode.pixelAspectRatio){
-           
+
             ofxiOSAppDelegate * appDelegate;
             appDelegate = [[UIApplication sharedApplication] delegate];
-            
+
             bool bOk = [appDelegate displayOnScreenWithIndex:1 andScreenModeIndex:i];
             return bOk;
         }
     }
-    
+
     return false;
 }
 
@@ -94,22 +95,22 @@
             break;
         }
     }
-    
+
     if(!bFound){
         return false;
     }
-    
+
     ofxiOSAppDelegate * appDelegate;
     appDelegate = [[UIApplication sharedApplication] delegate];
-    
+
     bool bOk = [appDelegate displayOnScreenWithIndex:1 andScreenModeIndex:i];
     return bOk;
 }
 
 bool ofxiOSExternalDisplay::displayOnDeviceScreen(){
     ofxiOSAppDelegate * appDelegate;
     appDelegate = [[UIApplication sharedApplication] delegate];
-    
+
     bool bOk = [appDelegate displayOnScreenWithIndex:0 andScreenModeIndex:0];
     return bOk;
 }
@@ -127,7 +128,7 @@
 
     [appDelegate destroyExternalWindow];
     return true;
-    
+
     // the below code checks if the display is being mirrored.
     // the problem is that this does not take effect straight away and always returns as false.
     // the user will have to check themselves if mirroring is working by calling isMirroring()