libeplayer3: merge Playback to Player class

This commit is contained in:
martii
2014-04-07 21:25:30 +02:00
parent ca5effe1bc
commit 12c9643978
8 changed files with 242 additions and 292 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: