- formatting code using astyle

Conflicts:
	libarmbox/dmx.cpp
	libgeneric-pc/video_lib.h
	libspark/dmx.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-05-17 23:47:39 +02:00
committed by Thilo Graf
parent 42264ba4af
commit 7e5b1fc5d2
161 changed files with 13043 additions and 11396 deletions

View File

@@ -62,16 +62,16 @@ struct Program
class Manager
{
friend class Player;
friend class Player;
private:
Player *player;
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);
Track *getTrack(std::map<int,Track*> &tracks, int pid);
std::vector<Track> getTracks(std::map<int,Track*> &tracks);
std::map<int, Track *> videoTracks, audioTracks, subtitleTracks, teletextTracks;
std::map<int, Program> Programs;
void addTrack(std::map<int, Track *> &tracks, Track &track);
Track *getTrack(std::map<int, Track *> &tracks, int pid);
std::vector<Track> getTracks(std::map<int, Track *> &tracks);
public:
void addVideoTrack(Track &track);
void addAudioTrack(Track &track);