annotate stream/stream_dvb.c @ 35941:45da530449e4

Simplify if-clauses after r36034.
author ib
date Thu, 21 Mar 2013 11:19:34 +0000
parents a93891202051
children e89214f37501
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
1 /*
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
2
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
3 dvbstream
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
4 (C) Dave Chapman <dave@dchapman.com> 2001, 2002.
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
5
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
6 The latest version can be found at http://www.linuxstb.org/dvbstream
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
7
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
8 Modified for use with MPlayer, for details see the changelog at
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
9 http://svn.mplayerhq.hu/mplayer/trunk/
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
10 $Id$
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
11
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
12 Copyright notice:
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
13
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
14 This program is free software; you can redistribute it and/or modify
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
15 it under the terms of the GNU General Public License as published by
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
16 the Free Software Foundation; either version 2 of the License, or
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
17 (at your option) any later version.
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
18
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
19 This program is distributed in the hope that it will be useful,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
20 but WITHOUT ANY WARRANTY; without even the implied warranty of
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
22 GNU General Public License for more details.
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
23
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
24 You should have received a copy of the GNU General Public License
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
25 along with this program; if not, write to the Free Software
21977
cea0eb833758 Fix FSF address and otherwise broken license headers.
diego
parents: 21834
diff changeset
26 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
27
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
28 */
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
29
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
30 #include "config.h"
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
31 #include <stdio.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
32 #include <stdlib.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
33 #include <string.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
34 #include <ctype.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
35 #include <sys/ioctl.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
36 #include <sys/time.h>
27431
bb738b9ea7c4 Use '#include <poll.h>' instead of '#include <sys/poll.h>'.
diego
parents: 27370
diff changeset
37 #include <poll.h>
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
38 #include <unistd.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
39 #include <fcntl.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
40 #include <errno.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
41
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
42 #include "stream.h"
19312
ab8d6b6deb63 proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
ben
parents: 19296
diff changeset
43 #include "libmpdemux/demuxer.h"
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
44 #include "help_mp.h"
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
45 #include "m_option.h"
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
46 #include "m_struct.h"
34174
a93891202051 Add missing mp_msg.h #includes, remove some unnecessary ones.
diego
parents: 33259
diff changeset
47 #include "mp_msg.h"
30901
76a13038105e Rename get_path.[ch] --> path.[ch].
diego
parents: 30776
diff changeset
48 #include "path.h"
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23629
diff changeset
49 #include "libavutil/avstring.h"
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
50
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
51 #include "dvbin.h"
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
52
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
53
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
54 #define MAX_CHANNELS 8
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
55 #define CHANNEL_LINE_LEN 256
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
56 #define min(a, b) ((a) <= (b) ? (a) : (b))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
57
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
58
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
59 //TODO: CAMBIARE list_ptr e da globale a per_priv
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
60
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
61
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
62 static struct stream_priv_s
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
63 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
64 char *prog;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
65 int card;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
66 int timeout;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
67 char *file;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
68 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
69 stream_defaults =
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
70 {
26391
16ab100f5870 removed useless parameter :type from -dvbin (the frontend type is reported by the card)
nicodvb
parents: 26390
diff changeset
71 "", 1, 30, NULL
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
72 };
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
73
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
74 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
75
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
76 /// URL definition
25242
371a40dcc1cc stream_opts arrays should be const
reimar
parents: 25241
diff changeset
77 static const m_option_t stream_params[] = {
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
78 {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL},
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
79 {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
33259
04dc3e55cd90 Increase the maximum value of the DVB timeout to 240 seconds.
iive
parents: 32511
diff changeset
80 {"timeout",ST_OFF(timeout), CONF_TYPE_INT, M_OPT_RANGE, 1, 240, NULL},
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
81 {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL},
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
82
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
83 {"hostname", ST_OFF(prog), CONF_TYPE_STRING, 0, 0, 0, NULL },
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
84 {"username", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
85 {NULL, NULL, 0, 0, 0, 0, NULL}
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
86 };
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
87
25691
68015115f63a stream_opts should be const
reimar
parents: 25389
diff changeset
88 static const struct m_struct_st stream_opts = {
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
89 "dvbin",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
90 sizeof(struct stream_priv_s),
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
91 &stream_defaults,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
92 stream_params
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
93 };
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
94
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
95
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
96
25241
bb7c65f2a289 Make m_option_t arrays referenced by cfg-common.h const
reimar
parents: 25211
diff changeset
97 const m_option_t dvbin_opts_conf[] = {
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
98 {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL},
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
99 {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
33259
04dc3e55cd90 Increase the maximum value of the DVB timeout to 240 seconds.
iive
parents: 32511
diff changeset
100 {"timeout", &stream_defaults.timeout, CONF_TYPE_INT, M_OPT_RANGE, 1, 240, NULL},
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
101 {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL},
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
102
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
103 {NULL, NULL, 0, 0, 0, 0, NULL}
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
104 };
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
105
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
106
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
107
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
108
28051
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 27863
diff changeset
109 int dvb_set_ts_filt(int fd, uint16_t pid, dmx_pes_type_t pestype);
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 27863
diff changeset
110 int dvb_demux_stop(int fd);
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 27863
diff changeset
111 int dvb_get_tuner_type(int fd);
24875
fe6dc73c7314 removed unused variables and parameters
nicodvb
parents: 24257
diff changeset
112 int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt);
fe6dc73c7314 removed unused variables and parameters
nicodvb
parents: 24257
diff changeset
113 int dvb_fix_demuxes(dvb_priv_t *priv, int cnt);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
114
28051
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 27863
diff changeset
115 int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int tone,
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
116 fe_spectral_inversion_t specInv, fe_modulation_t modulation, fe_guard_interval_t guardInterval,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
117 fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth, fe_code_rate_t HP_CodeRate,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
118 fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier, int timeout);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
119
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
120
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
121
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
122 static dvb_channels_list *dvb_get_channels(char *filename, int type)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
123 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
124 dvb_channels_list *list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
125 FILE *f;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
126 char line[CHANNEL_LINE_LEN], *colon;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
127
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
128 int fields, cnt, pcnt, k;
21814
8032b9d9349d don't add pid 0 if it's already present in the list
nicodvb
parents: 21465
diff changeset
129 int has8192, has0;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
130 dvb_channel_t *ptr, *tmp, chn;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
131 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];
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
132 const char *cbl_conf = "%d:%255[^:]:%d:%255[^:]:%255[^:]:%255[^:]:%255[^:]\n";
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
133 const char *sat_conf = "%d:%c:%d:%d:%255[^:]:%255[^:]\n";
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
134 const char *ter_conf = "%d:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]\n";
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
135 const char *atsc_conf = "%d:%255[^:]:%255[^:]:%255[^:]\n";
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
136
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
137 mp_msg(MSGT_DEMUX, MSGL_V, "CONFIG_READ FILE: %s, type: %d\n", filename, type);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
138 if((f=fopen(filename, "r"))==NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
139 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
140 mp_msg(MSGT_DEMUX, MSGL_FATAL, "CAN'T READ CONFIG FILE %s\n", filename);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
141 return NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
142 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
143
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
144 list = malloc(sizeof(dvb_channels_list));
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
145 if(list == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
146 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
147 fclose(f);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
148 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_GET_CHANNELS: couldn't malloc enough memory\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
149 return NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
150 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
151
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
152 ptr = &chn;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
153 list->NUM_CHANNELS = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
154 list->channels = NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
155 while(! feof(f))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
156 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
157 if( fgets(line, CHANNEL_LINE_LEN, f) == NULL )
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
158 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
159
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
160 if((line[0] == '#') || (strlen(line) == 0))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
161 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
162
21464
f43100cbeee5 use strchr() instead of index()
aurel
parents: 21241
diff changeset
163 colon = strchr(line, ':');
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
164 if(colon)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
165 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
166 k = colon - line;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
167 if(!k)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
168 continue;
23629
cb1277fb9d7e get rid of useless *alloc casts
reimar
parents: 23486
diff changeset
169 ptr->name = malloc(k+1);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
170 if(! ptr->name)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
171 continue;
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23629
diff changeset
172 av_strlcpy(ptr->name, line, k+1);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
173 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
174 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
175 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
176 k++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
177 apid_str[0] = vpid_str[0] = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
178 ptr->pids_cnt = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
179 ptr->freq = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
180 if(type == TUNER_TER)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
181 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
182 fields = sscanf(&line[k], ter_conf,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
183 &ptr->freq, inv, bw, cr, tmp_lcr, mod,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
184 transm, gi, tmp_hier, vpid_str, apid_str);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
185 mp_msg(MSGT_DEMUX, MSGL_V,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
186 "TER, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
187 list->NUM_CHANNELS, fields, ptr->name, ptr->freq);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
188 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
189 else if(type == TUNER_CBL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
190 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
191 fields = sscanf(&line[k], cbl_conf,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
192 &ptr->freq, inv, &ptr->srate,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
193 cr, mod, vpid_str, apid_str);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
194 mp_msg(MSGT_DEMUX, MSGL_V,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
195 "CBL, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
196 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
197 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
198 #ifdef DVB_ATSC
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
199 else if(type == TUNER_ATSC)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
200 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
201 fields = sscanf(&line[k], atsc_conf,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
202 &ptr->freq, mod, vpid_str, apid_str);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
203 mp_msg(MSGT_DEMUX, MSGL_V,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
204 "ATSC, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d\n",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
205 list->NUM_CHANNELS, fields, ptr->name, ptr->freq);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
206 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
207 #endif
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
208 else //SATELLITE
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
209 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
210 fields = sscanf(&line[k], sat_conf,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
211 &ptr->freq, &ptr->pol, &ptr->diseqc, &ptr->srate, vpid_str, apid_str);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
212 ptr->pol = toupper(ptr->pol);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
213 ptr->freq *= 1000UL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
214 ptr->srate *= 1000UL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
215 ptr->tone = -1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
216 ptr->inv = INVERSION_AUTO;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
217 ptr->cr = FEC_AUTO;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
218 if((ptr->diseqc > 4) || (ptr->diseqc < 0))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
219 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
220 if(ptr->diseqc > 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
221 ptr->diseqc--;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
222 mp_msg(MSGT_DEMUX, MSGL_V,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
223 "SAT, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d, POL: %c, DISEQC: %d",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
224 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate, ptr->pol, ptr->diseqc);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
225 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
226
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
227 if(vpid_str[0])
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
228 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
229 pcnt = sscanf(vpid_str, "%d+%d+%d+%d+%d+%d+%d", &ptr->pids[0], &ptr->pids[1], &ptr->pids[2], &ptr->pids[3],
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
230 &ptr->pids[4], &ptr->pids[5], &ptr->pids[6]);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
231 if(pcnt > 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
232 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
233 ptr->pids_cnt = pcnt;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
234 fields++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
235 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
236 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
237
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
238 if(apid_str[0])
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
239 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
240 cnt = ptr->pids_cnt;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
241 pcnt = sscanf(apid_str, "%d+%d+%d+%d+%d+%d+%d+%d", &ptr->pids[cnt], &ptr->pids[cnt+1], &ptr->pids[cnt+2],
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
242 &ptr->pids[cnt+3], &ptr->pids[cnt+4], &ptr->pids[cnt+5], &ptr->pids[cnt+6], &ptr->pids[cnt+7]);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
243 if(pcnt > 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
244 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
245 ptr->pids_cnt += pcnt;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
246 fields++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
247 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
248 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
249
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
250 if((fields < 2) || (ptr->pids_cnt <= 0) || (ptr->freq == 0) || (strlen(ptr->name) == 0))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
251 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
252
21814
8032b9d9349d don't add pid 0 if it's already present in the list
nicodvb
parents: 21465
diff changeset
253 has8192 = has0 = 0;
21033
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
254 for(cnt = 0; cnt < ptr->pids_cnt; cnt++)
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
255 {
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
256 if(ptr->pids[cnt] == 8192)
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
257 has8192 = 1;
21814
8032b9d9349d don't add pid 0 if it's already present in the list
nicodvb
parents: 21465
diff changeset
258 if(ptr->pids[cnt] == 0)
8032b9d9349d don't add pid 0 if it's already present in the list
nicodvb
parents: 21465
diff changeset
259 has0 = 1;
21033
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
260 }
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
261 if(has8192)
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
262 {
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
263 ptr->pids[0] = 8192;
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
264 ptr->pids_cnt = 1;
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
265 }
21814
8032b9d9349d don't add pid 0 if it's already present in the list
nicodvb
parents: 21465
diff changeset
266 else if(! has0)
21033
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
267 {
21034
5357da9f0690 riformatted after previous commit
nicodvb
parents: 21033
diff changeset
268 ptr->pids[ptr->pids_cnt] = 0; //PID 0 is the PAT
5357da9f0690 riformatted after previous commit
nicodvb
parents: 21033
diff changeset
269 ptr->pids_cnt++;
21033
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
270 }
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
271 mp_msg(MSGT_DEMUX, MSGL_V, " PIDS: ");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
272 for(cnt = 0; cnt < ptr->pids_cnt; cnt++)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
273 mp_msg(MSGT_DEMUX, MSGL_V, " %d ", ptr->pids[cnt]);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
274 mp_msg(MSGT_DEMUX, MSGL_V, "\n");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
275
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
276 if((type == TUNER_TER) || (type == TUNER_CBL))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
277 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
278 if(! strcmp(inv, "INVERSION_ON"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
279 ptr->inv = INVERSION_ON;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
280 else if(! strcmp(inv, "INVERSION_OFF"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
281 ptr->inv = INVERSION_OFF;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
282 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
283 ptr->inv = INVERSION_AUTO;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
284
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
285
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
286 if(! strcmp(cr, "FEC_1_2"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
287 ptr->cr =FEC_1_2;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
288 else if(! strcmp(cr, "FEC_2_3"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
289 ptr->cr =FEC_2_3;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
290 else if(! strcmp(cr, "FEC_3_4"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
291 ptr->cr =FEC_3_4;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
292 else if(! strcmp(cr, "FEC_4_5"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
293 ptr->cr =FEC_4_5;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
294 else if(! strcmp(cr, "FEC_6_7"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
295 ptr->cr =FEC_6_7;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
296 else if(! strcmp(cr, "FEC_8_9"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
297 ptr->cr =FEC_8_9;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
298 else if(! strcmp(cr, "FEC_5_6"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
299 ptr->cr =FEC_5_6;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
300 else if(! strcmp(cr, "FEC_7_8"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
301 ptr->cr =FEC_7_8;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
302 else if(! strcmp(cr, "FEC_NONE"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
303 ptr->cr =FEC_NONE;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
304 else ptr->cr =FEC_AUTO;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
305 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
306
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
307
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
308 if((type == TUNER_TER) || (type == TUNER_CBL) || (type == TUNER_ATSC))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
309 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
310 if(! strcmp(mod, "QAM_128"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
311 ptr->mod = QAM_128;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
312 else if(! strcmp(mod, "QAM_256"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
313 ptr->mod = QAM_256;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
314 else if(! strcmp(mod, "QAM_64"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
315 ptr->mod = QAM_64;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
316 else if(! strcmp(mod, "QAM_32"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
317 ptr->mod = QAM_32;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
318 else if(! strcmp(mod, "QAM_16"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
319 ptr->mod = QAM_16;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
320 #ifdef DVB_ATSC
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
321 else if(! strcmp(mod, "VSB_8") || ! strcmp(mod, "8VSB"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
322 ptr->mod = VSB_8;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
323 else if(! strcmp(mod, "VSB_16") || !strcmp(mod, "16VSB"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
324 ptr->mod = VSB_16;
29761
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
325 else if(! strcmp(mod, "QAM_AUTO"))
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
326 ptr->mod = QAM_AUTO;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
327
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
328 #endif
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
329 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
330
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
331 if(type == TUNER_TER)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
332 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
333 if(! strcmp(bw, "BANDWIDTH_6_MHZ"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
334 ptr->bw = BANDWIDTH_6_MHZ;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
335 else if(! strcmp(bw, "BANDWIDTH_7_MHZ"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
336 ptr->bw = BANDWIDTH_7_MHZ;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
337 else if(! strcmp(bw, "BANDWIDTH_8_MHZ"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
338 ptr->bw = BANDWIDTH_8_MHZ;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
339
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
340
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
341 if(! strcmp(transm, "TRANSMISSION_MODE_2K"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
342 ptr->trans = TRANSMISSION_MODE_2K;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
343 else if(! strcmp(transm, "TRANSMISSION_MODE_8K"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
344 ptr->trans = TRANSMISSION_MODE_8K;
29761
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
345 else if(! strcmp(transm, "TRANSMISSION_MODE_AUTO"))
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
346 ptr->trans = TRANSMISSION_MODE_AUTO;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
347
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
348 if(! strcmp(gi, "GUARD_INTERVAL_1_32"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
349 ptr->gi = GUARD_INTERVAL_1_32;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
350 else if(! strcmp(gi, "GUARD_INTERVAL_1_16"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
351 ptr->gi = GUARD_INTERVAL_1_16;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
352 else if(! strcmp(gi, "GUARD_INTERVAL_1_8"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
353 ptr->gi = GUARD_INTERVAL_1_8;
29761
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
354 else if(! strcmp(gi, "GUARD_INTERVAL_1_4"))
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
355 ptr->gi = GUARD_INTERVAL_1_4;
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
356 else ptr->gi = GUARD_INTERVAL_AUTO;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
357
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
358 if(! strcmp(tmp_lcr, "FEC_1_2"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
359 ptr->cr_lp =FEC_1_2;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
360 else if(! strcmp(tmp_lcr, "FEC_2_3"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
361 ptr->cr_lp =FEC_2_3;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
362 else if(! strcmp(tmp_lcr, "FEC_3_4"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
363 ptr->cr_lp =FEC_3_4;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
364 else if(! strcmp(tmp_lcr, "FEC_4_5"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
365 ptr->cr_lp =FEC_4_5;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
366 else if(! strcmp(tmp_lcr, "FEC_6_7"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
367 ptr->cr_lp =FEC_6_7;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
368 else if(! strcmp(tmp_lcr, "FEC_8_9"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
369 ptr->cr_lp =FEC_8_9;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
370 else if(! strcmp(tmp_lcr, "FEC_5_6"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
371 ptr->cr_lp =FEC_5_6;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
372 else if(! strcmp(tmp_lcr, "FEC_7_8"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
373 ptr->cr_lp =FEC_7_8;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
374 else if(! strcmp(tmp_lcr, "FEC_NONE"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
375 ptr->cr_lp =FEC_NONE;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
376 else ptr->cr_lp =FEC_AUTO;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
377
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
378
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
379 if(! strcmp(tmp_hier, "HIERARCHY_1"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
380 ptr->hier = HIERARCHY_1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
381 else if(! strcmp(tmp_hier, "HIERARCHY_2"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
382 ptr->hier = HIERARCHY_2;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
383 else if(! strcmp(tmp_hier, "HIERARCHY_4"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
384 ptr->hier = HIERARCHY_4;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
385 else if(! strcmp(tmp_hier, "HIERARCHY_AUTO"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
386 ptr->hier = HIERARCHY_AUTO;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
387 else ptr->hier = HIERARCHY_NONE;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
388 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
389
23629
cb1277fb9d7e get rid of useless *alloc casts
reimar
parents: 23486
diff changeset
390 tmp = realloc(list->channels, sizeof(dvb_channel_t) * (list->NUM_CHANNELS + 1));
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
391 if(tmp == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
392 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
393
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
394 list->channels = tmp;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
395 memcpy(&(list->channels[list->NUM_CHANNELS]), ptr, sizeof(dvb_channel_t));
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
396 list->NUM_CHANNELS++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
397 if(sizeof(dvb_channel_t) * list->NUM_CHANNELS >= 1024*1024)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
398 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
399 mp_msg(MSGT_DEMUX, MSGL_V, "dvbin.c, > 1MB allocated for channels struct, dropping the rest of the file\r\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
400 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
401 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
402 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
403
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
404 fclose(f);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
405 if(list->NUM_CHANNELS == 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
406 {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
407 free(list->channels);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
408 free(list);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
409 return NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
410 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
411
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
412 list->current = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
413 return list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
414 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
415
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
416 void dvb_free_config(dvb_config_t *config)
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
417 {
25389
cd65c1242675 10l, in dvb_free_config() channels' names must be free individually
nicodvb
parents: 25380
diff changeset
418 int i, j;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
419
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
420 for(i=0; i<config->count; i++)
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
421 {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
422 free(config->cards[i].name);
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
423 if(!config->cards[i].list)
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
424 continue;
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
425 if(config->cards[i].list->channels)
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
426 {
25389
cd65c1242675 10l, in dvb_free_config() channels' names must be free individually
nicodvb
parents: 25380
diff changeset
427 for(j=0; j<config->cards[i].list->NUM_CHANNELS; j++)
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
428 free(config->cards[i].list->channels[j].name);
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
429 free(config->cards[i].list->channels);
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
430 }
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
431 free(config->cards[i].list);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
432 }
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
433 free(config);
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
434 }
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
435
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
436 static int dvb_streaming_read(stream_t *stream, char *buffer, int size)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
437 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
438 struct pollfd pfds[1];
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
439 int pos=0, tries, rk, fd;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
440 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
441
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
442 mp_msg(MSGT_DEMUX, MSGL_DBG3, "dvb_streaming_read(%d)\n", size);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
443
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
444 tries = priv->retry + 1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
445
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
446 fd = stream->fd;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
447 while(pos < size)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
448 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
449 pfds[0].fd = fd;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
450 pfds[0].events = POLLIN | POLLPRI;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
451
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
452 rk = size - pos;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
453 if(poll(pfds, 1, 500) <= 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
454 {
23486
056c2968b148 Set errno to 0 after printing it, not before
reimar
parents: 22402
diff changeset
455 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);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
456 errno = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
457 if(--tries > 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
458 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
459 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
460 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
461 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
462 if((rk = read(fd, &buffer[pos], rk)) > 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
463 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
464 pos += rk;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
465 mp_msg(MSGT_DEMUX, MSGL_DBG3, "ret (%d) bytes\n", pos);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
466 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
467 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
468
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
469
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
470 if(! pos)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
471 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_streaming_read, return %d bytes\n", pos);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
472
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
473 return pos;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
474 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
475
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
476 static void dvbin_close(stream_t *stream);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
477
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
478 int dvb_set_channel(stream_t *stream, int card, int n)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
479 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
480 dvb_channels_list *new_list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
481 dvb_channel_t *channel;
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
482 dvb_priv_t *priv = stream->priv;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
483 char buf[4096];
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
484 dvb_config_t *conf = (dvb_config_t *) priv->config;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
485 int devno;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
486 int i;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
487
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
488 if((card < 0) || (card > conf->count))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
489 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
490 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CARD NUMBER: %d vs %d, abort\n", card, conf->count);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
491 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
492 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
493
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
494 devno = conf->cards[card].devno;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
495 new_list = conf->cards[card].list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
496 if((n > new_list->NUM_CHANNELS) || (n < 0))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
497 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
498 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CHANNEL NUMBER: %d, for card %d, abort\n", n, card);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
499 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
500 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
501 channel = &(new_list->channels[n]);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
502
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
503 if(priv->is_on) //the fds are already open and we have to stop the demuxers
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
504 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
505 for(i = 0; i < priv->demux_fds_cnt; i++)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
506 dvb_demux_stop(priv->demux_fds[i]);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
507
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
508 priv->retry = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
509 while(dvb_streaming_read(stream, buf, 4096) > 0); //empty both the stream's and driver's buffer
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
510 if(priv->card != card)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
511 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
512 dvbin_close(stream);
24875
fe6dc73c7314 removed unused variables and parameters
nicodvb
parents: 24257
diff changeset
513 if(! dvb_open_devices(priv, devno, channel->pids_cnt))
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
514 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
515 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
516 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
517 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
518 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
519 else //close all demux_fds with pos > pids required for the new channel or open other demux_fds if we have too few
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
520 {
24875
fe6dc73c7314 removed unused variables and parameters
nicodvb
parents: 24257
diff changeset
521 if(! dvb_fix_demuxes(priv, channel->pids_cnt))
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
522 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
523 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
524 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
525 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
526 {
24875
fe6dc73c7314 removed unused variables and parameters
nicodvb
parents: 24257
diff changeset
527 if(! dvb_open_devices(priv, devno, channel->pids_cnt))
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
528 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
529 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL2, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
530 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
531 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
532 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
533
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
534 priv->card = card;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
535 priv->list = new_list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
536 priv->retry = 5;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
537 new_list->current = n;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
538 stream->fd = priv->dvr_fd;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
539 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_SET_CHANNEL: new channel name=%s, card: %d, channel %d\n", channel->name, card, n);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
540
30625
bc29a1172753 Replace misuse of stream_reset to set stream pos to 0 by more appropriate code.
reimar
parents: 29761
diff changeset
541 stream->buf_pos = stream->buf_len = 0;
bc29a1172753 Replace misuse of stream_reset to set stream pos to 0 by more appropriate code.
reimar
parents: 29761
diff changeset
542 stream->pos = 0;
bc29a1172753 Replace misuse of stream_reset to set stream pos to 0 by more appropriate code.
reimar
parents: 29761
diff changeset
543 stream->eof = 0;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
544
20659
31b525f90395 nonsense removal: compare old and new frequency in order to skip tuning
nicodvb
parents: 19312
diff changeset
545 if(channel->freq != priv->last_freq)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
546 if (! dvb_tune(priv, channel->freq, channel->pol, channel->srate, channel->diseqc, channel->tone,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
547 channel->inv, channel->mod, channel->gi, channel->trans, channel->bw, channel->cr, channel->cr_lp, channel->hier, priv->timeout))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
548 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
549
20659
31b525f90395 nonsense removal: compare old and new frequency in order to skip tuning
nicodvb
parents: 19312
diff changeset
550 priv->last_freq = channel->freq;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
551 priv->is_on = 1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
552
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
553 //sets demux filters and restart the stream
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
554 for(i = 0; i < channel->pids_cnt; i++)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
555 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
556 if(! dvb_set_ts_filt(priv->demux_fds[i], channel->pids[i], DMX_PES_OTHER))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
557 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
558 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
559
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
560 return 1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
561 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
562
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
563
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
564
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
565 int dvb_step_channel(stream_t *stream, int dir)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
566 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
567 int new_current;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
568 dvb_channels_list *list;
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
569 dvb_priv_t *priv = stream->priv;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
570
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
571 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_STEP_CHANNEL dir %d\n", dir);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
572
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
573 if(priv == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
574 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
575 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL priv_ptr, quit\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
576 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
577 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
578
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
579 list = priv->list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
580 if(list == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
581 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
582 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL list_ptr, quit\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
583 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
584 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
585
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
586 new_current = (list->NUM_CHANNELS + list->current + (dir == DVB_CHANNEL_HIGHER ? 1 : -1)) % list->NUM_CHANNELS;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
587
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
588 return dvb_set_channel(stream, priv->card, new_current);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
589 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
590
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
591
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
592
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
593
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
594 static void dvbin_close(stream_t *stream)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
595 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
596 int i;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
597 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
598
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
599 for(i = priv->demux_fds_cnt-1; i >= 0; i--)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
600 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
601 priv->demux_fds_cnt--;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
602 mp_msg(MSGT_DEMUX, MSGL_V, "DVBIN_CLOSE, close(%d), fd=%d, COUNT=%d\n", i, priv->demux_fds[i], priv->demux_fds_cnt);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
603 close(priv->demux_fds[i]);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
604 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
605 close(priv->dvr_fd);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
606
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
607 close(priv->fe_fd);
27863
f3384addfb0b set to -1 fds that were closed; handle the sec_fd only if CONFIG_DVB_HEAD isn't defined; patch by Reimar
nicodvb
parents: 27858
diff changeset
608 priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
609
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
610 priv->is_on = 0;
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
611 dvb_free_config(priv->config);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
612 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
613
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
614
25380
5857ec4dedb4 removed the obscene priv->stream entry. Someone must have injected vodka in my milk when I wrote it
nicodvb
parents: 25379
diff changeset
615 static int dvb_streaming_start(stream_t *stream, struct stream_priv_s *opts, int tuner_type, char *progname)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
616 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
617 int i;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
618 dvb_channel_t *channel = NULL;
25380
5857ec4dedb4 removed the obscene priv->stream entry. Someone must have injected vodka in my milk when I wrote it
nicodvb
parents: 25379
diff changeset
619 dvb_priv_t *priv = stream->priv;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
620
26391
16ab100f5870 removed useless parameter :type from -dvbin (the frontend type is reported by the card)
nicodvb
parents: 26390
diff changeset
621 mp_msg(MSGT_DEMUX, MSGL_V, "\r\ndvb_streaming_start(PROG: %s, CARD: %d, FILE: %s)\r\n",
16ab100f5870 removed useless parameter :type from -dvbin (the frontend type is reported by the card)
nicodvb
parents: 26390
diff changeset
622 opts->prog, opts->card, opts->file);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
623
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
624 priv->is_on = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
625
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
626 i = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
627 while((channel == NULL) && i < priv->list->NUM_CHANNELS)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
628 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
629 if(! strcmp(priv->list->channels[i].name, progname))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
630 channel = &(priv->list->channels[i]);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
631
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
632 i++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
633 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
634
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
635 if(channel != NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
636 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
637 priv->list->current = i-1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
638 mp_msg(MSGT_DEMUX, MSGL_V, "PROGRAM NUMBER %d: name=%s, freq=%u\n", i-1, channel->name, channel->freq);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
639 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
640 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
641 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
642 mp_msg(MSGT_DEMUX, MSGL_ERR, "\n\nDVBIN: no such channel \"%s\"\n\n", progname);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
643 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
644 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
645
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
646
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
647 if(!dvb_set_channel(stream, priv->card, priv->list->current))
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
648 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
649 mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR, COULDN'T SET CHANNEL %i: ", priv->list->current);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
650 dvbin_close(stream);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
651 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
652 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
653
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
654 mp_msg(MSGT_DEMUX, MSGL_V, "SUCCESSFUL EXIT from dvb_streaming_start\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
655
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
656 return 1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
657 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
658
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
659
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
660
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
661
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
662 static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
663 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
664 // I don't force the file format bacause, although it's almost always TS,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
665 // there are some providers that stream an IP multicast with M$ Mpeg4 inside
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
666 struct stream_priv_s* p = (struct stream_priv_s*)opts;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
667 dvb_priv_t *priv;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
668 char *progname;
21241
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
669 int tuner_type = 0, i;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
670
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
671
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
672 if(mode != STREAM_READ)
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 24242
diff changeset
673 return STREAM_UNSUPPORTED;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
674
23629
cb1277fb9d7e get rid of useless *alloc casts
reimar
parents: 23486
diff changeset
675 stream->priv = calloc(1, sizeof(dvb_priv_t));
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
676 if(stream->priv == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
677 return STREAM_ERROR;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
678
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
679 priv = (dvb_priv_t *)stream->priv;
27863
f3384addfb0b set to -1 fds that were closed; handle the sec_fd only if CONFIG_DVB_HEAD isn't defined; patch by Reimar
nicodvb
parents: 27858
diff changeset
680 priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1;
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
681 priv->config = dvb_get_config();
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
682 if(priv->config == NULL)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
683 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
684 free(priv);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
685 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB CONFIGURATION IS EMPTY, exit\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
686 return STREAM_ERROR;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
687 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
688
21241
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
689 priv->card = -1;
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
690 for(i=0; i<priv->config->count; i++)
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
691 {
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
692 if(priv->config->cards[i].devno+1 == p->card)
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
693 {
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
694 priv->card = i;
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
695 break;
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
696 }
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
697 }
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
698
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
699 if(priv->card == -1)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
700 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
701 free(priv);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
702 mp_msg(MSGT_DEMUX, MSGL_ERR, "NO CONFIGURATION FOUND FOR CARD N. %d, exit\n", p->card);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
703 return STREAM_ERROR;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
704 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
705 priv->timeout = p->timeout;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
706
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
707 tuner_type = priv->config->cards[priv->card].type;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
708
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
709 if(tuner_type == 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
710 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
711 free(priv);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
712 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: UNKNOWN OR UNDETECTABLE TUNER TYPE, EXIT\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
713 return STREAM_ERROR;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
714 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
715
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
716
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
717 priv->tuner_type = tuner_type;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
718
26390
b2cc442c095d removed defunct options :vid and :aid from -dvbin (they were useless from the start)
nicodvb
parents: 26123
diff changeset
719 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: prog=%s, card=%d, type=%d\n",
b2cc442c095d removed defunct options :vid and :aid from -dvbin (they were useless from the start)
nicodvb
parents: 26123
diff changeset
720 p->prog, priv->card+1, priv->tuner_type);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
721
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
722 priv->list = priv->config->cards[priv->card].list;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
723
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
724 if((! strcmp(p->prog, "")) && (priv->list != NULL))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
725 progname = priv->list->channels[0].name;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
726 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
727 progname = p->prog;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
728
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
729
25380
5857ec4dedb4 removed the obscene priv->stream entry. Someone must have injected vodka in my milk when I wrote it
nicodvb
parents: 25379
diff changeset
730 if(! dvb_streaming_start(stream, p, tuner_type, progname))
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
731 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
732 free(stream->priv);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
733 stream->priv = NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
734 return STREAM_ERROR;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
735 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
736
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
737 stream->type = STREAMTYPE_DVB;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
738 stream->fill_buffer = dvb_streaming_read;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
739 stream->close = dvbin_close;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
740 m_struct_free(&stream_opts, opts);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
741
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
742 *file_format = DEMUXER_TYPE_MPEG_TS;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
743
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
744 return STREAM_OK;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
745 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
746
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
747 #define MAX_CARDS 4
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
748 dvb_config_t *dvb_get_config(void)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
749 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
750 int i, fd, type, size;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
751 char filename[30], *conf_file, *name;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
752 dvb_channels_list *list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
753 dvb_card_config_t *cards = NULL, *tmp;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
754 dvb_config_t *conf = NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
755
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
756
23629
cb1277fb9d7e get rid of useless *alloc casts
reimar
parents: 23486
diff changeset
757 conf = malloc(sizeof(dvb_config_t));
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
758 if(conf == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
759 return NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
760
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
761 conf->priv = NULL;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
762 conf->count = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
763 conf->cards = NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
764 for(i=0; i<MAX_CARDS; i++)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
765 {
22402
963d93b2fe7c replaced 2 instances of sprintf() with snprintf() and one instance
nicodvb
parents: 21977
diff changeset
766 snprintf(filename, sizeof(filename), "/dev/dvb/adapter%d/frontend0", i);
21834
8d486fd6cf2f in dvb_get_config() open the frontend in READ_ONLY mode for probing (worksaround some buggy driver)
nicodvb
parents: 21814
diff changeset
767 fd = open(filename, O_RDONLY|O_NONBLOCK);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
768 if(fd < 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
769 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
770 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't open device %s, skipping\n", filename);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
771 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
772 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
773
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
774 type = dvb_get_tuner_type(fd);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
775 close(fd);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
776 if(type != TUNER_SAT && type != TUNER_TER && type != TUNER_CBL && type != TUNER_ATSC)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
777 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
778 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't detect tuner type of card %d, skipping\n", i);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
779 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
780 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
781
31800
20e5447d78f9 Initialize conf_file variable to kill the warning:
diego
parents: 30901
diff changeset
782 conf_file = get_path("channels.conf");
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
783 switch(type)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
784 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
785 case TUNER_TER:
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
786 conf_file = get_path("channels.conf.ter");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
787 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
788 case TUNER_CBL:
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
789 conf_file = get_path("channels.conf.cbl");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
790 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
791 case TUNER_SAT:
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
792 conf_file = get_path("channels.conf.sat");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
793 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
794 case TUNER_ATSC:
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
795 conf_file = get_path("channels.conf.atsc");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
796 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
797 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
798
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
799 if((access(conf_file, F_OK | R_OK) != 0))
25355
3110688d2406 fix memleaks; patch by andrew calkin from gmail com
nicodvb
parents: 25242
diff changeset
800 {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
801 free(conf_file);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
802 conf_file = get_path("channels.conf");
26123
37786c8469b2 search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com
nicodvb
parents: 25692
diff changeset
803 if((access(conf_file, F_OK | R_OK) != 0))
37786c8469b2 search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com
nicodvb
parents: 25692
diff changeset
804 {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
805 free(conf_file);
26123
37786c8469b2 search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com
nicodvb
parents: 25692
diff changeset
806 conf_file = strdup(MPLAYER_CONFDIR "/channels.conf");
37786c8469b2 search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com
nicodvb
parents: 25692
diff changeset
807 }
25355
3110688d2406 fix memleaks; patch by andrew calkin from gmail com
nicodvb
parents: 25242
diff changeset
808 }
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
809
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
810 list = dvb_get_channels(conf_file, type);
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
811 free(conf_file);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
812 if(list == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
813 continue;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
814
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
815 size = sizeof(dvb_card_config_t) * (conf->count + 1);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
816 tmp = realloc(conf->cards, size);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
817
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
818 if(tmp == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
819 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
820 fprintf(stderr, "DVB_CONFIG, can't realloc %d bytes, skipping\n", size);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
821 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
822 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
823 cards = tmp;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
824
23629
cb1277fb9d7e get rid of useless *alloc casts
reimar
parents: 23486
diff changeset
825 name = malloc(20);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
826 if(name==NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
827 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
828 fprintf(stderr, "DVB_CONFIG, can't realloc 20 bytes, skipping\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
829 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
830 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
831
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
832 conf->cards = cards;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
833 conf->cards[conf->count].devno = i;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
834 conf->cards[conf->count].list = list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
835 conf->cards[conf->count].type = type;
22402
963d93b2fe7c replaced 2 instances of sprintf() with snprintf() and one instance
nicodvb
parents: 21977
diff changeset
836 snprintf(name, 20, "DVB-%c card n. %d", type==TUNER_TER ? 'T' : (type==TUNER_CBL ? 'C' : 'S'), conf->count+1);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
837 conf->cards[conf->count].name = name;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
838 conf->count++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
839 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
840
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
841 if(conf->count == 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
842 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
843 free(conf);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
844 conf = NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
845 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
846
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
847 return conf;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
848 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
849
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
850
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
851
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 24875
diff changeset
852 const stream_info_t stream_info_dvb = {
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
853 "Dvb Input",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
854 "dvbin",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
855 "Nico",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
856 "based on the code from ??? (probably Arpi)",
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
857 dvb_open,
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
858 { "dvb", NULL },
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
859 &stream_opts,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
860 1 // Urls are an option string
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
861 };