BIG refactor of app confs and programs, rm rotate-desktop script

author Guillaume Pellerin <yomguy@parisson.com>

Mon, 15 Jul 2013 21:17:41 +0000 (23:17 +0200)

committer Guillaume Pellerin <yomguy@parisson.com>

Mon, 15 Jul 2013 21:17:41 +0000 (23:17 +0200)
author Guillaume Pellerin <yomguy@parisson.com>
Mon, 15 Jul 2013 21:17:41 +0000 (23:17 +0200)
committer Guillaume Pellerin <yomguy@parisson.com>
Mon, 15 Jul 2013 21:17:41 +0000 (23:17 +0200)
diff --git a/tcserver/conf/etc/init.d/telecaster b/tcserver/conf/etc/init.d/telecaster

index f087c8010775b3388ee5a1793275561ae9d70f24..fdb02adbede977f83f9c439cd63205caadb85d12 100755 (executable)
--- a/tcserver/conf/etc/init.d/telecaster
+++ b/tcserver/conf/etc/init.d/telecaster
@@ -14,15 +14,15 @@ USER=
  OPTIONS=""
  LOG=/var/log/vncserver.log
  PIDFILE=/var/run/vncserver.pid
-PORT=1
+PORT=2
  
-test -f /etc/default/vncserver || exit 0
-. /etc/default/vncserver
+test -f /etc/default/telecaster || exit 0
+. /etc/default/telecaster
  
  VNCHOME=/home/$USER
  
  if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "stop" ]; then
-       echo "Edit /etc/default/vncserver to start vncserver"
+       echo "Edit /etc/default/telecaster to start telecaster vncserver"
         exit 0
  fi
  
@@ -31,28 +31,27 @@ test -f $DAEMON || exit 0
  . /lib/lsb/init-functions
  
  case "$1" in
-       start)  
-           log_begin_msg "Starting vncserver audio server:" "vncserver"
-            echo $DAEMON $OPTIONS :$PORT' &' > $VNCHOME/.vncserverinit
-            chmod +x $VNCHOME/.vncserverinit
-            su -c $VNCHOME/.vncserverinit $USER > ${LOG}
-           sleep 2
-            pid=`pgrep -u ${USER} vncserver` 
+       start)
+           log_begin_msg "Starting telecaster streaming vncserver:" "telecaster"
+            su -c "$DAEMON $OPTIONS :$PORT > $LOG &" $USER
+            sleep 20
+            deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml > /dev/null &
+            deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml > /dev/null &
+            pid=`pgrep -u ${USER} vncserver`
             if [ pid = '' ]; then
-                       log_failure_msg "Vncserver daemon can't be started! Check logfile: ${LOG}"
+                       log_failure_msg "TeleCaster daemon can't be started! Check logfile: $LOG"
              else
                  echo $pid > $PIDFILE
                 fi
-               
+
                 ;;
         stop)
-               log_begin_msg "Stopping vncserver audio server:" "vncserver"
-                pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` 
+               log_begin_msg "Stopping telecaster streaming vncserver:" "telecaster"
+                pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
                 if [ ! pid = '' ]; then
-                       su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_audio_safe.xml\" "
-                       su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_video_safe.xml\" "
-                       su -c "pkill -9 edcast_jack" $USER
-                        su -c "pkill -9 gst-launch-0.10" $USER
+                       su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_mp3_monitor.yaml\" "
+                       su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_webm_monitor.yaml\" "
+                    su -c "pkill -9 gst-launch-0.10" $USER
                         sleep 1
                          su -c "vncserver -kill :$PORT" $USER
                         log_end_msg 0
@@ -75,7 +74,7 @@ case "$1" in
                 ;;
  
         *)
-               log_warning_msg "Usage: /etc/init.d/vncserver {start|stop|restart|force-reload|awaken|debug-run}"
+               log_warning_msg "Usage: /etc/init.d/telecaster {start|stop|restart|force-reload|awaken|debug-run}"
                 log_warning_msg "  start - starts system-wide vncserver service"
                 log_warning_msg "  stop  - stops system-wide vncserver service"
                 log_warning_msg "  restart, force-reload - starts a new system-wide vncserver service"
diff --git a/tcserver/conf/etc/telecaster/deefuzzer.xml b/tcserver/conf/etc/telecaster/deefuzzer.xml

deleted file mode 100644 (file)

index 3df370d..0000000
--- a/tcserver/conf/etc/telecaster/deefuzzer.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<deefuzzer>
-    <log>/var/log/deefuzzer/telecaster_safe.log</log>
-    <m3u>/var/www/m3u/telecaster_safe.m3u</m3u>
-
-    <station>
-        <infos>
-            <short_name>telecaster_live_safe</short_name>
-            <name>TeleCaster Localhost Live Safe Recorder</name>
-            <description>TeleCaster safe local live audio record</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <type>icecast</type>
-            <host>127.0.0.1</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/telecaster/media/mp3</dir>
-            <format>mp3</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>1</mode>
-            <port>1234</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>1</mode>
-            <dir>/home/telecaster/trash</dir>
-        </record>
-    </station>
-
-    <station>
-        <infos>
-            <short_name>telecaster_live_safe</short_name>
-            <name>TeleCaster Localhost Live Safe Recorder</name>
-            <description>TeleCaster safe local live audio record</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <type>icecast</type>
-            <host>parisson.com</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/telecaster/media/mp3</dir>
-            <format>mp3</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>1</mode>
-            <port>1235</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>0</mode>
-            <dir>/home/telecaster/trash</dir>
-        </record>
-    </station>
-
-
-</deefuzzer>
-
-
diff --git a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml

new file mode 100644 (file)

index 0000000..264ef2e
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml
@@ -0,0 +1,116 @@
+<deefuzzer>
+    <log>/var/log/telecaster/deefuzzer_mp3_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_mp3.m3u</m3u>
+
+    <station>
+        <infos>
+            <short_name>telecaster_live_safe</short_name>
+            <name>TeleCaster Localhost Live Safe Recorder</name>
+            <description>TeleCaster safe local live audio record</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <type>icecast</type>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/telecaster/media/mp3</dir>
+            <format>mp3</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>48000</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>1</mode>
+            <port>1234</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/archives</dir>
+        </record>
+    </station>
+
+    <station>
+        <infos>
+            <short_name>telecaster_live_safe</short_name>
+            <name>TeleCaster Localhost Live Safe Recorder</name>
+            <description>TeleCaster safe local live audio record</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <type>icecast</type>
+            <host>angus.parisson.com</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/telecaster/media/mp3</dir>
+            <format>mp3</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>48000</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>1</mode>
+            <port>1235</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>0</mode>
+            <dir>/home/telecaster/trash</dir>
+        </record>
+    </station>
+
+
+</deefuzzer>
+
+
diff --git a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml

new file mode 100644 (file)

index 0000000..e370f91
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml
@@ -0,0 +1,25 @@
+deefuzzer:
+  log: /var/log/telecaster/telecaster_mp3_monitor.log
+  m3u: /var/www/m3u/telecaster_mp3_monitor.m3u
+  station:
+    control: {mode: 1, port: 16001}
+    infos: {description: TeleCaster MP3 monitor,
+            genre: Vocal,
+            name: telecaster_mp3_monitor,
+            url: 'http://parisson.com.com'}
+    jingles: {dir: /path/to/jingles, mode: 0, shuffle: 1}
+    media: {bitrate: 96,
+            dir: /home/telecaster/media/mp3,
+            format: mp3, ogg_quality: 4,
+            samplerate: 48000, shuffle: 0, voices: '2'}
+    record: {dir: /home/telecaster/trash/mp3, mode: 1}
+    relay: {author: Inconnu, mode: 1,
+            url: 'http://127.0.0.1:8000/telecaster_live.mp3'}
+    rss: {dir: /var/www/rss, enclosure: 0,
+          media_url: 'http://localhost/rss/'}
+    server: {host: 127.0.0.1, mountpoint: monitor,
+             port: 8000, public: 0,
+             sourcepassword: source2parisson, type: icecast}
+    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE,
+              mode: 0, secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
+              tags: bla bla}
diff --git a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml

new file mode 100644 (file)

index 0000000..c8a7494
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml
@@ -0,0 +1,112 @@
+<deefuzzer>
+    <m3u>/var/www/m3u/telecaster_webm.m3u</m3u>
+    <station>
+        <control>
+            <mode>1</mode>
+            <port>1236</port>
+        </control>
+        <relay>
+            <url>http://127.0.0.1:8080/consume/safe</url>
+            <mode>1</mode>
+            <author>Parisson</author>
+        </relay>
+        <media>
+            <shuffle>0</shuffle>
+            <format>webm</format>
+            <voices>2</voices>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>48000</samplerate>
+            <bitrate>600</bitrate>
+            <dir>/home/telecaster/media/webm/</dir>
+        </media>
+        <twitter>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <tags>bla bla</tags>
+        </twitter>
+        <server>
+            <host>angus.parisson.com</host>
+            <type>stream-m</type>
+            <port>8080</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <record>
+            <mode>0</mode>
+            <dir>/home/telecaster/archives</dir>
+        </record>
+        <jingles>
+            <shuffle>0</shuffle>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+        </jingles>
+        <infos>
+            <url>http://parisson.com</url>
+            <genre>Oral</genre>
+            <name>crfpa-droit-international-prive-cours</name>
+            <short_name>crfpa-droit-international-prive-cours</short_name>
+            <description>crfpa-droit-international-prive-cours</description>
+        </infos>
+        <rss>
+            <enclosure>0</enclosure>
+            <dir>/var/www/rss</dir>
+        </rss>
+    </station>
+    <station>
+        <control>
+            <mode>1</mode>
+            <port>1237</port>
+        </control>
+        <relay>
+            <url>http://127.0.0.1:8080/consume/safe</url>
+            <mode>1</mode>
+            <author>Parisson</author>
+        </relay>
+        <media>
+            <shuffle>0</shuffle>
+            <format>webm</format>
+            <voices>2</voices>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>48000</samplerate>
+            <bitrate>600</bitrate>
+            <dir>/home/telecaster/media/webm/</dir>
+        </media>
+        <twitter>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <tags>bla bla</tags>
+        </twitter>
+        <server>
+            <host>127.0.0.1</host>
+            <type>stream-m</type>
+            <port>8080</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/archives</dir>
+        </record>
+        <jingles>
+            <shuffle>0</shuffle>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+        </jingles>
+        <infos>
+            <url>http://parisson.com</url>
+            <genre>Oral</genre>
+            <name>crfpa-droit-international-prive-cours</name>
+            <short_name>crfpa-droit-international-prive-cours</short_name>
+            <description>crfpa-droit-international-prive-cours</description>
+        </infos>
+        <rss>
+            <enclosure>0</enclosure>
+            <dir>/var/www/rss</dir>
+        </rss>
+    </station>
+
+
+<log>/var/log/telecaster/deefuzzer_mp3_safe.log</log>
+</deefuzzer>
diff --git a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml

new file mode 100644 (file)

index 0000000..0c7e3e9
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml
@@ -0,0 +1,17 @@
+deefuzzer:
+  log: /var/log/telecaster/telecaster_webm_monitor.log
+  m3u: /var/www/m3u/telecaster_webm_monitor.m3u
+  station:
+    control: {mode: 1, port: 16002}
+    infos: {description: TeleCaster WebM monitor stream, genre: Vocal, name: monitor, short_name: monitor,
+      url: 'http://parisson.com.com'}
+    jingles: {dir: /path/to/jingles, mode: '0', shuffle: '0'}
+    media: {bitrate: '512', dir: /home/telecaster/media/webm, format: webm, ogg_quality: '4',
+      samplerate: '48000', shuffle: '0', voices: '1'}
+    record: {dir: /home/telecaster/trash/webm, mode: 1}
+    relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:9000/'}
+    rss: {dir: /var/www/rss, enclosure: '0', media_url: 'http://localhost/rss/'}
+    server: {host: 127.0.0.1, port: '8080', public: '0', sourcepassword: source2parisson,
+      type: stream-m, mountpoint: monitor}
+    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
+      tags: bla bla}
diff --git a/tcserver/conf/etc/telecaster/deefuzzer_audio_safe.xml b/tcserver/conf/etc/telecaster/deefuzzer_audio_safe.xml

deleted file mode 100644 (file)

index 4b5a473..0000000
--- a/tcserver/conf/etc/telecaster/deefuzzer_audio_safe.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<deefuzzer>
-    <log>/var/log/deefuzzer/telecaster_audio_safe.log</log>
-    <m3u>/var/www/m3u/telecaster_audio_safe.m3u</m3u>
-
-    <station>
-        <control>
-            <mode>0</mode>
-            <port>1236</port>
-        </control>
-        <relay>
-            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
-            <mode>1</mode>
-            <author>Inconnu</author>
-        </relay>
-        <media>
-            <shuffle>0</shuffle>
-            <format>mp3</format>
-            <voices>2</voices>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>48000</samplerate>
-            <bitrate>96</bitrate>
-            <dir>/home/telecaster/media/mp3</dir>
-        </media>
-        <twitter>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <tags>bla bla</tags>
-        </twitter>
-        <server>
-            <type>icecast</type>
-            <host>127.0.0.1</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <record>
-            <mode>1</mode>
-            <dir>/home/telecaster/trash/mp3</dir>
-        </record>
-        <jingles>
-            <shuffle>1</shuffle>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-        </jingles>
-        <infos>
-            <url>http://parisson.com.com</url>
-            <genre>Vocal</genre>
-            <name>telecaster_audio_safe</name>
-            <short_name>telecaster_audio_safe</short_name>
-            <description>TeleCaster safe audio stream</description>
-        </infos>
-        <rss>
-            <enclosure>0</enclosure>
-            <dir>/var/www/rss</dir>
-            <media_url>http://my.domain.com/rss/</media_url>
-        </rss>
-    </station>
-
-</deefuzzer>
-
-
diff --git a/tcserver/conf/etc/telecaster/deefuzzer_mp3.xml b/tcserver/conf/etc/telecaster/deefuzzer_mp3.xml

deleted file mode 100644 (file)

index 264ef2e..0000000
--- a/tcserver/conf/etc/telecaster/deefuzzer_mp3.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<deefuzzer>
-    <log>/var/log/telecaster/deefuzzer_mp3_safe.log</log>
-    <m3u>/var/www/m3u/telecaster_mp3.m3u</m3u>
-
-    <station>
-        <infos>
-            <short_name>telecaster_live_safe</short_name>
-            <name>TeleCaster Localhost Live Safe Recorder</name>
-            <description>TeleCaster safe local live audio record</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <type>icecast</type>
-            <host>127.0.0.1</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/telecaster/media/mp3</dir>
-            <format>mp3</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>48000</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>1</mode>
-            <port>1234</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>1</mode>
-            <dir>/home/telecaster/archives</dir>
-        </record>
-    </station>
-
-    <station>
-        <infos>
-            <short_name>telecaster_live_safe</short_name>
-            <name>TeleCaster Localhost Live Safe Recorder</name>
-            <description>TeleCaster safe local live audio record</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <type>icecast</type>
-            <host>angus.parisson.com</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/telecaster/media/mp3</dir>
-            <format>mp3</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>48000</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>1</mode>
-            <port>1235</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>0</mode>
-            <dir>/home/telecaster/trash</dir>
-        </record>
-    </station>
-
-
-</deefuzzer>
-
-
diff --git a/tcserver/conf/etc/telecaster/deefuzzer_ogg.xml b/tcserver/conf/etc/telecaster/deefuzzer_ogg.xml

deleted file mode 100644 (file)

index 522cfc3..0000000
--- a/tcserver/conf/etc/telecaster/deefuzzer_ogg.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<deefuzzer>
-    <log>/var/log/deefuzzer/telecaster.log</log>
-    <m3u>/var/www/m3u/telecaster.m3u</m3u>
-
-    <station>
-        <infos>
-            <short_name>telecaster_local</short_name>
-            <name>TeleCaster Localhost</name>
-            <description>TeleCaster local audio streaming</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <host>127.0.0.1</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/path/to/ogg</dir>
-            <format>ogg</format>
-            <bitrate>64</bitrate>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>1</mode>
-            <port>1234</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>1</mode>
-            <dir>/path/to/archives</dir>
-        </record>
-    </station>
-
-
-    <station>
-        <infos>
-            <short_name>telecaster</short_name>
-            <name>TeleCaster Remote</name>
-            <description>TeleCaster Remote</description>
-            <url>http://parisson.com</url>
-            <genre>School</genre>
-        </infos>
-        <server>
-            <host>stream.parisson.com</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/path/to/ogg</dir>
-            <format>ogg</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>my_twitter_user</key>
-            <secret>my_twitter_password</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>0</mode>
-            <port>1235</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>0</mode>
-            <dir>/path/to/archives</dir>
-        </record>
-    </station>
-
-</deefuzzer>
-
-
diff --git a/tcserver/conf/etc/telecaster/deefuzzer_safe.xml b/tcserver/conf/etc/telecaster/deefuzzer_safe.xml

deleted file mode 100644 (file)

index e1d6ebb..0000000
--- a/tcserver/conf/etc/telecaster/deefuzzer_safe.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<deefuzzer>
-    <log>/var/log/deefuzzer/telecaster_safe.log</log>
-    <m3u>/var/www/m3u/telecaster_safe.m3u</m3u>
-
-    <station>
-        <infos>
-            <short_name>telecaster_live_safe</short_name>
-            <name>TeleCaster Localhost Live Safe Recorder</name>
-            <description>TeleCaster safe local live audio record</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <host>127.0.0.1</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/telecaster/media/ogg</dir>
-            <format>ogg</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>0</mode>
-            <port>1234</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>1</mode>
-            <dir>/home/telecaster/trash</dir>
-        </record>
-    </station>
-
-</deefuzzer>
-
-
diff --git a/tcserver/conf/etc/telecaster/deefuzzer_safe_mp3.xml b/tcserver/conf/etc/telecaster/deefuzzer_safe_mp3.xml

deleted file mode 100644 (file)

index 4ad00d7..0000000
--- a/tcserver/conf/etc/telecaster/deefuzzer_safe_mp3.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<deefuzzer>
-    <log>/var/log/deefuzzer/telecaster_safe.log</log>
-    <m3u>/var/www/m3u/telecaster_safe.m3u</m3u>
-
-    <station>
-        <infos>
-            <short_name>telecaster_live_safe</short_name>
-            <name>TeleCaster Localhost Live Safe Recorder</name>
-            <description>TeleCaster safe local live audio record</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <host>127.0.0.1</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/telecaster/media/mp3</dir>
-            <format>mp3</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>0</mode>
-            <port>1234</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>1</mode>
-            <dir>/home/telecaster/trash</dir>
-        </record>
-    </station>
-
-</deefuzzer>
-
-
diff --git a/tcserver/conf/etc/telecaster/deefuzzer_safe_ogg.xml b/tcserver/conf/etc/telecaster/deefuzzer_safe_ogg.xml

deleted file mode 100644 (file)

index e1d6ebb..0000000
--- a/tcserver/conf/etc/telecaster/deefuzzer_safe_ogg.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<deefuzzer>
-    <log>/var/log/deefuzzer/telecaster_safe.log</log>
-    <m3u>/var/www/m3u/telecaster_safe.m3u</m3u>
-
-    <station>
-        <infos>
-            <short_name>telecaster_live_safe</short_name>
-            <name>TeleCaster Localhost Live Safe Recorder</name>
-            <description>TeleCaster safe local live audio record</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <host>127.0.0.1</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/telecaster/media/ogg</dir>
-            <format>ogg</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>0</mode>
-            <port>1234</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>1</mode>
-            <dir>/home/telecaster/trash</dir>
-        </record>
-    </station>
-
-</deefuzzer>
-
-
diff --git a/tcserver/conf/etc/telecaster/deefuzzer_video.xml b/tcserver/conf/etc/telecaster/deefuzzer_video.xml

deleted file mode 100644 (file)

index bd0db95..0000000
--- a/tcserver/conf/etc/telecaster/deefuzzer_video.xml
+++ /dev/null
@@ -1,329 +0,0 @@
-<deefuzzer>
-    <log>/var/log/deefuzzer/telecaster.log</log>
-    <m3u>/var/www/m3u/telecaster.m3u</m3u>
-
-    <station>
-        <infos>
-            <short_name>telecaster_local</short_name>
-            <name>TeleCaster Localhost</name>
-            <description>TeleCaster local audio streaming</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <host>127.0.0.1</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/path/to/ogg</dir>
-            <format>ogg</format>
-            <bitrate>64</bitrate>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>1</mode>
-            <port>1234</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>1</mode>
-            <dir>/path/to/archives</dir>
-        </record>
-    </station>
-
-
-    <station>
-        <infos>
-            <short_name>telecaster</short_name>
-            <name>TeleCaster Remote</name>
-            <description>TeleCaster Remote</description>
-            <url>http://parisson.com</url>
-            <genre>School</genre>
-        </infos>
-        <server>
-            <host>stream.parisson.com</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/path/to/ogg</dir>
-            <format>ogg</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>0</mode>
-            <port>1235</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>0</mode>
-            <dir>/path/to/archives</dir>
-        </record>
-    </station>
-
-
-    <station>
-        <infos>
-            <short_name>telecaster</short_name>
-            <name>TeleCaster Remote</name>
-            <description>TeleCaster Remote</description>
-            <url>http://parisson.com</url>
-            <genre>School</genre>
-        </infos>
-        <server>
-            <host>stream.parisson.com</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/path/to/ogg</dir>
-            <format>ogg</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>0</mode>
-            <port>1235</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>0</mode>
-            <dir>/path/to/archives</dir>
-        </record>
-    </station>
-
-    <station>
-        <infos>
-            <short_name>telecaster_video</short_name>
-            <name>TeleCaster Video Localhost</name>
-            <description>TeleCaster local video streaming</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <host>127.0.0.1</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/path/to/ogg</dir>
-            <format>ogg</format>
-            <bitrate>64</bitrate>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>1</mode>
-            <port>1235</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live_video.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>1</mode>
-            <dir>/path/to/archives</dir>
-        </record>
-    </station>
-
-
-    <station>
-        <infos>
-            <short_name>telecaster_video</short_name>
-            <name>TeleCaster Video Remote</name>
-            <description>TeleCaster Video Remote</description>
-            <url>http://parisson.com</url>
-            <genre>School</genre>
-        </infos>
-        <server>
-            <host>stream.parisson.com</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/path/to/ogg</dir>
-            <format>ogg</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>0</mode>
-            <port>1235</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live_video.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>0</mode>
-            <dir>/path/to/archives</dir>
-        </record>
-    </station>
-
-
-    <station>
-        <infos>
-            <short_name>telecaster</short_name>
-            <name>TeleCaster Remote</name>
-            <description>TeleCaster Remote</description>
-            <url>http://parisson.com</url>
-            <genre>School</genre>
-        </infos>
-        <server>
-            <host>stream.parisson.com</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/path/to/ogg</dir>
-            <format>ogg</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>0</mode>
-            <port>1235</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live_video.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>0</mode>
-            <dir>/path/to/archives</dir>
-        </record>
-    </station>
-    
-</deefuzzer>
-
-
diff --git a/tcserver/conf/etc/telecaster/deefuzzer_video_local.xml b/tcserver/conf/etc/telecaster/deefuzzer_video_local.xml

deleted file mode 100644 (file)

index 30bf444..0000000
--- a/tcserver/conf/etc/telecaster/deefuzzer_video_local.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<deefuzzer>
-    <log>/var/log/deefuzzer/telecaster.log</log>
-    <m3u>/var/www/m3u/telecaster.m3u</m3u>
-
-    <station>
-        <infos>
-            <short_name>telecaster_video</short_name>
-            <name>TeleCaster Video Localhost</name>
-            <description>TeleCaster local video streaming</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <host>127.0.0.1</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/telecaster/media/ogg</dir>
-            <format>ogg</format>
-            <bitrate>64</bitrate>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>1</mode>
-            <port>1234</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live_video.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>1</mode>
-            <dir>/path/to/archives</dir>
-        </record>
-    </station>
-
-    <station>
-        <infos>
-            <short_name>telecaster_video</short_name>
-            <name>TeleCaster Video Localhost</name>
-            <description>TeleCaster local video streaming</description>
-            <url>http://parisson.com</url>
-            <genre>Vocal</genre>
-        </infos>
-        <server>
-            <host>stream.parisson.com</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/telecaster/media/ogg</dir>
-            <format>ogg</format>
-            <bitrate>64</bitrate>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
-        </media>
-        <rss>
-            <dir>/var/www/rss</dir>
-            <enclosure>0</enclosure>
-        </rss>
-        <twitter>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <tags>bla bla</tags>
-        </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>0</mode>
-            <port>1234</port>
-        </control>
-        <relay>
-            <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live_video.ogg</url>
-            <author>Parisson</author>
-        </relay>
-        <record>
-            <mode>0</mode>
-            <dir>/path/to/archives</dir>
-        </record>
-    </station>
-
-</deefuzzer>
-
-
diff --git a/tcserver/conf/etc/telecaster/deefuzzer_video_safe.xml b/tcserver/conf/etc/telecaster/deefuzzer_video_safe.xml

deleted file mode 100644 (file)

index d1bc791..0000000
--- a/tcserver/conf/etc/telecaster/deefuzzer_video_safe.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<deefuzzer>
-    <log>/var/log/deefuzzer/telecaster_video_safe.log</log>
-    <m3u>/var/www/m3u/telecaster_video_safe.m3u</m3u>
-
-    <station>
-        <control>
-            <mode>0</mode>
-            <port>1235</port>
-        </control>
-        <relay>
-            <url>http://127.0.0.1:9000/</url>
-            <mode>1</mode>
-            <author>TeleCaster</author>
-        </relay>
-        <media>
-            <shuffle>0</shuffle>
-            <format>webm</format>
-            <voices>1</voices>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>48000</samplerate>
-            <bitrate>64</bitrate>
-            <dir>/home/telecaster/media/webm</dir>
-        </media>
-        <twitter>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <tags>bla bla</tags>
-        </twitter>
-        <server>
-            <type>stream-m</type>
-            <host>127.0.0.1</host>
-            <port>8080</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <record>
-            <mode>1</mode>
-            <dir>/home/telecaster/trash/webm</dir>
-        </record>
-        <jingles>
-            <shuffle>1</shuffle>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-        </jingles>
-        <infos>
-            <url>http://parisson.com.com</url>
-            <genre>Vocal</genre>
-            <name>safe</name>
-            <short_name>safe</short_name>
-            <description>TeleCaster safe video stream</description>
-        </infos>
-        <rss>
-            <enclosure>0</enclosure>
-            <dir>/var/www/rss</dir>
-            <media_url>http://my.domain.com/rss/</media_url>
-        </rss>
-    </station>
-
-</deefuzzer>
-
-
diff --git a/tcserver/conf/etc/telecaster/deefuzzer_webm.xml b/tcserver/conf/etc/telecaster/deefuzzer_webm.xml

deleted file mode 100644 (file)

index c8a7494..0000000
--- a/tcserver/conf/etc/telecaster/deefuzzer_webm.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<deefuzzer>
-    <m3u>/var/www/m3u/telecaster_webm.m3u</m3u>
-    <station>
-        <control>
-            <mode>1</mode>
-            <port>1236</port>
-        </control>
-        <relay>
-            <url>http://127.0.0.1:8080/consume/safe</url>
-            <mode>1</mode>
-            <author>Parisson</author>
-        </relay>
-        <media>
-            <shuffle>0</shuffle>
-            <format>webm</format>
-            <voices>2</voices>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>48000</samplerate>
-            <bitrate>600</bitrate>
-            <dir>/home/telecaster/media/webm/</dir>
-        </media>
-        <twitter>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <tags>bla bla</tags>
-        </twitter>
-        <server>
-            <host>angus.parisson.com</host>
-            <type>stream-m</type>
-            <port>8080</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <record>
-            <mode>0</mode>
-            <dir>/home/telecaster/archives</dir>
-        </record>
-        <jingles>
-            <shuffle>0</shuffle>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-        </jingles>
-        <infos>
-            <url>http://parisson.com</url>
-            <genre>Oral</genre>
-            <name>crfpa-droit-international-prive-cours</name>
-            <short_name>crfpa-droit-international-prive-cours</short_name>
-            <description>crfpa-droit-international-prive-cours</description>
-        </infos>
-        <rss>
-            <enclosure>0</enclosure>
-            <dir>/var/www/rss</dir>
-        </rss>
-    </station>
-    <station>
-        <control>
-            <mode>1</mode>
-            <port>1237</port>
-        </control>
-        <relay>
-            <url>http://127.0.0.1:8080/consume/safe</url>
-            <mode>1</mode>
-            <author>Parisson</author>
-        </relay>
-        <media>
-            <shuffle>0</shuffle>
-            <format>webm</format>
-            <voices>2</voices>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>48000</samplerate>
-            <bitrate>600</bitrate>
-            <dir>/home/telecaster/media/webm/</dir>
-        </media>
-        <twitter>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <tags>bla bla</tags>
-        </twitter>
-        <server>
-            <host>127.0.0.1</host>
-            <type>stream-m</type>
-            <port>8080</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <record>
-            <mode>1</mode>
-            <dir>/home/telecaster/archives</dir>
-        </record>
-        <jingles>
-            <shuffle>0</shuffle>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-        </jingles>
-        <infos>
-            <url>http://parisson.com</url>
-            <genre>Oral</genre>
-            <name>crfpa-droit-international-prive-cours</name>
-            <short_name>crfpa-droit-international-prive-cours</short_name>
-            <description>crfpa-droit-international-prive-cours</description>
-        </infos>
-        <rss>
-            <enclosure>0</enclosure>
-            <dir>/var/www/rss</dir>
-        </rss>
-    </station>
-
-
-<log>/var/log/telecaster/deefuzzer_mp3_safe.log</log>
-</deefuzzer>
diff --git a/tcserver/conf/etc/telecaster/edcast_jack_local.cfg b/tcserver/conf/etc/telecaster/edcast_jack_local.cfg

deleted file mode 100644 (file)

index ae28e09..0000000
--- a/tcserver/conf/etc/telecaster/edcast_jack_local.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
-ServerType=Icecast2
-Server=localhost
-Port=8000
-ServerPassword=source2parisson
-ServerMountpoint=/telecaster_live.mp3
-# YP (Stream Directory) Settings
-ServerPublic=0
-ServerIRC=
-ServerAIM=
-ServerICQ=
-ServerStreamURL=http://parisson.com
-ServerName=TeleCaster LIVE
-ServerDescription=Local LIVE media streaming broadcast
-ServerGenre=Vocal
-AutomaticReconnectSecs=10
-AutoConnect=1
-# Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
-Encode=MP3
-# General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
-NumberChannels=2
-Samplerate=48000
-BitrateNominal=96
-BitrateMin=32
-BitrateMax=100
-
-#
-SaveDirectoryFlag=0
-SaveDirectory=/home/telecaster/trash
-SaveAsWAV=0
-#
-# Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
-OggQuality=3
-OggBitrateQualityFlag=Quality
-# LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
-LameCBRFlag=0
-LameQuality=5
-LameCopywrite=0
-LameOriginal=0
-LameStrictISO=0
-LameDisableReservior=0
-LameVBRMode=vbr_abr
-LameLowpassfreq=0
-LameHighpassfreq=0
-LAMEPreset=0
-# AAC (FAAC) specific settings.
-AACQuality=100
-AACCutoff=
-# Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
-LogLevel=1
-# Log File
-LogFile=/tmp/telecaster_streamer_log
-
diff --git a/tcserver/conf/etc/telecaster/edcast_jack_local_mp3.cfg b/tcserver/conf/etc/telecaster/edcast_jack_local_mp3.cfg

deleted file mode 100644 (file)

index 1638c6e..0000000
--- a/tcserver/conf/etc/telecaster/edcast_jack_local_mp3.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
-ServerType=Icecast2
-Server=localhost
-Port=8000
-ServerPassword=source2parisson
-ServerMountpoint=/telecaster_live.mp3
-# YP (Stream Directory) Settings
-ServerPublic=0
-ServerIRC=
-ServerAIM=
-ServerICQ=
-ServerStreamURL=http://parisson.com
-ServerName=TeleCaster LIVE
-ServerDescription=Local LIVE media streaming broadcast
-ServerGenre=Vocal
-AutomaticReconnectSecs=10
-AutoConnect=1
-# Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
-Encode=MP3
-# General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
-NumberChannels=1
-Samplerate=44100
-BitrateNominal=64
-BitrateMin=32
-BitrateMax=96
-
-#
-SaveDirectoryFlag=0
-SaveDirectory=/home/telecaster/trash
-SaveAsWAV=0
-#
-# Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
-OggQuality=3
-OggBitrateQualityFlag=Quality
-# LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
-LameCBRFlag=0
-LameQuality=5
-LameCopywrite=0
-LameOriginal=0
-LameStrictISO=0
-LameDisableReservior=0
-LameVBRMode=vbr_abr
-LameLowpassfreq=0
-LameHighpassfreq=0
-LAMEPreset=0
-# AAC (FAAC) specific settings.
-AACQuality=100
-AACCutoff=
-# Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
-LogLevel=1
-# Log File
-LogFile=/tmp/telecaster_streamer_log
-
diff --git a/tcserver/conf/etc/telecaster/edcast_jack_local_ogg.cfg b/tcserver/conf/etc/telecaster/edcast_jack_local_ogg.cfg

deleted file mode 100644 (file)

index 0cfe09d..0000000
--- a/tcserver/conf/etc/telecaster/edcast_jack_local_ogg.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
-ServerType=Icecast2
-Server=localhost
-Port=8000
-ServerPassword=source2parisson
-ServerMountpoint=/telecaster_live.ogg
-# YP (Stream Directory) Settings
-ServerPublic=0
-ServerIRC=
-ServerAIM=
-ServerICQ=
-ServerStreamURL=http://parisson.com
-ServerName=TeleCaster LIVE
-ServerDescription=Local LIVE media streaming broadcast
-ServerGenre=Vocal
-AutomaticReconnectSecs=10
-AutoConnect=1
-# Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
-Encode=OggVorbis
-# General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
-NumberChannels=1
-Samplerate=44100
-BitrateNominal=64
-BitrateMin=32
-BitrateMax=96
-
-#
-SaveDirectoryFlag=0
-SaveDirectory=/home/telecaster/trash
-SaveAsWAV=0
-#
-# Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
-OggQuality=4
-OggBitrateQualityFlag=Quality
-# LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
-LameCBRFlag=0
-LameQuality=5
-LameCopywrite=0
-LameOriginal=0
-LameStrictISO=0
-LameDisableReservior=0
-LameVBRMode=vbr_abr
-LameLowpassfreq=0
-LameHighpassfreq=0
-LAMEPreset=0
-# AAC (FAAC) specific settings.
-AACQuality=100
-AACCutoff=
-# Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
-LogLevel=1
-# Log File
-LogFile=/tmp/telecaster_streamer_log
-
diff --git a/tcserver/conf/etc/telecaster/eq_comp_limit_02.rack b/tcserver/conf/etc/telecaster/eq_comp_limit_02.rack

deleted file mode 100644 (file)

index da37e40..0000000

Binary files a/tcserver/conf/etc/telecaster/eq_comp_limit_02.rack and /dev/null differ
diff --git a/tcserver/conf/etc/telecaster/eq_comp_limit_02_old.rack b/tcserver/conf/etc/telecaster/eq_comp_limit_02_old.rack

deleted file mode 100644 (file)

index 87d5e4c..0000000

Binary files a/tcserver/conf/etc/telecaster/eq_comp_limit_02_old.rack and /dev/null differ
diff --git a/tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack b/tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack

new file mode 100644 (file)

index 0000000..da37e40

Binary files /dev/null and b/tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack differ
diff --git a/tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack b/tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack

new file mode 100644 (file)

index 0000000..87d5e4c

Binary files /dev/null and b/tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack differ
diff --git a/tcserver/conf/etc/telecaster/old/edcast_jack_local.cfg b/tcserver/conf/etc/telecaster/old/edcast_jack_local.cfg

new file mode 100644 (file)

index 0000000..ae28e09
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/old/edcast_jack_local.cfg
@@ -0,0 +1,53 @@
+# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
+ServerType=Icecast2
+Server=localhost
+Port=8000
+ServerPassword=source2parisson
+ServerMountpoint=/telecaster_live.mp3
+# YP (Stream Directory) Settings
+ServerPublic=0
+ServerIRC=
+ServerAIM=
+ServerICQ=
+ServerStreamURL=http://parisson.com
+ServerName=TeleCaster LIVE
+ServerDescription=Local LIVE media streaming broadcast
+ServerGenre=Vocal
+AutomaticReconnectSecs=10
+AutoConnect=1
+# Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
+Encode=MP3
+# General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
+NumberChannels=2
+Samplerate=48000
+BitrateNominal=96
+BitrateMin=32
+BitrateMax=100
+
+#
+SaveDirectoryFlag=0
+SaveDirectory=/home/telecaster/trash
+SaveAsWAV=0
+#
+# Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
+OggQuality=3
+OggBitrateQualityFlag=Quality
+# LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
+LameCBRFlag=0
+LameQuality=5
+LameCopywrite=0
+LameOriginal=0
+LameStrictISO=0
+LameDisableReservior=0
+LameVBRMode=vbr_abr
+LameLowpassfreq=0
+LameHighpassfreq=0
+LAMEPreset=0
+# AAC (FAAC) specific settings.
+AACQuality=100
+AACCutoff=
+# Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
+LogLevel=1
+# Log File
+LogFile=/tmp/telecaster_streamer_log
+
diff --git a/tcserver/conf/etc/telecaster/old/edcast_jack_local_mp3.cfg b/tcserver/conf/etc/telecaster/old/edcast_jack_local_mp3.cfg

new file mode 100644 (file)

index 0000000..1638c6e
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/old/edcast_jack_local_mp3.cfg
@@ -0,0 +1,53 @@
+# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
+ServerType=Icecast2
+Server=localhost
+Port=8000
+ServerPassword=source2parisson
+ServerMountpoint=/telecaster_live.mp3
+# YP (Stream Directory) Settings
+ServerPublic=0
+ServerIRC=
+ServerAIM=
+ServerICQ=
+ServerStreamURL=http://parisson.com
+ServerName=TeleCaster LIVE
+ServerDescription=Local LIVE media streaming broadcast
+ServerGenre=Vocal
+AutomaticReconnectSecs=10
+AutoConnect=1
+# Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
+Encode=MP3
+# General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
+NumberChannels=1
+Samplerate=44100
+BitrateNominal=64
+BitrateMin=32
+BitrateMax=96
+
+#
+SaveDirectoryFlag=0
+SaveDirectory=/home/telecaster/trash
+SaveAsWAV=0
+#
+# Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
+OggQuality=3
+OggBitrateQualityFlag=Quality
+# LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
+LameCBRFlag=0
+LameQuality=5
+LameCopywrite=0
+LameOriginal=0
+LameStrictISO=0
+LameDisableReservior=0
+LameVBRMode=vbr_abr
+LameLowpassfreq=0
+LameHighpassfreq=0
+LAMEPreset=0
+# AAC (FAAC) specific settings.
+AACQuality=100
+AACCutoff=
+# Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
+LogLevel=1
+# Log File
+LogFile=/tmp/telecaster_streamer_log
+
diff --git a/tcserver/conf/etc/telecaster/old/edcast_jack_local_ogg.cfg b/tcserver/conf/etc/telecaster/old/edcast_jack_local_ogg.cfg

new file mode 100644 (file)

index 0000000..0cfe09d
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/old/edcast_jack_local_ogg.cfg
@@ -0,0 +1,53 @@
+# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
+ServerType=Icecast2
+Server=localhost
+Port=8000
+ServerPassword=source2parisson
+ServerMountpoint=/telecaster_live.ogg
+# YP (Stream Directory) Settings
+ServerPublic=0
+ServerIRC=
+ServerAIM=
+ServerICQ=
+ServerStreamURL=http://parisson.com
+ServerName=TeleCaster LIVE
+ServerDescription=Local LIVE media streaming broadcast
+ServerGenre=Vocal
+AutomaticReconnectSecs=10
+AutoConnect=1
+# Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
+Encode=OggVorbis
+# General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
+NumberChannels=1
+Samplerate=44100
+BitrateNominal=64
+BitrateMin=32
+BitrateMax=96
+
+#
+SaveDirectoryFlag=0
+SaveDirectory=/home/telecaster/trash
+SaveAsWAV=0
+#
+# Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
+OggQuality=4
+OggBitrateQualityFlag=Quality
+# LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
+LameCBRFlag=0
+LameQuality=5
+LameCopywrite=0
+LameOriginal=0
+LameStrictISO=0
+LameDisableReservior=0
+LameVBRMode=vbr_abr
+LameLowpassfreq=0
+LameHighpassfreq=0
+LAMEPreset=0
+# AAC (FAAC) specific settings.
+AACQuality=100
+AACCutoff=
+# Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
+LogLevel=1
+# Log File
+LogFile=/tmp/telecaster_streamer_log
+
diff --git a/tcserver/conf/etc/telecaster/old/telecaster.xml b/tcserver/conf/etc/telecaster/old/telecaster.xml

new file mode 100644 (file)

index 0000000..980fe6f
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/old/telecaster.xml
@@ -0,0 +1,333 @@
+<telecaster>
+    <infos>
+        <short_name>Parisson</short_name>
+        <name>Parisson</name>
+        <description>TeleCaster</description>
+        <url>telecaster.parisson.com</url>
+        <genre>Various</genre>
+    </infos>
+    <log>/var/log/telecaster/telecaster.log</log>
+    <deefuzzer>
+       <conf>/etc/telecaster/deefuzzer.xml</conf>
+    </deefuzzer>
+    <media>
+        <record>true</record>
+        <play_dir>/home/telecaster/media/mp3</play_dir>
+        <rec_dir>/home/telecaster/archives</rec_dir>
+        <format>mp3</format>
+        <bitrate>64</bitrate>
+        <channels>1</channels>
+        <ogg_quality>4</ogg_quality>
+        <samplerate>48000</samplerate>
+    </media>
+    <jack>
+        <input>
+        <name>jack_rack:out_1</name>
+        </input>
+    </jack>
+
+    <department>
+        <name>CRFPA</name>
+        <conferences>
+          <conference>
+            <name>Droit_administratif_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_administratif_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_Libertes_publiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Note_de_synthese_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Cours</name>
+          </conference>
+          <conference>
+            <name>Oral-Procedures_communautaires</name>
+          </conference>
+         <conference>
+            <name>Oral-Voies_d_ex</name>
+          </conference>
+          <conference>
+            <name>Oral-Comptabilite_privee</name>
+          </conference>
+          <conference>
+            <name>Oral-Finances_publiques</name>
+          </conference>
+          <conference>
+            <name>TEST</name>
+          </conference>
+        </conferences>
+        
+    </department>
+
+    <department>
+        <name>AE</name>
+        <conferences>
+            <conference>
+                <name>Administratif_Cours</name>
+            </conference>
+            <conference>
+                <name>Adm_Correction</name>
+            </conference>
+            <conference>
+                <name>Civil_Correction</name>
+            </conference>
+            <conference>
+                <name>Commercial_Correctio</name>
+            </conference>
+            <conference>
+                <name>Commercial_Cours</name>
+            </conference>
+            <conference>
+                <name>Deontologie_Cours</name>
+            </conference>
+            <conference>
+                <name>Civil_Cours</name>
+            </conference>
+            <conference>
+                <name>Methodo_Oraux</name>
+            </conference>
+            <conference>
+                <name>Penal_Correction</name>
+            </conference>
+            <conference>
+                <name>Penal_Cours</name>
+            </conference>
+            <conference>
+                <name>Procedures_Cours</name>
+            </conference>
+            <conference>
+                <name>Reunion_info</name>
+            </conference>
+            <conference>
+                <name>Social_Corrections</name>
+            </conference>
+            <conference>
+                <name>Social_Cours</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+            <conference>
+                <name>TEST</name>
+            </conference>
+        </conferences>
+    </department>
+
+    <department>
+        <name>ENM</name>
+        <conferences>
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+                
+
+    <department>
+        <name>FJP</name>
+        <conferences>
+            <conference>
+                <name>Actualisation</name>
+            </conference> 
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+
+        <professor>
+            <name>MARINHO A.</name>
+        </professor>
+        <professor>
+            <name>GIUSTINIANI G.</name>
+        </professor>
+        <professor>
+            <name>BOFFA R.</name>
+        </professor>
+        <professor>
+            <name>MEUNIER J.</name>
+        </professor>
+        <professor>
+            <name>THERY C.</name>
+        </professor>
+        <professor>
+            <name>JLB</name>
+        </professor>
+        <professor>
+            <name>AZZI T.</name>
+        </professor>
+        <professor>
+            <name>ETIENNEY A.</name>
+        </professor>
+        <professor>
+            <name>MARKUS J.</name>
+        </professor>
+        <professor>
+            <name>ANDREU L.</name>
+        </professor>
+        <professor>
+            <name>ROUMIER W.</name>
+        </professor>
+        <professor>
+            <name>HAIK R.</name>
+        </professor>
+        <professor>
+            <name>POISSON S.</name>
+        </professor>
+        <professor>
+            <name>CARTIER-BRESSON A.</name>
+        </professor>
+        <professor>
+            <name>MBONGO P.</name>
+        </professor>
+        <professor>
+            <name>MATHONNET P.</name>
+        </professor>
+        <professor>
+            <name>FOULQUIER N.</name>
+        </professor>
+        <professor>
+            <name>RILOV. F</name>
+        </professor>
+        <professor>
+            <name>JEANSEN E.</name>
+        </professor>
+        <professor>
+            <name>LA J.</name>
+        </professor>
+        <professor>
+            <name>MECARELLI G.</name>
+        </professor>
+        <professor>
+            <name>COLLET M.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>VIAL C.</name>
+        </professor>
+        <professor>
+            <name>PAGNERRE E.</name>
+        </professor>
+        <professor>
+            <name>PANOU C.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>ROBBE S.</name>
+        </professor>
+
+
+        <comment><text>1ere_sem</text></comment>
+        <comment><text>2e_sem</text></comment>
+        <comment><text>3e_sem</text></comment>
+        <comment><text>4e_sem</text></comment>
+        <comment><text>5e_sem</text></comment>
+        <comment><text>6e_sem</text></comment>
+        <comment><text>7e_sem</text></comment>
+        <comment><text>8e_sem</text></comment>
+        <comment><text>9e_sem</text></comment>
+        <comment><text>10e_sem</text></comment>
+        <comment><text>11e_sem</text></comment>
+        <comment><text>12e_sem</text></comment>
+        <comment><text>13e_sem</text></comment>
+        <comment><text>14e_sem</text></comment>
+        <comment><text>15e_sem</text></comment>
+        <comment><text>16e_sem</text></comment>
+       
+    
+</telecaster>
diff --git a/tcserver/conf/etc/telecaster/old/telecaster_mp3.xml b/tcserver/conf/etc/telecaster/old/telecaster_mp3.xml

new file mode 100644 (file)

index 0000000..1d0eeaf
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/old/telecaster_mp3.xml
@@ -0,0 +1,333 @@
+<telecaster>
+    <infos>
+        <short_name>Parisson</short_name>
+        <name>Parisson</name>
+        <description>TeleCaster Services</description>
+        <url>telecaster.parisson.com</url>
+        <genre>Various</genre>
+    </infos>
+    <log>/var/log/telecaster/telecaster.log</log>
+    <deefuzzer>
+       <conf>/etc/telecaster/deefuzzer.xml</conf>
+    </deefuzzer>
+    <media>
+        <record>true</record>
+        <play_dir>/home/telecaster/media/mp3</play_dir>
+        <rec_dir>/home/telecaster/archives</rec_dir>
+        <format>mp3</format>
+        <bitrate>96</bitrate>
+        <channels>1</channels>
+        <ogg_quality>3</ogg_quality>
+        <samplerate>44100</samplerate>
+    </media>
+    <jack>
+        <input>
+        <name>jack_rack:out_1</name>
+        </input>
+    </jack>
+
+    <department>
+        <name>CRFPA</name>
+        <conferences>
+          <conference>
+            <name>Droit_administratif_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_administratif_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_Libertes_publiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Note_de_synthese_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Cours</name>
+          </conference>
+          <conference>
+            <name>Oral-Procedures_communautaires</name>
+          </conference>
+         <conference>
+            <name>Oral-Voies_d_ex</name>
+          </conference>
+          <conference>
+            <name>Oral-Comptabilite_privee</name>
+          </conference>
+          <conference>
+            <name>Oral-Finances_publiques</name>
+          </conference>
+          <conference>
+            <name>TEST</name>
+          </conference>
+        </conferences>
+        
+    </department>
+
+    <department>
+        <name>AE</name>
+        <conferences>
+            <conference>
+                <name>Administratif_Cours</name>
+            </conference>
+            <conference>
+                <name>Adm_Correction</name>
+            </conference>
+            <conference>
+                <name>Civil_Correction</name>
+            </conference>
+            <conference>
+                <name>Commercial_Correctio</name>
+            </conference>
+            <conference>
+                <name>Commercial_Cours</name>
+            </conference>
+            <conference>
+                <name>Deontologie_Cours</name>
+            </conference>
+            <conference>
+                <name>Droit civil - Cours</name>
+            </conference>
+            <conference>
+                <name>Methodo_Oraux</name>
+            </conference>
+            <conference>
+                <name>Penal_Correction</name>
+            </conference>
+            <conference>
+                <name>Penal_Cours</name>
+            </conference>
+            <conference>
+                <name>Procedures_Cours</name>
+            </conference>
+            <conference>
+                <name>Reunion_info</name>
+            </conference>
+            <conference>
+                <name>Social_Corrections</name>
+            </conference>
+            <conference>
+                <name>Social_Cours</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+            <conference>
+                <name>TEST</name>
+            </conference>
+        </conferences>
+    </department>
+
+    <department>
+        <name>ENM</name>
+        <conferences>
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+                
+
+    <department>
+        <name>FJP</name>
+        <conferences>
+            <conference>
+                <name>Actualisation</name>
+            </conference> 
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+
+        <professor>
+            <name>MARINHO A.</name>
+        </professor>
+        <professor>
+            <name>GIUSTINIANI G.</name>
+        </professor>
+        <professor>
+            <name>BOFFA R.</name>
+        </professor>
+        <professor>
+            <name>MEUNIER J.</name>
+        </professor>
+        <professor>
+            <name>THERY C.</name>
+        </professor>
+        <professor>
+            <name>JLB</name>
+        </professor>
+        <professor>
+            <name>AZZI T.</name>
+        </professor>
+        <professor>
+            <name>ETIENNEY A.</name>
+        </professor>
+        <professor>
+            <name>MARKUS J.</name>
+        </professor>
+        <professor>
+            <name>ANDREU L.</name>
+        </professor>
+        <professor>
+            <name>ROUMIER W.</name>
+        </professor>
+        <professor>
+            <name>HAIK R.</name>
+        </professor>
+        <professor>
+            <name>POISSON S.</name>
+        </professor>
+        <professor>
+            <name>CARTIER-BRESSON A.</name>
+        </professor>
+        <professor>
+            <name>MBONGO P.</name>
+        </professor>
+        <professor>
+            <name>MATHONNET P.</name>
+        </professor>
+        <professor>
+            <name>FOULQUIER N.</name>
+        </professor>
+        <professor>
+            <name>RILOV. F</name>
+        </professor>
+        <professor>
+            <name>JEANSEN E.</name>
+        </professor>
+        <professor>
+            <name>LA J.</name>
+        </professor>
+        <professor>
+            <name>MECARELLI G.</name>
+        </professor>
+        <professor>
+            <name>COLLET M.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>VIAL C.</name>
+        </professor>
+        <professor>
+            <name>PAGNERRE E.</name>
+        </professor>
+        <professor>
+            <name>PANOU C.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>ROBBE S.</name>
+        </professor>
+
+
+        <comment><text>1ere_sem</text></comment>
+        <comment><text>2e_sem</text></comment>
+        <comment><text>3e_sem</text></comment>
+        <comment><text>4e_sem</text></comment>
+        <comment><text>5e_sem</text></comment>
+        <comment><text>6e_sem</text></comment>
+        <comment><text>7e_sem</text></comment>
+        <comment><text>8e_sem</text></comment>
+        <comment><text>9e_sem</text></comment>
+        <comment><text>10e_sem</text></comment>
+        <comment><text>11e_sem</text></comment>
+        <comment><text>12e_sem</text></comment>
+        <comment><text>13e_sem</text></comment>
+        <comment><text>14e_sem</text></comment>
+        <comment><text>15e_sem</text></comment>
+        <comment><text>16e_sem</text></comment>
+       
+    
+</telecaster>
diff --git a/tcserver/conf/etc/telecaster/old/telecaster_ogg.xml b/tcserver/conf/etc/telecaster/old/telecaster_ogg.xml

new file mode 100644 (file)

index 0000000..93d8604
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/old/telecaster_ogg.xml
@@ -0,0 +1,333 @@
+<telecaster>
+    <infos>
+        <short_name>Parisson</short_name>
+        <name>Parisson</name>
+        <description>TeleCaster Services</description>
+        <url>telecaster.parisson.com</url>
+        <genre>Various</genre>
+    </infos>
+    <log>/var/log/telecaster/telecaster.log</log>
+    <deefuzzer>
+       <conf>/etc/telecaster/deefuzzer.xml</conf>
+    </deefuzzer>
+    <media>
+        <record>true</record>
+        <play_dir>/home/telecaster/media/ogg</play_dir>
+        <rec_dir>/home/telecaster/archives</rec_dir>
+        <format>ogg</format>
+        <bitrate>64</bitrate>
+        <channels>1</channels>
+        <ogg_quality>4</ogg_quality>
+        <samplerate>44100</samplerate>
+    </media>
+    <jack>
+        <input>
+        <name>jack_rack:out_1</name>
+        </input>
+    </jack>
+
+    <department>
+        <name>CRFPA</name>
+        <conferences>
+          <conference>
+            <name>Droit_administratif_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_administratif_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_Libertes_publiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Note_de_synthese_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Cours</name>
+          </conference>
+          <conference>
+            <name>Oral-Procedures_communautaires</name>
+          </conference>
+         <conference>
+            <name>Oral-Voies_d_ex</name>
+          </conference>
+          <conference>
+            <name>Oral-Comptabilite_privee</name>
+          </conference>
+          <conference>
+            <name>Oral-Finances_publiques</name>
+          </conference>
+          <conference>
+            <name>TEST</name>
+          </conference>
+        </conferences>
+        
+    </department>
+
+    <department>
+        <name>AE</name>
+        <conferences>
+            <conference>
+                <name>Administratif_Cours</name>
+            </conference>
+            <conference>
+                <name>Adm_Correction</name>
+            </conference>
+            <conference>
+                <name>Civil_Correction</name>
+            </conference>
+            <conference>
+                <name>Commercial_Correctio</name>
+            </conference>
+            <conference>
+                <name>Commercial_Cours</name>
+            </conference>
+            <conference>
+                <name>Deontologie_Cours</name>
+            </conference>
+            <conference>
+                <name>Droit civil - Cours</name>
+            </conference>
+            <conference>
+                <name>Methodo_Oraux</name>
+            </conference>
+            <conference>
+                <name>Penal_Correction</name>
+            </conference>
+            <conference>
+                <name>Penal_Cours</name>
+            </conference>
+            <conference>
+                <name>Procedures_Cours</name>
+            </conference>
+            <conference>
+                <name>Reunion_info</name>
+            </conference>
+            <conference>
+                <name>Social_Corrections</name>
+            </conference>
+            <conference>
+                <name>Social_Cours</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+            <conference>
+                <name>TEST</name>
+            </conference>
+        </conferences>
+    </department>
+
+    <department>
+        <name>ENM</name>
+        <conferences>
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+                
+
+    <department>
+        <name>FJP</name>
+        <conferences>
+            <conference>
+                <name>Actualisation</name>
+            </conference> 
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+
+        <professor>
+            <name>MARINHO A.</name>
+        </professor>
+        <professor>
+            <name>GIUSTINIANI G.</name>
+        </professor>
+        <professor>
+            <name>BOFFA R.</name>
+        </professor>
+        <professor>
+            <name>MEUNIER J.</name>
+        </professor>
+        <professor>
+            <name>THERY C.</name>
+        </professor>
+        <professor>
+            <name>JLB</name>
+        </professor>
+        <professor>
+            <name>AZZI T.</name>
+        </professor>
+        <professor>
+            <name>ETIENNEY A.</name>
+        </professor>
+        <professor>
+            <name>MARKUS J.</name>
+        </professor>
+        <professor>
+            <name>ANDREU L.</name>
+        </professor>
+        <professor>
+            <name>ROUMIER W.</name>
+        </professor>
+        <professor>
+            <name>HAIK R.</name>
+        </professor>
+        <professor>
+            <name>POISSON S.</name>
+        </professor>
+        <professor>
+            <name>CARTIER-BRESSON A.</name>
+        </professor>
+        <professor>
+            <name>MBONGO P.</name>
+        </professor>
+        <professor>
+            <name>MATHONNET P.</name>
+        </professor>
+        <professor>
+            <name>FOULQUIER N.</name>
+        </professor>
+        <professor>
+            <name>RILOV. F</name>
+        </professor>
+        <professor>
+            <name>JEANSEN E.</name>
+        </professor>
+        <professor>
+            <name>LA J.</name>
+        </professor>
+        <professor>
+            <name>MECARELLI G.</name>
+        </professor>
+        <professor>
+            <name>COLLET M.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>VIAL C.</name>
+        </professor>
+        <professor>
+            <name>PAGNERRE E.</name>
+        </professor>
+        <professor>
+            <name>PANOU C.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>ROBBE S.</name>
+        </professor>
+
+
+        <comment><text>1ere_sem</text></comment>
+        <comment><text>2e_sem</text></comment>
+        <comment><text>3e_sem</text></comment>
+        <comment><text>4e_sem</text></comment>
+        <comment><text>5e_sem</text></comment>
+        <comment><text>6e_sem</text></comment>
+        <comment><text>7e_sem</text></comment>
+        <comment><text>8e_sem</text></comment>
+        <comment><text>9e_sem</text></comment>
+        <comment><text>10e_sem</text></comment>
+        <comment><text>11e_sem</text></comment>
+        <comment><text>12e_sem</text></comment>
+        <comment><text>13e_sem</text></comment>
+        <comment><text>14e_sem</text></comment>
+        <comment><text>15e_sem</text></comment>
+        <comment><text>16e_sem</text></comment>
+       
+    
+</telecaster>
diff --git a/tcserver/conf/etc/telecaster/old/telecaster_parisson_mp3.xml b/tcserver/conf/etc/telecaster/old/telecaster_parisson_mp3.xml

new file mode 100644 (file)

index 0000000..c15ccea
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/old/telecaster_parisson_mp3.xml
@@ -0,0 +1,333 @@
+<telecaster>
+    <infos>
+        <short_name>Parisson</short_name>
+        <name>Parisson</name>
+        <description>TeleCaster Services</description>
+        <url>telecaster6.parisson.com</url>
+        <genre>Various</genre>
+    </infos>
+    <log>/var/log/telecaster/telecaster.log</log>
+    <deefuzzer>
+       <conf>/etc/telecaster/deefuzzer.xml</conf>
+    </deefuzzer>
+    <media>
+        <record>true</record>
+        <play_dir>/home/telecaster/media/mp3</play_dir>
+        <rec_dir>/home/telecaster/archives</rec_dir>
+        <format>mp3</format>
+        <bitrate>64</bitrate>
+        <channels>1</channels>
+        <ogg_quality>4</ogg_quality>
+        <samplerate>44100</samplerate>
+    </media>
+    <jack>
+        <input>
+        <name>jack_rack:out_1</name>
+        </input>
+    </jack>
+
+    <department>
+        <name>CRFPA</name>
+        <conferences>
+          <conference>
+            <name>Droit_administratif_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_administratif_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_Libertes_publiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Note_de_synthese_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Cours</name>
+          </conference>
+          <conference>
+            <name>Oral-Procedures_communautaires</name>
+          </conference>
+         <conference>
+            <name>Oral-Voies_d_ex</name>
+          </conference>
+          <conference>
+            <name>Oral-Comptabilite_privee</name>
+          </conference>
+          <conference>
+            <name>Oral-Finances_publiques</name>
+          </conference>
+          <conference>
+            <name>TEST</name>
+          </conference>
+        </conferences>
+        
+    </department>
+
+    <department>
+        <name>AE</name>
+        <conferences>
+            <conference>
+                <name>Administratif_Cours</name>
+            </conference>
+            <conference>
+                <name>Adm_Correction</name>
+            </conference>
+            <conference>
+                <name>Civil_Correction</name>
+            </conference>
+            <conference>
+                <name>Commercial_Correctio</name>
+            </conference>
+            <conference>
+                <name>Commercial_Cours</name>
+            </conference>
+            <conference>
+                <name>Deontologie_Cours</name>
+            </conference>
+            <conference>
+                <name>Droit civil - Cours</name>
+            </conference>
+            <conference>
+                <name>Methodo_Oraux</name>
+            </conference>
+            <conference>
+                <name>Penal_Correction</name>
+            </conference>
+            <conference>
+                <name>Penal_Cours</name>
+            </conference>
+            <conference>
+                <name>Procedures_Cours</name>
+            </conference>
+            <conference>
+                <name>Reunion_info</name>
+            </conference>
+            <conference>
+                <name>Social_Corrections</name>
+            </conference>
+            <conference>
+                <name>Social_Cours</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+            <conference>
+                <name>TEST</name>
+            </conference>
+        </conferences>
+    </department>
+
+    <department>
+        <name>ENM</name>
+        <conferences>
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+                
+
+    <department>
+        <name>FJP</name>
+        <conferences>
+            <conference>
+                <name>Actualisation</name>
+            </conference> 
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+
+        <professor>
+            <name>MARINHO A.</name>
+        </professor>
+        <professor>
+            <name>GIUSTINIANI G.</name>
+        </professor>
+        <professor>
+            <name>BOFFA R.</name>
+        </professor>
+        <professor>
+            <name>MEUNIER J.</name>
+        </professor>
+        <professor>
+            <name>THERY C.</name>
+        </professor>
+        <professor>
+            <name>JLB</name>
+        </professor>
+        <professor>
+            <name>AZZI T.</name>
+        </professor>
+        <professor>
+            <name>ETIENNEY A.</name>
+        </professor>
+        <professor>
+            <name>MARKUS J.</name>
+        </professor>
+        <professor>
+            <name>ANDREU L.</name>
+        </professor>
+        <professor>
+            <name>ROUMIER W.</name>
+        </professor>
+        <professor>
+            <name>HAIK R.</name>
+        </professor>
+        <professor>
+            <name>POISSON S.</name>
+        </professor>
+        <professor>
+            <name>CARTIER-BRESSON A.</name>
+        </professor>
+        <professor>
+            <name>MBONGO P.</name>
+        </professor>
+        <professor>
+            <name>MATHONNET P.</name>
+        </professor>
+        <professor>
+            <name>FOULQUIER N.</name>
+        </professor>
+        <professor>
+            <name>RILOV. F</name>
+        </professor>
+        <professor>
+            <name>JEANSEN E.</name>
+        </professor>
+        <professor>
+            <name>LA J.</name>
+        </professor>
+        <professor>
+            <name>MECARELLI G.</name>
+        </professor>
+        <professor>
+            <name>COLLET M.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>VIAL C.</name>
+        </professor>
+        <professor>
+            <name>PAGNERRE E.</name>
+        </professor>
+        <professor>
+            <name>PANOU C.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>ROBBE S.</name>
+        </professor>
+
+
+        <comment><text>1ere_sem</text></comment>
+        <comment><text>2e_sem</text></comment>
+        <comment><text>3e_sem</text></comment>
+        <comment><text>4e_sem</text></comment>
+        <comment><text>5e_sem</text></comment>
+        <comment><text>6e_sem</text></comment>
+        <comment><text>7e_sem</text></comment>
+        <comment><text>8e_sem</text></comment>
+        <comment><text>9e_sem</text></comment>
+        <comment><text>10e_sem</text></comment>
+        <comment><text>11e_sem</text></comment>
+        <comment><text>12e_sem</text></comment>
+        <comment><text>13e_sem</text></comment>
+        <comment><text>14e_sem</text></comment>
+        <comment><text>15e_sem</text></comment>
+        <comment><text>16e_sem</text></comment>
+       
+    
+</telecaster>
diff --git a/tcserver/conf/etc/telecaster/old/telecaster_pb.xml b/tcserver/conf/etc/telecaster/old/telecaster_pb.xml

new file mode 100644 (file)

index 0000000..f76043c
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/old/telecaster_pb.xml
@@ -0,0 +1,336 @@
+<telecaster>
+    <infos>
+        <short_name>Pre-Barreau</short_name>
+        <name>Pre-Barreau</name>
+        <description>La preparation au Barreau de Paris</description>
+        <url>augustins.pre-barreau.com</url>
+        <genre>Vocal</genre>
+    </infos>
+    <log>/var/log/telecaster/telecaster.log</log>
+    <deefuzzer>
+       <conf>/etc/telecaster/deefuzzer.xml</conf>
+    </deefuzzer>
+    <media>
+        <record>true</record>
+        <play_dir>/home/pre-barreau/media/mp3</play_dir>
+        <rec_dir>/home/pre-barreau/archives</rec_dir>
+        <format>mp3</format>
+        <bitrate>96</bitrate>
+        <channels>1</channels>
+        <ogg_quality>3</ogg_quality>
+        <samplerate>48000</samplerate>
+    </media>
+    <jack>
+        <input>
+        <name>jack_rack:out_1</name>
+        </input>
+    </jack>
+
+    <department>
+        <name>CRFPA</name>
+        <conferences>
+          <conference>
+            <name>Droit_administratif_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_administratif_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_Libertes_publiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Note_de_synthese_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Cours</name>
+          </conference>
+          <conference>
+            <name>Oral-Procedures_communautaires</name>
+          </conference>
+         <conference>
+            <name>Oral-Voies_d_ex</name>
+          </conference>
+          <conference>
+            <name>Oral-Comptabilite_privee</name>
+          </conference>
+          <conference>
+            <name>Oral-Finances_publiques</name>
+          </conference>
+          <conference>
+            <name>Conference-actualisation-septembre</name>
+          </conference>
+          <conference>
+            <name>TEST</name>
+          </conference>
+        </conferences>
+        
+    </department>
+
+    <department>
+        <name>AE</name>
+        <conferences>
+            <conference>
+                <name>Administratif_Cours</name>
+            </conference>
+            <conference>
+                <name>Adm_Correction</name>
+            </conference>
+            <conference>
+                <name>Civil_Correction</name>
+            </conference>
+            <conference>
+                <name>Commercial_Correctio</name>
+            </conference>
+            <conference>
+                <name>Commercial_Cours</name>
+            </conference>
+            <conference>
+                <name>Deontologie_Cours</name>
+            </conference>
+            <conference>
+                <name>Civil_Cours</name>
+            </conference>
+            <conference>
+                <name>Methodo_Oraux</name>
+            </conference>
+            <conference>
+                <name>Penal_Correction</name>
+            </conference>
+            <conference>
+                <name>Penal_Cours</name>
+            </conference>
+            <conference>
+                <name>Procedures_Cours</name>
+            </conference>
+            <conference>
+                <name>Reunion_info</name>
+            </conference>
+            <conference>
+                <name>Social_Corrections</name>
+            </conference>
+            <conference>
+                <name>Social_Cours</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+            <conference>
+                <name>TEST</name>
+            </conference>
+        </conferences>
+    </department>
+
+    <department>
+        <name>ENM</name>
+        <conferences>
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+                
+
+    <department>
+        <name>FJP</name>
+        <conferences>
+            <conference>
+                <name>Actualisation</name>
+            </conference> 
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+
+        <professor>
+            <name>MARINHO A.</name>
+        </professor>
+        <professor>
+            <name>GIUSTINIANI G.</name>
+        </professor>
+        <professor>
+            <name>BOFFA R.</name>
+        </professor>
+        <professor>
+            <name>MEUNIER J.</name>
+        </professor>
+        <professor>
+            <name>THERY C.</name>
+        </professor>
+        <professor>
+            <name>JLB</name>
+        </professor>
+        <professor>
+            <name>AZZI T.</name>
+        </professor>
+        <professor>
+            <name>ETIENNEY A.</name>
+        </professor>
+        <professor>
+            <name>MARKUS J.</name>
+        </professor>
+        <professor>
+            <name>ANDREU L.</name>
+        </professor>
+        <professor>
+            <name>ROUMIER W.</name>
+        </professor>
+        <professor>
+            <name>HAIK R.</name>
+        </professor>
+        <professor>
+            <name>POISSON S.</name>
+        </professor>
+        <professor>
+            <name>CARTIER-BRESSON A.</name>
+        </professor>
+        <professor>
+            <name>MBONGO P.</name>
+        </professor>
+        <professor>
+            <name>MATHONNET P.</name>
+        </professor>
+        <professor>
+            <name>FOULQUIER N.</name>
+        </professor>
+        <professor>
+            <name>RILOV. F</name>
+        </professor>
+        <professor>
+            <name>JEANSEN E.</name>
+        </professor>
+        <professor>
+            <name>LA J.</name>
+        </professor>
+        <professor>
+            <name>MECARELLI G.</name>
+        </professor>
+        <professor>
+            <name>COLLET M.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>VIAL C.</name>
+        </professor>
+        <professor>
+            <name>PAGNERRE E.</name>
+        </professor>
+        <professor>
+            <name>PANOU C.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>ROBBE S.</name>
+        </professor>
+
+
+        <comment><text>1ere_sem</text></comment>
+        <comment><text>2e_sem</text></comment>
+        <comment><text>3e_sem</text></comment>
+        <comment><text>4e_sem</text></comment>
+        <comment><text>5e_sem</text></comment>
+        <comment><text>6e_sem</text></comment>
+        <comment><text>7e_sem</text></comment>
+        <comment><text>8e_sem</text></comment>
+        <comment><text>9e_sem</text></comment>
+        <comment><text>10e_sem</text></comment>
+        <comment><text>11e_sem</text></comment>
+        <comment><text>12e_sem</text></comment>
+        <comment><text>13e_sem</text></comment>
+        <comment><text>14e_sem</text></comment>
+        <comment><text>15e_sem</text></comment>
+        <comment><text>16e_sem</text></comment>
+       
+    
+</telecaster>
diff --git a/tcserver/conf/etc/telecaster/telecaster.xml b/tcserver/conf/etc/telecaster/telecaster.xml

deleted file mode 100644 (file)

index 980fe6f..0000000
--- a/tcserver/conf/etc/telecaster/telecaster.xml
+++ /dev/null
@@ -1,333 +0,0 @@
-<telecaster>
-    <infos>
-        <short_name>Parisson</short_name>
-        <name>Parisson</name>
-        <description>TeleCaster</description>
-        <url>telecaster.parisson.com</url>
-        <genre>Various</genre>
-    </infos>
-    <log>/var/log/telecaster/telecaster.log</log>
-    <deefuzzer>
-       <conf>/etc/telecaster/deefuzzer.xml</conf>
-    </deefuzzer>
-    <media>
-        <record>true</record>
-        <play_dir>/home/telecaster/media/mp3</play_dir>
-        <rec_dir>/home/telecaster/archives</rec_dir>
-        <format>mp3</format>
-        <bitrate>64</bitrate>
-        <channels>1</channels>
-        <ogg_quality>4</ogg_quality>
-        <samplerate>48000</samplerate>
-    </media>
-    <jack>
-        <input>
-        <name>jack_rack:out_1</name>
-        </input>
-    </jack>
-
-    <department>
-        <name>CRFPA</name>
-        <conferences>
-          <conference>
-            <name>Droit_administratif_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_administratif_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_Libertes_publiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Note_de_synthese_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Cours</name>
-          </conference>
-          <conference>
-            <name>Oral-Procedures_communautaires</name>
-          </conference>
-         <conference>
-            <name>Oral-Voies_d_ex</name>
-          </conference>
-          <conference>
-            <name>Oral-Comptabilite_privee</name>
-          </conference>
-          <conference>
-            <name>Oral-Finances_publiques</name>
-          </conference>
-          <conference>
-            <name>TEST</name>
-          </conference>
-        </conferences>
-        
-    </department>
-
-    <department>
-        <name>AE</name>
-        <conferences>
-            <conference>
-                <name>Administratif_Cours</name>
-            </conference>
-            <conference>
-                <name>Adm_Correction</name>
-            </conference>
-            <conference>
-                <name>Civil_Correction</name>
-            </conference>
-            <conference>
-                <name>Commercial_Correctio</name>
-            </conference>
-            <conference>
-                <name>Commercial_Cours</name>
-            </conference>
-            <conference>
-                <name>Deontologie_Cours</name>
-            </conference>
-            <conference>
-                <name>Civil_Cours</name>
-            </conference>
-            <conference>
-                <name>Methodo_Oraux</name>
-            </conference>
-            <conference>
-                <name>Penal_Correction</name>
-            </conference>
-            <conference>
-                <name>Penal_Cours</name>
-            </conference>
-            <conference>
-                <name>Procedures_Cours</name>
-            </conference>
-            <conference>
-                <name>Reunion_info</name>
-            </conference>
-            <conference>
-                <name>Social_Corrections</name>
-            </conference>
-            <conference>
-                <name>Social_Cours</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-            <conference>
-                <name>TEST</name>
-            </conference>
-        </conferences>
-    </department>
-
-    <department>
-        <name>ENM</name>
-        <conferences>
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-                
-
-    <department>
-        <name>FJP</name>
-        <conferences>
-            <conference>
-                <name>Actualisation</name>
-            </conference> 
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-
-        <professor>
-            <name>MARINHO A.</name>
-        </professor>
-        <professor>
-            <name>GIUSTINIANI G.</name>
-        </professor>
-        <professor>
-            <name>BOFFA R.</name>
-        </professor>
-        <professor>
-            <name>MEUNIER J.</name>
-        </professor>
-        <professor>
-            <name>THERY C.</name>
-        </professor>
-        <professor>
-            <name>JLB</name>
-        </professor>
-        <professor>
-            <name>AZZI T.</name>
-        </professor>
-        <professor>
-            <name>ETIENNEY A.</name>
-        </professor>
-        <professor>
-            <name>MARKUS J.</name>
-        </professor>
-        <professor>
-            <name>ANDREU L.</name>
-        </professor>
-        <professor>
-            <name>ROUMIER W.</name>
-        </professor>
-        <professor>
-            <name>HAIK R.</name>
-        </professor>
-        <professor>
-            <name>POISSON S.</name>
-        </professor>
-        <professor>
-            <name>CARTIER-BRESSON A.</name>
-        </professor>
-        <professor>
-            <name>MBONGO P.</name>
-        </professor>
-        <professor>
-            <name>MATHONNET P.</name>
-        </professor>
-        <professor>
-            <name>FOULQUIER N.</name>
-        </professor>
-        <professor>
-            <name>RILOV. F</name>
-        </professor>
-        <professor>
-            <name>JEANSEN E.</name>
-        </professor>
-        <professor>
-            <name>LA J.</name>
-        </professor>
-        <professor>
-            <name>MECARELLI G.</name>
-        </professor>
-        <professor>
-            <name>COLLET M.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>VIAL C.</name>
-        </professor>
-        <professor>
-            <name>PAGNERRE E.</name>
-        </professor>
-        <professor>
-            <name>PANOU C.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>ROBBE S.</name>
-        </professor>
-
-
-        <comment><text>1ere_sem</text></comment>
-        <comment><text>2e_sem</text></comment>
-        <comment><text>3e_sem</text></comment>
-        <comment><text>4e_sem</text></comment>
-        <comment><text>5e_sem</text></comment>
-        <comment><text>6e_sem</text></comment>
-        <comment><text>7e_sem</text></comment>
-        <comment><text>8e_sem</text></comment>
-        <comment><text>9e_sem</text></comment>
-        <comment><text>10e_sem</text></comment>
-        <comment><text>11e_sem</text></comment>
-        <comment><text>12e_sem</text></comment>
-        <comment><text>13e_sem</text></comment>
-        <comment><text>14e_sem</text></comment>
-        <comment><text>15e_sem</text></comment>
-        <comment><text>16e_sem</text></comment>
-       
-    
-</telecaster>
diff --git a/tcserver/conf/etc/telecaster/telecaster_audio_monitor.xml b/tcserver/conf/etc/telecaster/telecaster_audio_monitor.xml

deleted file mode 100644 (file)

index 56ba762..0000000
--- a/tcserver/conf/etc/telecaster/telecaster_audio_monitor.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<deefuzzer>
-    <log>/var/log/telecaster/telecaster_audio_monitor.log</log>
-    <m3u>/var/www/m3u/telecaster_audio_monitor.m3u</m3u>
-
-    <station>
-        <control>
-            <mode>0</mode>
-            <port>1236</port>
-        </control>
-        <relay>
-            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
-            <mode>1</mode>
-            <author>Inconnu</author>
-        </relay>
-        <media>
-            <shuffle>0</shuffle>
-            <format>mp3</format>
-            <voices>2</voices>
-            <ogg_quality>4</ogg_quality>
-            <samplerate>48000</samplerate>
-            <bitrate>96</bitrate>
-            <dir>/home/telecaster/media/mp3</dir>
-        </media>
-        <twitter>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
-            <mode>0</mode>
-            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
-            <tags>bla bla</tags>
-        </twitter>
-        <server>
-            <type>icecast</type>
-            <host>127.0.0.1</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-            <mountpoint>telecaster_mp3_monitor</mountpoint>
-        </server>
-        <record>
-            <mode>1</mode>
-            <dir>/home/telecaster/trash/mp3</dir>
-        </record>
-        <jingles>
-            <shuffle>1</shuffle>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-        </jingles>
-        <infos>
-            <url>http://parisson.com.com</url>
-            <genre>Vocal</genre>
-            <name>telecaster_mp3_monitor</name>
-            <description>TeleCaster MP3 monitor</description>
-        </infos>
-        <rss>
-            <enclosure>0</enclosure>
-            <dir>/var/www/rss</dir>
-            <media_url>http://my.domain.com/rss/</media_url>
-        </rss>
-    </station>
-
-</deefuzzer>
-
-
diff --git a/tcserver/conf/etc/telecaster/telecaster_mp3.xml b/tcserver/conf/etc/telecaster/telecaster_mp3.xml

deleted file mode 100644 (file)

index 1d0eeaf..0000000
--- a/tcserver/conf/etc/telecaster/telecaster_mp3.xml
+++ /dev/null
@@ -1,333 +0,0 @@
-<telecaster>
-    <infos>
-        <short_name>Parisson</short_name>
-        <name>Parisson</name>
-        <description>TeleCaster Services</description>
-        <url>telecaster.parisson.com</url>
-        <genre>Various</genre>
-    </infos>
-    <log>/var/log/telecaster/telecaster.log</log>
-    <deefuzzer>
-       <conf>/etc/telecaster/deefuzzer.xml</conf>
-    </deefuzzer>
-    <media>
-        <record>true</record>
-        <play_dir>/home/telecaster/media/mp3</play_dir>
-        <rec_dir>/home/telecaster/archives</rec_dir>
-        <format>mp3</format>
-        <bitrate>96</bitrate>
-        <channels>1</channels>
-        <ogg_quality>3</ogg_quality>
-        <samplerate>44100</samplerate>
-    </media>
-    <jack>
-        <input>
-        <name>jack_rack:out_1</name>
-        </input>
-    </jack>
-
-    <department>
-        <name>CRFPA</name>
-        <conferences>
-          <conference>
-            <name>Droit_administratif_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_administratif_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_Libertes_publiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Note_de_synthese_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Cours</name>
-          </conference>
-          <conference>
-            <name>Oral-Procedures_communautaires</name>
-          </conference>
-         <conference>
-            <name>Oral-Voies_d_ex</name>
-          </conference>
-          <conference>
-            <name>Oral-Comptabilite_privee</name>
-          </conference>
-          <conference>
-            <name>Oral-Finances_publiques</name>
-          </conference>
-          <conference>
-            <name>TEST</name>
-          </conference>
-        </conferences>
-        
-    </department>
-
-    <department>
-        <name>AE</name>
-        <conferences>
-            <conference>
-                <name>Administratif_Cours</name>
-            </conference>
-            <conference>
-                <name>Adm_Correction</name>
-            </conference>
-            <conference>
-                <name>Civil_Correction</name>
-            </conference>
-            <conference>
-                <name>Commercial_Correctio</name>
-            </conference>
-            <conference>
-                <name>Commercial_Cours</name>
-            </conference>
-            <conference>
-                <name>Deontologie_Cours</name>
-            </conference>
-            <conference>
-                <name>Droit civil - Cours</name>
-            </conference>
-            <conference>
-                <name>Methodo_Oraux</name>
-            </conference>
-            <conference>
-                <name>Penal_Correction</name>
-            </conference>
-            <conference>
-                <name>Penal_Cours</name>
-            </conference>
-            <conference>
-                <name>Procedures_Cours</name>
-            </conference>
-            <conference>
-                <name>Reunion_info</name>
-            </conference>
-            <conference>
-                <name>Social_Corrections</name>
-            </conference>
-            <conference>
-                <name>Social_Cours</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-            <conference>
-                <name>TEST</name>
-            </conference>
-        </conferences>
-    </department>
-
-    <department>
-        <name>ENM</name>
-        <conferences>
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-                
-
-    <department>
-        <name>FJP</name>
-        <conferences>
-            <conference>
-                <name>Actualisation</name>
-            </conference> 
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-
-        <professor>
-            <name>MARINHO A.</name>
-        </professor>
-        <professor>
-            <name>GIUSTINIANI G.</name>
-        </professor>
-        <professor>
-            <name>BOFFA R.</name>
-        </professor>
-        <professor>
-            <name>MEUNIER J.</name>
-        </professor>
-        <professor>
-            <name>THERY C.</name>
-        </professor>
-        <professor>
-            <name>JLB</name>
-        </professor>
-        <professor>
-            <name>AZZI T.</name>
-        </professor>
-        <professor>
-            <name>ETIENNEY A.</name>
-        </professor>
-        <professor>
-            <name>MARKUS J.</name>
-        </professor>
-        <professor>
-            <name>ANDREU L.</name>
-        </professor>
-        <professor>
-            <name>ROUMIER W.</name>
-        </professor>
-        <professor>
-            <name>HAIK R.</name>
-        </professor>
-        <professor>
-            <name>POISSON S.</name>
-        </professor>
-        <professor>
-            <name>CARTIER-BRESSON A.</name>
-        </professor>
-        <professor>
-            <name>MBONGO P.</name>
-        </professor>
-        <professor>
-            <name>MATHONNET P.</name>
-        </professor>
-        <professor>
-            <name>FOULQUIER N.</name>
-        </professor>
-        <professor>
-            <name>RILOV. F</name>
-        </professor>
-        <professor>
-            <name>JEANSEN E.</name>
-        </professor>
-        <professor>
-            <name>LA J.</name>
-        </professor>
-        <professor>
-            <name>MECARELLI G.</name>
-        </professor>
-        <professor>
-            <name>COLLET M.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>VIAL C.</name>
-        </professor>
-        <professor>
-            <name>PAGNERRE E.</name>
-        </professor>
-        <professor>
-            <name>PANOU C.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>ROBBE S.</name>
-        </professor>
-
-
-        <comment><text>1ere_sem</text></comment>
-        <comment><text>2e_sem</text></comment>
-        <comment><text>3e_sem</text></comment>
-        <comment><text>4e_sem</text></comment>
-        <comment><text>5e_sem</text></comment>
-        <comment><text>6e_sem</text></comment>
-        <comment><text>7e_sem</text></comment>
-        <comment><text>8e_sem</text></comment>
-        <comment><text>9e_sem</text></comment>
-        <comment><text>10e_sem</text></comment>
-        <comment><text>11e_sem</text></comment>
-        <comment><text>12e_sem</text></comment>
-        <comment><text>13e_sem</text></comment>
-        <comment><text>14e_sem</text></comment>
-        <comment><text>15e_sem</text></comment>
-        <comment><text>16e_sem</text></comment>
-       
-    
-</telecaster>
diff --git a/tcserver/conf/etc/telecaster/telecaster_mp3_monitor.yaml b/tcserver/conf/etc/telecaster/telecaster_mp3_monitor.yaml

deleted file mode 100644 (file)

index c69d48c..0000000
--- a/tcserver/conf/etc/telecaster/telecaster_mp3_monitor.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-deefuzzer:
-  log: /var/log/telecaster/telecaster_audio_monitor.log
-  m3u: /var/www/m3u/telecaster_audio_monitor.m3u
-  station:
-    control: {mode: 0, port: 16001}
-    infos: {description: TeleCaster MP3 monitor,
-            genre: Vocal,
-            name: telecaster_mp3_monitor,
-            url: 'http://parisson.com.com'}
-    jingles: {dir: /path/to/jingles, mode: 0, shuffle: 1}
-    media: {bitrate: 96,
-            dir: /home/telecaster/media/mp3,
-            format: mp3, ogg_quality: 4,
-            samplerate: 48000, shuffle: 0, voices: '2'}
-    record: {dir: /home/telecaster/trash/mp3, mode: 1}
-    relay: {author: Inconnu, mode: 1,
-            url: 'http://127.0.0.1:8000/telecaster_live.mp3'}
-    rss: {dir: /var/www/rss, enclosure: 0,
-          media_url: 'http://localhost/rss/'}
-    server: {host: 127.0.0.1, mountpoint: telecaster_mp3_monitor,
-             port: 8000, public: 0,
-             sourcepassword: source2parisson, type: icecast}
-    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE,
-              mode: 0, secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
-              tags: bla bla}
diff --git a/tcserver/conf/etc/telecaster/telecaster_ogg.xml b/tcserver/conf/etc/telecaster/telecaster_ogg.xml

deleted file mode 100644 (file)

index 93d8604..0000000
--- a/tcserver/conf/etc/telecaster/telecaster_ogg.xml
+++ /dev/null
@@ -1,333 +0,0 @@
-<telecaster>
-    <infos>
-        <short_name>Parisson</short_name>
-        <name>Parisson</name>
-        <description>TeleCaster Services</description>
-        <url>telecaster.parisson.com</url>
-        <genre>Various</genre>
-    </infos>
-    <log>/var/log/telecaster/telecaster.log</log>
-    <deefuzzer>
-       <conf>/etc/telecaster/deefuzzer.xml</conf>
-    </deefuzzer>
-    <media>
-        <record>true</record>
-        <play_dir>/home/telecaster/media/ogg</play_dir>
-        <rec_dir>/home/telecaster/archives</rec_dir>
-        <format>ogg</format>
-        <bitrate>64</bitrate>
-        <channels>1</channels>
-        <ogg_quality>4</ogg_quality>
-        <samplerate>44100</samplerate>
-    </media>
-    <jack>
-        <input>
-        <name>jack_rack:out_1</name>
-        </input>
-    </jack>
-
-    <department>
-        <name>CRFPA</name>
-        <conferences>
-          <conference>
-            <name>Droit_administratif_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_administratif_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_Libertes_publiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Note_de_synthese_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Cours</name>
-          </conference>
-          <conference>
-            <name>Oral-Procedures_communautaires</name>
-          </conference>
-         <conference>
-            <name>Oral-Voies_d_ex</name>
-          </conference>
-          <conference>
-            <name>Oral-Comptabilite_privee</name>
-          </conference>
-          <conference>
-            <name>Oral-Finances_publiques</name>
-          </conference>
-          <conference>
-            <name>TEST</name>
-          </conference>
-        </conferences>
-        
-    </department>
-
-    <department>
-        <name>AE</name>
-        <conferences>
-            <conference>
-                <name>Administratif_Cours</name>
-            </conference>
-            <conference>
-                <name>Adm_Correction</name>
-            </conference>
-            <conference>
-                <name>Civil_Correction</name>
-            </conference>
-            <conference>
-                <name>Commercial_Correctio</name>
-            </conference>
-            <conference>
-                <name>Commercial_Cours</name>
-            </conference>
-            <conference>
-                <name>Deontologie_Cours</name>
-            </conference>
-            <conference>
-                <name>Droit civil - Cours</name>
-            </conference>
-            <conference>
-                <name>Methodo_Oraux</name>
-            </conference>
-            <conference>
-                <name>Penal_Correction</name>
-            </conference>
-            <conference>
-                <name>Penal_Cours</name>
-            </conference>
-            <conference>
-                <name>Procedures_Cours</name>
-            </conference>
-            <conference>
-                <name>Reunion_info</name>
-            </conference>
-            <conference>
-                <name>Social_Corrections</name>
-            </conference>
-            <conference>
-                <name>Social_Cours</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-            <conference>
-                <name>TEST</name>
-            </conference>
-        </conferences>
-    </department>
-
-    <department>
-        <name>ENM</name>
-        <conferences>
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-                
-
-    <department>
-        <name>FJP</name>
-        <conferences>
-            <conference>
-                <name>Actualisation</name>
-            </conference> 
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-
-        <professor>
-            <name>MARINHO A.</name>
-        </professor>
-        <professor>
-            <name>GIUSTINIANI G.</name>
-        </professor>
-        <professor>
-            <name>BOFFA R.</name>
-        </professor>
-        <professor>
-            <name>MEUNIER J.</name>
-        </professor>
-        <professor>
-            <name>THERY C.</name>
-        </professor>
-        <professor>
-            <name>JLB</name>
-        </professor>
-        <professor>
-            <name>AZZI T.</name>
-        </professor>
-        <professor>
-            <name>ETIENNEY A.</name>
-        </professor>
-        <professor>
-            <name>MARKUS J.</name>
-        </professor>
-        <professor>
-            <name>ANDREU L.</name>
-        </professor>
-        <professor>
-            <name>ROUMIER W.</name>
-        </professor>
-        <professor>
-            <name>HAIK R.</name>
-        </professor>
-        <professor>
-            <name>POISSON S.</name>
-        </professor>
-        <professor>
-            <name>CARTIER-BRESSON A.</name>
-        </professor>
-        <professor>
-            <name>MBONGO P.</name>
-        </professor>
-        <professor>
-            <name>MATHONNET P.</name>
-        </professor>
-        <professor>
-            <name>FOULQUIER N.</name>
-        </professor>
-        <professor>
-            <name>RILOV. F</name>
-        </professor>
-        <professor>
-            <name>JEANSEN E.</name>
-        </professor>
-        <professor>
-            <name>LA J.</name>
-        </professor>
-        <professor>
-            <name>MECARELLI G.</name>
-        </professor>
-        <professor>
-            <name>COLLET M.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>VIAL C.</name>
-        </professor>
-        <professor>
-            <name>PAGNERRE E.</name>
-        </professor>
-        <professor>
-            <name>PANOU C.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>ROBBE S.</name>
-        </professor>
-
-
-        <comment><text>1ere_sem</text></comment>
-        <comment><text>2e_sem</text></comment>
-        <comment><text>3e_sem</text></comment>
-        <comment><text>4e_sem</text></comment>
-        <comment><text>5e_sem</text></comment>
-        <comment><text>6e_sem</text></comment>
-        <comment><text>7e_sem</text></comment>
-        <comment><text>8e_sem</text></comment>
-        <comment><text>9e_sem</text></comment>
-        <comment><text>10e_sem</text></comment>
-        <comment><text>11e_sem</text></comment>
-        <comment><text>12e_sem</text></comment>
-        <comment><text>13e_sem</text></comment>
-        <comment><text>14e_sem</text></comment>
-        <comment><text>15e_sem</text></comment>
-        <comment><text>16e_sem</text></comment>
-       
-    
-</telecaster>
diff --git a/tcserver/conf/etc/telecaster/telecaster_parisson_mp3.xml b/tcserver/conf/etc/telecaster/telecaster_parisson_mp3.xml

deleted file mode 100644 (file)

index c15ccea..0000000
--- a/tcserver/conf/etc/telecaster/telecaster_parisson_mp3.xml
+++ /dev/null
@@ -1,333 +0,0 @@
-<telecaster>
-    <infos>
-        <short_name>Parisson</short_name>
-        <name>Parisson</name>
-        <description>TeleCaster Services</description>
-        <url>telecaster6.parisson.com</url>
-        <genre>Various</genre>
-    </infos>
-    <log>/var/log/telecaster/telecaster.log</log>
-    <deefuzzer>
-       <conf>/etc/telecaster/deefuzzer.xml</conf>
-    </deefuzzer>
-    <media>
-        <record>true</record>
-        <play_dir>/home/telecaster/media/mp3</play_dir>
-        <rec_dir>/home/telecaster/archives</rec_dir>
-        <format>mp3</format>
-        <bitrate>64</bitrate>
-        <channels>1</channels>
-        <ogg_quality>4</ogg_quality>
-        <samplerate>44100</samplerate>
-    </media>
-    <jack>
-        <input>
-        <name>jack_rack:out_1</name>
-        </input>
-    </jack>
-
-    <department>
-        <name>CRFPA</name>
-        <conferences>
-          <conference>
-            <name>Droit_administratif_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_administratif_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_Libertes_publiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Note_de_synthese_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Cours</name>
-          </conference>
-          <conference>
-            <name>Oral-Procedures_communautaires</name>
-          </conference>
-         <conference>
-            <name>Oral-Voies_d_ex</name>
-          </conference>
-          <conference>
-            <name>Oral-Comptabilite_privee</name>
-          </conference>
-          <conference>
-            <name>Oral-Finances_publiques</name>
-          </conference>
-          <conference>
-            <name>TEST</name>
-          </conference>
-        </conferences>
-        
-    </department>
-
-    <department>
-        <name>AE</name>
-        <conferences>
-            <conference>
-                <name>Administratif_Cours</name>
-            </conference>
-            <conference>
-                <name>Adm_Correction</name>
-            </conference>
-            <conference>
-                <name>Civil_Correction</name>
-            </conference>
-            <conference>
-                <name>Commercial_Correctio</name>
-            </conference>
-            <conference>
-                <name>Commercial_Cours</name>
-            </conference>
-            <conference>
-                <name>Deontologie_Cours</name>
-            </conference>
-            <conference>
-                <name>Droit civil - Cours</name>
-            </conference>
-            <conference>
-                <name>Methodo_Oraux</name>
-            </conference>
-            <conference>
-                <name>Penal_Correction</name>
-            </conference>
-            <conference>
-                <name>Penal_Cours</name>
-            </conference>
-            <conference>
-                <name>Procedures_Cours</name>
-            </conference>
-            <conference>
-                <name>Reunion_info</name>
-            </conference>
-            <conference>
-                <name>Social_Corrections</name>
-            </conference>
-            <conference>
-                <name>Social_Cours</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-            <conference>
-                <name>TEST</name>
-            </conference>
-        </conferences>
-    </department>
-
-    <department>
-        <name>ENM</name>
-        <conferences>
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-                
-
-    <department>
-        <name>FJP</name>
-        <conferences>
-            <conference>
-                <name>Actualisation</name>
-            </conference> 
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-
-        <professor>
-            <name>MARINHO A.</name>
-        </professor>
-        <professor>
-            <name>GIUSTINIANI G.</name>
-        </professor>
-        <professor>
-            <name>BOFFA R.</name>
-        </professor>
-        <professor>
-            <name>MEUNIER J.</name>
-        </professor>
-        <professor>
-            <name>THERY C.</name>
-        </professor>
-        <professor>
-            <name>JLB</name>
-        </professor>
-        <professor>
-            <name>AZZI T.</name>
-        </professor>
-        <professor>
-            <name>ETIENNEY A.</name>
-        </professor>
-        <professor>
-            <name>MARKUS J.</name>
-        </professor>
-        <professor>
-            <name>ANDREU L.</name>
-        </professor>
-        <professor>
-            <name>ROUMIER W.</name>
-        </professor>
-        <professor>
-            <name>HAIK R.</name>
-        </professor>
-        <professor>
-            <name>POISSON S.</name>
-        </professor>
-        <professor>
-            <name>CARTIER-BRESSON A.</name>
-        </professor>
-        <professor>
-            <name>MBONGO P.</name>
-        </professor>
-        <professor>
-            <name>MATHONNET P.</name>
-        </professor>
-        <professor>
-            <name>FOULQUIER N.</name>
-        </professor>
-        <professor>
-            <name>RILOV. F</name>
-        </professor>
-        <professor>
-            <name>JEANSEN E.</name>
-        </professor>
-        <professor>
-            <name>LA J.</name>
-        </professor>
-        <professor>
-            <name>MECARELLI G.</name>
-        </professor>
-        <professor>
-            <name>COLLET M.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>VIAL C.</name>
-        </professor>
-        <professor>
-            <name>PAGNERRE E.</name>
-        </professor>
-        <professor>
-            <name>PANOU C.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>ROBBE S.</name>
-        </professor>
-
-
-        <comment><text>1ere_sem</text></comment>
-        <comment><text>2e_sem</text></comment>
-        <comment><text>3e_sem</text></comment>
-        <comment><text>4e_sem</text></comment>
-        <comment><text>5e_sem</text></comment>
-        <comment><text>6e_sem</text></comment>
-        <comment><text>7e_sem</text></comment>
-        <comment><text>8e_sem</text></comment>
-        <comment><text>9e_sem</text></comment>
-        <comment><text>10e_sem</text></comment>
-        <comment><text>11e_sem</text></comment>
-        <comment><text>12e_sem</text></comment>
-        <comment><text>13e_sem</text></comment>
-        <comment><text>14e_sem</text></comment>
-        <comment><text>15e_sem</text></comment>
-        <comment><text>16e_sem</text></comment>
-       
-    
-</telecaster>
diff --git a/tcserver/conf/etc/telecaster/telecaster_pb.xml b/tcserver/conf/etc/telecaster/telecaster_pb.xml

deleted file mode 100644 (file)

index f76043c..0000000
--- a/tcserver/conf/etc/telecaster/telecaster_pb.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-<telecaster>
-    <infos>
-        <short_name>Pre-Barreau</short_name>
-        <name>Pre-Barreau</name>
-        <description>La preparation au Barreau de Paris</description>
-        <url>augustins.pre-barreau.com</url>
-        <genre>Vocal</genre>
-    </infos>
-    <log>/var/log/telecaster/telecaster.log</log>
-    <deefuzzer>
-       <conf>/etc/telecaster/deefuzzer.xml</conf>
-    </deefuzzer>
-    <media>
-        <record>true</record>
-        <play_dir>/home/pre-barreau/media/mp3</play_dir>
-        <rec_dir>/home/pre-barreau/archives</rec_dir>
-        <format>mp3</format>
-        <bitrate>96</bitrate>
-        <channels>1</channels>
-        <ogg_quality>3</ogg_quality>
-        <samplerate>48000</samplerate>
-    </media>
-    <jack>
-        <input>
-        <name>jack_rack:out_1</name>
-        </input>
-    </jack>
-
-    <department>
-        <name>CRFPA</name>
-        <conferences>
-          <conference>
-            <name>Droit_administratif_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_administratif_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_Libertes_publiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Note_de_synthese_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Cours</name>
-          </conference>
-          <conference>
-            <name>Oral-Procedures_communautaires</name>
-          </conference>
-         <conference>
-            <name>Oral-Voies_d_ex</name>
-          </conference>
-          <conference>
-            <name>Oral-Comptabilite_privee</name>
-          </conference>
-          <conference>
-            <name>Oral-Finances_publiques</name>
-          </conference>
-          <conference>
-            <name>Conference-actualisation-septembre</name>
-          </conference>
-          <conference>
-            <name>TEST</name>
-          </conference>
-        </conferences>
-        
-    </department>
-
-    <department>
-        <name>AE</name>
-        <conferences>
-            <conference>
-                <name>Administratif_Cours</name>
-            </conference>
-            <conference>
-                <name>Adm_Correction</name>
-            </conference>
-            <conference>
-                <name>Civil_Correction</name>
-            </conference>
-            <conference>
-                <name>Commercial_Correctio</name>
-            </conference>
-            <conference>
-                <name>Commercial_Cours</name>
-            </conference>
-            <conference>
-                <name>Deontologie_Cours</name>
-            </conference>
-            <conference>
-                <name>Civil_Cours</name>
-            </conference>
-            <conference>
-                <name>Methodo_Oraux</name>
-            </conference>
-            <conference>
-                <name>Penal_Correction</name>
-            </conference>
-            <conference>
-                <name>Penal_Cours</name>
-            </conference>
-            <conference>
-                <name>Procedures_Cours</name>
-            </conference>
-            <conference>
-                <name>Reunion_info</name>
-            </conference>
-            <conference>
-                <name>Social_Corrections</name>
-            </conference>
-            <conference>
-                <name>Social_Cours</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-            <conference>
-                <name>TEST</name>
-            </conference>
-        </conferences>
-    </department>
-
-    <department>
-        <name>ENM</name>
-        <conferences>
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-                
-
-    <department>
-        <name>FJP</name>
-        <conferences>
-            <conference>
-                <name>Actualisation</name>
-            </conference> 
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-
-        <professor>
-            <name>MARINHO A.</name>
-        </professor>
-        <professor>
-            <name>GIUSTINIANI G.</name>
-        </professor>
-        <professor>
-            <name>BOFFA R.</name>
-        </professor>
-        <professor>
-            <name>MEUNIER J.</name>
-        </professor>
-        <professor>
-            <name>THERY C.</name>
-        </professor>
-        <professor>
-            <name>JLB</name>
-        </professor>
-        <professor>
-            <name>AZZI T.</name>
-        </professor>
-        <professor>
-            <name>ETIENNEY A.</name>
-        </professor>
-        <professor>
-            <name>MARKUS J.</name>
-        </professor>
-        <professor>
-            <name>ANDREU L.</name>
-        </professor>
-        <professor>
-            <name>ROUMIER W.</name>
-        </professor>
-        <professor>
-            <name>HAIK R.</name>
-        </professor>
-        <professor>
-            <name>POISSON S.</name>
-        </professor>
-        <professor>
-            <name>CARTIER-BRESSON A.</name>
-        </professor>
-        <professor>
-            <name>MBONGO P.</name>
-        </professor>
-        <professor>
-            <name>MATHONNET P.</name>
-        </professor>
-        <professor>
-            <name>FOULQUIER N.</name>
-        </professor>
-        <professor>
-            <name>RILOV. F</name>
-        </professor>
-        <professor>
-            <name>JEANSEN E.</name>
-        </professor>
-        <professor>
-            <name>LA J.</name>
-        </professor>
-        <professor>
-            <name>MECARELLI G.</name>
-        </professor>
-        <professor>
-            <name>COLLET M.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>VIAL C.</name>
-        </professor>
-        <professor>
-            <name>PAGNERRE E.</name>
-        </professor>
-        <professor>
-            <name>PANOU C.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>ROBBE S.</name>
-        </professor>
-
-
-        <comment><text>1ere_sem</text></comment>
-        <comment><text>2e_sem</text></comment>
-        <comment><text>3e_sem</text></comment>
-        <comment><text>4e_sem</text></comment>
-        <comment><text>5e_sem</text></comment>
-        <comment><text>6e_sem</text></comment>
-        <comment><text>7e_sem</text></comment>
-        <comment><text>8e_sem</text></comment>
-        <comment><text>9e_sem</text></comment>
-        <comment><text>10e_sem</text></comment>
-        <comment><text>11e_sem</text></comment>
-        <comment><text>12e_sem</text></comment>
-        <comment><text>13e_sem</text></comment>
-        <comment><text>14e_sem</text></comment>
-        <comment><text>15e_sem</text></comment>
-        <comment><text>16e_sem</text></comment>
-       
-    
-</telecaster>
diff --git a/tcserver/conf/etc/telecaster/telecaster_webm_monitor.yaml b/tcserver/conf/etc/telecaster/telecaster_webm_monitor.yaml

deleted file mode 100644 (file)

index 1df5cee..0000000
--- a/tcserver/conf/etc/telecaster/telecaster_webm_monitor.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-deefuzzer:
-  log: /var/log/deefuzzer/telecaster_video_safe.log
-  m3u: /var/www/m3u/telecaster_video_safe.m3u
-  station:
-    control: {mode: '0', port: '16002'}
-    infos: {description: TeleCaster safe video stream, genre: Vocal, name: safe, short_name: safe,
-      url: 'http://parisson.com.com'}
-    jingles: {dir: /path/to/jingles, mode: '0', shuffle: '1'}
-    media: {bitrate: '64', dir: /home/telecaster/media/webm, format: webm, ogg_quality: '4',
-      samplerate: '48000', shuffle: '0', voices: '1'}
-    record: {dir: /home/telecaster/trash/webm, mode: '1'}
-    relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:9000/'}
-    rss: {dir: /var/www/rss, enclosure: '0', media_url: 'http://my.domain.com/rss/'}
-    server: {host: 127.0.0.1, port: '8080', public: '0', sourcepassword: source2parisson,
-      type: stream-m}
-    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
-      tags: bla bla}
diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer.xml

new file mode 100644 (file)

index 0000000..3df370d
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/tests/deefuzzer.xml
@@ -0,0 +1,116 @@
+<deefuzzer>
+    <log>/var/log/deefuzzer/telecaster_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_safe.m3u</m3u>
+
+    <station>
+        <infos>
+            <short_name>telecaster_live_safe</short_name>
+            <name>TeleCaster Localhost Live Safe Recorder</name>
+            <description>TeleCaster safe local live audio record</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <type>icecast</type>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/telecaster/media/mp3</dir>
+            <format>mp3</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>1</mode>
+            <port>1234</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/trash</dir>
+        </record>
+    </station>
+
+    <station>
+        <infos>
+            <short_name>telecaster_live_safe</short_name>
+            <name>TeleCaster Localhost Live Safe Recorder</name>
+            <description>TeleCaster safe local live audio record</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <type>icecast</type>
+            <host>parisson.com</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/telecaster/media/mp3</dir>
+            <format>mp3</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>1</mode>
+            <port>1235</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>0</mode>
+            <dir>/home/telecaster/trash</dir>
+        </record>
+    </station>
+
+
+</deefuzzer>
+
+
diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_audio_safe.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_audio_safe.xml

new file mode 100644 (file)

index 0000000..4b5a473
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/tests/deefuzzer_audio_safe.xml
@@ -0,0 +1,62 @@
+<deefuzzer>
+    <log>/var/log/deefuzzer/telecaster_audio_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_audio_safe.m3u</m3u>
+
+    <station>
+        <control>
+            <mode>0</mode>
+            <port>1236</port>
+        </control>
+        <relay>
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+            <mode>1</mode>
+            <author>Inconnu</author>
+        </relay>
+        <media>
+            <shuffle>0</shuffle>
+            <format>mp3</format>
+            <voices>2</voices>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>48000</samplerate>
+            <bitrate>96</bitrate>
+            <dir>/home/telecaster/media/mp3</dir>
+        </media>
+        <twitter>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <tags>bla bla</tags>
+        </twitter>
+        <server>
+            <type>icecast</type>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/trash/mp3</dir>
+        </record>
+        <jingles>
+            <shuffle>1</shuffle>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+        </jingles>
+        <infos>
+            <url>http://parisson.com.com</url>
+            <genre>Vocal</genre>
+            <name>telecaster_audio_safe</name>
+            <short_name>telecaster_audio_safe</short_name>
+            <description>TeleCaster safe audio stream</description>
+        </infos>
+        <rss>
+            <enclosure>0</enclosure>
+            <dir>/var/www/rss</dir>
+            <media_url>http://my.domain.com/rss/</media_url>
+        </rss>
+    </station>
+
+</deefuzzer>
+
+
diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_ogg.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_ogg.xml

new file mode 100644 (file)

index 0000000..522cfc3
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/tests/deefuzzer_ogg.xml
@@ -0,0 +1,114 @@
+<deefuzzer>
+    <log>/var/log/deefuzzer/telecaster.log</log>
+    <m3u>/var/www/m3u/telecaster.m3u</m3u>
+
+    <station>
+        <infos>
+            <short_name>telecaster_local</short_name>
+            <name>TeleCaster Localhost</name>
+            <description>TeleCaster local audio streaming</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/path/to/ogg</dir>
+            <format>ogg</format>
+            <bitrate>64</bitrate>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>1</mode>
+            <port>1234</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>1</mode>
+            <dir>/path/to/archives</dir>
+        </record>
+    </station>
+
+
+    <station>
+        <infos>
+            <short_name>telecaster</short_name>
+            <name>TeleCaster Remote</name>
+            <description>TeleCaster Remote</description>
+            <url>http://parisson.com</url>
+            <genre>School</genre>
+        </infos>
+        <server>
+            <host>stream.parisson.com</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/path/to/ogg</dir>
+            <format>ogg</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>my_twitter_user</key>
+            <secret>my_twitter_password</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>0</mode>
+            <port>1235</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>0</mode>
+            <dir>/path/to/archives</dir>
+        </record>
+    </station>
+
+</deefuzzer>
+
+
diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_safe.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_safe.xml

new file mode 100644 (file)

index 0000000..e1d6ebb
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/tests/deefuzzer_safe.xml
@@ -0,0 +1,60 @@
+<deefuzzer>
+    <log>/var/log/deefuzzer/telecaster_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_safe.m3u</m3u>
+
+    <station>
+        <infos>
+            <short_name>telecaster_live_safe</short_name>
+            <name>TeleCaster Localhost Live Safe Recorder</name>
+            <description>TeleCaster safe local live audio record</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/telecaster/media/ogg</dir>
+            <format>ogg</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>0</mode>
+            <port>1234</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/trash</dir>
+        </record>
+    </station>
+
+</deefuzzer>
+
+
diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml

new file mode 100644 (file)

index 0000000..4ad00d7
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml
@@ -0,0 +1,60 @@
+<deefuzzer>
+    <log>/var/log/deefuzzer/telecaster_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_safe.m3u</m3u>
+
+    <station>
+        <infos>
+            <short_name>telecaster_live_safe</short_name>
+            <name>TeleCaster Localhost Live Safe Recorder</name>
+            <description>TeleCaster safe local live audio record</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/telecaster/media/mp3</dir>
+            <format>mp3</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>0</mode>
+            <port>1234</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/trash</dir>
+        </record>
+    </station>
+
+</deefuzzer>
+
+
diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml

new file mode 100644 (file)

index 0000000..e1d6ebb
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml
@@ -0,0 +1,60 @@
+<deefuzzer>
+    <log>/var/log/deefuzzer/telecaster_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_safe.m3u</m3u>
+
+    <station>
+        <infos>
+            <short_name>telecaster_live_safe</short_name>
+            <name>TeleCaster Localhost Live Safe Recorder</name>
+            <description>TeleCaster safe local live audio record</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/telecaster/media/ogg</dir>
+            <format>ogg</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>0</mode>
+            <port>1234</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/trash</dir>
+        </record>
+    </station>
+
+</deefuzzer>
+
+
diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_video.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_video.xml

new file mode 100644 (file)

index 0000000..bd0db95
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/tests/deefuzzer_video.xml
@@ -0,0 +1,329 @@
+<deefuzzer>
+    <log>/var/log/deefuzzer/telecaster.log</log>
+    <m3u>/var/www/m3u/telecaster.m3u</m3u>
+
+    <station>
+        <infos>
+            <short_name>telecaster_local</short_name>
+            <name>TeleCaster Localhost</name>
+            <description>TeleCaster local audio streaming</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/path/to/ogg</dir>
+            <format>ogg</format>
+            <bitrate>64</bitrate>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>1</mode>
+            <port>1234</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>1</mode>
+            <dir>/path/to/archives</dir>
+        </record>
+    </station>
+
+
+    <station>
+        <infos>
+            <short_name>telecaster</short_name>
+            <name>TeleCaster Remote</name>
+            <description>TeleCaster Remote</description>
+            <url>http://parisson.com</url>
+            <genre>School</genre>
+        </infos>
+        <server>
+            <host>stream.parisson.com</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/path/to/ogg</dir>
+            <format>ogg</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>0</mode>
+            <port>1235</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>0</mode>
+            <dir>/path/to/archives</dir>
+        </record>
+    </station>
+
+
+    <station>
+        <infos>
+            <short_name>telecaster</short_name>
+            <name>TeleCaster Remote</name>
+            <description>TeleCaster Remote</description>
+            <url>http://parisson.com</url>
+            <genre>School</genre>
+        </infos>
+        <server>
+            <host>stream.parisson.com</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/path/to/ogg</dir>
+            <format>ogg</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>0</mode>
+            <port>1235</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>0</mode>
+            <dir>/path/to/archives</dir>
+        </record>
+    </station>
+
+    <station>
+        <infos>
+            <short_name>telecaster_video</short_name>
+            <name>TeleCaster Video Localhost</name>
+            <description>TeleCaster local video streaming</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/path/to/ogg</dir>
+            <format>ogg</format>
+            <bitrate>64</bitrate>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>1</mode>
+            <port>1235</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live_video.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>1</mode>
+            <dir>/path/to/archives</dir>
+        </record>
+    </station>
+
+
+    <station>
+        <infos>
+            <short_name>telecaster_video</short_name>
+            <name>TeleCaster Video Remote</name>
+            <description>TeleCaster Video Remote</description>
+            <url>http://parisson.com</url>
+            <genre>School</genre>
+        </infos>
+        <server>
+            <host>stream.parisson.com</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/path/to/ogg</dir>
+            <format>ogg</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>0</mode>
+            <port>1235</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live_video.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>0</mode>
+            <dir>/path/to/archives</dir>
+        </record>
+    </station>
+
+
+    <station>
+        <infos>
+            <short_name>telecaster</short_name>
+            <name>TeleCaster Remote</name>
+            <description>TeleCaster Remote</description>
+            <url>http://parisson.com</url>
+            <genre>School</genre>
+        </infos>
+        <server>
+            <host>stream.parisson.com</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/path/to/ogg</dir>
+            <format>ogg</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>0</mode>
+            <port>1235</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live_video.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>0</mode>
+            <dir>/path/to/archives</dir>
+        </record>
+    </station>
+    
+</deefuzzer>
+
+
diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_video_local.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_video_local.xml

new file mode 100644 (file)

index 0000000..30bf444
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/tests/deefuzzer_video_local.xml
@@ -0,0 +1,113 @@
+<deefuzzer>
+    <log>/var/log/deefuzzer/telecaster.log</log>
+    <m3u>/var/www/m3u/telecaster.m3u</m3u>
+
+    <station>
+        <infos>
+            <short_name>telecaster_video</short_name>
+            <name>TeleCaster Video Localhost</name>
+            <description>TeleCaster local video streaming</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/telecaster/media/ogg</dir>
+            <format>ogg</format>
+            <bitrate>64</bitrate>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>1</mode>
+            <port>1234</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live_video.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>1</mode>
+            <dir>/path/to/archives</dir>
+        </record>
+    </station>
+
+    <station>
+        <infos>
+            <short_name>telecaster_video</short_name>
+            <name>TeleCaster Video Localhost</name>
+            <description>TeleCaster local video streaming</description>
+            <url>http://parisson.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <host>stream.parisson.com</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/home/telecaster/media/ogg</dir>
+            <format>ogg</format>
+            <bitrate>64</bitrate>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>0</mode>
+            <port>1234</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live_video.ogg</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>0</mode>
+            <dir>/path/to/archives</dir>
+        </record>
+    </station>
+
+</deefuzzer>
+
+
diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_video_safe.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_video_safe.xml

new file mode 100644 (file)

index 0000000..d1bc791
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/tests/deefuzzer_video_safe.xml
@@ -0,0 +1,62 @@
+<deefuzzer>
+    <log>/var/log/deefuzzer/telecaster_video_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_video_safe.m3u</m3u>
+
+    <station>
+        <control>
+            <mode>0</mode>
+            <port>1235</port>
+        </control>
+        <relay>
+            <url>http://127.0.0.1:9000/</url>
+            <mode>1</mode>
+            <author>TeleCaster</author>
+        </relay>
+        <media>
+            <shuffle>0</shuffle>
+            <format>webm</format>
+            <voices>1</voices>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>48000</samplerate>
+            <bitrate>64</bitrate>
+            <dir>/home/telecaster/media/webm</dir>
+        </media>
+        <twitter>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <tags>bla bla</tags>
+        </twitter>
+        <server>
+            <type>stream-m</type>
+            <host>127.0.0.1</host>
+            <port>8080</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/trash/webm</dir>
+        </record>
+        <jingles>
+            <shuffle>1</shuffle>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+        </jingles>
+        <infos>
+            <url>http://parisson.com.com</url>
+            <genre>Vocal</genre>
+            <name>safe</name>
+            <short_name>safe</short_name>
+            <description>TeleCaster safe video stream</description>
+        </infos>
+        <rss>
+            <enclosure>0</enclosure>
+            <dir>/var/www/rss</dir>
+            <media_url>http://my.domain.com/rss/</media_url>
+        </rss>
+    </station>
+
+</deefuzzer>
+
+
diff --git a/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor.xml b/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor.xml

new file mode 100644 (file)

index 0000000..56ba762
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor.xml
@@ -0,0 +1,62 @@
+<deefuzzer>
+    <log>/var/log/telecaster/telecaster_audio_monitor.log</log>
+    <m3u>/var/www/m3u/telecaster_audio_monitor.m3u</m3u>
+
+    <station>
+        <control>
+            <mode>0</mode>
+            <port>1236</port>
+        </control>
+        <relay>
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+            <mode>1</mode>
+            <author>Inconnu</author>
+        </relay>
+        <media>
+            <shuffle>0</shuffle>
+            <format>mp3</format>
+            <voices>2</voices>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>48000</samplerate>
+            <bitrate>96</bitrate>
+            <dir>/home/telecaster/media/mp3</dir>
+        </media>
+        <twitter>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <tags>bla bla</tags>
+        </twitter>
+        <server>
+            <type>icecast</type>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+            <mountpoint>telecaster_mp3_monitor</mountpoint>
+        </server>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/trash/mp3</dir>
+        </record>
+        <jingles>
+            <shuffle>1</shuffle>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+        </jingles>
+        <infos>
+            <url>http://parisson.com.com</url>
+            <genre>Vocal</genre>
+            <name>telecaster_mp3_monitor</name>
+            <description>TeleCaster MP3 monitor</description>
+        </infos>
+        <rss>
+            <enclosure>0</enclosure>
+            <dir>/var/www/rss</dir>
+            <media_url>http://my.domain.com/rss/</media_url>
+        </rss>
+    </station>
+
+</deefuzzer>
+
+
diff --git a/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml b/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml

new file mode 100644 (file)

index 0000000..9fcfcea
--- /dev/null
+++ b/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml
@@ -0,0 +1,17 @@
+deefuzzer:
+  log: /var/log/telecaster/telecaster_audio_monitor.log
+  m3u: /var/www/m3u/telecaster_audio_monitor.m3u
+  station:
+    control: {mode: 0, port: 1237}
+    infos: {description: TeleCaster MP3 monitor, genre: Vocal, name: telecaster_mp3_monitor,
+      url: 'http://parisson.com.com'}
+    jingles: {dir: /path/to/jingles, mode: 0, shuffle: 1}
+    media: {bitrate: 96, dir: /home/telecaster/media/mp3, format: mp3, ogg_quality: 4,
+      samplerate: 48000, shuffle: 0, voices: '2'}
+    record: {dir: /home/telecaster/trash/mp3, mode: 1}
+    relay: {author: Inconnu, mode: 1, url: 'http://127.0.0.1:8000/telecaster_live.mp3'}
+    rss: {dir: /var/www/rss, enclosure: 0, media_url: 'http://my.domain.com/rss/'}
+    server: {host: 127.0.0.1, mountpoint: telecaster_mp3_monitor2, port: 8000, public: 0,
+      sourcepassword: source2parisson, type: icecast}
+    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: 0, secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
+      tags: bla bla}
diff --git a/tcserver/conf/home/bin/rotate_desktop b/tcserver/conf/home/bin/rotate_desktop

deleted file mode 100755 (executable)

index 3e6abf8..0000000
--- a/tcserver/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/tcserver/conf/home/fluxbox/autostart.sh b/tcserver/conf/home/fluxbox/autostart.sh

index 69650125112eeae71029bd8af93f2c04db1d2802..585bc4d90c19b660bb950ea7a52dd928dd9f9ca8 100755 (executable)
--- a/tcserver/conf/home/fluxbox/autostart.sh
+++ b/tcserver/conf/home/fluxbox/autostart.sh
@@ -1,4 +1,58 @@
  #!/bin/sh
  
-sh ~/.fluxbox/tc_audio_start.sh &
-sh ~/.fluxbox/tc_video_start.sh &
+# ---------------------
+# Audio channel
+# ---------------------
+
+pid=`pgrep jack-rack`
+
+
+if [ ! $pid = "" ]; then
+ sleep 1
+else
+ jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null &
+ sleep 6
+fi
+
+jack_connect system:capture_1 jack_rack:in_1
+jack_connect system:capture_2 jack_rack:in_2
+
+qjackctl &
+
+/usr/local/share/telecaster/scripts/telecaster/tc_audio_mp3_icecast.sh &
+#edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n lamemp3enc -p jack_rack > /dev/null &
+
+sleep 3
+
+# MONO setup
+#jack_disconnect jack_rack:out_2 lamemp3enc:in_jackaudiosrc0_1
+jack_connect    jack_rack:out_1 lamemp3enc:in_jackaudiosrc0_1
+#jack_connect    jack_rack:out_1 lamemp3enc:in_jackaudiosrc0_2
+#jack_connect jack_rack:out_1  system:playback_1
+#jack_connect jack_rack:out_1  system:playback_2
+
+# STEREO setup
+#jack_connect jack_rack:out_1  lamemp3enc:in_1
+#jack_connect jack_rack:out_2  lamemp3enc:in_2
+#jack_connect jack_rack:out_1  system:playback_1
+#jack_connect jack_rack:out_2  system:playback_2
+
+ # 4 channels setup
+ #jack_connect system:capture_1 jack_rack:in_1
+ #jack_connect system:capture_1 jack_rack:in_2
+ #jack_connect system:capture_2 jack_rack:in_1
+ #jack_connect system:capture_2 jack_rack:in_2
+ #jack_connect system:capture_3 jack_rack:in_1
+ #jack_connect system:capture_4 jack_rack:in_2
+
+# ---------------------
+# Video channel
+# ---------------------
+
+/usr/local/share/telecaster/scripts/telecaster/tc_video_simple_webm_stream.sh &
+
+sleep 3
+
+jack_disconnect system:capture_1 webmenc:in_jackaudiosrc0_1
+jack_connect    jack_rack:out_1  webmenc:in_jackaudiosrc0_1
+
diff --git a/tcserver/conf/home/fluxbox/tc_audio_start.sh b/tcserver/conf/home/fluxbox/tc_audio_start.sh

deleted file mode 100755 (executable)

index 59a7c31..0000000
--- a/tcserver/conf/home/fluxbox/tc_audio_start.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-pid=`pgrep jack-rack`
-
-# Audio channel
-
-if [ ! $pid = "" ]; then
- sleep 1
-else
- jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null &
- sleep 6
- jack_connect system:capture_1 jack_rack:in_1
- jack_connect system:capture_2 jack_rack:in_2
-fi
-
-qjackctl &
-
-/usr/local/share/telecaster/scripts/tc_audio_mp3_icecast.sh &
-#edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n lamemp3enc -p jack_rack > /dev/null &
-
-sleep 3
-
-# MONO setup
-jack_disconnect jack_rack:out_2 lamemp3enc:in_2
-jack_connect    jack_rack:out_1 lamemp3enc:in_1
-jack_connect    jack_rack:out_1 lamemp3enc:in_2
-#jack_connect jack_rack:out_1  system:playback_1
-#jack_connect jack_rack:out_1  system:playback_2
-
-# STEREO setup
-#jack_connect jack_rack:out_1  lamemp3enc:in_1
-#jack_connect jack_rack:out_2  lamemp3enc:in_2
-#jack_connect jack_rack:out_1  system:playback_1
-#jack_connect jack_rack:out_2  system:playback_2
-
-# Start safe DeeFuzzer
-deefuzzer /etc/telecaster/telecaster_mp3_monitor.yaml > /dev/null &
diff --git a/tcserver/conf/home/fluxbox/tc_video_start.sh b/tcserver/conf/home/fluxbox/tc_video_start.sh

deleted file mode 100755 (executable)

index f313342..0000000
--- a/tcserver/conf/home/fluxbox/tc_video_start.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-/usr/local/share/telecaster/scripts/telecaster/tc_video_simple_webm_stream.sh &
-
-sleep 3
-
-jack_disconnect system:capture_1 webmenc:in_jackaudiosrc0_1
-jack_connect    jack_rack:out_1  webmenc:in_jackaudiosrc0_1
-
-deefuzzer /etc/telecaster/telecaster_webm_monitor.yaml > /dev/null &
diff --git a/tcserver/conf/usr/local/bin/rotate_desktop b/tcserver/conf/usr/local/bin/rotate_desktop

deleted file mode 100755 (executable)

index 3e6abf8..0000000
--- a/tcserver/conf/usr/local/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/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 5753f72595dcdf9b63e63073c7b5e63cd11286b6..3fee7a6c92db4a6fb66a837c4d9abcf3e492068d 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
@@ -9,7 +9,7 @@ HEIGHT=360
  
  v4l2-ctl -d 1 -c power_line_frequency=1
  
-gst-launch v4l2src device=/dev/video1 ! video/x-raw-rgb, width=$WIDTH, height=$HEIGHT, framerate={24/1}  \
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT, framerate={30/1}  \
         ! queue ! ffmpegcolorspace \
         ! queue ! vp8enc speed=2 threads=4 quality=10.0 max-latency=25 max-keyframe-distance=96 auto-alt-ref-frames=true  ! queue ! muxout. \
         jackaudiosrc connect=2 client-name=webmenc ! audio/x-raw-float, channels=2 \
@@ -17,4 +17,3 @@ gst-launch v4l2src device=/dev/video1 ! video/x-raw-rgb, width=$WIDTH, height=$H
         webmmux streamable=true name=muxout \
         ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none blocksize=65536 sync-method=1 \
         > /dev/null
-
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_dv_jack_shout b/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_dv_jack_shout

deleted file mode 100755 (executable)

index ef59dfc..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_dv_jack_shout
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-gst-launch-0.10 dv1394src ! queue ! dvdemux name=d ! queue ! dvdec  \
-       ! queue ! videoscale ! video/x-raw-yuv, width=480, height=368 \
-       ! queue ! ffmpegcolorspace ! theoraenc bitrate=500 ! muxout. \
-        oggmux name=muxout \
-       ! queue ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 \
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_osc_multi.py b/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_osc_multi.py

deleted file mode 100755 (executable)

index d47e17f..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_osc_multi.py
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/usr/bin/python
-import gobject; gobject.threads_init()
-import pygst; pygst.require("0.10")
-import gst
-from threading import Thread
-
-
-class OSCController(Thread):
-
-    def __init__(self, port):
-        Thread.__init__(self)
-        import liblo
-        self.port = port
-        try:
-            self.server = liblo.Server(self.port)
-        except liblo.ServerError, err:
-            print str(err)
-
-    def add_method(self, path, type, method):
-        self.server.add_method(path, type, method)
-
-    def run(self):
-        while True:
-            self.server.recv(100)
-
-
-class GSTSrcVideo(object):
-
-    def __init__(self, pipe=None, mime_type='video/x-raw-yuv', framerate='24/1',
-                 width=160, height=90, xpos=0, ypos=0):
-        self.mime_type = mime_type
-        self.framerate = framerate
-        self.width = width
-        self.height = height
-        self.xpos = xpos
-        self.ypos = ypos
-        if not pipe:
-            pipe = 'videotestsrc pattern="snow"'
-        self.pipe = pipe + ' ! %s, framerate=%s, width=%s, height=%s' \
-                        % (self.mime_type, self.framerate, str(self.width), str(self.height))
-
-
-class GSTSrcAudio(object):
-
-    def __init__(self, pipe=None, mime_type='audio/x-raw-float', channels=2):
-        self.mime_type = mime_type
-        self.channels = channels
-        if not pipe:
-            pipe = 'jackaudiosrc connect=2'
-        self.pipe = pipe + ' ! %s, channels=%s' % (self.mime_type, str(self.channels))
-
-
-class V4lControl(object):
-
-    def __init__(self, device=0):
-        self.program = 'v4l2-ctl'
-        self.device = device
-
-    def execute(self, args):
-        command = ' '.join([self.program, '-d', self.device, '-c', args])
-        os.system(command)
-
-    def power_line_frequency(self, value):
-          arg = 'power_line_frequency=' + value
-          self.execute(arg)
-
-
-class GSTWebmStreamer(object):
-
-    def __init__(self, host='127.0.0.1', port=9000, blocksize=65536):
-        self.host = host
-        self.port = port
-        self.blocksize = blocksize
-        self.muxer = """webmmux streamable=true name=muxer \
-                    ! queue ! tcpserversink host=%s port=%s protocol=none blocksize=%s sync-method=1
-                    """ % (self.host, str(self.port), str(self.blocksize))
-
-    def video_setup(self, threads=4, quality=10):
-        self.video = """! queue ! ffmpegcolorspace ! queue ! vp8enc speed=2 threads=%s quality=%s \
-                        max-latency=25 max-keyframe-distance=96 auto-alt-ref-frames=true  \
-                        ! queue ! muxer.""" % (str(threads), str(quality))
-
-    def audio_setup(self, quality=0.3):
-        self.audio = "! queue ! audioconvert ! queue ! vorbisenc quality=%s ! queue ! muxer." % str(self.quality)
-
-    @property
-    def pipe(self):
-        return ' '.join([self.video, self.audio, self.muxer])
-
-
-class GSTMixer(object):
-
-    def __init__(self, osc_port=8338):
-        self.name = 'mixer'
-        self.pipe = ['videomixer name=mixer ! ffmpegcolorspace ! xvimagesink']
-        self.srcs = []
-        self.i= 0
-        self.osc_port = osc_port
-        self.osc = OSCController(self.osc_port)
-
-    def osc_callback(self, path, value):
-        paths = path.split('/')
-        sink = paths[1]
-        param = paths[2]
-        for src in self.srcs:
-            if src['sink'] == sink:
-                break
-        src['control'].set(param, 5 * gst.SECOND, value[0])
-
-    def osc_alpha_callback(self, path, value):
-        paths = path.split('/')
-        layer = paths[1]
-        param = paths[2]
-        id = int(param[-1])-1
-        for src in self.srcs:
-            if src['id'] == id:
-                break
-        src['control'].set('alpha', 5 * gst.SECOND, value[0])
-
-    def osc_xy_callback(self, path, value):
-        for src in self.srcs:
-            if src['id'] == 2:
-                break
-        src['control'].set("xpos", 5 * gst.SECOND, int(value[0]*480))
-        src['control'].set("ypos", 5 * gst.SECOND, int(value[1]*270))
-
-    def add_src(self, src):
-        self.srcs.append({'id': self.i, 'src': src, 'sink': 'sink_' + str(self.i)})
-        self.i += 1
-
-    def setup(self):
-        self.srcs.reverse()
-
-        for src in self.srcs:
-            self.pipe.append(' '.join([src['src'].pipe, '! ' + self.name + '.' + src['sink']]))
-
-        print ' '.join(self.pipe)
-        self.process = gst.parse_launch(' '.join(self.pipe))
-        mixer = self.process.get_by_name("mixer")
-
-        for src in self.srcs:
-            src['pad'] = mixer.get_pad(src['sink'])
-            src['control'] = gst.Controller(src['pad'], "xpos", "ypos", "alpha")
-
-            src['control'].set_interpolation_mode("xpos", gst.INTERPOLATE_LINEAR)
-            src['control'].set("xpos", 5 * gst.SECOND, src['src'].xpos)
-
-            src['control'].set_interpolation_mode("ypos", gst.INTERPOLATE_LINEAR)
-            src['control'].set("ypos", 5 * gst.SECOND, src['src'].ypos)
-
-            src['control'].set_interpolation_mode("alpha", gst.INTERPOLATE_LINEAR)
-            src['control'].set("alpha", 5 * gst.SECOND, 1.0)
-
-            self.osc.add_method('/1/fader'+str(src['id']+1), 'f', self.osc_alpha_callback)
-
-        self.osc.add_method('/3/xy', 'ff', self.osc_xy_callback)
-
-    def run(self):
-        self.osc.start()
-        self.process.set_state(gst.STATE_PLAYING)
-        gobject.MainLoop().run()
-
-
-if __name__ == '__main__':
-    src1 = GSTSrcVideo(width=640, height=360, framerate='24/1', pipe='videotestsrc pattern="black" ')
-    src2 = GSTSrcVideo(width=640, height=360, framerate='24/1', pipe='videotestsrc ')
-    src3 = GSTSrcVideo(width=160, height=90, framerate='24/1', xpos=200, ypos=150)
-    src4 = GSTSrcVideo(width=160, height=90, framerate='24/1', xpos=300, ypos=250)
-    mixer = GSTMixer()
-    mixer.add_src(src1)
-    mixer.add_src(src2)
-    mixer.add_src(src3)
-    mixer.add_src(src4)
-    mixer.setup()
-    mixer.run()
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout b/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout

deleted file mode 100755 (executable)

index 246d01e..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-gst-launch v4l2src device=/dev/video0 ! videoscale ! video/x-raw-yuv, width=160, height=120 ! videomixer name=mix sink_1::xpos=20 sink_1::ypos=20 sink_1::alpha=0.9  ! queue ! ffmpegcolorspace ! theoraenc quality=40 ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! tee name=t ! queue ! filesink location="video_test.ogg" t. ! queue ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 v4l2src device=/dev/video1 ! videoscale ! video/x-raw-yuv, width=480, height=270 ! mix.
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout2.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout2.sh

deleted file mode 100755 (executable)

index cd25b51..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout2.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_fifo_shout b/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_fifo_shout

deleted file mode 100755 (executable)

index 1c19e27..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_fifo_shout
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -e
-
-case "$1" in
- start)
-   dir=/home/$USER/trash
-   dat=`date '+%y-%m-%d-%H:%M:%S'`
-   file=$dir/video_test_$dat.ogg
-
-   gst-launch-0.10 v4l2src device=/dev/video0 ! queue ! videorate ! video/x-raw-yuv,width=320 ! queue  ! theoraenc quality=60 ! queue ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! filesink location=$file sync=true &
-   
-#    gst-launch v4l2src ! queue ! videorate ! video/x-raw-yuv,fps=30,width=320 ! queue  ! theoraenc quality=60 ! queue ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 &
-   
-#    
-    sleep 10
-    cat $file | oggfwd -d "TeleCaster Live Video Services" -g "Vocal"  -n "TeleCaster Live Video" localhost 8000 source2parisson /telecaster_live_video.ogg &
-   ;;
- 
- stop)
-   pkill -9 oggfwd
-   pkill -9 gst-launch-0.10
-   ;;
-esac
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_shout b/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_shout

deleted file mode 100755 (executable)

index f5d25ba..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_shout
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -e
-
-case "$1" in
- start)
-   dir=/home/$USER/trash
-   dat=`date '+%y-%m-%d-%H:%M:%S'`
-   file=$dir/video_test_$dat.ogg
-
-#   gst-launch-0.10 v4l2src device=/dev/video0 ! queue ! videorate ! video/x-raw-yuv,width=320 ! queue  ! theoraenc quality=60 ! queue ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! filesink location=$file sync=true &
-   
-    gst-launch-0.10 v4l2src ! queue ! videorate ! video/x-raw-yuv,fps=30,width=320 ! queue  ! theoraenc quality=60 ! queue ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 &
-   
-#    
-#    sleep 10
-#    cat $file | oggfwd -d "TeleCaster Live Video Services" -g "Vocal"  -n "TeleCaster Live Video" localhost 8000 source2parisson /telecaster_live_video.ogg &
-   ;;
- 
- stop)
-   pkill -9 oggfwd
-   pkill -9 gst-launch-0.10
-   ;;
-esac
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg b/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg

deleted file mode 100755 (executable)

index af63af4..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv,width=640, height=480 \
-       ! queue ! ffmpegcolorspace \
-       ! queue ! theoraenc quality=20 ! mux. \
-       alsasrc device=hw:0,0 ! audio/x-raw-int,rate=44100,channels=2,depth=16 \
-       !  queue ! audioconvert ! audio/x-raw-float,rate=44100,channels=2,depth=16 ! queue ! vorbisenc ! mux. \
-       oggmux name=mux ! filesink location=/var/www/test/test.ogg \
-
-# ! queue ! videorate ! video/x-raw-yuv, framerate=25/1 \
-#jackaudiosrc connect=1 ! queue ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16
-\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg_jack b/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg_jack

deleted file mode 100755 (executable)

index 69d2091..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg_jack
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv,width=640, height=480 \
-       ! queue ! ffmpegcolorspace \
-       ! queue ! theoraenc quality=25 ! mux. \
-       jackaudiosrc connect=1 ! queue ! audioconvert ! queue ! vorbisenc ! mux. \
-       oggmux name=mux ! filesink location=/var/www/test/test.ogg \
-
-# ! queue ! videorate ! video/x-raw-yuv, framerate=25/1 \
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_triple_shout b/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_triple_shout

deleted file mode 100755 (executable)

index d6aeec8..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_triple_shout
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-gst-launch v4l2src device=/dev/video0 ! queue ! videoscale ! video/x-raw-yuv, width=160, height=120 \
-       ! queue ! ffmpegcolorspace ! video/x-raw-rgb \
-       ! queue ! videomixer name=mix \
-               sink_1::xpos=40 sink_1::ypos=60 sink_1::alpha=0.9 sink_2::xpos=40 sink_2::ypos=180 sink_2::alpha=0.9 \
-       ! queue ! videoscale ! video/x-raw-rgb, width=480, height=270 \
-       ! queue ! ffmpegcolorspace ! theoraenc quality=10 ! oggmux name=muxout \
-       ! queue ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 \
-       ximagesrc ! queue ! videorate ! video/x-raw-rgb, framerate=30/1 ! videoscale ! video/x-raw-rgb, width=160, height=120 ! mix. \
-    v4l2src device=/dev/video1 ! queue ! ffmpegcolorspace ! video/x-raw-rgb ! videoscale ! video/x-raw-rgb, width=640, height=360 ! mix. \
-\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264.sh

deleted file mode 100755 (executable)

index e3ca8cf..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-gst-launch -v  gstrtpbin name=rtpbin \
- v4l2src ! video/x-raw-yuv,width=640,height=480 \
- ! queue ! x264enc byte-stream=true bitrate=500 bframes=4 ref=4 me=hex subme=4 weightb=true threads=4 ! rtph264pay \
- ! rtpbin.send_rtp_sink_0 \
- rtpbin.send_rtp_src_0 ! udpsink port=5000 host=127.0.0.1 \
- rtpbin.send_rtcp_src_0 ! udpsink port=5001 host=127.0.0.1 sync=false async=false  \
- udpsrc port=5002 ! rtpbin.recv_rtcp_sink_0 
- 
-\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264_pl.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264_pl.sh

deleted file mode 100755 (executable)

index c4445cd..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264_pl.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-gst-launch -v gstrtpbin name=rtpbin latency=200 \
- udpsrc caps="application/x-rtp, media=(string)video, clock-rate=(int)90000, encoding-name=(string)H264, payload=(int)96" port=5000 \
- ! rtpbin.recv_rtp_sink_0 \
- rtpbin. ! rtph264depay ! queue ! tee name=t ! ffdec_h264 ! xvimagesink \
- t. ! queue ! filesink location=/tmp/video.mp4 \
- udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
- rtpbin.send_rtcp_src_0 ! udpsink port=5002 host=127.0.0.1 sync=false async=false \
- 
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_flu_simple_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_flu_simple_webm.sh

deleted file mode 100755 (executable)

index e86ca98..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_flu_simple_webm.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=640
-HEIGHT=360
-#WIDTH=1024
-#HEIGHT=576
-
-
-pipe="v4l2src device=/dev/video0  \
-       ! vp8-encoder ! muxout. \
-       jackaudiosrc ! vorbis-encoder ! muxout.  \
-       webmmux streamable=true name=muxout"
-
-flumotion-launch pipeline-producer pipeline=$pipe ! http-streamer port=8800 
-
-sleep 2
-
-jack_disconnect system:capture_1 flumotion-launch:in_jackaudiosrc0_1
-jack_connect   jack_rack:out_1  flumotion-launch:in_jackaudiosrc0_1
-
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_alsa_webm_stream.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_alsa_webm_stream.sh

deleted file mode 100755 (executable)

index 7754217..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_alsa_webm_stream.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=320
-HEIGHT=240
-#WIDTH=1024
-#HEIGHT=576
-
-gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
-       ! queue ! ffmpegcolorspace \
-       ! queue ! vp8enc speed=2 threads=2 quality=9.0 ! queue ! muxout. \
-       alsasrc device=hw:0 \
-       ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
-       webmmux streamable=true name=muxout \
-       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none \
-       > /dev/null 
-
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_dv_webm_stream.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_dv_webm_stream.sh

deleted file mode 100755 (executable)

index 054abc6..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_dv_webm_stream.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-#WIDTH=640
-#HEIGHT=360
-#WIDTH=1024
-#HEIGHT=576
-WIDTH=480
-HEIGHT=320
-
-gst-launch dv1394src ! dvdemux ! queue ! dvdec ! queue ! deinterlace \
-       ! queue ! videoscale ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT \
-       ! queue ! ffmpegcolorspace \
-        ! queue ! vp8enc speed=2 threads=2 quality=10.0 max-latency=25 max-keyframe-distance=96 \
-        ! queue ! muxout. \
-       jackaudiosrc connect=1 ! audio/x-raw-float, channels=2 \
-       ! queue ! audioconvert ! queue ! vorbisenc quality=0.6 ! queue ! muxout.  \
-       webmmux streamable=true name=muxout \
-       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none blocksize=65536 sync-method=1 
-
-
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_only_simple_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_only_simple_webm.sh

deleted file mode 100755 (executable)

index 7c92b88..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_only_simple_webm.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=640
-HEIGHT=480
-#WIDTH=1024
-#HEIGHT=576
-
-gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
-       ! queue ! ffmpegcolorspace \
-       ! queue ! vp8enc speed=2 threads=4 quality=5.0 ! queue ! muxout. \
-       webmmux streamable=true name=muxout \
-       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none 
-
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file.sh

deleted file mode 100755 (executable)

index 181dd2f..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=432
-HEIGHT=240
-
-gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
-       ! queue ! ffmpegcolorspace \
-       ! queue ! theoraenc bitrate=400 speed-level=0 ! queue ! muxout. \
-       jackaudiosrc connect=1 \
-       ! queue ! audioconvert ! queue ! vorbisenc ! queue ! muxout.  \
-       oggmux name=muxout ! filesink location=/home/telecaster/archives/test.ogg \
-       > /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/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file_webm.sh

deleted file mode 100755 (executable)

index d08dc06..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file_webm.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=640
-HEIGHT=360
-#WIDTH=1024
-#HEIGHT=576
-
-gst-launch v4l2src device=/dev/video1 ! 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 ! filesink location=/home/telecaster/trash/test.webm \
-       > /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/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_start.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_start.sh

deleted file mode 100755 (executable)

index 061e290..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=432
-HEIGHT=240
-
-gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
-       ! queue ! ffmpegcolorspace \
-       ! queue ! theoraenc quality=10 ! queue ! muxout. \
-       jackaudiosrc connect=1 \
-       ! queue ! audioconvert ! queue ! vorbisenc quality=3 ! queue ! muxout.  \
-       oggmux name=muxout ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 \
-       > /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/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_ice.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_ice.sh

deleted file mode 100755 (executable)

index 58c1573..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_ice.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=640
-HEIGHT=360
-
-gst-launch v4l2src device=/dev/video0 ! video/x-raw-rgb, width=$WIDTH, height=$HEIGHT  \
-    ! queue ! ffmpegcolorspace \
-    ! queue ! vp8enc speed=2 threads=2 quality=9.0 \
-    ! webmmux streamable=true \
-    ! shout2send mount=/telecaster_live_video.webm port=8000 password=source2parisson ip=127.0.0.1
-\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd.sh

deleted file mode 100755 (executable)

index 7afd26c..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_alsa_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_alsa_test.sh

deleted file mode 100755 (executable)

index 3894ae2..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_alsa_test.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=1280
-HEIGHT=720
-
-gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
-       ! queue ! ffmpegcolorspace \
-       ! queue ! vp8enc speed=2 threads=1 quality=9.0 ! queue ! muxout. \
-       alsasrc \
-       ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
-       webmmux streamable=true name=muxout \
-       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none
-
-       
-
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_jack_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_jack_test.sh

deleted file mode 100755 (executable)

index 0cfb252..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_jack_test.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=1280
-HEIGHT=720
-
-gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
-       ! queue ! ffmpegcolorspace \
-       ! queue ! vp8enc speed=2 threads=4 quality=9.0 ! queue ! muxout. \
-       jackaudiosrc connect=1 \
-       ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
-       webmmux streamable=true name=muxout \
-       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none
-
-       
-
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_test.sh

deleted file mode 100755 (executable)

index 8522473..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=1280
-HEIGHT=720
-
-gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
-       ! queue ! ffmpegcolorspace \
-       ! queue ! vp8enc speed=2 threads=4 quality=9.0 \
-       ! queue ! webmmux streamable=true name=muxout \
-       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none
-
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_m.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_m.sh

deleted file mode 100755 (executable)

index b4d8403..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_m.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=640
-HEIGHT=360
-#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 ! multifdsink name=sink sync=false recover-policy=3 \
-       t. ! queue ! filesink location=/home/telecaster/trash/test.webm \
-       > /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/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_sd_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_sd_test.sh

deleted file mode 100755 (executable)

index 0fb2ce0..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_sd_test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=800
-HEIGHT=600
-
-gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
-       ! queue ! ffmpegcolorspace \
-       ! queue ! vp8enc speed=2 threads=4 quality=9.0 \
-       ! queue ! webmmux streamable=true name=muxout \
-       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none
-
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_tee.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_tee.sh

deleted file mode 100755 (executable)

index d006917..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_tee.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-WIDTH=640
-HEIGHT=360
-#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=9.0 ! queue ! muxout. \
-       jackaudiosrc connect=1 \
-       ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
-       webmmux streamable=true name=muxout \
-       ! tee name=t ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none \
-       t. ! queue ! filesink location=/home/telecaster/trash/test.webm \
-       > /dev/null &
-
-sleep 4
-
-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/tcserver/conf/usr/local/share/telecaster/scripts/test/tcp2x.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/tcp2x.sh

deleted file mode 100755 (executable)

index 8e61926..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/tcp2x.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-gst-launch tcpclientsrc host=192.168.0.18 port=9000 \
-    ! matroskademux \
-    ! vp8dec ! ffmpegcolorspace \
-    ! ximagesink
-
-# tcpclientsrc host=192.168.0.18 port=9000 protocol=none \
-\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_2.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_2.sh

deleted file mode 100755 (executable)

index ae35e7c..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_2.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-gst-launch v4l2src ! video/x-raw-yuv,width=640,height=480 \
- ! queue ! x264enc byte-stream=true bitrate=500 bframes=4 ref=4 me=hex subme=4 weightb=true threads=4 \
- ! tcpserversink host=127.0.0.1 port=9000 protocol=none
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_pl2.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_pl2.sh

deleted file mode 100755 (executable)

index 8595bed..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_pl2.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-gst-launch tcpclientsrc host=127.0.0.1 port=9000 \
-  ! ffdec_h264 ! xvimagesink 
- 
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay.sh

deleted file mode 100755 (executable)

index 8d1a65b..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-gst-launch tcpclientsrc host=192.168.0.18 port=9000 \
-    ! matroskademux \
-    ! queue ! vp8dec \
-    ! queue ! ffmpegcolorspace \
-    ! queue ! x264enc bitrate=200 bframes=4 ref=4 me=hex subme=4 weightb=true threads=0 ! muxout. \
-       mp4mux name=muxout \
-       ! queue ! filesink location=/tmp/video.mp4
-
-# tcpclientsrc host=192.168.0.18 port=9000 protocol=none \
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay_x.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay_x.sh

deleted file mode 100755 (executable)

index 3a30d1b..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay_x.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-gst-launch tcpclientsrc host=192.168.0.18 port=9000 \
-    ! matroskademux \
-    ! vp8dec ! ffmpegcolorspace \
-    ! queue ! x264enc \
-    ! queue ! vdpauh264dec ! ffmpegcolorspace ! ximagesink
-
-# tcpclientsrc host=192.168.0.18 port=9000 protocol=none \
-\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/x_jack_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/test/x_jack_webm.sh

deleted file mode 100755 (executable)

index 8abeab6..0000000
--- a/tcserver/conf/usr/local/share/telecaster/scripts/test/x_jack_webm.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-gst-launch ximagesrc ! video/x-raw-rgb,framerate=30/1 \
-       ! queue ! ffmpegcolorspace \
-       ! queue ! vp8enc speed=2 threads=2 quality=9.0 ! queue ! muxout. \
-       jackaudiosrc connect=1 \
-       ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
-       webmmux streamable=true name=muxout \
-       ! queue ! filesink location=/home/momo/tmp/desktop.webm
-       
-
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_dv_jack_shout b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_dv_jack_shout

new file mode 100755 (executable)

index 0000000..ef59dfc
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_dv_jack_shout
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+gst-launch-0.10 dv1394src ! queue ! dvdemux name=d ! queue ! dvdec  \
+       ! queue ! videoscale ! video/x-raw-yuv, width=480, height=368 \
+       ! queue ! ffmpegcolorspace ! theoraenc bitrate=500 ! muxout. \
+        oggmux name=muxout \
+       ! queue ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 \
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_osc_multi.py b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_osc_multi.py

new file mode 100755 (executable)

index 0000000..d47e17f
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_osc_multi.py
@@ -0,0 +1,175 @@
+#!/usr/bin/python
+import gobject; gobject.threads_init()
+import pygst; pygst.require("0.10")
+import gst
+from threading import Thread
+
+
+class OSCController(Thread):
+
+    def __init__(self, port):
+        Thread.__init__(self)
+        import liblo
+        self.port = port
+        try:
+            self.server = liblo.Server(self.port)
+        except liblo.ServerError, err:
+            print str(err)
+
+    def add_method(self, path, type, method):
+        self.server.add_method(path, type, method)
+
+    def run(self):
+        while True:
+            self.server.recv(100)
+
+
+class GSTSrcVideo(object):
+
+    def __init__(self, pipe=None, mime_type='video/x-raw-yuv', framerate='24/1',
+                 width=160, height=90, xpos=0, ypos=0):
+        self.mime_type = mime_type
+        self.framerate = framerate
+        self.width = width
+        self.height = height
+        self.xpos = xpos
+        self.ypos = ypos
+        if not pipe:
+            pipe = 'videotestsrc pattern="snow"'
+        self.pipe = pipe + ' ! %s, framerate=%s, width=%s, height=%s' \
+                        % (self.mime_type, self.framerate, str(self.width), str(self.height))
+
+
+class GSTSrcAudio(object):
+
+    def __init__(self, pipe=None, mime_type='audio/x-raw-float', channels=2):
+        self.mime_type = mime_type
+        self.channels = channels
+        if not pipe:
+            pipe = 'jackaudiosrc connect=2'
+        self.pipe = pipe + ' ! %s, channels=%s' % (self.mime_type, str(self.channels))
+
+
+class V4lControl(object):
+
+    def __init__(self, device=0):
+        self.program = 'v4l2-ctl'
+        self.device = device
+
+    def execute(self, args):
+        command = ' '.join([self.program, '-d', self.device, '-c', args])
+        os.system(command)
+
+    def power_line_frequency(self, value):
+          arg = 'power_line_frequency=' + value
+          self.execute(arg)
+
+
+class GSTWebmStreamer(object):
+
+    def __init__(self, host='127.0.0.1', port=9000, blocksize=65536):
+        self.host = host
+        self.port = port
+        self.blocksize = blocksize
+        self.muxer = """webmmux streamable=true name=muxer \
+                    ! queue ! tcpserversink host=%s port=%s protocol=none blocksize=%s sync-method=1
+                    """ % (self.host, str(self.port), str(self.blocksize))
+
+    def video_setup(self, threads=4, quality=10):
+        self.video = """! queue ! ffmpegcolorspace ! queue ! vp8enc speed=2 threads=%s quality=%s \
+                        max-latency=25 max-keyframe-distance=96 auto-alt-ref-frames=true  \
+                        ! queue ! muxer.""" % (str(threads), str(quality))
+
+    def audio_setup(self, quality=0.3):
+        self.audio = "! queue ! audioconvert ! queue ! vorbisenc quality=%s ! queue ! muxer." % str(self.quality)
+
+    @property
+    def pipe(self):
+        return ' '.join([self.video, self.audio, self.muxer])
+
+
+class GSTMixer(object):
+
+    def __init__(self, osc_port=8338):
+        self.name = 'mixer'
+        self.pipe = ['videomixer name=mixer ! ffmpegcolorspace ! xvimagesink']
+        self.srcs = []
+        self.i= 0
+        self.osc_port = osc_port
+        self.osc = OSCController(self.osc_port)
+
+    def osc_callback(self, path, value):
+        paths = path.split('/')
+        sink = paths[1]
+        param = paths[2]
+        for src in self.srcs:
+            if src['sink'] == sink:
+                break
+        src['control'].set(param, 5 * gst.SECOND, value[0])
+
+    def osc_alpha_callback(self, path, value):
+        paths = path.split('/')
+        layer = paths[1]
+        param = paths[2]
+        id = int(param[-1])-1
+        for src in self.srcs:
+            if src['id'] == id:
+                break
+        src['control'].set('alpha', 5 * gst.SECOND, value[0])
+
+    def osc_xy_callback(self, path, value):
+        for src in self.srcs:
+            if src['id'] == 2:
+                break
+        src['control'].set("xpos", 5 * gst.SECOND, int(value[0]*480))
+        src['control'].set("ypos", 5 * gst.SECOND, int(value[1]*270))
+
+    def add_src(self, src):
+        self.srcs.append({'id': self.i, 'src': src, 'sink': 'sink_' + str(self.i)})
+        self.i += 1
+
+    def setup(self):
+        self.srcs.reverse()
+
+        for src in self.srcs:
+            self.pipe.append(' '.join([src['src'].pipe, '! ' + self.name + '.' + src['sink']]))
+
+        print ' '.join(self.pipe)
+        self.process = gst.parse_launch(' '.join(self.pipe))
+        mixer = self.process.get_by_name("mixer")
+
+        for src in self.srcs:
+            src['pad'] = mixer.get_pad(src['sink'])
+            src['control'] = gst.Controller(src['pad'], "xpos", "ypos", "alpha")
+
+            src['control'].set_interpolation_mode("xpos", gst.INTERPOLATE_LINEAR)
+            src['control'].set("xpos", 5 * gst.SECOND, src['src'].xpos)
+
+            src['control'].set_interpolation_mode("ypos", gst.INTERPOLATE_LINEAR)
+            src['control'].set("ypos", 5 * gst.SECOND, src['src'].ypos)
+
+            src['control'].set_interpolation_mode("alpha", gst.INTERPOLATE_LINEAR)
+            src['control'].set("alpha", 5 * gst.SECOND, 1.0)
+
+            self.osc.add_method('/1/fader'+str(src['id']+1), 'f', self.osc_alpha_callback)
+
+        self.osc.add_method('/3/xy', 'ff', self.osc_xy_callback)
+
+    def run(self):
+        self.osc.start()
+        self.process.set_state(gst.STATE_PLAYING)
+        gobject.MainLoop().run()
+
+
+if __name__ == '__main__':
+    src1 = GSTSrcVideo(width=640, height=360, framerate='24/1', pipe='videotestsrc pattern="black" ')
+    src2 = GSTSrcVideo(width=640, height=360, framerate='24/1', pipe='videotestsrc ')
+    src3 = GSTSrcVideo(width=160, height=90, framerate='24/1', xpos=200, ypos=150)
+    src4 = GSTSrcVideo(width=160, height=90, framerate='24/1', xpos=300, ypos=250)
+    mixer = GSTMixer()
+    mixer.add_src(src1)
+    mixer.add_src(src2)
+    mixer.add_src(src3)
+    mixer.add_src(src4)
+    mixer.setup()
+    mixer.run()
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_double_shout b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_double_shout

new file mode 100755 (executable)

index 0000000..246d01e
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_double_shout
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+gst-launch v4l2src device=/dev/video0 ! videoscale ! video/x-raw-yuv, width=160, height=120 ! videomixer name=mix sink_1::xpos=20 sink_1::ypos=20 sink_1::alpha=0.9  ! queue ! ffmpegcolorspace ! theoraenc quality=40 ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! tee name=t ! queue ! filesink location="video_test.ogg" t. ! queue ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 v4l2src device=/dev/video1 ! videoscale ! video/x-raw-yuv, width=480, height=270 ! mix.
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_double_shout2.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_double_shout2.sh

new file mode 100755 (executable)

index 0000000..cd25b51
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/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/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_fifo_shout b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_fifo_shout

new file mode 100755 (executable)

index 0000000..1c19e27
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_fifo_shout
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+case "$1" in
+ start)
+   dir=/home/$USER/trash
+   dat=`date '+%y-%m-%d-%H:%M:%S'`
+   file=$dir/video_test_$dat.ogg
+
+   gst-launch-0.10 v4l2src device=/dev/video0 ! queue ! videorate ! video/x-raw-yuv,width=320 ! queue  ! theoraenc quality=60 ! queue ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! filesink location=$file sync=true &
+   
+#    gst-launch v4l2src ! queue ! videorate ! video/x-raw-yuv,fps=30,width=320 ! queue  ! theoraenc quality=60 ! queue ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 &
+   
+#    
+    sleep 10
+    cat $file | oggfwd -d "TeleCaster Live Video Services" -g "Vocal"  -n "TeleCaster Live Video" localhost 8000 source2parisson /telecaster_live_video.ogg &
+   ;;
+ 
+ stop)
+   pkill -9 oggfwd
+   pkill -9 gst-launch-0.10
+   ;;
+esac
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_shout b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_shout

new file mode 100755 (executable)

index 0000000..f5d25ba
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_shout
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+case "$1" in
+ start)
+   dir=/home/$USER/trash
+   dat=`date '+%y-%m-%d-%H:%M:%S'`
+   file=$dir/video_test_$dat.ogg
+
+#   gst-launch-0.10 v4l2src device=/dev/video0 ! queue ! videorate ! video/x-raw-yuv,width=320 ! queue  ! theoraenc quality=60 ! queue ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! filesink location=$file sync=true &
+   
+    gst-launch-0.10 v4l2src ! queue ! videorate ! video/x-raw-yuv,fps=30,width=320 ! queue  ! theoraenc quality=60 ! queue ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 &
+   
+#    
+#    sleep 10
+#    cat $file | oggfwd -d "TeleCaster Live Video Services" -g "Vocal"  -n "TeleCaster Live Video" localhost 8000 source2parisson /telecaster_live_video.ogg &
+   ;;
+ 
+ stop)
+   pkill -9 oggfwd
+   pkill -9 gst-launch-0.10
+   ;;
+esac
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg

new file mode 100755 (executable)

index 0000000..af63af4
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv,width=640, height=480 \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! theoraenc quality=20 ! mux. \
+       alsasrc device=hw:0,0 ! audio/x-raw-int,rate=44100,channels=2,depth=16 \
+       !  queue ! audioconvert ! audio/x-raw-float,rate=44100,channels=2,depth=16 ! queue ! vorbisenc ! mux. \
+       oggmux name=mux ! filesink location=/var/www/test/test.ogg \
+
+# ! queue ! videorate ! video/x-raw-yuv, framerate=25/1 \
+#jackaudiosrc connect=1 ! queue ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16
+\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg_jack b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg_jack

new file mode 100755 (executable)

index 0000000..69d2091
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg_jack
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv,width=640, height=480 \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! theoraenc quality=25 ! mux. \
+       jackaudiosrc connect=1 ! queue ! audioconvert ! queue ! vorbisenc ! mux. \
+       oggmux name=mux ! filesink location=/var/www/test/test.ogg \
+
+# ! queue ! videorate ! video/x-raw-yuv, framerate=25/1 \
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_triple_shout b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_triple_shout

new file mode 100755 (executable)

index 0000000..d6aeec8
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_triple_shout
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+gst-launch v4l2src device=/dev/video0 ! queue ! videoscale ! video/x-raw-yuv, width=160, height=120 \
+       ! queue ! ffmpegcolorspace ! video/x-raw-rgb \
+       ! queue ! videomixer name=mix \
+               sink_1::xpos=40 sink_1::ypos=60 sink_1::alpha=0.9 sink_2::xpos=40 sink_2::ypos=180 sink_2::alpha=0.9 \
+       ! queue ! videoscale ! video/x-raw-rgb, width=480, height=270 \
+       ! queue ! ffmpegcolorspace ! theoraenc quality=10 ! oggmux name=muxout \
+       ! queue ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 \
+       ximagesrc ! queue ! videorate ! video/x-raw-rgb, framerate=30/1 ! videoscale ! video/x-raw-rgb, width=160, height=120 ! mix. \
+    v4l2src device=/dev/video1 ! queue ! ffmpegcolorspace ! video/x-raw-rgb ! videoscale ! video/x-raw-rgb, width=640, height=360 ! mix. \
+\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_start.py b/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_start.py

new file mode 100755 (executable)

index 0000000..12356a4
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_start.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import liblo, sys
+
+port = int(sys.argv[-1])
+
+# send all messages to port 1234 on the local machine
+try:
+    target = liblo.Address(port)
+except liblo.AddressError, err:
+    print str(err)
+    sys.exit()
+
+# send message "/foo/message1" with int, float and string arguments
+liblo.send(target, "/record", 1)
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_stop.py b/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_stop.py

new file mode 100755 (executable)

index 0000000..81da1a1
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_stop.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import liblo, sys
+
+port = int(sys.argv[-1])
+
+# send all messages to port 1234 on the local machine
+try:
+    target = liblo.Address(port)
+except liblo.AddressError, err:
+    print str(err)
+    sys.exit()
+
+# send message "/foo/message1" with int, float and string arguments
+liblo.send(target, "/record", 0)
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264.sh

new file mode 100755 (executable)

index 0000000..e3ca8cf
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+gst-launch -v  gstrtpbin name=rtpbin \
+ v4l2src ! video/x-raw-yuv,width=640,height=480 \
+ ! queue ! x264enc byte-stream=true bitrate=500 bframes=4 ref=4 me=hex subme=4 weightb=true threads=4 ! rtph264pay \
+ ! rtpbin.send_rtp_sink_0 \
+ rtpbin.send_rtp_src_0 ! udpsink port=5000 host=127.0.0.1 \
+ rtpbin.send_rtcp_src_0 ! udpsink port=5001 host=127.0.0.1 sync=false async=false  \
+ udpsrc port=5002 ! rtpbin.recv_rtcp_sink_0 
+ 
+\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264_pl.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264_pl.sh

new file mode 100755 (executable)

index 0000000..c4445cd
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264_pl.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+gst-launch -v gstrtpbin name=rtpbin latency=200 \
+ udpsrc caps="application/x-rtp, media=(string)video, clock-rate=(int)90000, encoding-name=(string)H264, payload=(int)96" port=5000 \
+ ! rtpbin.recv_rtp_sink_0 \
+ rtpbin. ! rtph264depay ! queue ! tee name=t ! ffdec_h264 ! xvimagesink \
+ t. ! queue ! filesink location=/tmp/video.mp4 \
+ udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
+ rtpbin.send_rtcp_src_0 ! udpsink port=5002 host=127.0.0.1 sync=false async=false \
+ 
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_flu_simple_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_flu_simple_webm.sh

new file mode 100755 (executable)

index 0000000..e86ca98
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_flu_simple_webm.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=640
+HEIGHT=360
+#WIDTH=1024
+#HEIGHT=576
+
+
+pipe="v4l2src device=/dev/video0  \
+       ! vp8-encoder ! muxout. \
+       jackaudiosrc ! vorbis-encoder ! muxout.  \
+       webmmux streamable=true name=muxout"
+
+flumotion-launch pipeline-producer pipeline=$pipe ! http-streamer port=8800 
+
+sleep 2
+
+jack_disconnect system:capture_1 flumotion-launch:in_jackaudiosrc0_1
+jack_connect   jack_rack:out_1  flumotion-launch:in_jackaudiosrc0_1
+
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_alsa_webm_stream.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_alsa_webm_stream.sh

new file mode 100755 (executable)

index 0000000..7754217
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_alsa_webm_stream.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=320
+HEIGHT=240
+#WIDTH=1024
+#HEIGHT=576
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! vp8enc speed=2 threads=2 quality=9.0 ! queue ! muxout. \
+       alsasrc device=hw:0 \
+       ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
+       webmmux streamable=true name=muxout \
+       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none \
+       > /dev/null 
+
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_dv_webm_stream.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_dv_webm_stream.sh

new file mode 100755 (executable)

index 0000000..054abc6
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_dv_webm_stream.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+#WIDTH=640
+#HEIGHT=360
+#WIDTH=1024
+#HEIGHT=576
+WIDTH=480
+HEIGHT=320
+
+gst-launch dv1394src ! dvdemux ! queue ! dvdec ! queue ! deinterlace \
+       ! queue ! videoscale ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT \
+       ! queue ! ffmpegcolorspace \
+        ! queue ! vp8enc speed=2 threads=2 quality=10.0 max-latency=25 max-keyframe-distance=96 \
+        ! queue ! muxout. \
+       jackaudiosrc connect=1 ! audio/x-raw-float, channels=2 \
+       ! queue ! audioconvert ! queue ! vorbisenc quality=0.6 ! queue ! muxout.  \
+       webmmux streamable=true name=muxout \
+       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none blocksize=65536 sync-method=1 
+
+
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_only_simple_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_only_simple_webm.sh

new file mode 100755 (executable)

index 0000000..7c92b88
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_only_simple_webm.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=640
+HEIGHT=480
+#WIDTH=1024
+#HEIGHT=576
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! vp8enc speed=2 threads=4 quality=5.0 ! queue ! muxout. \
+       webmmux streamable=true name=muxout \
+       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none 
+
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file.sh

new file mode 100755 (executable)

index 0000000..181dd2f
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=432
+HEIGHT=240
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! theoraenc bitrate=400 speed-level=0 ! queue ! muxout. \
+       jackaudiosrc connect=1 \
+       ! queue ! audioconvert ! queue ! vorbisenc ! queue ! muxout.  \
+       oggmux name=muxout ! filesink location=/home/telecaster/archives/test.ogg \
+       > /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/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file_webm.sh

new file mode 100755 (executable)

index 0000000..d08dc06
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file_webm.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=640
+HEIGHT=360
+#WIDTH=1024
+#HEIGHT=576
+
+gst-launch v4l2src device=/dev/video1 ! 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 ! filesink location=/home/telecaster/trash/test.webm \
+       > /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/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_start.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_start.sh

new file mode 100755 (executable)

index 0000000..061e290
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_start.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=432
+HEIGHT=240
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! theoraenc quality=10 ! queue ! muxout. \
+       jackaudiosrc connect=1 \
+       ! queue ! audioconvert ! queue ! vorbisenc quality=3 ! queue ! muxout.  \
+       oggmux name=muxout ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 \
+       > /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/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_ice.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_ice.sh

new file mode 100755 (executable)

index 0000000..58c1573
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_ice.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=640
+HEIGHT=360
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-rgb, width=$WIDTH, height=$HEIGHT  \
+    ! queue ! ffmpegcolorspace \
+    ! queue ! vp8enc speed=2 threads=2 quality=9.0 \
+    ! webmmux streamable=true \
+    ! shout2send mount=/telecaster_live_video.webm port=8000 password=source2parisson ip=127.0.0.1
+\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream.sh

new file mode 100755 (executable)

index 0000000..d41d76f
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=640
+HEIGHT=480
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT, framerate={30/1}  \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! vp8enc speed=2 threads=4 quality=7.0 max-latency=2 max-keyframe-distance=3 auto-alt-ref-frames=true  ! queue ! muxout. \
+       jackaudiosrc connect=2 client-name=webmenc ! audio/x-raw-float, channels=2 \
+       ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
+       webmmux streamable=true name=muxout \
+       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none blocksize=65536 sync-method=1
+
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd.sh

new file mode 100755 (executable)

index 0000000..7afd26c
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/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/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_alsa_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_alsa_test.sh

new file mode 100755 (executable)

index 0000000..3894ae2
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_alsa_test.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=1280
+HEIGHT=720
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! vp8enc speed=2 threads=1 quality=9.0 ! queue ! muxout. \
+       alsasrc \
+       ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
+       webmmux streamable=true name=muxout \
+       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none
+
+       
+
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_jack_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_jack_test.sh

new file mode 100755 (executable)

index 0000000..0cfb252
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_jack_test.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=1280
+HEIGHT=720
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! vp8enc speed=2 threads=4 quality=9.0 ! queue ! muxout. \
+       jackaudiosrc connect=1 \
+       ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
+       webmmux streamable=true name=muxout \
+       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none
+
+       
+
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_test.sh

new file mode 100755 (executable)

index 0000000..8522473
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_test.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=1280
+HEIGHT=720
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! vp8enc speed=2 threads=4 quality=9.0 \
+       ! queue ! webmmux streamable=true name=muxout \
+       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none
+
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_m.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_m.sh

new file mode 100755 (executable)

index 0000000..b4d8403
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_m.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=640
+HEIGHT=360
+#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 ! multifdsink name=sink sync=false recover-policy=3 \
+       t. ! queue ! filesink location=/home/telecaster/trash/test.webm \
+       > /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/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_sd_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_sd_test.sh

new file mode 100755 (executable)

index 0000000..0fb2ce0
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_sd_test.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=800
+HEIGHT=600
+
+gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT  \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! vp8enc speed=2 threads=4 quality=9.0 \
+       ! queue ! webmmux streamable=true name=muxout \
+       ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none
+
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_tee.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_tee.sh

new file mode 100755 (executable)

index 0000000..d006917
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_tee.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=640
+HEIGHT=360
+#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=9.0 ! queue ! muxout. \
+       jackaudiosrc connect=1 \
+       ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
+       webmmux streamable=true name=muxout \
+       ! tee name=t ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none \
+       t. ! queue ! filesink location=/home/telecaster/trash/test.webm \
+       > /dev/null &
+
+sleep 4
+
+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/tcserver/conf/usr/local/share/telecaster/scripts/tests/tcp2x.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tcp2x.sh

new file mode 100755 (executable)

index 0000000..8e61926
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tcp2x.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+gst-launch tcpclientsrc host=192.168.0.18 port=9000 \
+    ! matroskademux \
+    ! vp8dec ! ffmpegcolorspace \
+    ! ximagesink
+
+# tcpclientsrc host=192.168.0.18 port=9000 protocol=none \
+\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_2.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_2.sh

new file mode 100755 (executable)

index 0000000..ae35e7c
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_2.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+gst-launch v4l2src ! video/x-raw-yuv,width=640,height=480 \
+ ! queue ! x264enc byte-stream=true bitrate=500 bframes=4 ref=4 me=hex subme=4 weightb=true threads=4 \
+ ! tcpserversink host=127.0.0.1 port=9000 protocol=none
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_pl2.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_pl2.sh

new file mode 100755 (executable)

index 0000000..8595bed
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_pl2.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+gst-launch tcpclientsrc host=127.0.0.1 port=9000 \
+  ! ffdec_h264 ! xvimagesink 
+ 
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay.sh

new file mode 100755 (executable)

index 0000000..8d1a65b
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+gst-launch tcpclientsrc host=192.168.0.18 port=9000 \
+    ! matroskademux \
+    ! queue ! vp8dec \
+    ! queue ! ffmpegcolorspace \
+    ! queue ! x264enc bitrate=200 bframes=4 ref=4 me=hex subme=4 weightb=true threads=0 ! muxout. \
+       mp4mux name=muxout \
+       ! queue ! filesink location=/tmp/video.mp4
+
+# tcpclientsrc host=192.168.0.18 port=9000 protocol=none \
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay_x.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay_x.sh

new file mode 100755 (executable)

index 0000000..3a30d1b
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay_x.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+gst-launch tcpclientsrc host=192.168.0.18 port=9000 \
+    ! matroskademux \
+    ! vp8dec ! ffmpegcolorspace \
+    ! queue ! x264enc \
+    ! queue ! vdpauh264dec ! ffmpegcolorspace ! ximagesink
+
+# tcpclientsrc host=192.168.0.18 port=9000 protocol=none \
+\ No newline at end of file
diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/x_jack_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x_jack_webm.sh

new file mode 100755 (executable)

index 0000000..8abeab6
--- /dev/null
+++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x_jack_webm.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+gst-launch ximagesrc ! video/x-raw-rgb,framerate=30/1 \
+       ! queue ! ffmpegcolorspace \
+       ! queue ! vp8enc speed=2 threads=2 quality=9.0 ! queue ! muxout. \
+       jackaudiosrc connect=1 \
+       ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
+       webmmux streamable=true name=muxout \
+       ! queue ! filesink location=/home/momo/tmp/desktop.webm
+       
+
diff --git a/tcserver/install.py b/tcserver/install.py

index 040ea49322e6f0cbae9b923a3d86f2d217f184eb..22cbda0908ead0df06069341c5edde0d8fa3c32d 100644 (file)
--- a/tcserver/install.py
+++ b/tcserver/install.py
@@ -62,7 +62,6 @@ class Install(object):
          self.rss_dir = '/var/www/rss'
          self.m3u_dir = '/var/www/m3u'
          self.log_dir = '/var/log/telecaster'
-        self.deefuzzer_log_dir = '/var/log/deefuzzer'
          self.conf_dir = '/etc/telecaster'
          self.stream_m_conf_dir = '/etc/stream-m'
          self.init_dirs = ['/etc/init.d/', '/etc/default/']
@@ -79,10 +78,6 @@ class Install(object):
          os.system('chown -R ' + self.user + ':' + self.user + ' ' + dir)
  
      def install_deps(self):
-        # compiling edcast-jack
-        os.chdir(self.app_dir + '/lib/edcast-jack')
-        os.system('./configure; make; make install')
-
          # Install Stream-m
          os.chdir(self.app_dir)
          os.system('cp -ra lib/stream-m /usr/local/lib/')
@@ -118,7 +113,7 @@ class Install(object):
      def install_init(self):
          os.chdir(self.app_dir)
  
-        dirs = [self.rss_dir, self.m3u_dir, self.log_dir, self.deefuzzer_log_dir, self.conf_dir,  self.stream_m_conf_dir]
+        dirs = [self.rss_dir, self.m3u_dir, self.log_dir, self.conf_dir,  self.stream_m_conf_dir]
          for dir in dirs:
              if not os.path.exists(dir):
                  os.makedirs(dir)
@@ -142,7 +137,7 @@ class Install(object):
          if not os.path.islink(init_link):
              os.system('ln -s /etc/init.d/stream-m '+init_link)
  
-        os.system('cp -r conf/usr/* /usr/')
+        os.system('cp -ra conf/usr/* /usr/')
  
      def run(self):
          if self.options['keepinit'] == False:
author	Guillaume Pellerin <yomguy@parisson.com>
	Mon, 15 Jul 2013 21:17:41 +0000 (23:17 +0200)
committer	Guillaume Pellerin <yomguy@parisson.com>
	Mon, 15 Jul 2013 21:17:41 +0000 (23:17 +0200)
tcserver/conf/etc/init.d/telecaster		patch \| blob \| history
tcserver/conf/etc/telecaster/deefuzzer.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/deefuzzer_audio_safe.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/deefuzzer_mp3.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/deefuzzer_ogg.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/deefuzzer_safe.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/deefuzzer_safe_mp3.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/deefuzzer_safe_ogg.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/deefuzzer_video.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/deefuzzer_video_local.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/deefuzzer_video_safe.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/deefuzzer_webm.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/edcast_jack_local.cfg	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/edcast_jack_local_mp3.cfg	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/edcast_jack_local_ogg.cfg	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/eq_comp_limit_02.rack	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/eq_comp_limit_02_old.rack	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/old/edcast_jack_local.cfg	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/old/edcast_jack_local_mp3.cfg	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/old/edcast_jack_local_ogg.cfg	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/old/telecaster.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/old/telecaster_mp3.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/old/telecaster_ogg.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/old/telecaster_parisson_mp3.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/old/telecaster_pb.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/telecaster.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/telecaster_audio_monitor.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/telecaster_mp3.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/telecaster_mp3_monitor.yaml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/telecaster_ogg.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/telecaster_parisson_mp3.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/telecaster_pb.xml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/telecaster_webm_monitor.yaml	[deleted file]	patch \| blob \| history
tcserver/conf/etc/telecaster/tests/deefuzzer.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/tests/deefuzzer_audio_safe.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/tests/deefuzzer_ogg.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/tests/deefuzzer_safe.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/tests/deefuzzer_video.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/tests/deefuzzer_video_local.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/tests/deefuzzer_video_safe.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor.xml	[new file with mode: 0644]	patch \| blob
tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml	[new file with mode: 0644]	patch \| blob
tcserver/conf/home/bin/rotate_desktop	[deleted file]	patch \| blob \| history
tcserver/conf/home/fluxbox/autostart.sh		patch \| blob \| history
tcserver/conf/home/fluxbox/tc_audio_start.sh	[deleted file]	patch \| blob \| history
tcserver/conf/home/fluxbox/tc_video_start.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/bin/rotate_desktop	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh		patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/gst_dv_jack_shout	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/gst_osc_multi.py	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout2.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_fifo_shout	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_shout	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg_jack	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_triple_shout	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264_pl.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_flu_simple_webm.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_alsa_webm_stream.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_dv_webm_stream.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_only_simple_webm.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file_webm.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_start.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_ice.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_alsa_test.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_jack_test.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_test.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_m.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_sd_test.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_tee.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/tcp2x.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/x264_2.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/x264_pl2.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay_x.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/test/x_jack_webm.sh	[deleted file]	patch \| blob \| history
tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_dv_jack_shout	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_osc_multi.py	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_double_shout	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_double_shout2.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_fifo_shout	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_shout	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg_jack	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_triple_shout	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_start.py	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_stop.py	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264_pl.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_flu_simple_webm.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_alsa_webm_stream.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_dv_webm_stream.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_only_simple_webm.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file_webm.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_start.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_ice.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_alsa_test.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_jack_test.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_test.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_m.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_sd_test.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_tee.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/tcp2x.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_2.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_pl2.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay_x.sh	[new file with mode: 0755]	patch \| blob
tcserver/conf/usr/local/share/telecaster/scripts/tests/x_jack_webm.sh	[new file with mode: 0755]	patch \| blob
tcserver/install.py		patch \| blob \| history