# HG changeset patch
# User Naoya OYAMA <naoya.oyama@gmail.com>
# Date 1343459128 -32400
# Node ID 5eab7c73a28a2beea87ed87e16fd3238f74ce01d
# Parent  097d5aaf6b0790b964a2a5f3593f098f6cb4d4c2
Add PT3 driver

diff -r 097d5aaf6b07 -r 5eab7c73a28a Makefile
--- a/Makefile	Mon Jul 02 20:19:00 2012 +0900
+++ b/Makefile	Sat Jul 28 16:05:28 2012 +0900
@@ -7,10 +7,9 @@
 
 EXTRADIST = configure \
 
-EXTRALIBS = libupnp-1.6.6 \
-	libdlna-0.2.3 \
-
 SUBDIRS = src \
+          driver \
+          pt3 \
 
 all:
 	for subdir in $(SUBDIRS); do \
@@ -21,19 +20,11 @@
 	for subdir in $(SUBDIRS); do \
 	  $(MAKE) -C $$subdir $@; \
 	done
-	for subdir in $(EXTRALIBS); do \
-	  $(MAKE) uninstall; \
-	  $(MAKE) -C $$subdir $@; \
-	done
 
 distclean: clean
 	for subdir in $(SUBDIRS); do \
 	  $(MAKE) -C $$subdir $@; \
 	done
-	for subdir in $(EXTRALIBS); do \
-	  $(MAKE) uninstall; \
-	  $(MAKE) -C $$subdir $@; \
-	done
 	-$(RM) -f config.log
 	-$(RM) -f config.mak
 	-$(RM) -f config.h
@@ -46,6 +37,9 @@
 
 .PHONY: clean distclean install
 
+uninstall:
+	echo a > /dev/null
+
 dist:
 	-$(RM) $(DISTFILE)
 	dist=$(shell pwd)/recpt1-$(VERSION) && \
diff -r 097d5aaf6b07 -r 5eab7c73a28a configure
--- a/configure	Mon Jul 02 20:19:00 2012 +0900
+++ b/configure	Sat Jul 28 16:05:28 2012 +0900
@@ -468,6 +468,27 @@
 fi
 
 #################################################
+#  check pt3 driver
+#################################################
+if test -e pt3/mp_auto_pull ; then
+    if ! (cd pt3 && git pull --rebase) ; then
+        echo "git pull failed, (re)move pt3/auto_pull to disable pulling"
+        exit 1
+    fi
+fi
+
+if ! test -e pt3 ; then
+    echo "No pt3 checkout, press enter to download one with git or CTRL+C to abort"
+    read tmp
+    if ! git clone https://github.com/m-tsudo/pt3.git; then
+       rm -fr pt3
+       echo "Faild to get a PT3 checkout"
+       exit 1;
+    fi
+    touch pt3/auto_pull
+fi
+
+#################################################
 #   compiler sanity check
 #################################################
 echolog "Checking for compiler available..."
diff -r 097d5aaf6b07 -r 5eab7c73a28a src/pt1_dev.h
--- a/src/pt1_dev.h	Mon Jul 02 20:19:00 2012 +0900
+++ b/src/pt1_dev.h	Sat Jul 28 16:05:28 2012 +0900
@@ -13,6 +13,14 @@
     "/dev/pt1video8",
     "/dev/pt1video13",
     "/dev/pt1video12"
+    "/dev/pt3video1",
+    "/dev/pt3video0",
+    "/dev/pt3video5",
+    "/dev/pt3video4",
+    "/dev/pt3video9",
+    "/dev/pt3video8",
+    "/dev/pt3video13",
+    "/dev/pt3video12"
 };
 char *isdb_t_dev[NUM_ISDB_T_DEV] = {
     "/dev/pt1video2",
@@ -23,6 +31,14 @@
     "/dev/pt1video11",
     "/dev/pt1video14",
     "/dev/pt1video15"
+    "/dev/pt3video2",
+    "/dev/pt3video3",
+    "/dev/pt3video6",
+    "/dev/pt3video7",
+    "/dev/pt3video10",
+    "/dev/pt3video11",
+    "/dev/pt3video14",
+    "/dev/pt3video15"
 };
 
 // 変換テーブル(ISDB-T用)
diff -r 097d5aaf6b07 -r 5eab7c73a28a src/recpt1.h
--- a/src/recpt1.h	Mon Jul 02 20:19:00 2012 +0900
+++ b/src/recpt1.h	Sat Jul 28 16:05:28 2012 +0900
@@ -9,8 +9,8 @@
 #include "tssplitter_lite.h"
 
 #define HAVE_LIBARIB25 1
-#define NUM_BSDEV       8
-#define NUM_ISDB_T_DEV  8
+#define NUM_BSDEV       16
+#define NUM_ISDB_T_DEV  16
 #define CHTYPE_SATELLITE    0        /* satellite digital */
 #define CHTYPE_GROUND       1        /* terrestrial digital */
 #define MAX_QUEUE           8192