mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 23:12:44 +02:00
Revert "change libeplayer3 to own thread class"
This reverts commit3f238feb60
. Origin commit data ------------------ Branch: master Commit:b313db12a1
Author: max_10 <max_10@gmx.de> Date: 2018-09-20 (Thu, 20 Sep 2018) ------------------ This commit was generated by Migit
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user