From: yomguy <yomguy@parisson.com>
Date: Fri, 26 Nov 2010 16:54:48 +0000 (+0000)
Subject: goto OGG by default
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9a54dd8c0f08823f96691182fe91808b21e8065a;p=telecaster-cgi.git

goto OGG by default
---

diff --git a/conf/etc/telecaster/deefuzzer.xml b/conf/etc/telecaster/deefuzzer.xml
index dfb6d84..4a6da85 100644
--- a/conf/etc/telecaster/deefuzzer.xml
+++ b/conf/etc/telecaster/deefuzzer.xml
@@ -17,13 +17,13 @@
             <public>0</public>
         </server>
         <media>
-            <dir>/path/to/mp3</dir>
-            <format>mp3</format>
-            <bitrate>96</bitrate>
-            <ogg_quality>7</ogg_quality>
+            <dir>/path/to/ogg</dir>
+            <format>ogg</format>
+            <bitrate>64</bitrate>
+            <ogg_quality>4</ogg_quality>
             <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
         </media>
         <rss>
             <dir>/var/www/rss</dir>
@@ -46,7 +46,7 @@
         </control>
         <relay>
             <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
             <author>Parisson</author>
         </relay>
         <record>
@@ -71,13 +71,13 @@
             <public>0</public>
         </server>
         <media>
-            <dir>/path/to/mp3</dir>
-            <format>mp3</format>
+            <dir>/path/to/ogg</dir>
+            <format>ogg</format>
             <bitrate>96</bitrate>
-            <ogg_quality>7</ogg_quality>
+            <ogg_quality>4</ogg_quality>
             <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
+            <voices>1</voices>
+            <shuffle>0</shuffle>
         </media>
         <rss>
             <dir>/var/www/rss</dir>
@@ -100,7 +100,7 @@
         </control>
         <relay>
             <mode>1</mode>
-            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+            <url>http://127.0.0.1:8000/telecaster_live.ogg</url>
             <author>Parisson</author>
         </relay>
         <record>
diff --git a/conf/etc/telecaster/telecaster.xml b/conf/etc/telecaster/telecaster.xml
index 1d0eeaf..93d8604 100644
--- a/conf/etc/telecaster/telecaster.xml
+++ b/conf/etc/telecaster/telecaster.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>