increase edcast RB size, fix no choices on form

diff --git a/station.py b/station.py
index cffbbd6ceb2ed284fbde431d543b929af08f59ad..7429776ab001aa314543ab22851e35f19c0586f0 100644 (file)
--- 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 ec03b8476433e5c17f7906a741718dbef1666114..2b0138b5aad5766d8d5e168f5faf35d355f6049e 100755 (executable)
--- 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 4edd7fd3f4fe072deaeee63a3f67db42fc062e46..3c730534a75b9f11f7bf53a9b4edd0cebe7202fb 100644 (file)
--- 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;