From 03a7525218ce205ec0a508109ff9ca4179bc7408 Mon Sep 17 00:00:00 2001
From: smogm <smogm@vh0st.me>
Date: Mon, 12 Jan 2015 16:38:28 +0100
Subject: [PATCH] fix thread namespace

Origin commit data
------------------
Branch: master
Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/3ef2eeb8aa680ce1aba75305f6bafd791fd4e99f
Author: smogm <smogm@vh0st.me>
Date: 2015-01-12 (Mon, 12 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
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 271755c..0494fc4 100644
--- a/common/thread_abstraction.cpp
+++ b/common/thread_abstraction.cpp
@@ -1,12 +1,12 @@
 #include "thread_abstraction.h"
 
-Thread::Thread() :
+SimpleThread::SimpleThread() :
 	mIsRunning(false),
 	mThread()
 {
 }
 
-Thread::~Thread()
+SimpleThread::~SimpleThread()
 {
 	// if thread is still running on object destruction, cancel thread the hard way:
 	if (mIsRunning)
@@ -15,20 +15,20 @@ Thread::~Thread()
 	}
 }
 
-void Thread::startThread()
+void SimpleThread::startThread()
 {
 	mIsRunning = true;
-	pthread_create(&mThread, 0, &Thread::runThread, this);
+	pthread_create(&mThread, 0, &SimpleThread::runThread, this);
 }
 
-void Thread::joinThread()
+void SimpleThread::joinThread()
 {
 	pthread_join(mThread, 0);
 	mIsRunning = false;
 }
 
-void* Thread::runThread(void* ptr)
+void* SimpleThread::runThread(void* ptr)
 {
-	((Thread*)ptr)->run();
+	static_cast<SimpleThread*>(ptr)->run();
 	return 0;
 }
diff --git a/common/thread_abstraction.h b/common/thread_abstraction.h
index 3c3e35f..45a20b6 100644
--- a/common/thread_abstraction.h
+++ b/common/thread_abstraction.h
@@ -1,20 +1,20 @@
-#ifndef _THREAD_ABSTRACTION_H
-#define _THREAD_ABSTRACTION_H
+#ifndef _SIMPLETHREAD_ABSTRACTION_H
+#define _SIMPLETHREAD_ABSTRACTION_H
 
 #include <pthread.h>
 
-class Thread
+class SimpleThread
 {
 	bool mIsRunning;
 	pthread_t mThread;
 
 	static void* runThread(void*);
-	Thread(const Thread&);
-	const Thread& operator=(const Thread&);
+	SimpleThread(const SimpleThread&);
+	const SimpleThread& operator=(const SimpleThread&);
 
 	public:
-		Thread();
-		~Thread();
+		SimpleThread();
+		~SimpleThread();
 		void startThread();
 		void joinThread();
 
diff --git a/generic-pc/audio.cpp b/generic-pc/audio.cpp
index 5e7e7ad..7cb99b5 100644
--- a/generic-pc/audio.cpp
+++ b/generic-pc/audio.cpp
@@ -103,7 +103,7 @@ int cAudio::Start(void)
 {
 	lt_debug("%s >\n", __func__);
 	if (! HAL_nodec)
-		startThread();
+		SimpleThread::startThread();
 	lt_debug("%s <\n", __func__);
 	return 0;
 }
@@ -114,7 +114,7 @@ int cAudio::Stop(void)
 	if (thread_started)
 	{
 		thread_started = false;
-		joinThread();
+		SimpleThread::joinThread();
 	}
 	lt_debug("%s <\n", __func__);
 	return 0;
diff --git a/generic-pc/audio_lib.h b/generic-pc/audio_lib.h
index 86d4806..36d6140 100644
--- a/generic-pc/audio_lib.h
+++ b/generic-pc/audio_lib.h
@@ -38,7 +38,7 @@ typedef enum
    AUDIO_FMT_ADVANCED = AUDIO_FMT_MLP
 } AUDIO_FORMAT;
 
-class cAudio : public Thread
+class cAudio : public SimpleThread
 {
 	friend class cPlayback;
 	private:
diff --git a/generic-pc/glfb.cpp b/generic-pc/glfb.cpp
index 460777c..c518229 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();
-	startThread();
+	SimpleThread::startThread();
 	while (!mInitDone)
 		usleep(1);
 }
@@ -105,7 +105,7 @@ GLFramebuffer::GLFramebuffer(int x, int y): mReInit(true), mShutDown(false), mIn
 GLFramebuffer::~GLFramebuffer()
 {
 	mShutDown = true;
-	joinThread();
+	SimpleThread::joinThread();
 	if (input_fd >= 0)
 		close(input_fd);
 }
diff --git a/generic-pc/glfb.h b/generic-pc/glfb.h
index aa4017d..755a01f 100644
--- a/generic-pc/glfb.h
+++ b/generic-pc/glfb.h
@@ -31,7 +31,7 @@ extern "C" {
 #include <libavutil/rational.h>
 }
 
-class GLFramebuffer : public Thread
+class GLFramebuffer : public SimpleThread
 {
 public:
 	GLFramebuffer(int x, int y);
diff --git a/generic-pc/video.cpp b/generic-pc/video.cpp
index 4ca5d8b..7ce5f74 100644
--- a/generic-pc/video.cpp
+++ b/generic-pc/video.cpp
@@ -141,7 +141,7 @@ int cVideo::Start(void *, unsigned short, unsigned short, void *)
 {
 	lt_debug("%s running %d >\n", __func__, thread_running);
 	if (!thread_running && !HAL_nodec)
-		startThread();
+		SimpleThread::startThread();
 	lt_debug("%s running %d <\n", __func__, thread_running);
 	return 0;
 }
@@ -151,7 +151,7 @@ int cVideo::Stop(bool)
 	lt_debug("%s running %d >\n", __func__, thread_running);
 	if (thread_running) {
 		thread_running = false;
-		joinThread();
+		SimpleThread::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 3d3d7f2..44f883b 100644
--- a/generic-pc/video_lib.h
+++ b/generic-pc/video_lib.h
@@ -120,7 +120,7 @@ typedef enum
 
 
 #define VDEC_MAXBUFS 0x30
-class cVideo : public Thread
+class cVideo : public SimpleThread
 {
 	friend class GLFramebuffer;
 	friend class cDemux;