rm bad modules for python2.6, make 'telecaster' the default user

diff --git a/INSTALL b/INSTALL
index 50318b333bec07e34fdc4969f4043c153fe1fb19..85f986ab27e959227c40d813b9aa5c21c48d58bc 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,13 +14,20 @@ or Ubuntu / Kubuntu (>= 10.4). So please install one of these OS before.
 2. Install dependencies
 =======================
 
+Needed::
+
 $ sudo aptitude update
 
-$ sudo aptitude install python python-xml python-setuptools icecast2 apache2 apache2-suexec jackd vorbis-tools \
-                        python-mutagen procps meterbridge fluxbox vnc4server vncviewer \ 
-                        swh-plusgins jack-rack python-liblo
+$ sudo aptitude install python python-dev python-xml python-libxml2 python-setuptools python-twitter python-liblo python-mutagen \
+                        icecast2 apache2 apache2-suexec jackd libjack-dev vorbis-tools procps meterbridge fluxbox \
+                        vnc4server vncviewer swh-plugins jack-rack libshout3 libshout3-dev libmad0-dev libogg-dev g++
+
+Optional::
+
+$ sudo aptitude install libfaac-dev libmp3lame-dev libflac-dev 
 
-2.1. Install edcast-jack
+
+2.1. Install EdCast-Jack
 ------------------------
 
 $ cd telecaster-0.4.0/tools/edcast-jack
@@ -31,7 +38,8 @@ $ make
 
 $ sudo make install
 
-2.2. Install edcast-jack
+
+2.2. Install DeeFuzzer
 ------------------------
 
 $ cd telecaster-0.4.0/tools/deefuzzer
@@ -50,12 +58,14 @@ $ sudo python install.py
 4. Configuration
 ================
 
-Edit the following files to setup TeleCaster :
+Edit the following files to setup TeleCaster. Please be careful with the XML syntax::
 
 /etc/telecaster/telecaster.xml
 /etc/telecaster/session.xml
 /etc/telecaster/deefuzzer.xml
 
+and,
+
 /etc/default/jackd
 /etc/default/vncserver
 
@@ -66,3 +76,36 @@ Edit the following files to setup TeleCaster :
 $ sudo /etc/init.d/jackd start
 $ sudo /etc/init.d/vncserver start
 
+
+6. Configure Apache2
+====================
+
+Read conf/etc/apache2/default
+and copy #TELECASTER lines into your apache local VirtualHost 
+in /etc/apache2/sites-available/default
+
+Note that TeleCaster in install in /var/www/telecaster/ by default.
+
+Reload Apache::
+
+$ sudo /etc/init.d/apache2 reload
+
+
+7. Usage 
+========
+
+Browse the TeleCaster web control page::
+
+http://localhost/telecaster/telecaster.py
+
+Fill in the form and start any free recording and broadcasting stream !
+
+
+8. Contact
+==========
+
+Any questions, suggestions ? Please contact the main developer :
+
+Guillaume Pellerin <yomguy@parisson.com>
+
+

diff --git a/conf/etc/default/jackd b/conf/etc/default/jackd
index 54f08488603a99e50711f32ecfe4f3ee1b3f671f..f64b55782ba7c1dcffa4d20db06175dbf8ea02b5 100644 (file)
--- a/conf/etc/default/jackd
+++ b/conf/etc/default/jackd
@@ -2,8 +2,8 @@
 START_DAEMON=yes
 
 # The jackd process will run under this user
-USER=prebarreau
+USER=telecaster
 
 # Options to pass to jackd
-OPTIONS="-R -P70 -dalsa -r48000 -p1024 -n3 -D -Chw:0,1 -Phw:0,1 "
+OPTIONS="-r -dalsa -r48000 -p1024 -n8 -D -Chw:0 -Phw:0 "
 

diff --git a/conf/etc/default/vncserver b/conf/etc/default/vncserver
index 1d53129919ae8c8c0303a0e344819b7ec044d9cb..41409b745c6b5f6ced4a3dc92d42f8bb8eb15c63 100644 (file)
--- a/conf/etc/default/vncserver
+++ b/conf/etc/default/vncserver
@@ -2,7 +2,7 @@
 START_DAEMON=yes
 
 # The vncserver process will run under this user
-USER=prebarreau
+USER=telecaster
 
 # The vncserver port (i.e. 2 for 5902)
 PORT="1"

diff --git a/install.py b/install.py
index d4f5c6812ccd491435f29cf924821ff46ece5a17..b86cf850479e1cda04e9508f769eea2940c4f13f 100644 (file)
--- a/install.py
+++ b/install.py
@@ -46,6 +46,8 @@ if not os.path.exists(install_dir):
     os.mkdir(install_dir)
 
 os.system('cp -ra ./* ' + install_dir + os.sep)
+os.system('rm -rf ' + install_dir + os.sep + 'tools/edcast-jack')
+os.system('rm -rf ' + install_dir + os.sep + 'tools/deefuzzer')
 
 conf_dir = '/etc'
 if not os.path.exists(conf_dir):

diff --git a/tools/xmltodict.py b/tools/xmltodict.py
index 90db081d6df51ab389551b8eb8c26b5065125bcc..2a580437ecfc92a5e29c60b7db09fb831ba96b7e 100644 (file)
--- a/tools/xmltodict.py
+++ b/tools/xmltodict.py
@@ -5,7 +5,7 @@
 # http://www.gmta.info/publications/parsing-simple-xml-structure-to-a-python-dictionary
 
 import xml.dom.minidom
-import xml.dom.ext
+#import xml.dom.ext
 from xml.sax.saxutils import escape