From c915b0b0ecb9bbe66252ab96113c8c3bc9c70eb3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 6 Jan 2015 20:19:49 +0100 Subject: dvb: uncrustify Mostly automatic, some manual changes. --- stream/dvbin.h | 106 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 52 insertions(+), 54 deletions(-) (limited to 'stream/dvbin.h') diff --git a/stream/dvbin.h b/stream/dvbin.h index c475984450..5dfb20c548 100644 --- a/stream/dvbin.h +++ b/stream/dvbin.h @@ -11,9 +11,9 @@ #include "config.h" #include "stream.h" -#define SLOF (11700*1000UL) -#define LOF1 (9750*1000UL) -#define LOF2 (10600*1000UL) +#define SLOF (11700 * 1000UL) +#define LOF1 (9750 * 1000UL) +#define LOF2 (10600 * 1000UL) #include #include @@ -26,14 +26,14 @@ /* kernel headers >=2.6.28 have version 5. * * Version 5 is also called S2API, it adds support for tuning to S2 channels - * and is extensible for future delivery systems. Old API is deprecated. - * StreamID-implementation only supported since API >=5.2. + * and is extensible for future delivery systems. Old API is deprecated. + * StreamID-implementation only supported since API >=5.2. */ #if (DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR >= 2) #define DVB_USE_S2API 1 -// This had a different name until API 5.8. +// This had a different name until API 5.8. #ifndef DTV_STREAM_ID #define DTV_STREAM_ID DTV_ISDBS_TS_ID #endif @@ -50,7 +50,6 @@ #endif - #define DVB_CHANNEL_LOWER -1 #define DVB_CHANNEL_HIGHER 1 @@ -59,67 +58,66 @@ #endif typedef struct { - char *name; - int freq, srate, diseqc, tone; - char pol; - int tpid, dpid1, dpid2, progid, ca, pids[DMX_FILTER_SIZE], pids_cnt; - bool is_dvb_s2; - int stream_id; - int service_id; - fe_spectral_inversion_t inv; - fe_modulation_t mod; - fe_transmit_mode_t trans; - fe_bandwidth_t bw; - fe_guard_interval_t gi; - fe_code_rate_t cr, cr_lp; - fe_hierarchy_t hier; + char *name; + int freq, srate, diseqc, tone; + char pol; + int tpid, dpid1, dpid2, progid, ca, pids[DMX_FILTER_SIZE], pids_cnt; + bool is_dvb_s2; + int stream_id; + int service_id; + fe_spectral_inversion_t inv; + fe_modulation_t mod; + fe_transmit_mode_t trans; + fe_bandwidth_t bw; + fe_guard_interval_t gi; + fe_code_rate_t cr, cr_lp; + fe_hierarchy_t hier; } dvb_channel_t; typedef struct { - uint16_t NUM_CHANNELS; - uint16_t current; - dvb_channel_t *channels; + uint16_t NUM_CHANNELS; + uint16_t current; + dvb_channel_t *channels; } dvb_channels_list; typedef struct { - int type; - dvb_channels_list *list; - char *name; - int devno; + 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; + int count; + dvb_card_config_t *cards; + void *priv; } dvb_config_t; typedef struct dvb_params { - struct mp_log *log; - int fd; - int card; - int fe_fd; - int sec_fd; - int demux_fd[3], demux_fds[DMX_FILTER_SIZE], demux_fds_cnt; - int dvr_fd; - - dvb_config_t *config; - dvb_channels_list *list; - int tuner_type; - int is_on; - int retry; - int timeout; - int last_freq; - - char *cfg_prog; - int cfg_card; - int cfg_timeout; - char *cfg_file; - - int cfg_full_transponder; + struct mp_log *log; + int fd; + int card; + int fe_fd; + int sec_fd; + int demux_fd[3], demux_fds[DMX_FILTER_SIZE], demux_fds_cnt; + int dvr_fd; + + dvb_config_t *config; + dvb_channels_list *list; + int tuner_type; + int is_on; + int retry; + int timeout; + int last_freq; + + char *cfg_prog; + int cfg_card; + int cfg_timeout; + char *cfg_file; + + int cfg_full_transponder; } dvb_priv_t; - #define TUNER_SAT 1 #define TUNER_TER 2 #define TUNER_CBL 3 -- cgit v1.2.3