From 745b3054ba807b1db32e37a41a054f352b4c2edf Mon Sep 17 00:00:00 2001 From: max_10 Date: Thu, 20 Sep 2018 17:45:07 +0200 Subject: [PATCH] Revert "add changed files" This reverts commit c37263f594747fdd36f8c941cacf18386f785658. --- common/Makefile.am | 2 -- common/thread_abstraction.cpp | 1 - generic-pc/Makefile.am | 1 + generic-pc/audio.cpp | 5 +++-- generic-pc/audio_lib.h | 3 ++- generic-pc/glfb.cpp | 4 ++-- generic-pc/glfb.h | 9 ++++----- generic-pc/video.cpp | 4 ++-- generic-pc/video_lib.h | 9 ++++----- 9 files changed, 18 insertions(+), 20 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 86f3517..17395fc 100644 --- a/common/Makefile.am +++ b/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 diff --git a/common/thread_abstraction.cpp b/common/thread_abstraction.cpp index 271755c..57b7759 100644 --- a/common/thread_abstraction.cpp +++ b/common/thread_abstraction.cpp @@ -30,5 +30,4 @@ void Thread::joinThread() void* Thread::runThread(void* ptr) { ((Thread*)ptr)->run(); - return 0; } diff --git a/generic-pc/Makefile.am b/generic-pc/Makefile.am index baf15da..fd230bd 100644 --- a/generic-pc/Makefile.am +++ b/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@ \ diff --git a/generic-pc/audio.cpp b/generic-pc/audio.cpp index d5605f0..03558f8 100644 --- a/generic-pc/audio.cpp +++ b/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 extern "C" { #include @@ -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; diff --git a/generic-pc/audio_lib.h b/generic-pc/audio_lib.h index 0670cd9..fc96d27 100644 --- a/generic-pc/audio_lib.h +++ b/generic-pc/audio_lib.h @@ -4,6 +4,7 @@ #define _AUDIO_LIB_H_ #include +#include #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: diff --git a/generic-pc/glfb.cpp b/generic-pc/glfb.cpp index fa35e88..099f213 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(); + 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); } diff --git a/generic-pc/glfb.h b/generic-pc/glfb.h index aa4017d..78376ba 100644 --- a/generic-pc/glfb.h +++ b/generic-pc/glfb.h @@ -18,9 +18,8 @@ #ifndef __glthread__ #define __glthread__ -#include "../common/thread_abstraction.h" -#include "../common/mutex_abstraction.h" - +#include +#include #include #include #include @@ -31,7 +30,7 @@ extern "C" { #include } -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 */ diff --git a/generic-pc/video.cpp b/generic-pc/video.cpp index 8544e8b..dcfb341 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) - 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; diff --git a/generic-pc/video_lib.h b/generic-pc/video_lib.h index 2b8e14e..ca130f5 100644 --- a/generic-pc/video_lib.h +++ b/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 +#include #include #include #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;