Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/forms/LiveStreamingPreferences.php

@@ -44,7 +44,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         //liquidsoap harbor.input port
         $m_port = Application_Model_StreamSetting::GetMasterLiveSteamPort();
         $master_dj_port = new Zend_Form_Element_Text('master_harbor_input_port');
-        $master_dj_port->setLabel("Master DJ Port")
+        $master_dj_port->setLabel("Master Source Port")
                 ->setValue($m_port)
                 ->setValidators(array(new Zend_Validate_Between(array('min'=>0, 'max'=>99999))))
                 ->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>'Only numbers are allowed.')))
@@ -53,7 +53,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         
         $m_mount = Application_Model_StreamSetting::GetMasterLiveSteamMountPoint();
         $master_dj_mount = new Zend_Form_Element_Text('master_harbor_input_mount_point');
-        $master_dj_mount->setLabel("Master DJ Mount Point")
+        $master_dj_mount->setLabel("Master Source Mount Point")
                 ->setValue($m_mount)
                 ->setValidators(array(
                         array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
@@ -63,7 +63,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         //liquidsoap harbor.input port
         $l_port = Application_Model_StreamSetting::GetDJLiveSteamPort();
         $live_dj_port = new Zend_Form_Element_Text('dj_harbor_input_port');
-        $live_dj_port->setLabel("DJ Port")
+        $live_dj_port->setLabel("Show Source Port")
                 ->setValue($l_port)
                 ->setValidators(array(new Zend_Validate_Between(array('min'=>0, 'max'=>99999))))
                 ->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>'Only numbers are allowed.')))
@@ -72,7 +72,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         
         $l_mount = Application_Model_StreamSetting::GetDJLiveSteamMountPoint();
         $live_dj_mount = new Zend_Form_Element_Text('dj_harbor_input_mount_point');
-        $live_dj_mount->setLabel("DJ Mount Point")
+        $live_dj_mount->setLabel("Show Source Mount Point")
                 ->setValue($l_mount)
                 ->setValidators(array(
                         array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
@@ -127,7 +127,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $master_harbor_input_port = $data['master_harbor_input_port'];
         $dj_harbor_input_port = $data['dj_harbor_input_port'];
         
-        if($master_harbor_input_port == $dj_harbor_input_port){
+        if($master_harbor_input_port == $dj_harbor_input_port && $master_harbor_input_port != ""){
             $element = $this->getElement("dj_harbor_input_port");
             $element->addError("You cannot use same port as Master DJ port.");
         }

airtime_mvc/application/views/scripts/form/preferences_livestream.phtml

@@ -72,7 +72,7 @@
             <?php endif; ?> 
         </dd>
         <dt id="master_dj_connection_url-label">
-            <label class="optional" for="master_dj_connection_url">Master DJ Connection URL:
+            <label class="optional" for="master_dj_connection_url">Master Source Connection URL:
             </label>
         </dt>
         <dd id="master_dj_connection_url-element">
@@ -108,7 +108,7 @@
             <?php endif; ?> 
         </dd>
         <dt id="live_dj_connection_url-label">
-            <label class="optional" for="live_dj_connection_url">Live DJ Connection URL:
+            <label class="optional" for="live_dj_connection_url">Show Source Connection URL:
             </label>
         </dt>
         <dd id="live_dj_connection_url-element">

airtime_mvc/build/sql/defaultdata.sql

@@ -1,5 +1,9 @@
 INSERT INTO cc_subjs ("login", "type", "pass") VALUES ('admin', 'A', md5('admin'));
 
+-- added in 2.1
+INSERT INTO cc_pref("keystr", "valstr") VALUES('scheduled_play_switch', 'on');
+-- end of added in 2.1
+
 -- added in 2.0.0
 INSERT INTO cc_pref("keystr", "valstr") VALUES('stream_type', 'ogg, mp3');
 INSERT INTO cc_pref("keystr", "valstr") VALUES('stream_bitrate', '24, 32, 48, 64, 96, 128, 160, 192, 224, 256, 320');

python_apps/pypo/pypofetch.py

@@ -87,10 +87,10 @@ class PypoFetch(Thread):
                 self.update_liquidsoap_transition_fade(m['transition_fade'])
             elif command == 'switch_source':
                 self.logger.info("switch_on_source show command received...")
-                self.switch_source(m['sourcename'], m['status'])
+                self.switch_source(self.logger, self.telnet_lock, m['sourcename'], m['status'])
             elif command == 'disconnect_source':
                 self.logger.info("disconnect_on_source show command received...")
-                self.disconnect_source(m['sourcename'])
+                self.disconnect_source(self.logger, self.telnet.lock, m['sourcename'])
         except Exception, e:
             import traceback
             top = traceback.format_exc()
@@ -98,27 +98,29 @@ class PypoFetch(Thread):
             self.logger.error("traceback: %s", top)
             self.logger.error("Exception in handling Message Handler message: %s", e)
     
-    def disconnect_source(self,sourcename):
+    @staticmethod
-        self.logger.debug('Disconnecting source: %s', sourcename)
+    def disconnect_source(logger, lock, sourcename):
+        logger.debug('Disconnecting source: %s', sourcename)
         command = ""
         if(sourcename == "master_dj"):
             command += "master_harbor.kick\n"
         elif(sourcename == "live_dj"):
             command += "live_dj_harbor.kick\n"
             
-        self.telnet_lock.acquire()
+        lock.acquire()
         try:
             tn = telnetlib.Telnet(LS_HOST, LS_PORT)
             tn.write(command)
             tn.write('exit\n')
             tn.read_all()
         except Exception, e:
-            self.logger.error(str(e))
+            logger.error(str(e))
         finally:
-            self.telnet_lock.release()
+            lock.release()
-       
+    
-    def switch_source(self, sourcename, status):
+    @staticmethod
-        self.logger.debug('Switching source: %s to "%s" status', sourcename, status)
+    def switch_source(logger, lock, sourcename, status):
+        logger.debug('Switching source: %s to "%s" status', sourcename, status)
         command = "streams."
         if(sourcename == "master_dj"):
             command += "master_dj_"
@@ -132,16 +134,16 @@ class PypoFetch(Thread):
         else:
             command += "stop\n"
             
-        self.telnet_lock.acquire()
+        lock.acquire()
         try:
             tn = telnetlib.Telnet(LS_HOST, LS_PORT)
             tn.write(command)
             tn.write('exit\n')
             tn.read_all()
         except Exception, e:
-            self.logger.error(str(e))
+            logger.error(str(e))
         finally:
-            self.telnet_lock.release()
+            lock.release()
         
     """
         grabs some information that are needed to be set on bootstrap time
@@ -156,7 +158,7 @@ class PypoFetch(Thread):
         else:
             self.logger.debug('info:%s',info)
             for k, v in info['switch_status'].iteritems():
-                self.switch_source(k, v)
+                self.switch_source(self.logger, self.telnet_lock, k, v)
             self.update_liquidsoap_stream_format(info['stream_label'])
             self.update_liquidsoap_station_name(info['station_name'])
             self.update_liquidsoap_transition_fade(info['transition_fade'])