- moved grab task into mainthreadloop

2 files changed, 8 insertions, 12 deletions

diff --git a/pages/remote.ecpp b/pages/remote.ecpp
index 354f9b6..3ab8c35 100644
--- a/pages/remote.ecpp
+++ b/pages/remote.ecpp
@@ -59,7 +59,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 		function FillIntervals()
 		{
 			var element = document.getElementsByName('interval').item(0);
-			var items = new Array(100, 200, 500, 1000, 2000, 5000);
+			var items = new Array(1000, 2000, 5000);
 			element.options.length = items.length;
 			for (i = 0; i < items.length; ++i) {
 				element.options[i].value = items[i];
diff --git a/pages/screenshot.ecpp b/pages/screenshot.ecpp
index a84d82d..b8d8617 100644
--- a/pages/screenshot.ecpp
+++ b/pages/screenshot.ecpp
@@ -1,5 +1,8 @@
 <%pre>
-#include <vdr/device.h>
+#include "grab.h"
+
+using namespace vdrlive;
+
 </%pre>
 <%args>
 int quality = 80;
@@ -9,14 +12,7 @@ int height = 240;
 <%cpp>
 	reply.setContentType("image/jpg");
 
-	cDevice* device = cDevice::PrimaryDevice();
-	if ( device == 0 )
-		return DECLINED;
-
-	int size;
-	uchar* image = device->GrabImage( size, true, quality, width, height );
-	if ( image == 0 )
-		return DECLINED;
-
-	reply.out().write( reinterpret_cast< char* >( image ), size );
+	GrabImageInfo image = LiveGrabImageManager().GetImage();
+	if ( image.second > 0 )
+		reply.out().write( image.first.get(), image.second );
 </%cpp>