mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 15:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "change libeplayer3 to own thread class"

Browse Source 
This reverts commit 9ed0a0d244.
This commit is contained in:
max_10
2018-09-20 17:18:35 +02:00
committed by Thilo Graf
parent 89ab7c86dc
commit 10710b9b53
8 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libeplayer3/include/input.h
View File

@@ -26,7 +26,9 @@
#include <vector>
#include <map>
#include <scoped_lock.h>
#include <OpenThreads/ScopedLock>
#include <OpenThreads/Thread>
#include <OpenThreads/Condition>
extern "C" {
#include <libavutil/avutil.h>
@@ -46,7 +48,7 @@ class Input
friend int interrupt_cb(void *arg);
private:
Mutex mutex;
OpenThreads::Mutex mutex;
Track *videoTrack;
Track *audioTrack;

6
libeplayer3/include/manager.h
View File

@@ -26,7 +26,9 @@
#include <vector>
#include <map>
#include <scoped_lock.h>
#include <OpenThreads/ScopedLock>
#include <OpenThreads/Thread>
#include <OpenThreads/Condition>
extern "C" {
#include <libavutil/avutil.h>
@@ -64,7 +66,7 @@ class Manager
private:
Player *player;
Mutex mutex;
OpenThreads::Mutex mutex;
std::map<int,Track*> videoTracks, audioTracks, subtitleTracks, teletextTracks;
std::map<int,Program> Programs;
void addTrack(std::map<int,Track*> &tracks, Track &track);

6
libeplayer3/include/output.h
View File

@@ -26,7 +26,9 @@
#include <vector>
#include <map>
#include <scoped_lock.h>
#include <OpenThreads/ScopedLock>
#include <OpenThreads/Thread>
#include <OpenThreads/Condition>
extern "C" {
#include <libavutil/avutil.h>
@@ -48,7 +50,7 @@ class Output
int videofd;
int audiofd;
Writer *videoWriter, *audioWriter;
Mutex audioMutex, videoMutex;
OpenThreads::Mutex audioMutex, videoMutex;
Track *audioTrack, *videoTrack;
Player *player;
public:

6
libeplayer3/include/player.h
View File

@@ -21,7 +21,9 @@
#ifndef __PLAYER_H__
#define __PLAYER_H__
#include <scoped_lock.h>
#include <OpenThreads/ScopedLock>
#include <OpenThreads/Thread>
#include <OpenThreads/Condition>
extern "C" {
#include <libavutil/avutil.h>
@@ -61,7 +63,7 @@ class Player {
Input input;
Output output;
Manager manager;
Mutex chapterMutex;
OpenThreads::Mutex chapterMutex;
std::vector<Chapter> chapters;
pthread_t playThread;