Project

General

Profile

RE: Biss key » biss1.diff.txt

Andrew Semack, 2012-07-24 13:12

 
1
diff --git a/Makefile b/Makefile
2
index 100c71f..2264a2c 100644
3
--- a/Makefile
4
+++ b/Makefile
5
@@ -24,7 +24,7 @@ include ${BUILDDIR}/config.mak
6
 
7
 PROG=${BUILDDIR}/tvheadend
8
 
9
-CFLAGS += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
10
+CFLAGS += -Wall -Wwrite-strings -Wno-deprecated-declarations
11
 CFLAGS += -Wmissing-prototypes
12
 LDFLAGS += -lrt -ldl
13
 
14
@@ -103,6 +103,7 @@ SRCS-${CONFIG_V4L} += \
15
 #
16
 SRCS += src/cwc.c \
17
 	src/capmt.c \
18
+	src/ccw.c \
19
 	src/ffdecsa/ffdecsa_interface.c \
20
 	src/ffdecsa/ffdecsa_int.c
21
 
22
diff --git a/src/main.c b/src/main.c
23
index 370bb2a..c9369c6 100644
24
--- a/src/main.c
25
+++ b/src/main.c
26
@@ -48,6 +48,7 @@
27
 #include "serviceprobe.h"
28
 #include "cwc.h"
29
 #include "capmt.h"
30
+#include "ccw.h"
31
 #include "dvr/dvr.h"
32
 #include "htsp.h"
33
 #include "rawtsinput.h"
34
@@ -395,6 +396,8 @@ main(int argc, char **argv)
35
 
36
   capmt_init();
37
 
38
+  ccw_init();
39
+
40
   epg_init();
41
 
42
   dvr_init();
43
diff --git a/src/service.c b/src/service.c
44
index 1a405d1..3fad9da 100644
45
--- a/src/service.c
46
+++ b/src/service.c
47
@@ -41,6 +41,7 @@
48
 #include "packet.h"
49
 #include "channels.h"
50
 #include "cwc.h"
51
+#include "ccw.h"
52
 #include "capmt.h"
53
 #include "notify.h"
54
 #include "serviceprobe.h"
55
@@ -204,6 +205,7 @@ service_start(service_t *t, unsigned int weight, int force_start)
56
 
57
   cwc_service_start(t);
58
   capmt_service_start(t);
59
+  ccw_service_start(t);
60
 
61
   pthread_mutex_lock(&t->s_stream_mutex);
62
 
63
diff --git a/src/tsdemux.c b/src/tsdemux.c
64
index 897fe1d..b1e3b4a 100644
65
--- a/src/tsdemux.c
66
+++ b/src/tsdemux.c
67
@@ -204,6 +204,11 @@ ts_recv_packet1(service_t *t, const uint8_t *tsb, int64_t *pcrp)
68
 
69
   pid = (tsb[1] & 0x1f) << 8 | tsb[2];
70
 
71
+  if(pid==0x1FFF){  // ignore NULL stream
72
+    pthread_mutex_unlock(&t->s_stream_mutex);
73
+    return;
74
+  }
75
+
76
   st = service_stream_find(t, pid);
77
 
78
   /* Extract PCR */
79
diff --git a/src/webui/extjs.c b/src/webui/extjs.c
80
index 3ed9f8b..6c11c27 100644
81
--- a/src/webui/extjs.c
82
+++ b/src/webui/extjs.c
83
@@ -122,6 +122,7 @@ extjs_root(http_connection_t *hc, const char *remain, void *opaque)
84
   extjs_load(hq, "static/app/acleditor.js");
85
   extjs_load(hq, "static/app/cwceditor.js");
86
   extjs_load(hq, "static/app/capmteditor.js");
87
+  extjs_load(hq, "static/app/ccweditor.js");
88
   extjs_load(hq, "static/app/tvadapters.js");
89
 #if ENABLE_LINUXDVB
90
   extjs_load(hq, "static/app/dvb.js");
91
diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
92
index 5835b3f..84a83e7 100644
93
--- a/src/webui/static/app/tvheadend.js
94
+++ b/src/webui/static/app/tvheadend.js
95
@@ -241,7 +241,8 @@ function accessUpdate(o) {
96
 		    new tvheadend.iptv,
97
 		    new tvheadend.acleditor, 
98
 		    new tvheadend.cwceditor,
99
-                    new tvheadend.capmteditor]
100
+                    new tvheadend.capmteditor,
101
+                    new tvheadend.ccweditor]
102
 	});
103
 	tvheadend.rootTabPanel.add(tvheadend.confpanel);
104
     }
(3-3/3)