From: yomguy <yomguy@parisson.com>
Date: Mon, 9 Jan 2012 13:36:53 +0000 (+0100)
Subject: re-organize
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6dded5c8eade9830ea60a7ecb9079de117c01824;p=telecaster-cgi.git

re-organize
---

diff --git a/conf/home/bin/rotate_desktop b/conf/home/bin/rotate_desktop
deleted file mode 100755
index 3e6abf8..0000000
--- a/conf/home/bin/rotate_desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-xrandrout="$(xrandr)"
-
-case $xrandrout in
- *1024x600+0+0\ inverted\ \(* ) rotate=0; invert=0;;
- *1024x600+0+0\ \(* ) rotate=2; invert=1;;
-esac
-
-xrandr -o $rotate
-xinput --set-prop 11 "Evdev Axis Inversion" $invert, $invert
-
diff --git a/conf/home/fluxbox/telecaster/gst_video_double_shout2.sh b/conf/home/fluxbox/telecaster/gst_video_double_shout2.sh
new file mode 100755
index 0000000..cd25b51
--- /dev/null
+++ b/conf/home/fluxbox/telecaster/gst_video_double_shout2.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=480
+HEIGHT=270
+
+gst-launch v4l2src device=/dev/video0 ! queue ! videoscale ! video/x-raw-yuv, width=160, height=120 \
+	! queue ! videorate ! video/x-raw-yuv,framerate=25/1 \
+	! queue ! videomixer name=mix sink_1::xpos=0 sink_1::ypos=0 sink_1::alpha=0.9 \
+	! queue ! ffmpegcolorspace ! queue ! theoraenc quality=25 ! muxout. \
+	jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 \
+	! queue ! audioconvert ! vorbisenc ! queue ! muxout.  \
+	oggmux name=muxout ! queue ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 \
+	v4l2src device=/dev/video1 ! queue ! videoscale ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT \
+	! queue ! videorate ! video/x-raw-yuv,framerate=25/1 ! mix. \
+	> /dev/null &
+		
+sleep 2
+
+jack_disconnect system:capture_1 gst-launch-0.10:in_jackaudiosrc0_1
+jack_connect 	jack_rack:out_1  gst-launch-0.10:in_jackaudiosrc0_1
+
diff --git a/conf/home/fluxbox/telecaster/tc_video_simple_webm_stream_hd.sh b/conf/home/fluxbox/telecaster/tc_video_simple_webm_stream_hd.sh
new file mode 100755
index 0000000..7afd26c
--- /dev/null
+++ b/conf/home/fluxbox/telecaster/tc_video_simple_webm_stream_hd.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=1024
+HEIGHT=576
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
+	! queue ! videoflip method=rotate-180 \
+	! queue ! ffmpegcolorspace \
+	! queue ! vp8enc speed=2 threads=2 quality=5 ! queue ! muxout. \
+	jackaudiosrc connect=1 \
+	! queue ! audioconvert ! queue ! vorbisenc quality=3 ! queue ! muxout.  \
+	webmmux streamable=true name=muxout \
+	! tee name=t ! queue ! tcpserversink host=127.0.0.1 port=9000 \
+	t. ! queue ! filesink location=/home/telecaster/trash/test.webm \
+	> /dev/null &
+
diff --git a/conf/home/media/mp3/silence.mp3 b/conf/home/media/mp3/silence.mp3
deleted file mode 100644
index 17538c9..0000000
Binary files a/conf/home/media/mp3/silence.mp3 and /dev/null differ
diff --git a/conf/home/media/ogg/silence.ogg b/conf/home/media/ogg/silence.ogg
deleted file mode 100644
index 5cfaddf..0000000
Binary files a/conf/home/media/ogg/silence.ogg and /dev/null differ
diff --git a/conf/home/telecaster/media/mp3/silence.mp3 b/conf/home/telecaster/media/mp3/silence.mp3
new file mode 100644
index 0000000..17538c9
Binary files /dev/null and b/conf/home/telecaster/media/mp3/silence.mp3 differ
diff --git a/conf/home/telecaster/media/ogg/silence.ogg b/conf/home/telecaster/media/ogg/silence.ogg
new file mode 100644
index 0000000..5cfaddf
Binary files /dev/null and b/conf/home/telecaster/media/ogg/silence.ogg differ
diff --git a/conf/usr/local/bin/rotate_desktop b/conf/usr/local/bin/rotate_desktop
new file mode 100755
index 0000000..3e6abf8
--- /dev/null
+++ b/conf/usr/local/bin/rotate_desktop
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+xrandrout="$(xrandr)"
+
+case $xrandrout in
+ *1024x600+0+0\ inverted\ \(* ) rotate=0; invert=0;;
+ *1024x600+0+0\ \(* ) rotate=2; invert=1;;
+esac
+
+xrandr -o $rotate
+xinput --set-prop 11 "Evdev Axis Inversion" $invert, $invert
+
diff --git a/conf/usr/share/applications/rotate_desktop.desktop b/conf/usr/share/applications/rotate_desktop.desktop
index 4182a90..aa85a41 100644
--- a/conf/usr/share/applications/rotate_desktop.desktop
+++ b/conf/usr/share/applications/rotate_desktop.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Rotate Desktop
-Exec=~/bin/rotate_desktop
+Exec=/usr/local/bin/rotate_desktop
 Icon=preferences-desktop-rotate
 Type=Application
 Comment=Rotate Desktop for 180 degrees with the touchscreen
diff --git a/install.py b/install.py
index 41d276b..0f5235a 100644
--- a/install.py
+++ b/install.py
@@ -111,8 +111,9 @@ class Install(object):
         for dir in self.home_dirs:
             home_dir = self.home + '/.' + dir
             if not os.path.exists(home_dir):
-                shutil.copytree('conf/home/'+dir, home_dir, ignore=shutil.ignore_patterns('*.svn*'))
-                self.chown(dir)
+                os.makedirs(home_dir)
+            os.system('cp -r conf/home/'+dir + ' ' + home_dir)
+            self.chown(home_dir)
 
         dir = 'media'
         if not os.path.exists(self.home+os.sep+dir):
@@ -145,6 +146,8 @@ class Install(object):
         if not os.path.islink(init_link):
             os.system('ln -s /etc/init.d/vncserver '+init_link)
 
+
+
     def run(self):
         if self.options['keepinit'] == False:
             print 'Installing init files...'