tweak confs

diff --git a/conf/etc/telecaster/deefuzzer_mp3.xml b/conf/etc/telecaster/deefuzzer_mp3.xml
new file mode 100644 (file)
index 0000000..dfb6d84
--- /dev/null
+++ b/conf/etc/telecaster/deefuzzer_mp3.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/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>
+            <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>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>/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/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>
+            <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>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>/path/to/archives</dir>
+        </record>
+    </station>
+
+</deefuzzer>
+
+

diff --git a/conf/etc/telecaster/deefuzzer_ogg.xml b/conf/etc/telecaster/deefuzzer_ogg.xml
new file mode 100644 (file)
index 0000000..4a6da85
--- /dev/null
+++ b/conf/etc/telecaster/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>
+            <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>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>
+            <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>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/conf/etc/telecaster/edcast_jack_local.cfg b/conf/etc/telecaster/edcast_jack_local.cfg
new file mode 100644 (file)
index 0000000..0cfe09d
--- /dev/null
+++ b/conf/etc/telecaster/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.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/conf/etc/telecaster/edcast_jack_local_ogg.cfg b/conf/etc/telecaster/edcast_jack_local_ogg.cfg
new file mode 100644 (file)
index 0000000..0cfe09d
--- /dev/null
+++ b/conf/etc/telecaster/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/conf/etc/telecaster/telecaster_ogg.xml b/conf/etc/telecaster/telecaster_ogg.xml
index 1d0eeafe91be4be47d6face9c684fef4771cf147..93d86048d2a22aac95b89d9a9c1ca227a5d75ef7 100644 (file)
--- a/conf/etc/telecaster/telecaster_ogg.xml
+++ b/conf/etc/telecaster/telecaster_ogg.xml
@@ -12,12 +12,12 @@
     </deefuzzer>
     <media>
         <record>true</record>
-        <play_dir>/home/telecaster/media/mp3</play_dir>
+        <play_dir>/home/telecaster/media/ogg</play_dir>
         <rec_dir>/home/telecaster/archives</rec_dir>
-        <format>mp3</format>
-        <bitrate>96</bitrate>
+        <format>ogg</format>
+        <bitrate>64</bitrate>
         <channels>1</channels>
-        <ogg_quality>3</ogg_quality>
+        <ogg_quality>4</ogg_quality>
         <samplerate>44100</samplerate>
     </media>
     <jack>