From ab5dae9d514ec3b97fce6d0d88b5f0887e4eddde Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 17 Jul 2013 01:07:03 +0200 Subject: [PATCH] fix jackd and v4l default devices, add update-rc init commands --- tcserver/conf/etc/default/jackd | 2 +- .../scripts/tc_video_simple_webm_stream.sh | 2 +- tcserver/install.py | 18 ++++++------------ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/tcserver/conf/etc/default/jackd b/tcserver/conf/etc/default/jackd index 3f50b45..1d05842 100644 --- 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 41224a8..a4afde4 100755 --- 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 ddd5c93..c3ccf5e 100644 --- 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...' -- 2.39.5