ScreenDump: Renderers: add screenId in doScreenShot function

ScreenId is used to perform dump of the requested screen
this is especially required if the renderes supports more than one screen

Signed-off-by: Eugen Friedrich <efriedrich@de.adit-jv.com>

9 files changed, 14 insertions, 13 deletions

diff --git a/LayerManagerPlugins/Renderers/Base/include/BaseRenderer.h b/LayerManagerPlugins/Renderers/Base/include/BaseRenderer.h
index fccf8cb..7886096 100644
--- a/LayerManagerPlugins/Renderers/Base/include/BaseRenderer.h
+++ b/LayerManagerPlugins/Renderers/Base/include/BaseRenderer.h
@@ -36,7 +36,7 @@ public:
     void stop() = 0;
     void setdebug(bool onoff);
 
-    virtual void doScreenShot(std::string fileToSave) = 0;
+    virtual void doScreenShot(std::string fileToSave, const uint screen_id) = 0;
     virtual uint getLayerTypeCapabilities(LayerType layerType);
     virtual InputManager* getInputManager() const
     {
diff --git a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/include/X11GLXRenderer.h b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/include/X11GLXRenderer.h
index 01d9fc2..2314bf3 100644
--- a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/include/X11GLXRenderer.h
+++ b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/include/X11GLXRenderer.h
@@ -30,7 +30,7 @@ class X11GLXRenderer : public BaseRenderer
 public:
     X11GLXRenderer(ICommandExecutor& executor, Configuration& config);
     virtual ~X11GLXRenderer();
-    void doScreenShot(std::string fileToSave);
+    void doScreenShot(std::string fileToSave, const uint screen_id);
     void doScreenShotOfLayer(std::string fileToSave, uint id);
     void doScreenShotOfSurface(std::string fileToSave, uint id, uint layer_id);
     uint getNumberOfHardwareLayers(uint screenID);
diff --git a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp
index a3b232b..6dbaa5d 100644
--- a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp
+++ b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp
@@ -96,9 +96,9 @@ X11GLXRenderer::~X11GLXRenderer()
     delete m_pWindowSystem;
 }
 
-void X11GLXRenderer::doScreenShot(std::string fileToSave)
+void X11GLXRenderer::doScreenShot(std::string fileToSave, uint screen_id)
 {
-    m_pWindowSystem->doScreenShot(fileToSave);
+    m_pWindowSystem->doScreenShot(fileToSave,screen_id);
 }
 
 void X11GLXRenderer::doScreenShotOfLayer(std::string fileToSave, uint id)
diff --git a/LayerManagerPlugins/Renderers/Platform/TextRenderer/include/TextRenderer.h b/LayerManagerPlugins/Renderers/Platform/TextRenderer/include/TextRenderer.h
index bf7f284..d425476 100644
--- a/LayerManagerPlugins/Renderers/Platform/TextRenderer/include/TextRenderer.h
+++ b/LayerManagerPlugins/Renderers/Platform/TextRenderer/include/TextRenderer.h
@@ -28,7 +28,7 @@ class TextRenderer : public BaseRenderer
 public:
     TextRenderer(ICommandExecutor& executor, Configuration& config);
     virtual ~TextRenderer();
-    void doScreenShot(std::string fileToSave);
+    void doScreenShot(std::string fileToSave, uint screen_id);
     void doScreenShotOfLayer(std::string fileToSave, uint id);
     void doScreenShotOfSurface(std::string fileToSave, uint id, uint layer_id);
     uint getNumberOfHardwareLayers(uint screenID);
diff --git a/LayerManagerPlugins/Renderers/Platform/TextRenderer/src/TextRenderer.cpp b/LayerManagerPlugins/Renderers/Platform/TextRenderer/src/TextRenderer.cpp
index f047e50..043ec6d 100644
--- a/LayerManagerPlugins/Renderers/Platform/TextRenderer/src/TextRenderer.cpp
+++ b/LayerManagerPlugins/Renderers/Platform/TextRenderer/src/TextRenderer.cpp
@@ -60,10 +60,11 @@ TextRenderer::~TextRenderer()
     LOG_DEBUG("TextRenderer", "destroyed");
 }
 
-void TextRenderer::doScreenShot(std::string fileToSave)
+void TextRenderer::doScreenShot(std::string fileToSave, uint screen_id)
 {
     LOG_DEBUG("TextRenderer", "doScreenShot("
-                << "fileToSave=" << fileToSave << ")");
+                << "fileToSave=" << fileToSave
+                << ", screenID=" << screen_id <<")");
     std::fstream file(fileToSave.c_str());
 }
 
diff --git a/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/include/WaylandGLESRenderer.h b/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/include/WaylandGLESRenderer.h
index 36ef53a..f0f7e26 100644
--- a/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/include/WaylandGLESRenderer.h
+++ b/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/include/WaylandGLESRenderer.h
@@ -35,7 +35,7 @@ public:
     WaylandGLESRenderer(ICommandExecutor& executor, Configuration& config);
     bool start(int, int, const char*, int);
     void stop();
-    void doScreenShot(std::string fileToSave);
+    void doScreenShot(std::string fileToSave, uint screen_id);
     void doScreenShotOfLayer(std::string fileToSave, uint id);
     void doScreenShotOfSurface(std::string fileToSave, uint id, uint layer_id);
     uint getNumberOfHardwareLayers(uint screenID);
diff --git a/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/src/WaylandGLESRenderer.cpp b/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/src/WaylandGLESRenderer.cpp
index eed050c..2c184e5 100644
--- a/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/src/WaylandGLESRenderer.cpp
+++ b/LayerManagerPlugins/Renderers/Platform/WaylandGLESRenderer/src/WaylandGLESRenderer.cpp
@@ -103,9 +103,9 @@ void WaylandGLESRenderer::stop()
     }
 }
 
-void WaylandGLESRenderer::doScreenShot(std::string fileToSave)
+void WaylandGLESRenderer::doScreenShot(std::string fileToSave, const uint screen_id)
 {
-    m_pWindowSystem->doScreenShot(fileToSave);
+    m_pWindowSystem->doScreenShot(fileToSave, screen_id);
 }
 
 void WaylandGLESRenderer::doScreenShotOfLayer(std::string fileToSave, uint id)
diff --git a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/X11GLESRenderer.h b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/X11GLESRenderer.h
index 7d97679..b78a6db 100644
--- a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/X11GLESRenderer.h
+++ b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/X11GLESRenderer.h
@@ -32,7 +32,7 @@ public:
     X11GLESRenderer(ICommandExecutor& executor, Configuration& config);
     bool start(int, int, const char*, int);
     void stop();
-    void doScreenShot(std::string fileToSave);
+    void doScreenShot(std::string fileToSave, uint screen_id);
     void doScreenShotOfLayer(std::string fileToSave, uint id);
     void doScreenShotOfSurface(std::string fileToSave, uint id, uint layer_id);
     uint getNumberOfHardwareLayers(uint screenID);
diff --git a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp
index 1b55ad4..0a9e6f5 100644
--- a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp
+++ b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp
@@ -110,9 +110,9 @@ void X11GLESRenderer::stop()
     }
 }
 
-void X11GLESRenderer::doScreenShot(std::string fileToSave)
+void X11GLESRenderer::doScreenShot(std::string fileToSave, uint screen_id)
 {
-    m_pWindowSystem->doScreenShot(fileToSave);
+    m_pWindowSystem->doScreenShot(fileToSave, screen_id);
 }
 
 void X11GLESRenderer::doScreenShotOfLayer(std::string fileToSave, uint id)