fix jackd and v4l default devices, add update-rc init commands

diff --git a/tcserver/conf/etc/default/jackd b/tcserver/conf/etc/default/jackd
index 3f50b4556a8ee34b90b53a9706efa83f7108606f..1d05842e9dcea405f9b812f5e07e785ff164504c 100644 (file)
--- a/tcserver/conf/etc/default/jackd
+++ b/tcserver/conf/etc/default/jackd
@@ -5,5 +5,5 @@ START_DAEMON=yes
 USER=telecaster
 
 # Options to pass to jackd
-OPTIONS="-dalsa -r44100 -p1024 -n3 -Chw:3,1 -Phw:3,0"
+OPTIONS="-dalsa -r48000 -p1024 -n3 -Chw:3 -Phw:3"
 

diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh
index 41224a808c8e604eaf7420de350a4d29d9d3481d..a4afde43dfae442bd500c58a6c74b78df9e6d7c6 100755 (executable)
--- a/tcserver/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh
@@ -7,7 +7,7 @@ HEIGHT=360
 #WIDTH=1280
 #HEIGHT=720
 
-v4l2-ctl -d 1 -c power_line_frequency=1
+v4l2-ctl -d 0 -c power_line_frequency=1
 
 gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT, framerate={30/1}  \
        ! queue ! ffmpegcolorspace \

diff --git a/tcserver/install.py b/tcserver/install.py
index ddd5c934db597f86fa1ba0f9c21aae0edd5b0080..c3ccf5ef4056ec2bbdad3749564ee41315b52fa4 100644 (file)
--- a/tcserver/install.py
+++ b/tcserver/install.py
@@ -122,20 +122,14 @@ class Install(object):
                 shutil.copy('conf'+path, path)
                 os.system('sudo chmod 755 '+path)
 
-        init_link = '/etc/rc2.d/S97jackd'
-        if not os.path.islink(init_link):
-            os.system('ln -s /etc/init.d/jackd '+init_link)
-
-        init_link = '/etc/rc2.d/S99telecaster'
-        if not os.path.islink(init_link):
-            os.system('ln -s /etc/init.d/telecaster '+init_link)
-
-        init_link = '/etc/rc2.d/S98stream-m'
-        if not os.path.islink(init_link):
-            os.system('ln -s /etc/init.d/stream-m '+init_link)
-
         os.system('cp -ra conf/usr/* /usr/')
 
+        os.system('update-rc.d jackd defaults 30 30')
+        os.system('update-rc.d stream-m defaults 20 20')
+        os.system('update-rc.d telecaster-vnc defaults 80 15')
+        os.system('update-rc.d telecaster-video defaults 81 14')
+        os.system('update-rc.d telecaster-audio defaults 82 13')
+
     def run(self):
         if self.options['keepinit'] == False:
             print 'Installing init files...'