libeplayer3: merge Playback to Player class

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

View File

@@ -47,7 +47,7 @@ class Manager
friend class Player;
private:
Player *context;
Player *player;
OpenThreads::Mutex mutex;
std::map<int,Track *> videoTracks, audioTracks, subtitleTracks, teletextTracks;
public: