fix startup (mp3 + webm)

diff --git a/conf/etc/init.d/vncserver b/conf/etc/init.d/vncserver
index 52f15654173f6ad48c858b96f38a38f0996777cd..fbeaa5318b0af3e0a5ec2bc62427960a93d6c0aa 100755 (executable)
--- a/conf/etc/init.d/vncserver
+++ b/conf/etc/init.d/vncserver
@@ -11,7 +11,7 @@
 
 DAEMON=/usr/bin/vncserver
 USER=
-OPTIONS="/etc/stream-m/server.conf"
+OPTIONS=""
 LOG=/var/log/vncserver.log
 PIDFILE=/var/run/vncserver.pid
 PORT=1

diff --git a/conf/etc/telecaster/deefuzzer.xml b/conf/etc/telecaster/deefuzzer.xml
index 746f8dd861131249ed9894ecc471f117f89a331d..4ad00d7a0a4c517a8b7d1db49b2166ebd6fe253e 100644 (file)
--- a/conf/etc/telecaster/deefuzzer.xml
+++ b/conf/etc/telecaster/deefuzzer.xml
@@ -1,12 +1,12 @@
 <deefuzzer>
-    <log>/var/log/deefuzzer/telecaster.log</log>
-    <m3u>/var/www/m3u/telecaster.m3u</m3u>
+    <log>/var/log/deefuzzer/telecaster_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_safe.m3u</m3u>
 
     <station>
         <infos>
-            <short_name>telecaster_local</short_name>
-            <name>TeleCaster Localhost</name>
-            <description>TeleCaster local audio streaming</description>
+            <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>
@@ -17,67 +17,13 @@
             <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>
+            <dir>/home/telecaster/media/mp3</dir>
+            <format>mp3</format>
             <bitrate>96</bitrate>
-            <ogg_quality>4</ogg_quality>
+            <ogg_quality>7</ogg_quality>
             <samplerate>44100</samplerate>
-            <voices>1</voices>
-            <shuffle>0</shuffle>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
         </media>
         <rss>
             <dir>/var/www/rss</dir>
@@ -96,16 +42,16 @@
         </jingles>
         <control>
             <mode>0</mode>
-            <port>1235</port>
+            <port>1234</port>
         </control>
         <relay>
             <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
             <author>Parisson</author>
         </relay>
         <record>
-            <mode>0</mode>
-            <dir>/path/to/archives</dir>
+            <mode>1</mode>
+            <dir>/home/telecaster/trash</dir>
         </record>
     </station>
 

diff --git a/conf/etc/telecaster/deefuzzer_audio_safe.xml b/conf/etc/telecaster/deefuzzer_audio_safe.xml
index d38344ab3bd369224439c7d6e5a8f797cb4b7e6b..23c8e2e55d3e6a75f3cf90688168f677771cbebe 100644 (file)
--- a/conf/etc/telecaster/deefuzzer_audio_safe.xml
+++ b/conf/etc/telecaster/deefuzzer_audio_safe.xml
@@ -1,6 +1,6 @@
 <deefuzzer>
-    <log>/var/log/deefuzzer/telecaster_safe.log</log>
-    <m3u>/var/www/m3u/telecaster_safe.m3u</m3u>
+    <log>/var/log/deefuzzer/telecaster_audio_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_audio_safe.m3u</m3u>
 
     <station>
         <control>
@@ -28,6 +28,7 @@
             <tags>bla bla</tags>
         </twitter>
         <server>
+            <type>icecast</type>
             <host>127.0.0.1</host>
             <port>8000</port>
             <sourcepassword>source2parisson</sourcepassword>

diff --git a/conf/etc/telecaster/deefuzzer_video_safe.xml b/conf/etc/telecaster/deefuzzer_video_safe.xml
index e772e5250f8fcfaa891bb0eef34edecdd2dd3133..c91fd063712e5bfcc97826980ed29058d1c10856 100644 (file)
--- a/conf/etc/telecaster/deefuzzer_video_safe.xml
+++ b/conf/etc/telecaster/deefuzzer_video_safe.xml
@@ -28,6 +28,7 @@
             <tags>bla bla</tags>
         </twitter>
         <server>
+            <type>stream-m</type>
             <host>127.0.0.1</host>
             <port>8080</port>
             <sourcepassword>source2parisson</sourcepassword>
@@ -45,8 +46,8 @@
         <infos>
             <url>http://parisson.com.com</url>
             <genre>Vocal</genre>
-            <name>telecaster_video_safe</name>
-            <short_name>telecaster_video_safe</short_name>
+            <name>safe</name>
+            <short_name>publish/safe</short_name>
             <description>TeleCaster safe video stream</description>
         </infos>
         <rss>

diff --git a/conf/etc/telecaster/edcast_jack_local.cfg b/conf/etc/telecaster/edcast_jack_local.cfg
index 0cfe09d6869ce3a1435fdf9f0fe9f53b64179e44..16db86aae250f472cae2e24603c5e741d3611490 100644 (file)
--- a/conf/etc/telecaster/edcast_jack_local.cfg
+++ b/conf/etc/telecaster/edcast_jack_local.cfg
@@ -3,7 +3,7 @@ ServerType=Icecast2
 Server=localhost
 Port=8000
 ServerPassword=source2parisson
-ServerMountpoint=/telecaster_live.ogg
+ServerMountpoint=/telecaster_live.mp3
 # YP (Stream Directory) Settings
 ServerPublic=0
 ServerIRC=
@@ -16,10 +16,10 @@ ServerGenre=Vocal
 AutomaticReconnectSecs=10
 AutoConnect=1
 # Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
-Encode=OggVorbis
+Encode=MP3
 # General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
 NumberChannels=1
-Samplerate=44100
+Samplerate=48000
 BitrateNominal=64
 BitrateMin=32
 BitrateMax=96
@@ -30,7 +30,7 @@ SaveDirectory=/home/telecaster/trash
 SaveAsWAV=0
 #
 # Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
-OggQuality=4
+OggQuality=3
 OggBitrateQualityFlag=Quality
 # LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
 LameCBRFlag=0

diff --git a/conf/etc/telecaster/telecaster.xml b/conf/etc/telecaster/telecaster.xml
index 3faece54d6dc503485fe1d2a22ca58ca31ae6c62..b6061f10499b4a4449eeeff02b4cf8816610ab5a 100644 (file)
--- a/conf/etc/telecaster/telecaster.xml
+++ b/conf/etc/telecaster/telecaster.xml
@@ -12,13 +12,13 @@
     </deefuzzer>
     <media>
         <record>true</record>
-        <play_dir>/home/telecaster/.telecaster/media/ogg</play_dir>
+        <play_dir>/home/telecaster/media/mp3</play_dir>
         <rec_dir>/home/telecaster/archives</rec_dir>
-        <format>ogg</format>
+        <format>mp3</format>
         <bitrate>64</bitrate>
         <channels>1</channels>
         <ogg_quality>4</ogg_quality>
-        <samplerate>44100</samplerate>
+        <samplerate>48000</samplerate>
     </media>
     <jack>
         <input>

diff --git a/conf/home/fluxbox/autostart.sh b/conf/home/fluxbox/autostart.sh
index 208bc11ce8a1f47bed89a563482d6c878c29e4ab..69650125112eeae71029bd8af93f2c04db1d2802 100755 (executable)
--- a/conf/home/fluxbox/autostart.sh
+++ b/conf/home/fluxbox/autostart.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-sh ~/.fluxbox/tc_audio_start.sh
-sh ~/.fluxbox/tc_video_start.sh
+sh ~/.fluxbox/tc_audio_start.sh &
+sh ~/.fluxbox/tc_video_start.sh &

diff --git a/conf/home/fluxbox/init b/conf/home/fluxbox/init
index 25769d11648f3c8b05dd4a4a2344b97ad1b0e47d..a47c4240dc1ae2c70ae8f54b21c56969b04ec97a 100644 (file)
--- a/conf/home/fluxbox/init
+++ b/conf/home/fluxbox/init
@@ -1,37 +1,3 @@
-session.screen0.iconbar.mode:  {static groups} (workspace)
-session.screen0.tab.placement: Top
-session.screen0.tab.width:     64
-session.screen0.tab.height:    16
-session.screen0.tabs.usePixmap:        false
-session.screen0.toolbar.onTop: False
-session.screen0.toolbar.autoHide:      False
-session.screen0.toolbar.placement:     BottomCenter
-session.screen0.toolbar.widthPercent:  66
-session.screen0.slit.placement:        RightBottom
-session.screen0.slit.direction:        Vertical
-session.screen0.slit.onTop:    False
-session.screen0.slit.autoHide: False
-session.screen0.edgeSnapThreshold:     0
-session.screen0.strftimeFormat:        %k:%M
-session.screen0.colPlacementDirection: TopToBottom
-session.screen0.showwindowposition:    true
-session.screen0.rowPlacementDirection: LeftToRight
-session.screen0.focusNewWindows:       True
-session.screen0.windowPlacement:       RowSmartPlacement
-session.screen0.rootCommand:   sh ~/.fluxbox/autostart.sh
-session.screen0.workspaces:    4
-session.screen0.focusModel:    ClickToFocus
-session.screen0.focusLastWindow:       True
-session.screen0.workspaceNames:        one,two,three,four
-session.screen0.fullMaximization:      False
-session.colorsPerChannel:      4
 session.menuFile:      ~/.fluxbox/menu
-session.configVersion: 10
-session.doubleClickInterval:   250
-session.cacheLife:     5
-session.cacheMax:      200
-session.opaqueMove:    False
-session.styleFile:     /usr/share/fluxbox/styles/BlueNight
 session.keyFile:       ~/.fluxbox/keys
-session.autoRaiseDelay:        250
-session.imageDither:   True
+session.configVersion: 13

diff --git a/conf/home/fluxbox/tc_audio_start.sh b/conf/home/fluxbox/tc_audio_start.sh
index 1cd3d2d8cd103b529c74d02028d89d9c19f8ed56..2e27a0b01dfaaa9a3f2b8fa30b0eff083ec04c8d 100755 (executable)
--- a/conf/home/fluxbox/tc_audio_start.sh
+++ b/conf/home/fluxbox/tc_audio_start.sh
@@ -8,7 +8,7 @@ if [ ! $pid = "" ]; then
  sleep 1
 else
  jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null &
- sleep 12
+ sleep 6
  jack_connect system:capture_1 jack_rack:in_1
  jack_connect system:capture_2 jack_rack:in_2
 fi

diff --git a/conf/home/fluxbox/tc_video_start.sh b/conf/home/fluxbox/tc_video_start.sh
index d29c79a8385873a93033dc78d402fdb21447a4e1..07783ee32b79dd344cb9d435f5e0d9b32b7c2399 100755 (executable)
--- a/conf/home/fluxbox/tc_video_start.sh
+++ b/conf/home/fluxbox/tc_video_start.sh
@@ -2,7 +2,7 @@
 
 # Start TeleCaster video channel
 
-/home/telecaster/.fluxbox/telecaster/tc_video_simple_webm_stream.sh &
+/home/telecaster/.fluxbox/telecaster/tc_video_simple_webm_stream.sh > /dev/null &
 
 sleep 3