libeplayer3: rename Content_t => Player

This commit is contained in:
martii
2014-04-06 12:11:40 +02:00
parent 70f58d2cf5
commit dd527fdfba
16 changed files with 99 additions and 102 deletions

View File

@@ -8,13 +8,13 @@
#include <pthread.h>
#include <stdint.h>
typedef struct Context_s {
struct Player {
PlaybackHandler_t *playback;
ContainerHandler_t *container;
OutputHandler_t *output;
ManagerHandler_t *manager;
int64_t *currentAudioPtsP;
} Context_t;
};
int container_ffmpeg_update_tracks(Context_t * context, const char *filename);
int container_ffmpeg_update_tracks(Player * context, const char *filename);
#endif

View File

@@ -18,12 +18,11 @@ typedef enum {
CONTAINER_METADATA,
} ContainerCmd_t;
struct Context_s;
typedef struct Context_s Context_t;
struct Player;
typedef struct Container_s {
const char *Name;
int (*Command) (Context_t *, ContainerCmd_t, const char *);
int (*Command) (Player *, ContainerCmd_t, const char *);
const char **Capabilities;
} Container_t;
@@ -33,7 +32,7 @@ extern Container_t FFMPEGContainer;
typedef struct ContainerHandler_s {
const char *Name;
Container_t *selectedContainer;
int (*Command) (Context_t *, ContainerCmd_t, const char *);
int (*Command) (Player *, ContainerCmd_t, const char *);
} ContainerHandler_t;
#endif

View File

@@ -56,12 +56,11 @@ typedef struct Track_s {
Track_s() : Id(-1), language(NULL), duration(-1), avfc(NULL), stream(NULL), pending(0), is_static(0), chapter_start(0), chapter_end(0), ac3flags(-1) {}
} Track_t;
struct Context_s;
typedef struct Context_s Context_t;
struct Player;
typedef struct Manager_s {
const char *Name;
int (*Command) ( Context_t *, ManagerCmd_t, void *);
int (*Command) (Player *, ManagerCmd_t, void *);
const char **Capabilities;
} Manager_t;

View File

@@ -34,12 +34,11 @@ typedef enum {
OUTPUT_GET_FRAME_COUNT,
} OutputCmd_t;
struct Context_s;
typedef struct Context_s Context_t;
struct Player;
typedef struct Output_s {
const char *Name;
int (*Command) (Context_t *, OutputCmd_t, const char *);
int (*Command) (Player *, OutputCmd_t, const char *);
bool (*Write) (AVFormatContext *avfc, AVStream *stream, AVPacket *packet, int64_t &Pts);
const char **Capabilities;
@@ -52,7 +51,7 @@ typedef struct OutputHandler_s {
const char *Name;
Output_t *audio;
Output_t *video;
int (*Command) (Context_t *, OutputCmd_t, const char *);
int (*Command) (Player *, OutputCmd_t, const char *);
} OutputHandler_t;
#endif

View File

@@ -12,8 +12,7 @@ typedef enum { PLAYBACK_OPEN, PLAYBACK_CLOSE, PLAYBACK_PLAY, PLAYBACK_STOP,
PLAYBACK_SWITCH_TELETEXT
} PlaybackCmd_t;
struct Context_s;
typedef struct Context_s Context_t;
struct Player;
typedef struct PlaybackHandler_s {
const char *Name;
@@ -37,7 +36,7 @@ typedef struct PlaybackHandler_s {
unsigned char abortRequested;
unsigned char abortPlayback;
int (*Command) ( Context_t *, PlaybackCmd_t, void *);
int (*Command) ( Player *, PlaybackCmd_t, void *);
std::string uri;
unsigned char noprobe; /* hack: only minimal probing in av_find_stream_info */
unsigned long long readCount;