From: yomguy <>
Date: Mon, 22 Nov 2010 22:02:47 +0000 (+0000)
Subject: process stdout to /dev/null, increase encoder ringbuffer size, remove encoder recorde... 
X-Git-Tag: 0.9~179
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8eb3e896dedf7e0d6896d3f00ecc13ced8bb8482;p=telecaster-client.git

process stdout to /dev/null, increase encoder ringbuffer size, remove encoder recorder, add a local deefuzzer for safe recording
---

diff --git a/conf/etc/telecaster/deefuzzer_safe.xml b/conf/etc/telecaster/deefuzzer_safe.xml
new file mode 100644
index 0000000..6c4bf56
--- /dev/null
+++ b/conf/etc/telecaster/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_safe</short_name>
+            <name>TeleCaster Localhost Safe Recorder</name>
+            <description>TeleCaster safe local 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/</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>
+            <user>my_twitter_user</user>
+            <pass>my_twitter_password</pass>
+            <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/conf/etc/telecaster/edcast_jack_local.cfg b/conf/etc/telecaster/edcast_jack_local.cfg
index ac68675..16db86a 100644
--- a/conf/etc/telecaster/edcast_jack_local.cfg
+++ b/conf/etc/telecaster/edcast_jack_local.cfg
@@ -25,7 +25,7 @@ BitrateMin=32
 BitrateMax=96
 
 #
-SaveDirectoryFlag=1
+SaveDirectoryFlag=0
 SaveDirectory=/home/telecaster/trash
 SaveAsWAV=0
 #
diff --git a/conf/home/fluxbox/autostart.sh b/conf/home/fluxbox/autostart.sh
index 690047b..e67f098 100755
--- a/conf/home/fluxbox/autostart.sh
+++ b/conf/home/fluxbox/autostart.sh
@@ -1,12 +1,11 @@
 #!/bin/sh
-# Ensure the XPATH variable is set appropriately to the Linux distribution's Xvfb installation path.
 
 pid=`pgrep jack-rack`
 
 if [ ! $pid = "" ]; then 
  sleep 1
 else
- jack-rack -n /etc/telecaster/eq_comp_limit_02.rack &
+ jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null &
  sleep 10
  jack_connect system:capture_1 jack_rack:in_1
  jack_connect system:capture_2 jack_rack:in_2
@@ -14,7 +13,7 @@ fi
 
 qjackctl &
 
-edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack &
+edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack > /dev/null &
 sleep 3
 
 # MONO setup
@@ -31,6 +30,5 @@ jack_connect jack_rack:out_1  system:playback_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/deefuzzer_safe.xml > /dev/null &
diff --git a/conf/home/fluxbox/startup.ubuntu b/conf/home/fluxbox/startup.ubuntu
index 4a5b2cb..bd1a913 100644
--- a/conf/home/fluxbox/startup.ubuntu
+++ b/conf/home/fluxbox/startup.ubuntu
@@ -21,8 +21,6 @@ xmodmap "/home/telecaster/.Xmodmap"
 fluxbox &
 # or if you want to keep a log:
 # exec fluxbox -log "/home/telecaster/.fluxbox/log"
-#!/bin/sh
-# Ensure the XPATH variable is set appropriately to the Linux distribution's Xvfb installation path.
 
 fbpid=$!
 
@@ -34,7 +32,7 @@ pid=`pgrep jack-rack`
 if [ ! $pid = "" ]; then 
  sleep 1
 else
- jack-rack -n /etc/telecaster/eq_comp_limit_02.rack &
+ jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null &
  sleep 10
  jack_connect system:capture_1 jack_rack:in_1
  jack_connect system:capture_2 jack_rack:in_2
@@ -42,7 +40,7 @@ fi
 
 qjackctl &
 
-edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack &
+edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack > /dev/null &
 sleep 3
 
 # MONO setup
@@ -54,7 +52,9 @@ jack_connect jack_rack:out_1  LIVE:in_2
 #jack_connect jack_rack:out_1  LIVE:in_1
 #jack_connect jack_rack:out_2  LIVE:in_2
 
-echo "ok" > /tmp/tt
+# Start safe DeeFuzzer
+deefuzzer /etc/telecaster/deefuzzer_safe.xml > /dev/null &
+
 } &
 
 wait $fbpid
diff --git a/tools/edcast-jack/edcast.cpp b/tools/edcast-jack/edcast.cpp
index 03f84b8..3c73053 100644
--- a/tools/edcast-jack/edcast.cpp
+++ b/tools/edcast-jack/edcast.cpp
@@ -67,7 +67,7 @@ jack_nframes_t nframes;
 const size_t sample_size = sizeof(jack_default_audio_sample_t);
 
 /* Synchronization between process thread and edcast thread. */
-#define DEFAULT_RB_SIZE 16384*2		/* ringbuffer size in frames */
+#define DEFAULT_RB_SIZE 16384*16     /* ringbuffer size in frames */
 jack_ringbuffer_t **rb;
 pthread_mutex_t edcast_thread_lock = PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t  data_ready = PTHREAD_COND_INITIALIZER;