From c36afa86ec77a337081d01b03d0ed27023e382ef Mon Sep 17 00:00:00 2001 From: max_10 Date: Thu, 20 Sep 2018 17:42:46 +0200 Subject: [PATCH] Revert "fix thread namespace" This reverts commit 03a7525218ce205ec0a508109ff9ca4179bc7408. Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/1790425e86565fd2f2c77067c0b36cc9d10d50ac Author: max_10 Date: 2018-09-20 (Thu, 20 Sep 2018) ------------------ This commit was generated by Migit --- common/thread_abstraction.cpp | 14 +++++++------- common/thread_abstraction.h | 14 +++++++------- generic-pc/audio.cpp | 4 ++-- generic-pc/audio_lib.h | 2 +- generic-pc/glfb.cpp | 4 ++-- generic-pc/glfb.h | 2 +- generic-pc/video.cpp | 4 ++-- generic-pc/video_lib.h | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/common/thread_abstraction.cpp b/common/thread_abstraction.cpp index 0494fc4..271755c 100644 --- a/common/thread_abstraction.cpp +++ b/common/thread_abstraction.cpp @@ -1,12 +1,12 @@ #include "thread_abstraction.h" -SimpleThread::SimpleThread() : +Thread::Thread() : mIsRunning(false), mThread() { } -SimpleThread::~SimpleThread() +Thread::~Thread() { // if thread is still running on object destruction, cancel thread the hard way: if (mIsRunning) @@ -15,20 +15,20 @@ SimpleThread::~SimpleThread() } } -void SimpleThread::startThread() +void Thread::startThread() { 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); mIsRunning = false; } -void* SimpleThread::runThread(void* ptr) +void* Thread::runThread(void* ptr) { - static_cast(ptr)->run(); + ((Thread*)ptr)->run(); return 0; } diff --git a/common/thread_abstraction.h b/common/thread_abstraction.h index 45a20b6..3c3e35f 100644 --- a/common/thread_abstraction.h +++ b/common/thread_abstraction.h @@ -1,20 +1,20 @@ -#ifndef _SIMPLETHREAD_ABSTRACTION_H -#define _SIMPLETHREAD_ABSTRACTION_H +#ifndef _THREAD_ABSTRACTION_H +#define _THREAD_ABSTRACTION_H #include -class SimpleThread +class Thread { bool mIsRunning; pthread_t mThread; static void* runThread(void*); - SimpleThread(const SimpleThread&); - const SimpleThread& operator=(const SimpleThread&); + Thread(const Thread&); + const Thread& operator=(const Thread&); public: - SimpleThread(); - ~SimpleThread(); + Thread(); + ~Thread(); void startThread(); void joinThread(); diff --git a/generic-pc/audio.cpp b/generic-pc/audio.cpp index 0ee8b3b..d5605f0 100644 --- a/generic-pc/audio.cpp +++ b/generic-pc/audio.cpp @@ -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; diff --git a/generic-pc/audio_lib.h b/generic-pc/audio_lib.h index 6bcd80a..0670cd9 100644 --- a/generic-pc/audio_lib.h +++ b/generic-pc/audio_lib.h @@ -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: diff --git a/generic-pc/glfb.cpp b/generic-pc/glfb.cpp index 3cffd0e..fa35e88 100644 --- a/generic-pc/glfb.cpp +++ b/generic-pc/glfb.cpp @@ -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); } diff --git a/generic-pc/glfb.h b/generic-pc/glfb.h index 755a01f..aa4017d 100644 --- a/generic-pc/glfb.h +++ b/generic-pc/glfb.h @@ -31,7 +31,7 @@ extern "C" { #include } -class GLFramebuffer : public SimpleThread +class GLFramebuffer : public Thread { public: GLFramebuffer(int x, int y); diff --git a/generic-pc/video.cpp b/generic-pc/video.cpp index 06ea690..8544e8b 100644 --- a/generic-pc/video.cpp +++ b/generic-pc/video.cpp @@ -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; diff --git a/generic-pc/video_lib.h b/generic-pc/video_lib.h index 144b53f..2b8e14e 100644 --- a/generic-pc/video_lib.h +++ b/generic-pc/video_lib.h @@ -121,7 +121,7 @@ typedef enum #define VDEC_MAXBUFS 0x30 -class cVideo : public SimpleThread +class cVideo : public Thread { friend class GLFramebuffer; friend class cDemux;