Merge branch 'master' of github.com:kylemcdonald/ofxEdsdk

readme.md

@@ -1,3 +1,19 @@
 ofxEdsdk requires the EDSDK library from Canon.
 
-ofxEdsdk was developed with support from YCAM http://www.ycam.jp/
+ofxEdsdk was developed with support from YCAM http://www.ycam.jp/
+
+
+###Install Instructions
+
+1. Apply for a developer's license from [Canon's website](http://consumer.usa.canon.com/cusa/support/consumer/eos_slr_camera_systems/eos_digital_slr_cameras/digital_rebel_xt?fileURL=ps_sdk_form&pageKeyCode=downloadLicense&id=0901e02480057a74_1&productOverviewCid=0901e0248003ce28&keycode=Sdk_Lic) 
+2. After you have been approved (can take anywhere from minutes to a day or two), follow the download instructions included in your confirmation email from Canon.
+3. Download this repo as a zip file, unzip, and place contents in your addons folder.
+4. Edit the folder name so that it only says "ofxEdsdk."
+5. Open the Canon EDSDK .dmg image and save the files somewhere you can get at them if you need to. 
+6. Copy the EDSDK folder into this directory: OF > addons > ofEdsdk > src
+7. Open the OF Project Generator application and build a new app, including the ofxEdsdk addon.
+8. Open your new app in Xcode. Go into the Build Settings for the Target app. In the "Search Paths" section, double-click  "Header Search Paths."
+9. You should see something like "../../../addons/ofxEdsdk/src" as one of the paths in the list. To the right of that path, click the drop-down menu and select "recursive."
+10. Go into the "Build Phases" tab for the Target app. In the "Link Binary with Libraries" section, add the EDSDK frameworks by clicking the "+" button at the lower-left and selecting the two framework files: OF > addons > ofEdsdk > src > EDSDK > Framework
+
+Following these steps will include Canon's developer library and this wrapper for all its functions for use in OF. You should be able to run the blank project successfully.

src/ofxEdsdk.cpp

@@ -268,10 +268,6 @@ namespace ofxEdsdk {
 	void Camera::resetLiveView() {
 		lock();
 		if(connected) {
-			if(liveReady) {
-				Eds::EndLiveview(camera);
-				liveReady = false;
-			}
 			Eds::StartLiveview(camera);
 			lastResetTime = ofGetElapsedTimef();
 		}