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

libeplayer3: merge Playback to Player class

Browse Source 
Origin commit data
------------------
Branch: master
Commit: b08abf6b52
Author: martii <m4rtii@gmx.de>
Date: 2014-04-07 (Mon, 07 Apr 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-04-07 21:25:30 +02:00
parent e02b7dd602
commit adae72b3f7
9 changed files with 271 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libeplayer3/manager/manager.cpp
View File

@@ -76,7 +76,7 @@ void Manager::addTeletextTrack(Track &track)
std::vector<Track> Manager::getVideoTracks()
{
context->input.UpdateTracks();
player->input.UpdateTracks();
std::vector<Track> res;
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
for(std::map<int,Track*>::iterator it = videoTracks.begin(); it != videoTracks.end(); ++it)
@@ -87,7 +87,7 @@ std::vector<Track> Manager::getVideoTracks()
std::vector<Track> Manager::getAudioTracks()
{
context->input.UpdateTracks();
player->input.UpdateTracks();
std::vector<Track> res;
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
for(std::map<int,Track*>::iterator it = audioTracks.begin(); it != audioTracks.end(); ++it)
@@ -98,7 +98,7 @@ std::vector<Track> Manager::getAudioTracks()
std::vector<Track> Manager::getSubtitleTracks()
{
context->input.UpdateTracks();
player->input.UpdateTracks();
std::vector<Track> res;
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
for(std::map<int,Track*>::iterator it = subtitleTracks.begin(); it != subtitleTracks.end(); ++it)
@@ -109,7 +109,7 @@ std::vector<Track> Manager::getSubtitleTracks()
std::vector<Track> Manager::getTeletextTracks()
{
context->input.UpdateTracks();
player->input.UpdateTracks();
std::vector<Track> res;
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
for(std::map<int,Track*>::iterator it = teletextTracks.begin(); it != teletextTracks.end(); ++it)