mirror of
https://github.com/tuxbox-neutrino/libstb-hal.git
synced 2025-08-27 07:23:11 +02:00
- 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:
@@ -51,13 +51,14 @@ struct Chapter
|
||||
int64_t end;
|
||||
};
|
||||
|
||||
class Player {
|
||||
friend class Input;
|
||||
friend class Output;
|
||||
friend class Manager;
|
||||
friend class cPlayback;
|
||||
friend class WriterPCM;
|
||||
friend int interrupt_cb(void *arg);
|
||||
class Player
|
||||
{
|
||||
friend class Input;
|
||||
friend class Output;
|
||||
friend class Manager;
|
||||
friend class cPlayback;
|
||||
friend class WriterPCM;
|
||||
friend int interrupt_cb(void *arg);
|
||||
|
||||
private:
|
||||
Input input;
|
||||
@@ -81,10 +82,10 @@ class Player {
|
||||
uint64_t readCount;
|
||||
|
||||
std::string url;
|
||||
bool noprobe; /* hack: only minimal probing in av_find_stream_info */
|
||||
bool noprobe; /* hack: only minimal probing in av_find_stream_info */
|
||||
|
||||
void SetChapters(std::vector<Chapter> &Chapters);
|
||||
static void* playthread(void*);
|
||||
static void *playthread(void *);
|
||||
public:
|
||||
bool SwitchAudio(int pid);
|
||||
bool SwitchVideo(int pid);
|
||||
@@ -115,8 +116,14 @@ class Player {
|
||||
void RequestAbort();
|
||||
bool GetChapters(std::vector<int> &positions, std::vector<std::string> &titles);
|
||||
|
||||
AVFormatContext *GetAVFormatContext() { return input.GetAVFormatContext(); }
|
||||
void ReleaseAVFormatContext() { input.ReleaseAVFormatContext(); }
|
||||
AVFormatContext *GetAVFormatContext()
|
||||
{
|
||||
return input.GetAVFormatContext();
|
||||
}
|
||||
void ReleaseAVFormatContext()
|
||||
{
|
||||
input.ReleaseAVFormatContext();
|
||||
}
|
||||
|
||||
bool GetPrograms(std::vector<std::string> &keys, std::vector<std::string> &values);
|
||||
bool SelectProgram(int key);
|
||||
|
Reference in New Issue
Block a user