Move struct channels definition to channels.h
This commit is contained in:
parent
1515233fad
commit
98d9c0aaa1
4 changed files with 42 additions and 37 deletions
38
channels.h
38
channels.h
|
@ -19,6 +19,44 @@
|
|||
#ifndef CHANNELS_H
|
||||
#define CHANNELS_H
|
||||
|
||||
/*
|
||||
* Channel definition
|
||||
*/
|
||||
typedef struct channel {
|
||||
|
||||
int ch_refcount;
|
||||
int ch_zombie;
|
||||
|
||||
RB_ENTRY(channel) ch_name_link;
|
||||
char *ch_name;
|
||||
char *ch_sname;
|
||||
|
||||
RB_ENTRY(channel) ch_identifier_link;
|
||||
int ch_id;
|
||||
|
||||
LIST_HEAD(, th_transport) ch_transports;
|
||||
LIST_HEAD(, th_subscription) ch_subscriptions;
|
||||
|
||||
|
||||
struct tt_decoder ch_tt;
|
||||
|
||||
enum {
|
||||
COMMERCIAL_DETECT_NONE,
|
||||
COMMERCIAL_DETECT_TTP192,
|
||||
} ch_commercial_detection;
|
||||
|
||||
struct event_tree ch_epg_events;
|
||||
struct event *ch_epg_cur_event;
|
||||
char *ch_icon;
|
||||
|
||||
struct pvr_rec_list ch_pvrrs;
|
||||
|
||||
struct autorec_list ch_autorecs;
|
||||
|
||||
} channel_t;
|
||||
|
||||
|
||||
|
||||
void channels_load(void);
|
||||
|
||||
channel_t *channel_find_by_name(const char *name, int create);
|
||||
|
|
2
epg.h
2
epg.h
|
@ -19,6 +19,8 @@
|
|||
#ifndef EPG_H
|
||||
#define EPG_H
|
||||
|
||||
#include "channels.h"
|
||||
|
||||
void epg_init(void);
|
||||
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#ifndef TRANSPORTS_H
|
||||
#define TRANSPORTS_H
|
||||
|
||||
#include <libavcodec/avcodec.h>
|
||||
#include "channels.h"
|
||||
|
||||
unsigned int transport_compute_weight(struct th_transport_list *head);
|
||||
|
||||
|
|
37
tvhead.h
37
tvhead.h
|
@ -752,41 +752,6 @@ typedef struct tt_decoder {
|
|||
|
||||
|
||||
|
||||
/*
|
||||
* Channel definition
|
||||
*/
|
||||
typedef struct channel {
|
||||
|
||||
int ch_refcount;
|
||||
int ch_zombie;
|
||||
|
||||
RB_ENTRY(channel) ch_name_link;
|
||||
char *ch_name;
|
||||
char *ch_sname;
|
||||
|
||||
RB_ENTRY(channel) ch_identifier_link;
|
||||
int ch_id;
|
||||
|
||||
LIST_HEAD(, th_transport) ch_transports;
|
||||
LIST_HEAD(, th_subscription) ch_subscriptions;
|
||||
|
||||
|
||||
struct tt_decoder ch_tt;
|
||||
|
||||
enum {
|
||||
COMMERCIAL_DETECT_NONE,
|
||||
COMMERCIAL_DETECT_TTP192,
|
||||
} ch_commercial_detection;
|
||||
|
||||
struct event_tree ch_epg_events;
|
||||
struct event *ch_epg_cur_event;
|
||||
char *ch_icon;
|
||||
|
||||
struct pvr_rec_list ch_pvrrs;
|
||||
|
||||
struct autorec_list ch_autorecs;
|
||||
|
||||
} channel_t;
|
||||
|
||||
|
||||
/*
|
||||
|
@ -867,7 +832,7 @@ typedef struct epg_content_type {
|
|||
* EPG event
|
||||
*/
|
||||
typedef struct event {
|
||||
channel_t *e_channel;
|
||||
struct channel *e_channel;
|
||||
RB_ENTRY(event) e_channel_link;
|
||||
|
||||
LIST_ENTRY(event) e_content_type_link;
|
||||
|
|
Loading…
Add table
Reference in a new issue