mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-27 15:32:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "change libeplayer3 to own thread class"

Browse Source 
This reverts commit 3f238feb60.


Origin commit data
------------------
Branch: master
Commit: 10710b9b53
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:
max_10
2018-09-20 17:18:35 +02:00
committed by Thilo Graf
parent 3a618f5c1b
commit e61caae983
8 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libeplayer3/manager.cpp
View File

@@ -25,7 +25,7 @@
void Manager::addTrack(std::map<int,Track*> &tracks, Track &track)
{
ScopedLock m_lock(mutex);
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
std::map<int,Track*>::iterator it = tracks.find(track.pid);
if (it == tracks.end()) {
Track *t = new Track;
@@ -59,7 +59,7 @@ std::vector<Track> Manager::getTracks(std::map<int,Track*> &tracks)
{
player->input.UpdateTracks();
std::vector<Track> res;
ScopedLock m_lock(mutex);
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
for(std::map<int,Track*>::iterator it = tracks.begin(); it != tracks.end(); ++it)
if (!it->second->inactive && !it->second->hidden)
res.push_back(*it->second);
@@ -88,7 +88,7 @@ std::vector<Track> Manager::getTeletextTracks()
Track *Manager::getTrack(std::map<int,Track*> &tracks, int pid)
{
ScopedLock m_lock(mutex);
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
std::map<int,Track*>::iterator it = tracks.find(pid);
if (it != tracks.end() && !it->second->inactive)
return it->second;
@@ -116,7 +116,7 @@ Track *Manager::getTeletextTrack(int pid)
bool Manager::initTrackUpdate()
{
ScopedLock m_lock(mutex);
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
for (std::map<int,Track*>::iterator it = audioTracks.begin(); it != audioTracks.end(); ++it)
it->second->inactive = !it->second->is_static;
@@ -140,7 +140,7 @@ void Manager::addProgram(Program &program)
std::vector<Program> Manager::getPrograms(void)
{
ScopedLock m_lock(mutex);
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
std::vector<Program> res;
for (std::map<int,Program>::iterator it = Programs.begin(); it != Programs.end(); ++it)
res.push_back(it->second);
@@ -149,7 +149,7 @@ std::vector<Program> Manager::getPrograms(void)
bool Manager::selectProgram(const int id)
{
ScopedLock m_lock(mutex);
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
std::map<int,Program>::iterator i = Programs.find(id);
if (i != Programs.end()) {
@@ -236,7 +236,7 @@ bool Manager::selectProgram(const int id)
void Manager::clearTracks()
{
ScopedLock m_lock(mutex);
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
for (std::map<int,Track*>::iterator it = audioTracks.begin(); it != audioTracks.end(); ++it)
delete it->second;