Revert "add changed files"

This reverts commit 7f2f83b16e.


Origin commit data
------------------
Branch: master
Commit: b6aeafc446
Author: max_10 <max_10@gmx.de>
Date: 2018-09-20 (Thu, 20 Sep 2018)



------------------
This commit was generated by Migit

common/Makefile.am

@@ -31,8 +31,6 @@ endif
 endif
 
 libcommon_la_SOURCES += \
-	thread_abstraction.cpp \
-	mutex_abstraction.cpp \
 	lt_debug.cpp \
 	proc_tools.c \
 	pwrmngr.cpp

common/thread_abstraction.cpp

@@ -30,5 +30,4 @@ void Thread::joinThread()
 void* Thread::runThread(void* ptr)
 {
 	((Thread*)ptr)->run();
-	return 0;
 }

generic-pc/Makefile.am

@@ -9,6 +9,7 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 
 AM_LDFLAGS = \
 	-lglut -lGL -lGLU -lGLEW -lao \
+	-lOpenThreads \
 	@AVFORMAT_LIBS@ \
 	@AVUTIL_LIBS@ \
 	@AVCODEC_LIBS@ \

generic-pc/audio.cpp

@@ -29,6 +29,7 @@
 #define lt_debug(args...) _lt_debug(HAL_DEBUG_AUDIO, this, args)
 #define lt_info(args...) _lt_info(HAL_DEBUG_AUDIO, this, args)
 
+#include <OpenThreads/Thread>
 
 extern "C" {
 #include <libavformat/avformat.h>
@@ -104,7 +105,7 @@ int cAudio::Start(void)
 {
 	lt_debug("%s >\n", __func__);
 	if (! HAL_nodec)
-		startThread();
+		OpenThreads::Thread::start();
 	lt_debug("%s <\n", __func__);
 	return 0;
 }
@@ -115,7 +116,7 @@ int cAudio::Stop(void)
 	if (thread_started)
 	{
 		thread_started = false;
-		joinThread();
+		OpenThreads::Thread::join();
 	}
 	lt_debug("%s <\n", __func__);
 	return 0;

generic-pc/audio_lib.h

@@ -4,6 +4,7 @@
 #define _AUDIO_LIB_H_
 
 #include <stdint.h>
+#include <thread_abstraction.h>
 #include "cs_types.h"
 
 typedef enum
@@ -37,7 +38,7 @@ typedef enum
 	AUDIO_FMT_ADVANCED = AUDIO_FMT_MLP
 } AUDIO_FORMAT;
 
-class cAudio : public Thread
+class cAudio : public OpenThreads::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();
-	startThread();
+	OpenThreads::Thread::start();
 	while (!mInitDone)
 		usleep(1);
 }
@@ -105,7 +105,7 @@ GLFramebuffer::GLFramebuffer(int x, int y): mReInit(true), mShutDown(false), mIn
 GLFramebuffer::~GLFramebuffer()
 {
 	mShutDown = true;
-	joinThread();
+	OpenThreads::Thread::join();
 	if (input_fd >= 0)
 		close(input_fd);
 }

generic-pc/glfb.h

@@ -18,9 +18,8 @@
 
 #ifndef __glthread__
 #define __glthread__
-#include "../common/thread_abstraction.h"
-#include "../common/mutex_abstraction.h"
-
+#include <OpenThreads/Thread>
+#include <OpenThreads/Mutex>
 #include <vector>
 #include <map>
 #include <GL/glew.h>
@@ -31,7 +30,7 @@ extern "C" {
 #include <libavutil/rational.h>
 }
 
-class GLFramebuffer : public Thread
+class GLFramebuffer : public OpenThreads::Thread
 {
 public:
 	GLFramebuffer(int x, int y);
@@ -67,7 +66,7 @@ private:
 
 	bool mFullscreen;		/* fullscreen? */
 	bool mReInit;			/* setup things for GL */
-	Mutex mReInitLock;
+	OpenThreads::Mutex mReInitLock;
 	bool mShutDown;			/* if set main loop is left */
 	bool mInitDone;			/* condition predicate */
 	// OpenThreads::Condition mInitCond;	/* condition variable for init */

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)
-		startThread();
+		OpenThreads::Thread::start();
 	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;
-		joinThread();
+		OpenThreads::Thread::join();
 	}
 	lt_debug("%s running %d <\n", __func__, thread_running);
 	return 0;

generic-pc/video_lib.h

@@ -1,8 +1,8 @@
 #ifndef _VIDEO_LIB_H
 #define _VIDEO_LIB_H
 
-#include "../common/thread_abstraction.h"
-#include "../common/mutex_abstraction.h"
+#include <OpenThreads/Thread>
+#include <OpenThreads/Mutex>
 #include <vector>
 #include <linux/dvb/video.h>
 #include "cs_types.h"
@@ -121,7 +121,7 @@ typedef enum
 
 
 #define VDEC_MAXBUFS 0x30
-class cVideo : public Thread
+class cVideo : public OpenThreads::Thread
 {
 	friend class GLFramebuffer;
 	friend class cDemux;
@@ -211,8 +211,7 @@ class cVideo : public Thread
 		bool thread_running;
 		VIDEO_FORMAT v_format;
 		VIDEO_STD v_std;
-		//OpenThreads::Mutex buf_m;
-		Mutex buf_m;
+		OpenThreads::Mutex buf_m;
 		DISPLAY_AR display_aspect;
 		DISPLAY_AR_MODE display_crop;
 		int output_h;