Browse Source

Add input_fd and output_fd to struct ts

Georgi Chorbadzhiyski 13 years ago
parent
commit
9395555a6f
3 changed files with 9 additions and 3 deletions
  1. 3
    0
      data.c
  2. 3
    0
      data.h
  3. 3
    3
      tsdecrypt.c

+ 3
- 0
data.c View File

@@ -43,6 +43,9 @@ void data_init(struct ts *ts) {
43 43
 	ts->emm_send    = 1;
44 44
 	ts->pid_filter  = 0;
45 45
 	ts->output_ttl  = 1;
46
+
47
+	ts->input_fd    = 0; // stdin
48
+	ts->output_fd   = 1; // stdout
46 49
 }
47 50
 
48 51
 void data_free(struct ts *ts) {

+ 3
- 0
data.h View File

@@ -64,6 +64,9 @@ struct ts {
64 64
 	int					output_ttl;
65 65
 	struct in_addr		output_intf;
66 66
 
67
+	int					input_fd;
68
+	int					output_fd;
69
+
67 70
 	int					debug_level;
68 71
 };
69 72
 

+ 3
- 3
tsdecrypt.c View File

@@ -227,9 +227,9 @@ void ts_write_packets(struct ts *ts, uint8_t *data, ssize_t data_len) {
227 227
 		uint16_t pid = ts_packet_get_pid(ts_packet);
228 228
 		if (ts->pid_filter) {
229 229
 			if (pidmap_get(&ts->pidmap, pid)) // PAT or allowed PIDs
230
-				write(1, ts_packet, 188);
230
+				write(ts->output_fd, ts_packet, 188);
231 231
 		} else {
232
-			write(1, ts_packet, 188);
232
+			write(ts->output_fd, ts_packet, 188);
233 233
 		}
234 234
 	}
235 235
 }
@@ -249,7 +249,7 @@ int main(int argc, char **argv) {
249 249
 
250 250
 	camd35_connect(&ts.camd35);
251 251
 	do {
252
-		readen = read(0, ts_packet, FRAME_SIZE);
252
+		readen = read(ts.input_fd, ts_packet, FRAME_SIZE);
253 253
 		if (readen > 0) {
254 254
 			ts_process_packets(&ts, ts_packet, readen);
255 255
 			ts_write_packets(&ts, ts_packet, readen);

Loading…
Cancel
Save