Revert "fix thread namespace"

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

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<SimpleThread*>(ptr)->run();
+	((Thread*)ptr)->run();
 	return 0;
 }

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 <pthread.h>
 
-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();
 

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;

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:

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);
 }

generic-pc/glfb.h

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

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;

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;