check ripping before starting, add jackdbus support, fix acpi bugs, change default...

diff --git a/etc/default_conferences.xml b/etc/default_conferences.xml
index fdc552aa0f6bb4b2e3929a16a48bd91019ced5a7..eb3c4f05d5e18b10f1bfde9755fc58b1ee6acb97 100644 (file)
--- a/etc/default_conferences.xml
+++ b/etc/default_conferences.xml
@@ -1,7 +1,9 @@
-<teleoddcast>
-    <url>http://localhost</url>
-    <title>Example University</title>
+<telecaster>
+    <url>localhost</url>
+    <title>My Streams</title>
     <port>8000</port>
+    <format>mp3</format>
+
     <department>
         <name>Audio</name>
         <conferences>
@@ -46,4 +48,4 @@
             </conference>
         </conferences>
     </department>
-</teleoddcast>
+</telecaster>

diff --git a/etc/pre-barreau_conferences.xml b/etc/pre-barreau_conferences.xml
index 630b3f78938793c456d4936c39a1c5c509659739..11af5d586b9e36d789a2f884ff7fffc50a92a95e 100644 (file)
--- a/etc/pre-barreau_conferences.xml
+++ b/etc/pre-barreau_conferences.xml
@@ -1,5 +1,5 @@
 <telecaster>
-    <host>telecaster-04.parisson.com</host>
+    <host>localhost</host>
     <title>Pre-Barreau</title>
     <port>8000</port>
     <format>mp3</format>

diff --git a/telecaster.py b/telecaster.py
index d87e6797a4947540a17626782de86005ed3a104d..de0e59397c8fd52e3ff3ca97878adc1f3da999ee 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -120,8 +120,8 @@ class TeleCaster:
 
 
 # Call main function.
-conf_file = '/etc/telecaster/telecaster_mp3.xml'
-school_file = '/etc/telecaster/pre-barreau_conferences.xml'
+conf_file = '/etc/telecaster/telecaster.xml'
+school_file = '/etc/telecaster/sessions.xml'
 
 if __name__ == '__main__':
     t = TeleCaster(conf_file, school_file)

diff --git a/webview.py b/webview.py
index 22c64f4fcc409ddb9782f149a6cad7a8c137400c..db645bef5972773da703708acfe995fef8c34c5e 100644 (file)
--- a/webview.py
+++ b/webview.py
@@ -163,6 +163,8 @@ class WebView(FieldStorage):
 
     def hardware_data(self):
         jackd_pid = get_pid('jackd ', self.uid)
+        if jackd_pid == []:
+            jackd_pid = get_pid('/usr/bin/jackdbus ', self.uid)
         self.acpi.update()
         self.power_state = self.acpi.charging_state()
         if self.power_state == 0: