diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 20:24:20 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 21:43:16 +0100 |
| commit | 3dbc9007b080028f0aebbbf8b9ab1233cd70c45b (patch) | |
| tree | e6e46e5dd238338c44d421ef4f9101c9898c3cbf /stream/tv.h | |
| parent | 9149e2af568d4cb251f8b105f360c3e6b9fd9d86 (diff) | |
| download | mpv-3dbc9007b080028f0aebbbf8b9ab1233cd70c45b.tar.bz2 mpv-3dbc9007b080028f0aebbbf8b9ab1233cd70c45b.tar.xz | |
demux: mp_msg conversions
The TV code pretends to be part of stream/, but it's actually demuxer
code too. The audio_in code is shared between the TV code and
stream_radio.c, so stream_radio.c needs a small hack until stream.c is
converted.
Diffstat (limited to 'stream/tv.h')
| -rw-r--r-- | stream/tv.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/stream/tv.h b/stream/tv.h index 9cbc7ef652..4ab064e7fd 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -25,6 +25,8 @@ #ifndef MPLAYER_TV_H #define MPLAYER_TV_H +struct mp_log; + typedef struct tv_param_s { char *freq; char *channel; @@ -77,7 +79,7 @@ extern tv_param_t stream_tv_defaults; typedef struct tvi_info_s { - struct tvi_handle_s * (*tvi_init)(tv_param_t* tv_param); + struct tvi_handle_s * (*tvi_init)(struct mp_log *log, tv_param_t* tv_param); const char *name; const char *short_name; const char *author; @@ -100,6 +102,7 @@ typedef struct tvi_functions_s } tvi_functions_t; typedef struct tvi_handle_s { + struct mp_log *log; const tvi_functions_t *functions; void *priv; int seq; @@ -225,7 +228,7 @@ int tv_set_norm(tvi_handle_t *tvh, char* norm); void tv_start_scan(tvi_handle_t *tvh, int start); -tvi_handle_t *tv_new_handle(int size, const tvi_functions_t *functions); +tvi_handle_t *tv_new_handle(int size, struct mp_log *log, const tvi_functions_t *functions); void tv_free_handle(tvi_handle_t *h); #define TV_NORM_PAL 1 |