From: yomguy <>
Date: Mon, 22 Nov 2010 22:30:01 +0000 (+0000)
Subject: add silence media files, change media dir play
X-Git-Tag: 0.9~176
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3e685afc7c281799342422a6631f071a0ed8d98e;p=telecaster-client.git

add silence media files, change media dir play
---

diff --git a/conf/etc/telecaster/deefuzzer_safe.xml b/conf/etc/telecaster/deefuzzer_safe.xml
index fc1e8b9..cd5441d 100644
--- a/conf/etc/telecaster/deefuzzer_safe.xml
+++ b/conf/etc/telecaster/deefuzzer_safe.xml
@@ -17,7 +17,7 @@
             <public>0</public>
         </server>
         <media>
-            <dir>/home/telecaster/media/</dir>
+            <dir>/home/telecaster/media/mp3</dir>
             <format>mp3</format>
             <bitrate>96</bitrate>
             <ogg_quality>7</ogg_quality>
diff --git a/conf/etc/telecaster/telecaster.xml b/conf/etc/telecaster/telecaster.xml
index ed3e00e..1d0eeaf 100644
--- a/conf/etc/telecaster/telecaster.xml
+++ b/conf/etc/telecaster/telecaster.xml
@@ -12,7 +12,7 @@
     </deefuzzer>
     <media>
         <record>true</record>
-        <play_dir>/home/telecaster/media</play_dir>
+        <play_dir>/home/telecaster/media/mp3</play_dir>
         <rec_dir>/home/telecaster/archives</rec_dir>
         <format>mp3</format>
         <bitrate>96</bitrate>
diff --git a/conf/home/media/mp3/silence.mp3 b/conf/home/media/mp3/silence.mp3
new file mode 100644
index 0000000..17538c9
Binary files /dev/null and b/conf/home/media/mp3/silence.mp3 differ
diff --git a/conf/home/media/ogg/silence.ogg b/conf/home/media/ogg/silence.ogg
new file mode 100644
index 0000000..5cfaddf
Binary files /dev/null and b/conf/home/media/ogg/silence.ogg differ
diff --git a/install.py b/install.py
index 46df69b..6b31492 100644
--- a/install.py
+++ b/install.py
@@ -97,6 +97,12 @@ for dir in home_dirs:
         shutil.copytree('conf/home/'+dir, home_dir, ignore=shutil.ignore_patterns('*.svn*'))
         os.system('chown -R ' + user + ':' + user + ' ' + home_dir) 
 
+dir = 'media'
+home_dir = home + os.sep + dir
+if not os.path.exists():
+    shutil.copytree('conf/home/'+dir, home_dir, ignore=shutil.ignore_patterns('*.svn*'))
+    os.system('chown -R ' + user + ':' + user + ' ' + home_dir) 
+    
 apache_conf = '/etc/apache2/sites-available/telecaster.conf'
 if not os.path.exists(apache_conf):
     shutil.copy('conf'+apache_conf, apache_conf)