mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 07:22:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

CScreenShot: fix build

Browse Source 
Some lines were wrong picked


Origin commit data
------------------
Branch: ni/coolstream
Commit: b26fc7fb8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2017-10-27 22:35:42 +02:00
parent 475d570686
commit 1ddcc24bc7
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h
View File

@@ -81,8 +81,7 @@ public:
bool SetTeletextPid(int /*pid*/){return true;} bool SetTeletextPid(int /*pid*/){return true;}
int GetAPid(){return 0;} int GetAPid(){return 0;}
void GetMetadata(std::vector<std::string> /*&keys*/, std::vector<std::string> /*&values*/){}; void GetMetadata(std::vector<std::string> /*&keys*/, std::vector<std::string> /*&values*/){};
}
}
}; };
#endif // __PLAYBACK_CS_H_ #endif // __PLAYBACK_CS_H_

30
src/driver/screenshot.cpp
View File

@@ -718,12 +718,23 @@ void CScreenShot::cleanupThread(void *arg)
delete scs; delete scs;
} }
// printf("[CScreenShot::%s:%d] thread: %p\n", __func__, __LINE__, scs);
delete scs;
#if HAVE_COOL_HARDWARE
/* start ::run in new thread to save file in selected format */
bool CScreenShot::Start()
{
set_threadname("n:screenshot");
bool ret = false;
if (GetData())
ret = startThread();
else
delete this;
return ret;
} }
#else
/* start ::run in new thread to save file in selected format */ /* start ::run in new thread to save file in selected format */
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
bool CScreenShot::Start(const std::string custom_cmd) bool CScreenShot::Start(const std::string custom_cmd)
{ {
std::string cmd = "/bin/grab "; std::string cmd = "/bin/grab ";
@@ -762,19 +773,6 @@ bool CScreenShot::Start(const std::string custom_cmd)
system(cmd.c_str()); system(cmd.c_str());
return true; return true;
} }
#else
/* start ::run in new thread to save file in selected format */
bool CScreenShot::Start()
{
set_threadname("n:screenshot");
bool ret = false;
if (GetData())
ret = startThread();
else
delete this;
return ret;
}
#endif #endif
/* save file in sync mode, return true if save ok, or false */ /* save file in sync mode, return true if save ok, or false */

10
src/driver/screenshot.h
View File

@@ -23,6 +23,10 @@
#ifndef __screenshot_h_ #ifndef __screenshot_h_
#define __screenshot_h_ #define __screenshot_h_
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <pthread.h> #include <pthread.h>
class CScreenShot class CScreenShot
@@ -77,10 +81,10 @@ class CScreenShot
void EnableVideo(bool enable) { get_video = enable; } void EnableVideo(bool enable) { get_video = enable; }
void EnableOSD(bool enable) { get_osd = enable; } void EnableOSD(bool enable) { get_osd = enable; }
void ScaleToVideo(bool enable) { scale_to_video = enable; } void ScaleToVideo(bool enable) { scale_to_video = enable; }
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_COOL_HARDWARE
bool Start(const std::string custom_cmd = "");
#else
bool Start(); bool Start();
#else
bool Start(const std::string custom_cmd = "");
#endif #endif
bool StartSync(); bool StartSync();
}; };

2
src/gui/movieplayer.cpp
View File

@@ -3520,7 +3520,7 @@ void CMoviePlayerGui::makeScreenShot(bool autoshot, bool forcover)
sc->SetSize(w, h); sc->SetSize(w, h);
} }
} }
#if ! HAVE_COOL_HARDWARE #if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
sc->Start("-r 320 -j 75"); sc->Start("-r 320 -j 75");
#else #else
sc->Start(); sc->Start();