From 23bc896f26b88807727f067f4dc6b1943aa312dd Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 16 Jan 2012 18:51:10 +0100 Subject: [PATCH] fix startup (mp3 + webm) --- conf/etc/init.d/vncserver | 2 +- conf/etc/telecaster/deefuzzer.xml | 82 ++++---------------- conf/etc/telecaster/deefuzzer_audio_safe.xml | 5 +- conf/etc/telecaster/deefuzzer_video_safe.xml | 5 +- conf/etc/telecaster/edcast_jack_local.cfg | 8 +- conf/etc/telecaster/telecaster.xml | 6 +- conf/home/fluxbox/autostart.sh | 4 +- conf/home/fluxbox/init | 36 +-------- conf/home/fluxbox/tc_audio_start.sh | 2 +- conf/home/fluxbox/tc_video_start.sh | 2 +- 10 files changed, 33 insertions(+), 119 deletions(-) diff --git a/conf/etc/init.d/vncserver b/conf/etc/init.d/vncserver index 52f1565..fbeaa53 100755 --- 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 746f8dd..4ad00d7 100644 --- a/conf/etc/telecaster/deefuzzer.xml +++ b/conf/etc/telecaster/deefuzzer.xml @@ -1,12 +1,12 @@ - /var/log/deefuzzer/telecaster.log - /var/www/m3u/telecaster.m3u + /var/log/deefuzzer/telecaster_safe.log + /var/www/m3u/telecaster_safe.m3u - telecaster_local - TeleCaster Localhost - TeleCaster local audio streaming + telecaster_live_safe + TeleCaster Localhost Live Safe Recorder + TeleCaster safe local live audio record http://parisson.com Vocal @@ -17,67 +17,13 @@ 0 - /path/to/ogg - ogg - 64 - 4 - 44100 - 1 - 0 - - - /var/www/rss - 0 - - - 0 - 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE - 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4 - bla bla - - - 0 - /path/to/jingles - 1 - - - 1 - 1234 - - - 1 - http://127.0.0.1:8000/telecaster_live.ogg - Parisson - - - 1 - /path/to/archives - - - - - - - telecaster - TeleCaster Remote - TeleCaster Remote - http://parisson.com - School - - - stream.parisson.com - 8000 - source2parisson - 0 - - - /path/to/ogg - ogg + /home/telecaster/media/mp3 + mp3 96 - 4 + 7 44100 - 1 - 0 + 2 + 1 /var/www/rss @@ -96,16 +42,16 @@ 0 - 1235 + 1234 1 - http://127.0.0.1:8000/telecaster_live.ogg + http://127.0.0.1:8000/telecaster_live.mp3 Parisson - 0 - /path/to/archives + 1 + /home/telecaster/trash diff --git a/conf/etc/telecaster/deefuzzer_audio_safe.xml b/conf/etc/telecaster/deefuzzer_audio_safe.xml index d38344a..23c8e2e 100644 --- a/conf/etc/telecaster/deefuzzer_audio_safe.xml +++ b/conf/etc/telecaster/deefuzzer_audio_safe.xml @@ -1,6 +1,6 @@ - /var/log/deefuzzer/telecaster_safe.log - /var/www/m3u/telecaster_safe.m3u + /var/log/deefuzzer/telecaster_audio_safe.log + /var/www/m3u/telecaster_audio_safe.m3u @@ -28,6 +28,7 @@ bla bla + icecast 127.0.0.1 8000 source2parisson diff --git a/conf/etc/telecaster/deefuzzer_video_safe.xml b/conf/etc/telecaster/deefuzzer_video_safe.xml index e772e52..c91fd06 100644 --- a/conf/etc/telecaster/deefuzzer_video_safe.xml +++ b/conf/etc/telecaster/deefuzzer_video_safe.xml @@ -28,6 +28,7 @@ bla bla + stream-m 127.0.0.1 8080 source2parisson @@ -45,8 +46,8 @@ http://parisson.com.com Vocal - telecaster_video_safe - telecaster_video_safe + safe + publish/safe TeleCaster safe video stream diff --git a/conf/etc/telecaster/edcast_jack_local.cfg b/conf/etc/telecaster/edcast_jack_local.cfg index 0cfe09d..16db86a 100644 --- 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 3faece5..b6061f1 100644 --- a/conf/etc/telecaster/telecaster.xml +++ b/conf/etc/telecaster/telecaster.xml @@ -12,13 +12,13 @@ true - /home/telecaster/.telecaster/media/ogg + /home/telecaster/media/mp3 /home/telecaster/archives - ogg + mp3 64 1 4 - 44100 + 48000 diff --git a/conf/home/fluxbox/autostart.sh b/conf/home/fluxbox/autostart.sh index 208bc11..6965012 100755 --- 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 25769d1..a47c424 100644 --- 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 1cd3d2d..2e27a0b 100755 --- 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 d29c79a..07783ee 100755 --- 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 -- 2.39.5