annotate libmpdemux/dvbin.c @ 18453:8f10ce85a8dc

output typo fixes
author diego
date Fri, 12 May 2006 09:13:05 +0000
parents 4e04e61b54ac
children aa9ae54516c3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
1 /*
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
2
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
3 dvbstream
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
4 (C) Dave Chapman <dave@dchapman.com> 2001, 2002.
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
5
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
6 The latest version can be found at http://www.linuxstb.org/dvbstream
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
7
15178
8dd7a656eaf8 Mark modified imported files as such to comply more closely with GPL ¡ø2a.
diego
parents: 14382
diff changeset
8 Modified for use with MPlayer, for details see the CVS changelog at
8dd7a656eaf8 Mark modified imported files as such to comply more closely with GPL ¡ø2a.
diego
parents: 14382
diff changeset
9 http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
8dd7a656eaf8 Mark modified imported files as such to comply more closely with GPL ¡ø2a.
diego
parents: 14382
diff changeset
10 $Id$
8dd7a656eaf8 Mark modified imported files as such to comply more closely with GPL ¡ø2a.
diego
parents: 14382
diff changeset
11
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
12 Copyright notice:
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
13
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
14 This program is free software; you can redistribute it and/or modify
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
15 it under the terms of the GNU General Public License as published by
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
16 the Free Software Foundation; either version 2 of the License, or
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
17 (at your option) any later version.
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
18
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
19 This program is distributed in the hope that it will be useful,
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
20 but WITHOUT ANY WARRANTY; without even the implied warranty of
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
22 GNU General Public License for more details.
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
23
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
24 You should have received a copy of the GNU General Public License
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
25 along with this program; if not, write to the Free Software
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
26 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
27
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
28 */
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
29
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
30 #include "config.h"
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
31 #include <stdio.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
32 #include <stdlib.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
33 #include <string.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
34 #include <ctype.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
35 #include <sys/ioctl.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
36 #include <sys/time.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
37 #include <sys/poll.h>
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
38 #include <unistd.h>
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
39 #include <fcntl.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
40 #include <string.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
41 #include <errno.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
42 #include <fcntl.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
43
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
44 #include "stream.h"
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
45 #include "demuxer.h"
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
46 #include "help_mp.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16516
diff changeset
47 #include "m_option.h"
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16516
diff changeset
48 #include "m_struct.h"
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
49
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
50 #include "dvbin.h"
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
51
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
52
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
53 #define MAX_CHANNELS 8
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
54 #define CHANNEL_LINE_LEN 256
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
55 #define min(a, b) ((a) <= (b) ? (a) : (b))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
56
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
57
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
58 //TODO: CAMBIARE list_ptr e da globale a per_priv
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
59
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
60
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
61 static struct stream_priv_s
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
62 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
63 char *prog;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
64 int card;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
65 char *type;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
66 int vid, aid;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
67 char *file;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
68 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
69 stream_defaults =
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
70 {
12108
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
71 "", 1, "", 0, 0, NULL
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
72 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
73
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
74 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
75
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
76 /// URL definition
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
77 static m_option_t stream_params[] = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
78 {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
79 {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
80 {"type", ST_OFF(type), CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
81 {"vid", ST_OFF(vid), CONF_TYPE_INT, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
82 {"aid", ST_OFF(aid), CONF_TYPE_INT, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
83 {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
84
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
85 {"hostname", ST_OFF(prog), CONF_TYPE_STRING, 0, 0, 0, NULL },
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
86 {"username", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
87 {NULL, NULL, 0, 0, 0, 0, NULL}
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
88 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
89
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
90 static struct m_struct_st stream_opts = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
91 "dvbin",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
92 sizeof(struct stream_priv_s),
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
93 &stream_defaults,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
94 stream_params
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
95 };
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
96
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
97
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
98
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
99 m_option_t dvbin_opts_conf[] = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
100 {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
101 {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
12108
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
102 {"type", "DVB card type is autodetected and can't be overridden\n", CONF_TYPE_PRINT, CONF_NOCFG, 0 ,0, NULL},
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
103 {"vid", &stream_defaults.vid, CONF_TYPE_INT, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
104 {"aid", &stream_defaults.aid, CONF_TYPE_INT, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
105 {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL},
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
106
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
107 {NULL, NULL, 0, 0, 0, 0, NULL}
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
108 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
109
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
110
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
111
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
112
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
113 extern int dvb_set_ts_filt(int fd, uint16_t pid, dmx_pes_type_t pestype);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
114 extern int dvb_demux_stop(int fd);
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
115 extern int dvb_get_tuner_type(int fd);
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
116 int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt, int *pids);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
117 int dvb_fix_demuxes(dvb_priv_t *priv, int cnt, int *pids);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
118
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
119 extern int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int tone,
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
120 fe_spectral_inversion_t specInv, fe_modulation_t modulation, fe_guard_interval_t guardInterval,
13155
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
121 fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth, fe_code_rate_t HP_CodeRate,
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
122 fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier);
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
123 extern char *dvb_dvrdev[4], *dvb_demuxdev[4], *dvb_frontenddev[4];
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
124
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
125 static dvb_config_t *dvb_config = NULL;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
126
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
127
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
128 static dvb_channels_list *dvb_get_channels(char *filename, int type)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
129 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
130 dvb_channels_list *list;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
131 FILE *f;
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
132 char line[CHANNEL_LINE_LEN], *colon;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
133
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
134 int fields, cnt, pcnt, k;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
135 dvb_channel_t *ptr, *tmp, chn;
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
136 char tmp_lcr[256], tmp_hier[256], inv[256], bw[256], cr[256], mod[256], transm[256], gi[256], vpid_str[256], apid_str[256];
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
137 const char *cbl_conf = "%d:%255[^:]:%d:%255[^:]:%255[^:]:%255[^:]:%255[^:]\n";
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
138 const char *sat_conf = "%d:%c:%d:%d:%255[^:]:%255[^:]\n";
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
139 const char *ter_conf = "%d:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]\n";
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
140 const char *atsc_conf = "%d:%255[^:]:%255[^:]:%255[^:]\n";
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
141
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
142 mp_msg(MSGT_DEMUX, MSGL_V, "CONFIG_READ FILE: %s, type: %d\n", filename, type);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
143 if((f=fopen(filename, "r"))==NULL)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
144 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
145 mp_msg(MSGT_DEMUX, MSGL_FATAL, "CAN'T READ CONFIG FILE %s\n", filename);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
146 return NULL;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
147 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
148
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
149 list = malloc(sizeof(dvb_channels_list));
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
150 if(list == NULL)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
151 {
17820
4e04e61b54ac close channels file before exiting dvb_get_channels() if malloc(dvb_channels_list) fails; closes cid 161
nicodvb
parents: 17681
diff changeset
152 fclose(f);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
153 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_GET_CHANNELS: couldn't malloc enough memory\n");
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
154 return NULL;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
155 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
156
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
157 ptr = &chn;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
158 list->NUM_CHANNELS = 0;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
159 list->channels = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
160 while(! feof(f))
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
161 {
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
162 if( fgets(line, CHANNEL_LINE_LEN, f) == NULL )
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
163 continue;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
164
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
165 if((line[0] == '#') || (strlen(line) == 0))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
166 continue;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
167
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
168 colon = index(line, ':');
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
169 if(colon)
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
170 {
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
171 k = colon - line;
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
172 if(!k)
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
173 continue;
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
174 ptr->name = (char*) malloc(k+1);
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
175 if(! ptr->name)
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
176 continue;
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
177 strncpy(ptr->name, line, k);
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
178 ptr->name[k] = 0;
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
179 }
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
180 else
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
181 continue;
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
182 k++;
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
183 apid_str[0] = vpid_str[0] = 0;
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
184 ptr->pids_cnt = 0;
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
185 ptr->freq = 0;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
186 if(type == TUNER_TER)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
187 {
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
188 fields = sscanf(&line[k], ter_conf,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
189 &ptr->freq, inv, bw, cr, tmp_lcr, mod,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
190 transm, gi, tmp_hier, vpid_str, apid_str);
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
191 mp_msg(MSGT_DEMUX, MSGL_V,
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
192 "TER, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d",
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
193 list->NUM_CHANNELS, fields, ptr->name, ptr->freq);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
194 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
195 else if(type == TUNER_CBL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
196 {
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
197 fields = sscanf(&line[k], cbl_conf,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
198 &ptr->freq, inv, &ptr->srate,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
199 cr, mod, vpid_str, apid_str);
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
200 mp_msg(MSGT_DEMUX, MSGL_V,
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
201 "CBL, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d",
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
202 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
203 }
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
204 #ifdef DVB_ATSC
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
205 else if(type == TUNER_ATSC)
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
206 {
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
207 fields = sscanf(&line[k], atsc_conf,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
208 &ptr->freq, mod, vpid_str, apid_str);
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
209 mp_msg(MSGT_DEMUX, MSGL_V,
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
210 "ATSC, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d\n",
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
211 list->NUM_CHANNELS, fields, ptr->name, ptr->freq);
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
212 }
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
213 #endif
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
214 else //SATELLITE
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
215 {
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
216 fields = sscanf(&line[k], sat_conf,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
217 &ptr->freq, &ptr->pol, &ptr->diseqc, &ptr->srate, vpid_str, apid_str);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
218 ptr->pol = toupper(ptr->pol);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
219 ptr->freq *= 1000UL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
220 ptr->srate *= 1000UL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
221 ptr->tone = -1;
12047
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
222 ptr->inv = INVERSION_AUTO;
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
223 ptr->cr = FEC_AUTO;
12116
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
224 if((ptr->diseqc > 4) || (ptr->diseqc < 0))
12047
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
225 continue;
12116
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
226 if(ptr->diseqc > 0)
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
227 ptr->diseqc--;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
228 mp_msg(MSGT_DEMUX, MSGL_V,
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
229 "SAT, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d, POL: %c, DISEQC: %d",
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
230 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate, ptr->pol, ptr->diseqc);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
231 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
232
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
233 if(vpid_str[0])
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
234 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
235 pcnt = sscanf(vpid_str, "%d+%d+%d+%d+%d+%d+%d", &ptr->pids[0], &ptr->pids[1], &ptr->pids[2], &ptr->pids[3],
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
236 &ptr->pids[4], &ptr->pids[5], &ptr->pids[6]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
237 if(pcnt > 0)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
238 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
239 ptr->pids_cnt = pcnt;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
240 fields++;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
241 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
242 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
243
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
244 if(apid_str[0])
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
245 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
246 cnt = ptr->pids_cnt;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
247 pcnt = sscanf(apid_str, "%d+%d+%d+%d+%d+%d+%d+%d", &ptr->pids[cnt], &ptr->pids[cnt+1], &ptr->pids[cnt+2],
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
248 &ptr->pids[cnt+3], &ptr->pids[cnt+4], &ptr->pids[cnt+5], &ptr->pids[cnt+6], &ptr->pids[cnt+7]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
249 if(pcnt > 0)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
250 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
251 ptr->pids_cnt += pcnt;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
252 fields++;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
253 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
254 }
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
255
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
256 if((fields < 2) || (ptr->pids_cnt <= 0) || (ptr->freq == 0) || (strlen(ptr->name) == 0))
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
257 continue;
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
258
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
259
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
260 ptr->pids[ptr->pids_cnt] = 0; //PID 0 is the PAT
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
261 ptr->pids_cnt++;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
262 mp_msg(MSGT_DEMUX, MSGL_V, " PIDS: ");
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
263 for(cnt = 0; cnt < ptr->pids_cnt; cnt++)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
264 mp_msg(MSGT_DEMUX, MSGL_V, " %d ", ptr->pids[cnt]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
265 mp_msg(MSGT_DEMUX, MSGL_V, "\n");
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
266
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
267 if((type == TUNER_TER) || (type == TUNER_CBL))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
268 {
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
269 if(! strcmp(inv, "INVERSION_ON"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
270 ptr->inv = INVERSION_ON;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
271 else if(! strcmp(inv, "INVERSION_OFF"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
272 ptr->inv = INVERSION_OFF;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
273 else
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
274 ptr->inv = INVERSION_AUTO;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
275
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
276
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
277 if(! strcmp(cr, "FEC_1_2"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
278 ptr->cr =FEC_1_2;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
279 else if(! strcmp(cr, "FEC_2_3"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
280 ptr->cr =FEC_2_3;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
281 else if(! strcmp(cr, "FEC_3_4"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
282 ptr->cr =FEC_3_4;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
283 #ifdef HAVE_DVB_HEAD
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
284 else if(! strcmp(cr, "FEC_4_5"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
285 ptr->cr =FEC_4_5;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
286 else if(! strcmp(cr, "FEC_6_7"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
287 ptr->cr =FEC_6_7;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
288 else if(! strcmp(cr, "FEC_8_9"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
289 ptr->cr =FEC_8_9;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
290 #endif
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
291 else if(! strcmp(cr, "FEC_5_6"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
292 ptr->cr =FEC_5_6;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
293 else if(! strcmp(cr, "FEC_7_8"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
294 ptr->cr =FEC_7_8;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
295 else if(! strcmp(cr, "FEC_NONE"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
296 ptr->cr =FEC_NONE;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
297 else ptr->cr =FEC_AUTO;
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
298 }
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
299
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
300
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
301 if((type == TUNER_TER) || (type == TUNER_CBL) || (type == TUNER_ATSC))
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
302 {
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
303 if(! strcmp(mod, "QAM_128"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
304 ptr->mod = QAM_128;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
305 else if(! strcmp(mod, "QAM_256"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
306 ptr->mod = QAM_256;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
307 else if(! strcmp(mod, "QAM_64"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
308 ptr->mod = QAM_64;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
309 else if(! strcmp(mod, "QAM_32"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
310 ptr->mod = QAM_32;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
311 else if(! strcmp(mod, "QAM_16"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
312 ptr->mod = QAM_16;
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
313 #ifdef DVB_ATSC
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
314 else if(! strcmp(mod, "VSB_8") || ! strcmp(mod, "8VSB"))
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
315 ptr->mod = VSB_8;
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
316 else if(! strcmp(mod, "VSB_16") || !strcmp(mod, "16VSB"))
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
317 ptr->mod = VSB_16;
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
318
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
319 ptr->inv = INVERSION_AUTO;
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
320 #endif
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
321 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
322
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
323 if(type == TUNER_TER)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
324 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
325 if(! strcmp(bw, "BANDWIDTH_6_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
326 ptr->bw = BANDWIDTH_6_MHZ;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
327 else if(! strcmp(bw, "BANDWIDTH_7_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
328 ptr->bw = BANDWIDTH_7_MHZ;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
329 else if(! strcmp(bw, "BANDWIDTH_8_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
330 ptr->bw = BANDWIDTH_8_MHZ;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
331
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
332
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
333 if(! strcmp(transm, "TRANSMISSION_MODE_2K"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
334 ptr->trans = TRANSMISSION_MODE_2K;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
335 else if(! strcmp(transm, "TRANSMISSION_MODE_8K"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
336 ptr->trans = TRANSMISSION_MODE_8K;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
337
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
338
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
339 if(! strcmp(gi, "GUARD_INTERVAL_1_32"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
340 ptr->gi = GUARD_INTERVAL_1_32;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
341 else if(! strcmp(gi, "GUARD_INTERVAL_1_16"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
342 ptr->gi = GUARD_INTERVAL_1_16;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
343 else if(! strcmp(gi, "GUARD_INTERVAL_1_8"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
344 ptr->gi = GUARD_INTERVAL_1_8;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
345 else ptr->gi = GUARD_INTERVAL_1_4;
13155
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
346
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
347 if(! strcmp(tmp_lcr, "FEC_1_2"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
348 ptr->cr_lp =FEC_1_2;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
349 else if(! strcmp(tmp_lcr, "FEC_2_3"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
350 ptr->cr_lp =FEC_2_3;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
351 else if(! strcmp(tmp_lcr, "FEC_3_4"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
352 ptr->cr_lp =FEC_3_4;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
353 #ifdef HAVE_DVB_HEAD
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
354 else if(! strcmp(tmp_lcr, "FEC_4_5"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
355 ptr->cr_lp =FEC_4_5;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
356 else if(! strcmp(tmp_lcr, "FEC_6_7"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
357 ptr->cr_lp =FEC_6_7;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
358 else if(! strcmp(tmp_lcr, "FEC_8_9"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
359 ptr->cr_lp =FEC_8_9;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
360 #endif
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
361 else if(! strcmp(tmp_lcr, "FEC_5_6"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
362 ptr->cr_lp =FEC_5_6;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
363 else if(! strcmp(tmp_lcr, "FEC_7_8"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
364 ptr->cr_lp =FEC_7_8;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
365 else if(! strcmp(tmp_lcr, "FEC_NONE"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
366 ptr->cr_lp =FEC_NONE;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
367 else ptr->cr_lp =FEC_AUTO;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
368
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
369
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
370 if(! strcmp(tmp_hier, "HIERARCHY_1"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
371 ptr->hier = HIERARCHY_1;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
372 else if(! strcmp(tmp_hier, "HIERARCHY_2"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
373 ptr->hier = HIERARCHY_2;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
374 else if(! strcmp(tmp_hier, "HIERARCHY_4"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
375 ptr->hier = HIERARCHY_4;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
376 #ifdef HAVE_DVB_HEAD
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
377 else if(! strcmp(tmp_hier, "HIERARCHY_AUTO"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
378 ptr->hier = HIERARCHY_AUTO;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
379 #endif
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
380 else ptr->hier = HIERARCHY_NONE;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
381 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
382
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
383 tmp = (dvb_channel_t*)realloc(list->channels, sizeof(dvb_channel_t) * (list->NUM_CHANNELS + 1));
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
384 if(tmp == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
385 break;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
386
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
387 list->channels = tmp;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
388 memcpy(&(list->channels[list->NUM_CHANNELS]), ptr, sizeof(dvb_channel_t));
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
389 list->NUM_CHANNELS++;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
390 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
391
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
392 fclose(f);
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
393 if(list->NUM_CHANNELS == 0)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
394 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
395 if(list->channels != NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
396 free(list->channels);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
397 free(list);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
398 return NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
399 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
400
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
401 list->current = 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
402 return list;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
403 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
404
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
405
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
406
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
407 static int dvb_streaming_read(stream_t *stream, char *buffer, int size)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
408 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
409 struct pollfd pfds[1];
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
410 int pos=0, tries, rk, fd;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
411 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
412
12047
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
413 mp_msg(MSGT_DEMUX, MSGL_DBG3, "dvb_streaming_read(%d)\n", size);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
414
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
415 tries = priv->retry + 1;
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
416
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
417 fd = stream->fd;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
418 while(pos < size)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
419 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
420 pfds[0].fd = fd;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
421 pfds[0].events = POLLIN | POLLPRI;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
422
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
423 rk = size - pos;
15213
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
424 if(poll(pfds, 1, 500) <= 0)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
425 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
426 errno = 0;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
427 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_streaming_read, attempt N. %d failed with errno %d when reading %d bytes\n", tries, errno, size-pos);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
428 if(--tries > 0)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
429 continue;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
430 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
431 break;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
432 }
15213
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
433 if((rk = read(fd, &buffer[pos], rk)) > 0)
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
434 {
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
435 pos += rk;
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
436 mp_msg(MSGT_DEMUX, MSGL_DBG3, "ret (%d) bytes\n", pos);
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
437 }
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
438 }
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
439
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
440
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
441 if(! pos)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
442 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_streaming_read, return %d bytes\n", pos);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
443
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
444 return pos;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
445 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
446
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
447 static void dvbin_close(stream_t *stream);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
448
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
449 int dvb_set_channel(dvb_priv_t *priv, int card, int n)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
450 {
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
451 dvb_channels_list *new_list;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
452 dvb_channel_t *channel;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
453 int do_tuning;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
454 stream_t *stream = (stream_t*) priv->stream;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
455 char buf[4096];
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
456 dvb_config_t *conf = (dvb_config_t *) priv->config;
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
457 int devno;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
458 int i;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
459
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
460 if((card < 0) || (card > conf->count))
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
461 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
462 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CARD NUMBER: %d vs %d, abort\n", card, conf->count);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
463 return 0;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
464 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
465
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
466 devno = conf->cards[card].devno;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
467 new_list = conf->cards[card].list;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
468 if((n > new_list->NUM_CHANNELS) || (n < 0))
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
469 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
470 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CHANNEL NUMBER: %d, for card %d, abort\n", n, card);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
471 return 0;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
472 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
473 channel = &(new_list->channels[n]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
474
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
475 if(priv->is_on) //the fds are already open and we have to stop the demuxers
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
476 {
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
477 for(i = 0; i < priv->demux_fds_cnt; i++)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
478 dvb_demux_stop(priv->demux_fds[i]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
479
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
480 priv->retry = 0;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
481 while(dvb_streaming_read(stream, buf, 4096) > 0); //empty both the stream's and driver's buffer
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
482 if(priv->card != card)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
483 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
484 dvbin_close(stream);
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
485 if(! dvb_open_devices(priv, devno, channel->pids_cnt, channel->pids))
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
486 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
487 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
488 return 0;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
489 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
490 strcpy(priv->prev_tuning, "");
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
491 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
492 else //close all demux_fds with pos > pids required for the new channel or open other demux_fds if we have too few
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
493 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
494 if(! dvb_fix_demuxes(priv, channel->pids_cnt, channel->pids))
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
495 return 0;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
496 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
497 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
498 else
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
499 {
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
500 if(! dvb_open_devices(priv, devno, channel->pids_cnt, channel->pids))
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
501 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
502 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL2, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
503 return 0;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
504 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
505 strcpy(priv->prev_tuning, "");
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
506 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
507
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
508 dvb_config->priv = priv;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
509 priv->card = card;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
510 priv->list = new_list;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
511 priv->retry = 5;
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
512 new_list->current = n;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
513 stream->fd = priv->dvr_fd;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
514 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_SET_CHANNEL: new channel name=%s, card: %d, channel %d\n", channel->name, card, n);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
515
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
516 switch(priv->tuner_type)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
517 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
518 case TUNER_SAT:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
519 sprintf(priv->new_tuning, "%d|%09d|%09d|%d|%c", priv->card, channel->freq, channel->srate, channel->diseqc, channel->pol);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
520 break;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
521
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
522 case TUNER_TER:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
523 sprintf(priv->new_tuning, "%d|%09d|%d|%d|%d|%d|%d|%d", priv->card, channel->freq, channel->inv,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
524 channel->bw, channel->cr, channel->mod, channel->trans, channel->gi);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
525 break;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
526
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
527 case TUNER_CBL:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
528 sprintf(priv->new_tuning, "%d|%09d|%d|%d|%d|%d", priv->card, channel->freq, channel->inv, channel->srate,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
529 channel->cr, channel->mod);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
530 break;
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
531 #ifdef DVB_ATSC
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
532 case TUNER_ATSC:
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
533 sprintf(priv->new_tuning, "%d|%09d|%d", priv->card, channel->freq, channel->mod);
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
534 break;
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
535 #endif
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
536 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
537
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
538
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
539
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
540 if(strcmp(priv->prev_tuning, priv->new_tuning))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
541 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
542 mp_msg(MSGT_DEMUX, MSGL_V, "DIFFERENT TUNING THAN THE PREVIOUS: %s -> %s\n", priv->prev_tuning, priv->new_tuning);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
543 strcpy(priv->prev_tuning, priv->new_tuning);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
544 do_tuning = 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
545 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
546 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
547 {
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
548 mp_msg(MSGT_DEMUX, MSGL_V, "SAME TUNING PARAMETERS, NO TUNING\n");
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
549 do_tuning = 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
550 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
551
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
552 stream->eof=1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
553 stream_reset(stream);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
554
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
555
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
556 if(do_tuning)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
557 if (! dvb_tune(priv, channel->freq, channel->pol, channel->srate, channel->diseqc, channel->tone,
13155
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
558 channel->inv, channel->mod, channel->gi, channel->trans, channel->bw, channel->cr, channel->cr_lp, channel->hier))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
559 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
561
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
562 priv->is_on = 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
563
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
564 //sets demux filters and restart the stream
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
565 for(i = 0; i < channel->pids_cnt; i++)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
566 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
567 if(! dvb_set_ts_filt(priv->demux_fds[i], channel->pids[i], DMX_PES_OTHER))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
568 return 0;
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
569 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
570
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
571 return 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
572 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
573
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
574
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
575
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
576 int dvb_step_channel(dvb_priv_t *priv, int dir)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
577 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
578 int new_current;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
579 dvb_channels_list *list;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
580
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
581 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_STEP_CHANNEL dir %d\n", dir);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
582
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
583 if(priv == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
584 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
585 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL priv_ptr, quit\n");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
586 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
587 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
588
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
589 list = priv->list;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
590 if(list == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
591 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
592 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL list_ptr, quit\n");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
593 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
594 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
595
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
596
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
597 if(dir == DVB_CHANNEL_HIGHER)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
598 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
599 if(list->current == list->NUM_CHANNELS-1)
17681
0acfff9388f6 DVB channels cycling; patch by Ben Zores ben p geekbox d org
nicodvb
parents: 17566
diff changeset
600 new_current=0;
0acfff9388f6 DVB channels cycling; patch by Ben Zores ben p geekbox d org
nicodvb
parents: 17566
diff changeset
601 else
0acfff9388f6 DVB channels cycling; patch by Ben Zores ben p geekbox d org
nicodvb
parents: 17566
diff changeset
602 new_current = list->current + 1;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
603 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
604 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
605 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
606 if(list->current == 0)
17681
0acfff9388f6 DVB channels cycling; patch by Ben Zores ben p geekbox d org
nicodvb
parents: 17566
diff changeset
607 new_current=list->NUM_CHANNELS-1;
0acfff9388f6 DVB channels cycling; patch by Ben Zores ben p geekbox d org
nicodvb
parents: 17566
diff changeset
608 else
0acfff9388f6 DVB channels cycling; patch by Ben Zores ben p geekbox d org
nicodvb
parents: 17566
diff changeset
609 new_current = list->current - 1;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
610 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
611
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
612 return dvb_set_channel(priv, priv->card, new_current);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
613 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
614
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
615
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
616
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
617
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
618 extern char *get_path(char *);
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
619
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
620 static void dvbin_close(stream_t *stream)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
621 {
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
622 int i;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
623 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
624
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
625 for(i = priv->demux_fds_cnt-1; i >= 0; i--)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
626 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
627 priv->demux_fds_cnt--;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
628 mp_msg(MSGT_DEMUX, MSGL_V, "DVBIN_CLOSE, close(%d), fd=%d, COUNT=%d\n", i, priv->demux_fds[i], priv->demux_fds_cnt);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
629 close(priv->demux_fds[i]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
630 }
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
631 close(priv->dvr_fd);
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
632
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
633 close(priv->fe_fd);
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
634 #ifdef HAVE_DVB
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
635 close(priv->sec_fd);
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
636 #endif
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
637
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
638 priv->is_on = 0;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
639 dvb_config->priv = NULL;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
640 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
641
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
642
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
643 static int dvb_streaming_start(dvb_priv_t *priv, struct stream_priv_s *opts, int tuner_type, char *progname)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
644 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
645 int i;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
646 dvb_channel_t *channel = NULL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
647 stream_t *stream = (stream_t*) priv->stream;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
648
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
649
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
650 mp_msg(MSGT_DEMUX, MSGL_INFO, "code taken from dvbstream for mplayer v0.4pre1 - (C) Dave Chapman 2001\n");
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
651 mp_msg(MSGT_DEMUX, MSGL_INFO, "Released under the GPL.\n");
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
652 mp_msg(MSGT_DEMUX, MSGL_INFO, "Latest version available from http://www.linuxstb.org/\n");
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
653 mp_msg(MSGT_DEMUX, MSGL_V, "PROG: %s, CARD: %d, VID: %d, AID: %d, TYPE: %s, FILE: %s\n",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
654 opts->prog, opts->card, opts->vid, opts->aid, opts->type, opts->file);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
655
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
656 priv->is_on = 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
657
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
658 i = 0;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
659 while((channel == NULL) && i < priv->list->NUM_CHANNELS)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
660 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
661 if(! strcmp(priv->list->channels[i].name, progname))
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
662 channel = &(priv->list->channels[i]);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
663
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
664 i++;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
665 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
666
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
667 if(channel != NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
668 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
669 priv->list->current = i-1;
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
670 mp_msg(MSGT_DEMUX, MSGL_V, "PROGRAM NUMBER %d: name=%s, freq=%u\n", i-1, channel->name, channel->freq);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
671 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
672 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
673 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
674 mp_msg(MSGT_DEMUX, MSGL_ERR, "\n\nDVBIN: no such channel \"%s\"\n\n", progname);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
675 return 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
676 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
677
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
678
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
679 strcpy(priv->prev_tuning, "");
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
680 if(!dvb_set_channel(priv, priv->card, priv->list->current))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
681 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
682 mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR, COULDN'T SET CHANNEL %i: ", priv->list->current);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
683 dvbin_close(stream);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
684 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
685 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
686
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
687 mp_msg(MSGT_DEMUX, MSGL_V, "SUCCESSFUL EXIT from dvb_streaming_start\n");
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
688
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
689 return 1;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
690 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
691
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
692
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
693
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
694
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
695 static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
696 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
697 // I don't force the file format bacause, although it's almost always TS,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
698 // there are some providers that stream an IP multicast with M$ Mpeg4 inside
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
699 struct stream_priv_s* p = (struct stream_priv_s*)opts;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
700 dvb_priv_t *priv;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
701 char *progname;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
702 int tuner_type = 0;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
703
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
704
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
705 if(mode != STREAM_READ)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
706 return STREAM_UNSUPORTED;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
707
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
708 stream->priv = (dvb_priv_t*) malloc(sizeof(dvb_priv_t));
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
709 if(stream->priv == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
710 return STREAM_ERROR;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
711
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
712 priv = (dvb_priv_t *)stream->priv;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
713 priv->stream = stream;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
714 dvb_config = dvb_get_config();
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
715 if(dvb_config == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
716 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
717 free(priv);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
718 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB CONFIGURATION IS EMPTY, exit\n");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
719 return STREAM_ERROR;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
720 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
721 dvb_config->priv = priv;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
722 priv->config = dvb_config;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
723
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
724 if(p->card < 1 || p->card > priv->config->count)
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
725 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
726 free(priv);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
727 mp_msg(MSGT_DEMUX, MSGL_ERR, "NO CONFIGURATION FOUND FOR CARD N. %d, exit\n", p->card);
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
728 return STREAM_ERROR;
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
729 }
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
730 priv->card = p->card - 1;
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
731
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
732 tuner_type = priv->config->cards[priv->card].type;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
733
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
734 if(tuner_type == 0)
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
735 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
736 free(priv);
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
737 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: UNKNOWN OR UNDETECTABLE TUNER TYPE, EXIT\n");
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
738 return STREAM_ERROR;
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
739 }
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
740
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
741
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
742 priv->tuner_type = tuner_type;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
743
12108
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
744 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: prog=%s, card=%d, type=%d, vid=%d, aid=%d\n",
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
745 p->prog, priv->card+1, priv->tuner_type, p->vid, p->aid);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
746
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
747 priv->list = priv->config->cards[priv->card].list;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
748
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
749 if((! strcmp(p->prog, "")) && (priv->list != NULL))
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
750 progname = priv->list->channels[0].name;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
751 else
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
752 progname = p->prog;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
753
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
754
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
755 if(! dvb_streaming_start(priv, p, tuner_type, progname))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
756 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
757 free(stream->priv);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
758 stream->priv = NULL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
759 return STREAM_ERROR;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
760 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
761
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
762 stream->type = STREAMTYPE_DVB;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
763 stream->fill_buffer = dvb_streaming_read;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
764 stream->close = dvbin_close;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
765 m_struct_free(&stream_opts, opts);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
766
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
767 return STREAM_OK;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
768 }
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
769
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
770 #define MAX_CARDS 4
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17012
diff changeset
771 dvb_config_t *dvb_get_config(void)
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
772 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
773 int i, fd, type, size;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
774 char filename[30], *conf_file, *name;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
775 dvb_channels_list *list;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
776 dvb_card_config_t *cards = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
777 dvb_config_t *conf = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
778
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
779 if(dvb_config != NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
780 return dvb_config;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
781
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
782 conf = (dvb_config_t*) malloc(sizeof(dvb_config_t));
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
783 if(conf == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
784 return NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
785
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
786 conf->priv = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
787 conf->count = 0;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
788 conf->cards = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
789 for(i=0; i<MAX_CARDS; i++)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
790 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
791 sprintf(filename, "/dev/dvb/adapter%d/frontend0", i);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
792 fd = open(filename, O_RDWR | O_NONBLOCK);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
793 if(fd < 0)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
794 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
795 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't open device %s, skipping\n", filename);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
796 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
797 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
798
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
799 type = dvb_get_tuner_type(fd);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
800 close(fd);
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
801 if(type != TUNER_SAT && type != TUNER_TER && type != TUNER_CBL && type != TUNER_ATSC)
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
802 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
803 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't detect tuner type of card %d, skipping\n", i);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
804 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
805 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
806
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
807 switch(type)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
808 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
809 case TUNER_TER:
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
810 conf_file = get_path("channels.conf.ter");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
811 break;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
812 case TUNER_CBL:
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
813 conf_file = get_path("channels.conf.cbl");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
814 break;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
815 case TUNER_SAT:
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
816 conf_file = get_path("channels.conf.sat");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
817 break;
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
818 case TUNER_ATSC:
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
819 conf_file = get_path("channels.conf.atsc");
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
820 break;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
821 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
822
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
823 if((access(conf_file, F_OK | R_OK) != 0))
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
824 conf_file = get_path("channels.conf");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
825
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
826 list = dvb_get_channels(conf_file, type);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
827 if(list == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
828 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
829
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
830 size = sizeof(dvb_card_config_t) * (conf->count + 1);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
831 cards = realloc(conf->cards, size);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
832
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
833 if(cards == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
834 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
835 fprintf(stderr, "DVB_CONFIG, can't realloc %d bytes, skipping\n", size);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
836 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
837 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
838
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
839 name = (char*) malloc(20);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
840 if(name==NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
841 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
842 fprintf(stderr, "DVB_CONFIG, can't realloc 20 bytes, skipping\n");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
843 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
844 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
845
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
846 conf->cards = cards;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
847 conf->cards[conf->count].devno = i;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
848 conf->cards[conf->count].list = list;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
849 conf->cards[conf->count].type = type;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
850 sprintf(name, "DVB-%c card n. %d", type==TUNER_TER ? 'T' : (type==TUNER_CBL ? 'C' : 'S'), conf->count+1);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
851 conf->cards[conf->count].name = name;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
852 conf->count++;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
853 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
854
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
855 if(conf->count == 0)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
856 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
857 free(conf);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
858 conf = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
859 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
860
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
861 dvb_config = conf;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
862 return conf;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
863 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
864
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
865
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
866
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
867 stream_info_t stream_info_dvb = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
868 "Dvb Input",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
869 "dvbin",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
870 "Nico",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
871 "based on the code from ??? (probably Arpi)",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
872 dvb_open,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
873 { "dvb", NULL },
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
874 &stream_opts,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
875 1 // Urls are an option string
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
876 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
877
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
878
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
879
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
880