From: yomguy <>
Date: Thu, 3 Jun 2010 13:14:30 +0000 (+0000)
Subject: check ripping before starting, add jackdbus support, fix acpi bugs, change default... 
X-Git-Tag: 1.0~209
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b05b061f6060eb917fb98bfda0548c252ed54886;p=telecaster-server.git

check ripping before starting, add jackdbus support, fix acpi bugs, change default conf dir to /etc/telecaster/
---

diff --git a/etc/default_conferences.xml b/etc/default_conferences.xml
index fdc552a..eb3c4f0 100644
--- 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 630b3f7..11af5d5 100644
--- 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 d87e679..de0e593 100755
--- 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 22c64f4..db645be 100644
--- 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: