mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-31 01:10:58 +02:00
Revert "fix thread namespace"
This reverts commit03a7525218
. Origin commit data ------------------ Branch: master Commit:bc7be9dd74
Author: max_10 <max_10@gmx.de> Date: 2018-09-20 (Thu, 20 Sep 2018) ------------------ This commit was generated by Migit
This commit is contained in:
@@ -104,7 +104,7 @@ int cAudio::Start(void)
|
||||
{
|
||||
lt_debug("%s >\n", __func__);
|
||||
if (! HAL_nodec)
|
||||
SimpleThread::startThread();
|
||||
startThread();
|
||||
lt_debug("%s <\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
@@ -115,7 +115,7 @@ int cAudio::Stop(void)
|
||||
if (thread_started)
|
||||
{
|
||||
thread_started = false;
|
||||
SimpleThread::joinThread();
|
||||
joinThread();
|
||||
}
|
||||
lt_debug("%s <\n", __func__);
|
||||
return 0;
|
||||
|
@@ -37,7 +37,7 @@ typedef enum
|
||||
AUDIO_FMT_ADVANCED = AUDIO_FMT_MLP
|
||||
} AUDIO_FORMAT;
|
||||
|
||||
class cAudio : public SimpleThread
|
||||
class cAudio : public Thread
|
||||
{
|
||||
friend class cPlayback;
|
||||
private:
|
||||
|
@@ -97,7 +97,7 @@ GLFramebuffer::GLFramebuffer(int x, int y): mReInit(true), mShutDown(false), mIn
|
||||
if (input_fd < 0)
|
||||
lt_info("%s: could not open /tmp/neutrino.input FIFO: %m\n", __func__);
|
||||
initKeys();
|
||||
SimpleThread::startThread();
|
||||
startThread();
|
||||
while (!mInitDone)
|
||||
usleep(1);
|
||||
}
|
||||
@@ -105,7 +105,7 @@ GLFramebuffer::GLFramebuffer(int x, int y): mReInit(true), mShutDown(false), mIn
|
||||
GLFramebuffer::~GLFramebuffer()
|
||||
{
|
||||
mShutDown = true;
|
||||
SimpleThread::joinThread();
|
||||
joinThread();
|
||||
if (input_fd >= 0)
|
||||
close(input_fd);
|
||||
}
|
||||
|
@@ -31,7 +31,7 @@ extern "C" {
|
||||
#include <libavutil/rational.h>
|
||||
}
|
||||
|
||||
class GLFramebuffer : public SimpleThread
|
||||
class GLFramebuffer : public Thread
|
||||
{
|
||||
public:
|
||||
GLFramebuffer(int x, int y);
|
||||
|
@@ -145,7 +145,7 @@ int cVideo::Start(void *, unsigned short, unsigned short, void *)
|
||||
{
|
||||
lt_debug("%s running %d >\n", __func__, thread_running);
|
||||
if (!thread_running && !HAL_nodec)
|
||||
SimpleThread::startThread();
|
||||
startThread();
|
||||
lt_debug("%s running %d <\n", __func__, thread_running);
|
||||
return 0;
|
||||
}
|
||||
@@ -155,7 +155,7 @@ int cVideo::Stop(bool)
|
||||
lt_debug("%s running %d >\n", __func__, thread_running);
|
||||
if (thread_running) {
|
||||
thread_running = false;
|
||||
SimpleThread::joinThread();
|
||||
joinThread();
|
||||
}
|
||||
lt_debug("%s running %d <\n", __func__, thread_running);
|
||||
return 0;
|
||||
|
@@ -121,7 +121,7 @@ typedef enum
|
||||
|
||||
|
||||
#define VDEC_MAXBUFS 0x30
|
||||
class cVideo : public SimpleThread
|
||||
class cVideo : public Thread
|
||||
{
|
||||
friend class GLFramebuffer;
|
||||
friend class cDemux;
|
||||
|
Reference in New Issue
Block a user