Fix paket.template and build script

techyian · Apr 9, 2017 · 0cc9b3f · 0cc9b3f
1 parent 934e2ec
commit 0cc9b3f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/MMALSharp/paket.template b/MMALSharp/paket.template
@@ -5,9 +5,8 @@ authors Ian Auty (@Techyian)
 description
 	Unofficial C# API for the Raspberry Pi camera
 
-files
-    bin/Release ==> lib
-
 dependencies
 	FAKE ~> 4.50.0
-	Nito.AsyncEx ~> 3.0.1
+	Nito.AsyncEx ~> 3.0.1
+
+include-referenced-projects true
diff --git a/MMALSharpExample/Program.cs b/MMALSharpExample/Program.cs
@@ -33,19 +33,19 @@ static void Main(string[] args)
                 using (var imgEncoder = new MMALImageEncoder(imgCaptureHandler))
                 {
                     //Create our component pipeline.         
-                    cam.AddEncoder(vidEncoder, cam.Camera.VideoPort)
-                       .AddEncoder(imgEncoder, cam.Camera.StillPort)
+                    cam
+                       .AddEncoder(imgEncoder, cam.Camera.VideoPort)
                        .CreatePreviewComponent(new MMALVideoRenderer())
                        .ConfigureCamera();
 
                     //Record video for 1 minute, using segmented video record to split into multiple files every 30 seconds.
-                    await cam.TakeVideo(cam.Camera.VideoPort, DateTime.Now.AddMinutes(1), new Split { Mode = TimelapseMode.Second, Value = 30 });
+                    //await cam.TakeVideo(cam.Camera.VideoPort, DateTime.Now.AddMinutes(1), new Split { Mode = TimelapseMode.Second, Value = 30 });
 
                     //Take multiple pictures every 5 seconds for 1 minute as a timelapse. 
-                    await cam.TakePictureTimelapse(cam.Camera.StillPort, cam.Camera.StillPort, new Timelapse { Mode = TimelapseMode.Second, Value = 5, Timeout = DateTime.Now.AddMinutes(1) });
+                    //await cam.TakePictureTimelapse(cam.Camera.StillPort, cam.Camera.StillPort, new Timelapse { Mode = TimelapseMode.Second, Value = 5, Timeout = DateTime.Now.AddMinutes(1) });
 
                     //Take a single picture on the camera's still port using the encoder connected to the still port
-                    await cam.TakePicture(cam.Camera.StillPort, cam.Camera.StillPort);
+                    await cam.TakePicture(cam.Camera.VideoPort, cam.Camera.VideoPort);
 
                     //Processes the list of images you've taken with the *ImageStreamCaptureHandler* class into a video
                     imgCaptureHandler.ImagesToVideo("/home/pi/videos", 2);

diff --git a/build.cmd b/build.cmd
@@ -23,4 +23,10 @@ packages\FAKE\tools\FAKE.exe "%PWD%" Clean
 packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpReleaseApp
 packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpDebugApp
 
+packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpCommonReleaseApp
+packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpCommonDebugApp
+
+packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpFFmpegReleaseApp
+packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpFFmpegDebugApp
+
 .paket\paket.exe pack output build templatefile MMALSharp\paket.template