From a5ed005ff8aa69207ce9efb90e1b49ca02f7d64f Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 13 Jan 2013 18:49:37 +0100
Subject: [PATCH] neutrino: enable screenshots

---
 lib/libcoolstream/video_cs.h                   | 2 ++
 src/driver/Makefile.am                         | 2 +-
 src/driver/screenshot.cpp                      | 4 ++--
 src/gui/keybind_setup.cpp                      | 2 --
 src/gui/movieplayer.cpp                        | 2 --
 src/gui/osd_setup.cpp                          | 2 --
 src/neutrino.cpp                               | 2 --
 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 2 --
 8 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/libcoolstream/video_cs.h b/lib/libcoolstream/video_cs.h
index 251ec4058..11ede4433 100644
--- a/lib/libcoolstream/video_cs.h
+++ b/lib/libcoolstream/video_cs.h
@@ -18,6 +18,8 @@
 #define CS_VIDEO_PDATA void
 #endif
 
+#define SCREENSHOT 1
+
 typedef enum {
 	ANALOG_SD_RGB_CINCH = 0x00,
 	ANALOG_SD_YPRPB_CINCH,
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index 7b67fc113..f27f215e1 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -34,10 +34,10 @@ libneutrino_driver_a_SOURCES = \
 	record.cpp \
 	ringbuffer.c \
 	screen_max.cpp \
+	screenshot.cpp \
 	shutdown_count.cpp \
 	streamts.cpp \
 	volume.cpp
-#	screenshot.cpp
 
 if BOXTYPE_GENERIC
 libneutrino_driver_a_SOURCES += \
diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp
index 95a146daf..c1075a900 100644
--- a/src/driver/screenshot.cpp
+++ b/src/driver/screenshot.cpp
@@ -82,7 +82,7 @@ bool CScreenShot::GetData()
 #endif
 	if (videoDecoder->getBlank()) 
 		get_video = false;
-#if 1 // to enable after libcs/drivers update
+#ifdef SCREENSHOT
 	res = videoDecoder->GetScreenImage(pixel_data, xres, yres, get_video, get_osd, scale_to_video);
 #endif
 
@@ -90,7 +90,7 @@ bool CScreenShot::GetData()
 	/* sort of hack. GXA used to transfer/convert live image to RGB,
 	 * so setup GXA back */
 	CFrameBuffer::getInstance()->setupGXA();
-	CFrameBuffer::getInstance()->add_gxa_sync_marker();
+	//CFrameBuffer::getInstance()->add_gxa_sync_marker();
 	CFrameBuffer::getInstance()->setActive(true);
 #endif
 	mutex.unlock();
diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp
index 451aac763..c2ce525a2 100644
--- a/src/gui/keybind_setup.cpp
+++ b/src/gui/keybind_setup.cpp
@@ -63,9 +63,7 @@
 #include <gui/filebrowser.h>
 
 #include <driver/screen_max.h>
-#ifdef SCREENSHOT
 #include <driver/screenshot.h>
-#endif
 
 #include <system/debug.h>
 
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index ebbd1dc17..d08b9f280 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -37,9 +37,7 @@
 #include <gui/widget/helpbox.h>
 #include <gui/infoclock.h>
 #include <gui/plugins.h>
-#ifdef SCREENSHOT
 #include <driver/screenshot.h>
-#endif
 #include <driver/volume.h>
 #include <system/helpers.h>
 
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 139778a2e..738b9dcb0 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -49,9 +49,7 @@
 #include <gui/widget/stringinput.h>
 
 #include <driver/screen_max.h>
-#ifdef SCREENSHOT
 #include <driver/screenshot.h>
-#endif
 #include <driver/volume.h>
 
 #include <zapit/femanager.h>
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index e2a782688..05110dbdc 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -55,9 +55,7 @@
 #include <driver/rcinput.h>
 #include <driver/shutdown_count.h>
 #include <driver/record.h>
-#ifdef SCREENSHOT
 #include <driver/screenshot.h>
-#endif
 #include <driver/volume.h>
 #include <driver/streamts.h>
 
diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index 2da99e674..a3beb60b7 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -36,9 +36,7 @@
 #include <global.h>
 #include <gui/plugins.h>//for relodplugins
 #include <neutrino.h>
-#ifdef SCREENSHOT
 #include <driver/screenshot.h>
-#endif
 #include <gui/rc_lock.h>
 
 // yhttpd