Merge branch 'master' of https://github.com/TangoCash/libstb-hal-tangos

Origin commit data
------------------
Branch: master
Commit: c6876f3996
Author: Frankenstone <dampf_acc@online.de>
Date: 2018-10-02 (Tue, 02 Oct 2018)


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

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

include/condition_abstraction.h

@@ -1,23 +0,0 @@
-#ifndef _CONDITION_ABSTRACTION_H
-#define _CONDITION_ABSTRACTION_H
-
-#include <pthread.h>
-
-#include "mutex_abstraction.h"
-
-class Condition
-{
-	pthread_cond_t mCondition;
-
-	Condition(const Condition&);
-	const Condition& operator=(const Condition&);
-
-	public:
-		Condition();
-		virtual ~Condition();
-		virtual int wait(Mutex* const aMutex);
-		virtual int broadcast();
-		virtual int signal();
-};
-
-#endif

include/glfb.h

@@ -1,10 +1,42 @@
-#include <config.h>
-#if HAVE_GENERIC_HARDWARE
-#if BOXMODEL_RASPI
-#include "../raspi/glfb.h"
-#else
-#include "../generic-pc/glfb.h"
-#endif
-#else
-#error glfb.h only works with HAVE_GENERIC_HARDWARE defined
+/*
+	Copyright 2010 Carsten Juttner <carjay@gmx.net>
+	Copyright 2012,2013 Stefan Seyfried <seife@tuxboxcvs.slipkontur.de>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __glfb__
+#define __glfb__
+#include <OpenThreads/Thread>
+#include <vector>
+#include <linux/fb.h> /* for screeninfo etc. */
+
+class GLFramebuffer : public OpenThreads::Thread
+{
+public:
+	GLFramebuffer(int x, int y);
+	~GLFramebuffer();
+	std::vector<unsigned char> *getOSDBuffer() { return &osd_buf; } /* pointer to OSD bounce buffer */
+	void blit();
+	fb_var_screeninfo getScreenInfo() { return si; }
+
+private:
+	fb_var_screeninfo si;
+	std::vector<unsigned char> osd_buf; /* silly bounce buffer */
+	void run();	/* for OpenThreads::Thread */
+	void setup();
+	void blit_osd();
+	void *pdata;	/* not yet used */
+};
 #endif

include/mutex_abstraction.h

@@ -1,25 +0,0 @@
-#ifndef _MUTEX_ABSTRACTION_H
-#define _MUTEX_ABSTRACTION_H
-
-#include <pthread.h>
-
-class Mutex
-{
-	friend class Condition;
-
-	pthread_mutex_t mMutex;
-
-	Mutex(const Mutex&);
-	const Mutex& operator=(const Mutex&);
-
-	protected:
-		explicit Mutex(int);
-
-	public:
-		Mutex();
-		virtual ~Mutex();
-		virtual void lock();
-		virtual void unlock();
-};
-
-#endif

include/reentrant_mutex.h

@@ -1,16 +0,0 @@
-#ifndef _REENTRANT_MUTEX_H
-#define _REENTRANT_MUTEX_H
-
-#include "mutex_abstraction.h"
-
-class ReentrantMutex : public Mutex
-{
-	ReentrantMutex(const ReentrantMutex&);
-	const ReentrantMutex& operator=(const ReentrantMutex&);
-
-	public:
-		ReentrantMutex();
-		virtual ~ReentrantMutex();
-};
-
-#endif

include/scoped_lock.h

@@ -1,18 +0,0 @@
-#ifndef _SCOPED_LOCK_H
-#define _SCOPED_LOCK_H
-
-#include "mutex_abstraction.h"
-
-class ScopedLock
-{
-	Mutex& mMutex;
-
-	ScopedLock(const ScopedLock&);
-	const ScopedLock& operator=(const ScopedLock&);
-
-	public:
-		ScopedLock(Mutex&);
-		~ScopedLock();
-};
-
-#endif

include/thread_abstraction.h

@@ -1,30 +0,0 @@
-#ifndef _THREAD_ABSTRACTION_H
-#define _THREAD_ABSTRACTION_H
-
-#include <pthread.h>
-
-class Thread
-{
-	bool mIsRunning;
-	pthread_t mThread;
-
-	static void* runThread(void*);
-	Thread(const Thread&);
-	const Thread& operator=(const Thread&);
-
-	public:
-		Thread();
-		virtual ~Thread();
-		int startThread();
-		int cancelThread();
-		int detachThread();
-		int joinThread();
-
-		int setCancelModeDisable();
-		int setSchedulePriority(int);
-
-	protected:
-		virtual void run() = 0;
-};
-
-#endif