mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
CScreenShot: fix build
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:
@@ -718,12 +718,23 @@ void CScreenShot::cleanupThread(void *arg)
|
||||
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 */
|
||||
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
|
||||
bool CScreenShot::Start(const std::string custom_cmd)
|
||||
{
|
||||
std::string cmd = "/bin/grab ";
|
||||
@@ -762,19 +773,6 @@ bool CScreenShot::Start(const std::string custom_cmd)
|
||||
system(cmd.c_str());
|
||||
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
|
||||
|
||||
/* save file in sync mode, return true if save ok, or false */
|
||||
|
@@ -23,6 +23,10 @@
|
||||
#ifndef __screenshot_h_
|
||||
#define __screenshot_h_
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
class CScreenShot
|
||||
@@ -77,10 +81,10 @@ class CScreenShot
|
||||
void EnableVideo(bool enable) { get_video = enable; }
|
||||
void EnableOSD(bool enable) { get_osd = enable; }
|
||||
void ScaleToVideo(bool enable) { scale_to_video = enable; }
|
||||
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
|
||||
bool Start(const std::string custom_cmd = "");
|
||||
#else
|
||||
#if HAVE_COOL_HARDWARE
|
||||
bool Start();
|
||||
#else
|
||||
bool Start(const std::string custom_cmd = "");
|
||||
#endif
|
||||
bool StartSync();
|
||||
};
|
||||
|
Reference in New Issue
Block a user