mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix thread namespace"

Browse Source 
This reverts commit 03a7525218.


Origin commit data
------------------
Branch: master
Commit: 1790425e86
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:
max_10
2018-09-20 17:42:46 +02:00
parent 4cabdf7d12
commit c36afa86ec
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/thread_abstraction.cpp
View File

@@ -1,12 +1,12 @@
#include "thread_abstraction.h" #include "thread_abstraction.h"
SimpleThread::SimpleThread() : Thread::Thread() :
mIsRunning(false), mIsRunning(false),
mThread() mThread()
{ {
} }
SimpleThread::~SimpleThread() Thread::~Thread()
{ {
// if thread is still running on object destruction, cancel thread the hard way: // if thread is still running on object destruction, cancel thread the hard way:
if (mIsRunning) if (mIsRunning)
@@ -15,20 +15,20 @@ SimpleThread::~SimpleThread()
} }
} }
void SimpleThread::startThread() void Thread::startThread()
{ {
mIsRunning = true; mIsRunning = true;
pthread_create(&mThread, 0, &SimpleThread::runThread, this); pthread_create(&mThread, 0, &Thread::runThread, this);
} }
void SimpleThread::joinThread() void Thread::joinThread()
{ {
pthread_join(mThread, 0); pthread_join(mThread, 0);
mIsRunning = false; mIsRunning = false;
} }
void* SimpleThread::runThread(void* ptr) void* Thread::runThread(void* ptr)
{ {
static_cast<SimpleThread*>(ptr)->run(); ((Thread*)ptr)->run();
return 0; return 0;
} }

14
common/thread_abstraction.h
View File

@@ -1,20 +1,20 @@
#ifndef _SIMPLETHREAD_ABSTRACTION_H #ifndef _THREAD_ABSTRACTION_H
#define _SIMPLETHREAD_ABSTRACTION_H #define _THREAD_ABSTRACTION_H
#include <pthread.h> #include <pthread.h>
class SimpleThread class Thread
{ {
bool mIsRunning; bool mIsRunning;
pthread_t mThread; pthread_t mThread;
static void* runThread(void*); static void* runThread(void*);
SimpleThread(const SimpleThread&); Thread(const Thread&);
const SimpleThread& operator=(const SimpleThread&); const Thread& operator=(const Thread&);
public: public:
SimpleThread(); Thread();
~SimpleThread(); ~Thread();
void startThread(); void startThread();
void joinThread(); void joinThread();

4
generic-pc/audio.cpp
View File

@@ -104,7 +104,7 @@ int cAudio::Start(void)
{ {
lt_debug("%s >\n", __func__); lt_debug("%s >\n", __func__);
if (! HAL_nodec) if (! HAL_nodec)
SimpleThread::startThread(); startThread();
lt_debug("%s <\n", __func__); lt_debug("%s <\n", __func__);
return 0; return 0;
} }
@@ -115,7 +115,7 @@ int cAudio::Stop(void)
if (thread_started) if (thread_started)
{ {
thread_started = false; thread_started = false;
SimpleThread::joinThread(); joinThread();
} }
lt_debug("%s <\n", __func__); lt_debug("%s <\n", __func__);
return 0; return 0;

2
generic-pc/audio_lib.h
View File

@@ -37,7 +37,7 @@ typedef enum
AUDIO_FMT_ADVANCED = AUDIO_FMT_MLP AUDIO_FMT_ADVANCED = AUDIO_FMT_MLP
} AUDIO_FORMAT; } AUDIO_FORMAT;
class cAudio : public SimpleThread class cAudio : public Thread
{ {
friend class cPlayback; friend class cPlayback;
private: private:

4
generic-pc/glfb.cpp
View File

@@ -97,7 +97,7 @@ GLFramebuffer::GLFramebuffer(int x, int y): mReInit(true), mShutDown(false), mIn
if (input_fd < 0) if (input_fd < 0)
lt_info("%s: could not open /tmp/neutrino.input FIFO: %m\n", __func__); lt_info("%s: could not open /tmp/neutrino.input FIFO: %m\n", __func__);
initKeys(); initKeys();
SimpleThread::startThread(); startThread();
while (!mInitDone) while (!mInitDone)
usleep(1); usleep(1);
} }
@@ -105,7 +105,7 @@ GLFramebuffer::GLFramebuffer(int x, int y): mReInit(true), mShutDown(false), mIn
GLFramebuffer::~GLFramebuffer() GLFramebuffer::~GLFramebuffer()
{ {
mShutDown = true; mShutDown = true;
SimpleThread::joinThread(); joinThread();
if (input_fd >= 0) if (input_fd >= 0)
close(input_fd); close(input_fd);
} }

2
generic-pc/glfb.h
View File

@@ -31,7 +31,7 @@ extern "C" {
#include <libavutil/rational.h> #include <libavutil/rational.h>
} }
class GLFramebuffer : public SimpleThread class GLFramebuffer : public Thread
{ {
public: public:
GLFramebuffer(int x, int y); GLFramebuffer(int x, int y);

4
generic-pc/video.cpp
View File

@@ -145,7 +145,7 @@ int cVideo::Start(void *, unsigned short, unsigned short, void *)
{ {
lt_debug("%s running %d >\n", __func__, thread_running); lt_debug("%s running %d >\n", __func__, thread_running);
if (!thread_running && !HAL_nodec) if (!thread_running && !HAL_nodec)
SimpleThread::startThread(); startThread();
lt_debug("%s running %d <\n", __func__, thread_running); lt_debug("%s running %d <\n", __func__, thread_running);
return 0; return 0;
} }
@@ -155,7 +155,7 @@ int cVideo::Stop(bool)
lt_debug("%s running %d >\n", __func__, thread_running); lt_debug("%s running %d >\n", __func__, thread_running);
if (thread_running) { if (thread_running) {
thread_running = false; thread_running = false;
SimpleThread::joinThread(); joinThread();
} }
lt_debug("%s running %d <\n", __func__, thread_running); lt_debug("%s running %d <\n", __func__, thread_running);
return 0; return 0;

2
generic-pc/video_lib.h
View File

@@ -121,7 +121,7 @@ typedef enum
#define VDEC_MAXBUFS 0x30 #define VDEC_MAXBUFS 0x30
class cVideo : public SimpleThread class cVideo : public Thread
{ {
friend class GLFramebuffer; friend class GLFramebuffer;
friend class cDemux; friend class cDemux;