annotate libmpdemux/dvbin.c @ 18843:df3924884fd0

Remove bogus stream_eof() test - av_read_frame() has its own buffer and can still return usable data after the underlying stream_t has EOF'ed.
author pacman
date Wed, 28 Jun 2006 19:27:04 +0000
parents 0783dd397f74
children e60c8c7399d2
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
18783
0783dd397f74 CVS --> Subversion in copyright notices
diego
parents: 18561
diff changeset
8 Modified for use with MPlayer, for details see the changelog at
0783dd397f74 CVS --> Subversion in copyright notices
diego
parents: 18561
diff changeset
9 http://svn.mplayerhq.hu/mplayer/trunk/
15178
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;
18561
15fbdb09330f configurable tuning timeout
nicodvb
parents: 18513
diff changeset
67 int timeout;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
68 char *file;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
69 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
70 stream_defaults =
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
71 {
18561
15fbdb09330f configurable tuning timeout
nicodvb
parents: 18513
diff changeset
72 "", 1, "", 0, 0, 3, NULL
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
73 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
74
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
75 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
76
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
77 /// URL definition
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
78 static m_option_t stream_params[] = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
79 {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
80 {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
81 {"type", ST_OFF(type), CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
82 {"vid", ST_OFF(vid), CONF_TYPE_INT, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
83 {"aid", ST_OFF(aid), CONF_TYPE_INT, 0, 0 ,0, NULL},
18561
15fbdb09330f configurable tuning timeout
nicodvb
parents: 18513
diff changeset
84 {"timeout",ST_OFF(timeout), CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL},
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
85 {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
86
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
87 {"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
88 {"username", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
89 {NULL, NULL, 0, 0, 0, 0, NULL}
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
90 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
91
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
92 static struct m_struct_st stream_opts = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
93 "dvbin",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
94 sizeof(struct stream_priv_s),
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
95 &stream_defaults,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
96 stream_params
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
97 };
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
98
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
99
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
100
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
101 m_option_t dvbin_opts_conf[] = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
102 {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
103 {"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
104 {"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
105 {"vid", &stream_defaults.vid, CONF_TYPE_INT, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
106 {"aid", &stream_defaults.aid, CONF_TYPE_INT, 0, 0 ,0, NULL},
18561
15fbdb09330f configurable tuning timeout
nicodvb
parents: 18513
diff changeset
107 {"timeout", &stream_defaults.timeout, CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL},
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
108 {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL},
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
109
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
110 {NULL, NULL, 0, 0, 0, 0, NULL}
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
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
114
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
115
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
116 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
117 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
118 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
119 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
120 int dvb_fix_demuxes(dvb_priv_t *priv, int cnt, int *pids);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
121
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
122 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
123 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
124 fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth, fe_code_rate_t HP_CodeRate,
18561
15fbdb09330f configurable tuning timeout
nicodvb
parents: 18513
diff changeset
125 fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier, int timeout);
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
126 extern char *dvb_dvrdev[4], *dvb_demuxdev[4], *dvb_frontenddev[4];
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
127
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
128 static dvb_config_t *dvb_config = NULL;
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
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
131 static dvb_channels_list *dvb_get_channels(char *filename, int type)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
132 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
133 dvb_channels_list *list;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
134 FILE *f;
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
135 char line[CHANNEL_LINE_LEN], *colon;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
136
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
137 int fields, cnt, pcnt, k;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
138 dvb_channel_t *ptr, *tmp, chn;
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
139 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
140 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
141 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
142 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
143 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
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_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
146 if((f=fopen(filename, "r"))==NULL)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
147 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
148 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
149 return NULL;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
150 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
151
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
152 list = malloc(sizeof(dvb_channels_list));
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
153 if(list == NULL)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
154 {
17820
4e04e61b54ac close channels file before exiting dvb_get_channels() if malloc(dvb_channels_list) fails; closes cid 161
nicodvb
parents: 17681
diff changeset
155 fclose(f);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
156 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
157 return NULL;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
158 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
159
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
160 ptr = &chn;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
161 list->NUM_CHANNELS = 0;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
162 list->channels = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
163 while(! feof(f))
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( fgets(line, CHANNEL_LINE_LEN, f) == NULL )
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
166 continue;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
167
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
168 if((line[0] == '#') || (strlen(line) == 0))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
169 continue;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
170
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
171 colon = index(line, ':');
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
172 if(colon)
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
173 {
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
174 k = colon - line;
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
175 if(!k)
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 ptr->name = (char*) malloc(k+1);
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
178 if(! ptr->name)
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
179 continue;
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
180 strncpy(ptr->name, line, k);
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
181 ptr->name[k] = 0;
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
182 }
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
183 else
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
184 continue;
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
185 k++;
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
186 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
187 ptr->pids_cnt = 0;
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
188 ptr->freq = 0;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
189 if(type == TUNER_TER)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
190 {
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
191 fields = sscanf(&line[k], ter_conf,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
192 &ptr->freq, inv, bw, cr, tmp_lcr, mod,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
193 transm, gi, tmp_hier, vpid_str, apid_str);
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
194 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
195 "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
196 list->NUM_CHANNELS, fields, ptr->name, ptr->freq);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
197 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
198 else if(type == TUNER_CBL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
199 {
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
200 fields = sscanf(&line[k], cbl_conf,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
201 &ptr->freq, inv, &ptr->srate,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
202 cr, mod, vpid_str, apid_str);
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
203 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
204 "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
205 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
206 }
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
207 #ifdef DVB_ATSC
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
208 else if(type == TUNER_ATSC)
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
209 {
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
210 fields = sscanf(&line[k], atsc_conf,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
211 &ptr->freq, mod, vpid_str, apid_str);
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
212 mp_msg(MSGT_DEMUX, MSGL_V,
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
213 "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
214 list->NUM_CHANNELS, fields, ptr->name, ptr->freq);
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
215 }
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
216 #endif
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
217 else //SATELLITE
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
218 {
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
219 fields = sscanf(&line[k], sat_conf,
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
220 &ptr->freq, &ptr->pol, &ptr->diseqc, &ptr->srate, vpid_str, apid_str);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
221 ptr->pol = toupper(ptr->pol);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
222 ptr->freq *= 1000UL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
223 ptr->srate *= 1000UL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
224 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
225 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
226 ptr->cr = FEC_AUTO;
12116
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
227 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
228 continue;
12116
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
229 if(ptr->diseqc > 0)
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
230 ptr->diseqc--;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
231 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
232 "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
233 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate, ptr->pol, ptr->diseqc);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
234 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
235
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
236 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
237 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
238 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
239 &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
240 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
241 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
242 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
243 fields++;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
244 }
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
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
247 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
248 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
249 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
250 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
251 &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
252 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
253 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
254 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
255 fields++;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
256 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
257 }
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
258
16516
89ead8b64b69 removed dependency on glibc's %a in sscanf()
nicodvb
parents: 15213
diff changeset
259 if((fields < 2) || (ptr->pids_cnt <= 0) || (ptr->freq == 0) || (strlen(ptr->name) == 0))
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
260 continue;
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
261
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
262
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
263 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
264 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, " PIDS: ");
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
266 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
267 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
268 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
269
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
270 if((type == TUNER_TER) || (type == TUNER_CBL))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
271 {
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
272 if(! strcmp(inv, "INVERSION_ON"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
273 ptr->inv = INVERSION_ON;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
274 else if(! strcmp(inv, "INVERSION_OFF"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
275 ptr->inv = INVERSION_OFF;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
276 else
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
277 ptr->inv = INVERSION_AUTO;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
278
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
279
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
280 if(! strcmp(cr, "FEC_1_2"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
281 ptr->cr =FEC_1_2;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
282 else if(! strcmp(cr, "FEC_2_3"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
283 ptr->cr =FEC_2_3;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
284 else if(! strcmp(cr, "FEC_3_4"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
285 ptr->cr =FEC_3_4;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
286 #ifdef HAVE_DVB_HEAD
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
287 else if(! strcmp(cr, "FEC_4_5"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
288 ptr->cr =FEC_4_5;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
289 else if(! strcmp(cr, "FEC_6_7"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
290 ptr->cr =FEC_6_7;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
291 else if(! strcmp(cr, "FEC_8_9"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
292 ptr->cr =FEC_8_9;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
293 #endif
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
294 else if(! strcmp(cr, "FEC_5_6"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
295 ptr->cr =FEC_5_6;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
296 else if(! strcmp(cr, "FEC_7_8"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
297 ptr->cr =FEC_7_8;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
298 else if(! strcmp(cr, "FEC_NONE"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
299 ptr->cr =FEC_NONE;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
300 else ptr->cr =FEC_AUTO;
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
301 }
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
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
304 if((type == TUNER_TER) || (type == TUNER_CBL) || (type == TUNER_ATSC))
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
305 {
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
306 if(! strcmp(mod, "QAM_128"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
307 ptr->mod = QAM_128;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
308 else if(! strcmp(mod, "QAM_256"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
309 ptr->mod = QAM_256;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
310 else if(! strcmp(mod, "QAM_64"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
311 ptr->mod = QAM_64;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
312 else if(! strcmp(mod, "QAM_32"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
313 ptr->mod = QAM_32;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
314 else if(! strcmp(mod, "QAM_16"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
315 ptr->mod = QAM_16;
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
316 #ifdef DVB_ATSC
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
317 else if(! strcmp(mod, "VSB_8") || ! strcmp(mod, "8VSB"))
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
318 ptr->mod = VSB_8;
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
319 else if(! strcmp(mod, "VSB_16") || !strcmp(mod, "16VSB"))
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
320 ptr->mod = VSB_16;
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
321
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
322 ptr->inv = INVERSION_AUTO;
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
323 #endif
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
324 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
325
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
326 if(type == TUNER_TER)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
327 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
328 if(! strcmp(bw, "BANDWIDTH_6_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
329 ptr->bw = BANDWIDTH_6_MHZ;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
330 else if(! strcmp(bw, "BANDWIDTH_7_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
331 ptr->bw = BANDWIDTH_7_MHZ;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
332 else if(! strcmp(bw, "BANDWIDTH_8_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
333 ptr->bw = BANDWIDTH_8_MHZ;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
334
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
335
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
336 if(! strcmp(transm, "TRANSMISSION_MODE_2K"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
337 ptr->trans = TRANSMISSION_MODE_2K;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
338 else if(! strcmp(transm, "TRANSMISSION_MODE_8K"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
339 ptr->trans = TRANSMISSION_MODE_8K;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
340
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
341
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
342 if(! strcmp(gi, "GUARD_INTERVAL_1_32"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
343 ptr->gi = GUARD_INTERVAL_1_32;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
344 else if(! strcmp(gi, "GUARD_INTERVAL_1_16"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
345 ptr->gi = GUARD_INTERVAL_1_16;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
346 else if(! strcmp(gi, "GUARD_INTERVAL_1_8"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
347 ptr->gi = GUARD_INTERVAL_1_8;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
348 else ptr->gi = GUARD_INTERVAL_1_4;
13155
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
349
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
350 if(! strcmp(tmp_lcr, "FEC_1_2"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
351 ptr->cr_lp =FEC_1_2;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
352 else if(! strcmp(tmp_lcr, "FEC_2_3"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
353 ptr->cr_lp =FEC_2_3;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
354 else if(! strcmp(tmp_lcr, "FEC_3_4"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
355 ptr->cr_lp =FEC_3_4;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
356 #ifdef HAVE_DVB_HEAD
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
357 else if(! strcmp(tmp_lcr, "FEC_4_5"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
358 ptr->cr_lp =FEC_4_5;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
359 else if(! strcmp(tmp_lcr, "FEC_6_7"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
360 ptr->cr_lp =FEC_6_7;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
361 else if(! strcmp(tmp_lcr, "FEC_8_9"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
362 ptr->cr_lp =FEC_8_9;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
363 #endif
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
364 else if(! strcmp(tmp_lcr, "FEC_5_6"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
365 ptr->cr_lp =FEC_5_6;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
366 else if(! strcmp(tmp_lcr, "FEC_7_8"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
367 ptr->cr_lp =FEC_7_8;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
368 else if(! strcmp(tmp_lcr, "FEC_NONE"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
369 ptr->cr_lp =FEC_NONE;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
370 else ptr->cr_lp =FEC_AUTO;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
371
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
372
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
373 if(! strcmp(tmp_hier, "HIERARCHY_1"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
374 ptr->hier = HIERARCHY_1;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
375 else if(! strcmp(tmp_hier, "HIERARCHY_2"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
376 ptr->hier = HIERARCHY_2;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
377 else if(! strcmp(tmp_hier, "HIERARCHY_4"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
378 ptr->hier = HIERARCHY_4;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
379 #ifdef HAVE_DVB_HEAD
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
380 else if(! strcmp(tmp_hier, "HIERARCHY_AUTO"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
381 ptr->hier = HIERARCHY_AUTO;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
382 #endif
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
383 else ptr->hier = HIERARCHY_NONE;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
384 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
385
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
386 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
387 if(tmp == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
388 break;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
389
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
390 list->channels = tmp;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
391 memcpy(&(list->channels[list->NUM_CHANNELS]), ptr, sizeof(dvb_channel_t));
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
392 list->NUM_CHANNELS++;
18471
aa9ae54516c3 unconditionally stop allocating memory for dvb_channel_t after 1 MB: it's unreasonably big
nicodvb
parents: 17820
diff changeset
393 if(sizeof(dvb_channel_t) * list->NUM_CHANNELS >= 1024*1024)
aa9ae54516c3 unconditionally stop allocating memory for dvb_channel_t after 1 MB: it's unreasonably big
nicodvb
parents: 17820
diff changeset
394 {
aa9ae54516c3 unconditionally stop allocating memory for dvb_channel_t after 1 MB: it's unreasonably big
nicodvb
parents: 17820
diff changeset
395 mp_msg(MSGT_DEMUX, MSGL_V, "dvbin.c, > 1MB allocated for channels struct, dropping the rest of the file\r\n");
aa9ae54516c3 unconditionally stop allocating memory for dvb_channel_t after 1 MB: it's unreasonably big
nicodvb
parents: 17820
diff changeset
396 break;
aa9ae54516c3 unconditionally stop allocating memory for dvb_channel_t after 1 MB: it's unreasonably big
nicodvb
parents: 17820
diff changeset
397 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
398 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
399
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
400 fclose(f);
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
401 if(list->NUM_CHANNELS == 0)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
402 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
403 if(list->channels != NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
404 free(list->channels);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
405 free(list);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
406 return NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
407 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
408
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
409 list->current = 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
410 return list;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
411 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
412
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
413
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
414
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
415 static int dvb_streaming_read(stream_t *stream, char *buffer, int size)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
416 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
417 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
418 int pos=0, tries, rk, fd;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
419 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
420
12047
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
421 mp_msg(MSGT_DEMUX, MSGL_DBG3, "dvb_streaming_read(%d)\n", size);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
422
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
423 tries = priv->retry + 1;
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
424
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
425 fd = stream->fd;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
426 while(pos < size)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
427 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
428 pfds[0].fd = fd;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
429 pfds[0].events = POLLIN | POLLPRI;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
430
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
431 rk = size - pos;
15213
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
432 if(poll(pfds, 1, 500) <= 0)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
433 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
434 errno = 0;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
435 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
436 if(--tries > 0)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
437 continue;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
438 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
439 break;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
440 }
15213
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
441 if((rk = read(fd, &buffer[pos], rk)) > 0)
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
442 {
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
443 pos += rk;
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
444 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
445 }
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
446 }
4d8a0ecce6ac check the result of poll() before read()ing; 100l
nicodvb
parents: 15178
diff changeset
447
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
448
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
449 if(! pos)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
450 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
451
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
452 return pos;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
453 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
454
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
455 static void dvbin_close(stream_t *stream);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
456
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
457 int dvb_set_channel(dvb_priv_t *priv, int card, int n)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
458 {
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
459 dvb_channels_list *new_list;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
460 dvb_channel_t *channel;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
461 int do_tuning;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
462 stream_t *stream = (stream_t*) priv->stream;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
463 char buf[4096];
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
464 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
465 int devno;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
466 int i;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
467
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
468 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
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 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
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
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
474 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
475 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
476 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
477 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
478 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
479 return 0;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
480 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
481 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
482
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
483 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
484 {
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
485 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
486 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
487
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
488 priv->retry = 0;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
489 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
490 if(priv->card != card)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
491 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
492 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
493 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
494 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
495 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
496 return 0;
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 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
499 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
500 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
501 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
502 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
503 return 0;
12307
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 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
506 else
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
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 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
509 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
510 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
511 return 0;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
512 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
513 strcpy(priv->prev_tuning, "");
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
514 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
515
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
516 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
517 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
518 priv->list = new_list;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
519 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
520 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
521 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
522 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
523
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
524 switch(priv->tuner_type)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
525 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
526 case TUNER_SAT:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
527 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
528 break;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
529
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
530 case TUNER_TER:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
531 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
532 channel->bw, channel->cr, channel->mod, channel->trans, channel->gi);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
533 break;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
534
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
535 case TUNER_CBL:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
536 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
537 channel->cr, channel->mod);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
538 break;
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
539 #ifdef DVB_ATSC
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
540 case TUNER_ATSC:
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
541 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
542 break;
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
543 #endif
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
544 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
545
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
546
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
547
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
548 if(strcmp(priv->prev_tuning, priv->new_tuning))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
549 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
550 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
551 strcpy(priv->prev_tuning, priv->new_tuning);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
552 do_tuning = 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
553 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
554 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
555 {
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
556 mp_msg(MSGT_DEMUX, MSGL_V, "SAME TUNING PARAMETERS, NO TUNING\n");
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
557 do_tuning = 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
558 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
559
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
560 stream->eof=1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
561 stream_reset(stream);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
562
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
563
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
564 if(do_tuning)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
565 if (! dvb_tune(priv, channel->freq, channel->pol, channel->srate, channel->diseqc, channel->tone,
18561
15fbdb09330f configurable tuning timeout
nicodvb
parents: 18513
diff changeset
566 channel->inv, channel->mod, channel->gi, channel->trans, channel->bw, channel->cr, channel->cr_lp, channel->hier, priv->timeout))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
567 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
568
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
569
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
570 priv->is_on = 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
571
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
572 //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
573 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
574 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
575 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
576 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
577 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
578
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
579 return 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
580 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
581
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
582
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
583
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
584 int dvb_step_channel(dvb_priv_t *priv, int dir)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
585 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
586 int new_current;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
587 dvb_channels_list *list;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
588
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
589 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
590
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
591 if(priv == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
592 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
593 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL priv_ptr, quit\n");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
594 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
595 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
596
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
597 list = priv->list;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
598 if(list == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
599 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
600 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL list_ptr, quit\n");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
601 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
602 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
603
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
604
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
605 if(dir == DVB_CHANNEL_HIGHER)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
606 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
607 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
608 new_current=0;
0acfff9388f6 DVB channels cycling; patch by Ben Zores ben p geekbox d org
nicodvb
parents: 17566
diff changeset
609 else
0acfff9388f6 DVB channels cycling; patch by Ben Zores ben p geekbox d org
nicodvb
parents: 17566
diff changeset
610 new_current = list->current + 1;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
611 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
612 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
613 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
614 if(list->current == 0)
17681
0acfff9388f6 DVB channels cycling; patch by Ben Zores ben p geekbox d org
nicodvb
parents: 17566
diff changeset
615 new_current=list->NUM_CHANNELS-1;
0acfff9388f6 DVB channels cycling; patch by Ben Zores ben p geekbox d org
nicodvb
parents: 17566
diff changeset
616 else
0acfff9388f6 DVB channels cycling; patch by Ben Zores ben p geekbox d org
nicodvb
parents: 17566
diff changeset
617 new_current = list->current - 1;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
618 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
619
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
620 return dvb_set_channel(priv, priv->card, new_current);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
621 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
622
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
623
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
624
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
625
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
626 extern char *get_path(char *);
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
627
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
628 static void dvbin_close(stream_t *stream)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
629 {
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
630 int i;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
631 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
632
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
633 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
634 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
635 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
636 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
637 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
638 }
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
639 close(priv->dvr_fd);
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
640
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
641 close(priv->fe_fd);
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
642 #ifdef HAVE_DVB
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
643 close(priv->sec_fd);
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
644 #endif
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
645
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
646 priv->is_on = 0;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
647 dvb_config->priv = NULL;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
648 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
649
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
650
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
651 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
652 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
653 int i;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
654 dvb_channel_t *channel = NULL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
655 stream_t *stream = (stream_t*) priv->stream;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
656
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
657
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
658 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
659 mp_msg(MSGT_DEMUX, MSGL_INFO, "Released under the GPL.\n");
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
660 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
661 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
662 opts->prog, opts->card, opts->vid, opts->aid, opts->type, opts->file);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
663
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
664 priv->is_on = 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
665
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
666 i = 0;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
667 while((channel == NULL) && i < priv->list->NUM_CHANNELS)
10560
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 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
670 channel = &(priv->list->channels[i]);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
671
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
672 i++;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
673 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
674
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
675 if(channel != NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
676 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
677 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
678 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
679 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
680 else
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, "\n\nDVBIN: no such channel \"%s\"\n\n", progname);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
683 return 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
684 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
685
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
686
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
687 strcpy(priv->prev_tuning, "");
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
688 if(!dvb_set_channel(priv, priv->card, priv->list->current))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
689 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
690 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
691 dvbin_close(stream);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
692 return 0;
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 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
696
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
697 return 1;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
698 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
699
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
700
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
701
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
702
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
703 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
704 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
705 // I don't force the file format bacause, although it's almost always TS,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
706 // there are some providers that stream an IP multicast with M$ Mpeg4 inside
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
707 struct stream_priv_s* p = (struct stream_priv_s*)opts;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
708 dvb_priv_t *priv;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
709 char *progname;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
710 int tuner_type = 0;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
711
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
712
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
713 if(mode != STREAM_READ)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
714 return STREAM_UNSUPORTED;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
715
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
716 stream->priv = (dvb_priv_t*) malloc(sizeof(dvb_priv_t));
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
717 if(stream->priv == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
718 return STREAM_ERROR;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
719
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
720 priv = (dvb_priv_t *)stream->priv;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
721 priv->stream = stream;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
722 dvb_config = dvb_get_config();
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
723 if(dvb_config == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
724 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
725 free(priv);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
726 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
727 return STREAM_ERROR;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
728 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
729 dvb_config->priv = priv;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
730 priv->config = dvb_config;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
731
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
732 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
733 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
734 free(priv);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
735 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
736 return STREAM_ERROR;
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
737 }
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
738 priv->card = p->card - 1;
18561
15fbdb09330f configurable tuning timeout
nicodvb
parents: 18513
diff changeset
739 priv->timeout = p->timeout;
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
740
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
741 tuner_type = priv->config->cards[priv->card].type;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
742
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
743 if(tuner_type == 0)
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
744 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
745 free(priv);
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
746 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
747 return STREAM_ERROR;
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
748 }
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
749
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
750
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
751 priv->tuner_type = tuner_type;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
752
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
753 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
754 p->prog, priv->card+1, priv->tuner_type, p->vid, p->aid);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
755
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
756 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
757
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
758 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
759 progname = priv->list->channels[0].name;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
760 else
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
761 progname = p->prog;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
762
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
763
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
764 if(! dvb_streaming_start(priv, p, tuner_type, progname))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
765 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
766 free(stream->priv);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
767 stream->priv = NULL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
768 return STREAM_ERROR;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
769 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
770
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
771 stream->type = STREAMTYPE_DVB;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
772 stream->fill_buffer = dvb_streaming_read;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
773 stream->close = dvbin_close;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
774 m_struct_free(&stream_opts, opts);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
775
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
776 return STREAM_OK;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
777 }
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
778
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
779 #define MAX_CARDS 4
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17012
diff changeset
780 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
781 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
782 int i, fd, type, size;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
783 char filename[30], *conf_file, *name;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
784 dvb_channels_list *list;
18513
rathann
parents: 18472
diff changeset
785 dvb_card_config_t *cards = NULL, *tmp;
rathann
parents: 18472
diff changeset
786 dvb_config_t *conf = NULL;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
787
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
788 if(dvb_config != NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
789 return dvb_config;
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 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
792 if(conf == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
793 return NULL;
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 conf->priv = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
796 conf->count = 0;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
797 conf->cards = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
798 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
799 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
800 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
801 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
802 if(fd < 0)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
803 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
804 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
805 continue;
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
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
808 type = dvb_get_tuner_type(fd);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
809 close(fd);
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
810 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
811 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
812 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
813 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
814 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
815
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
816 switch(type)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
817 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
818 case TUNER_TER:
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
819 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
820 break;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
821 case TUNER_CBL:
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
822 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
823 break;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
824 case TUNER_SAT:
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
825 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
826 break;
14382
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
827 case TUNER_ATSC:
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
828 conf_file = get_path("channels.conf.atsc");
42d792053cde added support for ATSC tuner and conf.file
nicodvb
parents: 13155
diff changeset
829 break;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
830 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
831
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
832 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
833 conf_file = get_path("channels.conf");
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 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
836 if(list == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
837 continue;
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 size = sizeof(dvb_card_config_t) * (conf->count + 1);
18472
57cac8462fa8 prevent memleak
nicodvb
parents: 18471
diff changeset
840 tmp = realloc(conf->cards, size);
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
841
18472
57cac8462fa8 prevent memleak
nicodvb
parents: 18471
diff changeset
842 if(tmp == NULL)
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
843 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
844 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
845 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
846 }
18472
57cac8462fa8 prevent memleak
nicodvb
parents: 18471
diff changeset
847 cards = tmp;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
848
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
849 name = (char*) malloc(20);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
850 if(name==NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
851 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
852 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
853 continue;
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
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
856 conf->cards = cards;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
857 conf->cards[conf->count].devno = i;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
858 conf->cards[conf->count].list = list;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
859 conf->cards[conf->count].type = type;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
860 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
861 conf->cards[conf->count].name = name;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
862 conf->count++;
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
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
865 if(conf->count == 0)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
866 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
867 free(conf);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
868 conf = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
869 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
870
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
871 dvb_config = conf;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
872 return conf;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
873 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
874
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
875
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
876
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
877 stream_info_t stream_info_dvb = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
878 "Dvb Input",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
879 "dvbin",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
880 "Nico",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
881 "based on the code from ??? (probably Arpi)",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
882 dvb_open,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
883 { "dvb", NULL },
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
884 &stream_opts,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
885 1 // Urls are an option string
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
886 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
887
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
888
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
889
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
890