diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-26 21:22:33 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-26 21:22:33 +0000 |
| commit | daec5ef452399dc94844736d4e3176181df2f106 (patch) | |
| tree | e86adcb9e3e4d01b91f6797ae89170079ed809c5 /libmpdemux/dvbin.h | |
| parent | 4956c017df1dd9dcc0edc911241ccf611bac14ce (diff) | |
| download | mpv-daec5ef452399dc94844736d4e3176181df2f106.tar.bz2 mpv-daec5ef452399dc94844736d4e3176181df2f106.tar.xz | |
new configuration structure, gcc warn silencing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12310 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/dvbin.h')
| -rw-r--r-- | libmpdemux/dvbin.h | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/libmpdemux/dvbin.h b/libmpdemux/dvbin.h index 63cad2a152..1f6c4f5ee0 100644 --- a/libmpdemux/dvbin.h +++ b/libmpdemux/dvbin.h @@ -32,10 +32,6 @@ #include "inttypes.h" -typedef struct -{ - int next, prev; -} dvb_history_t; typedef struct { char *name; @@ -54,9 +50,21 @@ typedef struct { typedef struct { uint16_t NUM_CHANNELS; uint16_t current; - dvb_channel_t channels[512]; + dvb_channel_t *channels; } dvb_channels_list; +typedef struct { + int type; + dvb_channels_list *list; + char *name; + int devno; +} dvb_card_config_t; + +typedef struct { + int count; + dvb_card_config_t *cards; + void *priv; +} dvb_config_t; typedef struct { @@ -66,6 +74,7 @@ typedef struct { int demux_fd[3]; int dvr_fd; + dvb_config_t *config; dvb_channels_list *list; int tuner_type; int is_on; @@ -80,10 +89,7 @@ typedef struct { #define TUNER_CBL 3 extern int dvb_step_channel(dvb_priv_t *, int); -extern int dvb_set_channel(dvb_priv_t *, int); -extern int dvb_open_fe(dvb_priv_t *priv); - -extern dvb_history_t dvb_prev_next; - +extern int dvb_set_channel(dvb_priv_t *, int, int); +extern dvb_config_t *dvb_get_config(); #endif |