From: yomguy <yomguy@parisson.com>
Date: Fri, 26 Nov 2010 14:56:03 +0000 (+0000)
Subject: increase edcast RB size, fix no choices on form
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d901a54af1eda66589b207b8040f53b126b1da39;p=telecaster-cgi.git

increase edcast RB size, fix no choices on form
---

diff --git a/station.py b/station.py
index cffbbd6..7429776 100644
--- a/station.py
+++ b/station.py
@@ -55,15 +55,9 @@ class Conference:
         self.dict = dict
         self.title = dict['title']
         self.department = dict['department']
-        if '....' in self.department or self.department == '':
-            self.department = 'Undefined'
         self.conference = dict['conference']
-        if '....' in self.conference or self.conference == '':
-            self.conference = 'Undefined'
         self.session = dict['session']
         self.professor = dict['professor']
-        if '....' in self.professor or self.professor == '':
-            self.professor = 'Undefined'
         self.comment = dict['comment']
 
     def get_info(self):
diff --git a/telecaster.py b/telecaster.py
index ec03b84..2b0138b 100755
--- a/telecaster.py
+++ b/telecaster.py
@@ -92,24 +92,24 @@ class TeleCaster:
         if deefuzzer_pid == [] and form.has_key("action") and \
             form.has_key("department") and form.has_key("conference") and \
             form.has_key("session") and form["action"].value == "start":
-
-	    if not form.has_key("professsor"):
-		professor = 'Inconnu'
-	    else:
-		professor = form.getfirst("professor")
-		
-	    if not form.has_key("comment"):
-		comment = 'Non'
-	    else:
-		comment = form.getfirst("comment")
-		
-            self.conference_dict = {'title': self.title,
-                        'department': form.getfirst("department"),
-                        'conference': form.getfirst("conference"),
-                        'session': form.getfirst("session"),
-                        'professor': professor,
-                        'comment': comment}
-
+	    
+            self.conference_dict = {'title': '',
+                        'department': '',
+                        'conference': '',
+                        'session': '',
+                        'professor': '',
+                        'comment': ''}
+                        
+	    for data in self.conference_dict:
+		if not form.has_key(data):
+		    self.conference_dict[data] = 'Inconnu'
+		else:
+		    value = form.getfirst(data)
+		    if '....' in value:
+			self.conference_dict[data] = 'Inconnu'
+		    else:
+			self.conference_dict[data] = value
+	 
             s = Station(self.conf_file, self.conference_dict, self.lock_file)
             s.start()
             time.sleep(1)
diff --git a/tools/edcast-jack/edcast.cpp b/tools/edcast-jack/edcast.cpp
index 4edd7fd..3c73053 100644
--- a/tools/edcast-jack/edcast.cpp
+++ b/tools/edcast-jack/edcast.cpp
@@ -67,7 +67,7 @@ jack_nframes_t nframes;
 const size_t sample_size = sizeof(jack_default_audio_sample_t);
 
 /* Synchronization between process thread and edcast thread. */
-#define DEFAULT_RB_SIZE 16384*4     /* ringbuffer size in frames */
+#define DEFAULT_RB_SIZE 16384*16     /* ringbuffer size in frames */
 jack_ringbuffer_t **rb;
 pthread_mutex_t edcast_thread_lock = PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t  data_ready = PTHREAD_COND_INITIALIZER;