From 9017418b4e32773178a57fc2b7bda4c9d5de3086 Mon Sep 17 00:00:00 2001
From: comiconomenclaturist <james@4thharmonic.com>
Date: Mon, 27 Feb 2017 16:47:26 +0000
Subject: [PATCH] 	modified:  
 airtime_mvc/application/forms/StreamSetting.php 	modified:   install

---
 .../application/forms/StreamSetting.php       | 20 +++++++++++++++++++
 install                                       |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/forms/StreamSetting.php b/airtime_mvc/application/forms/StreamSetting.php
index d7e785d18..9f057b3b7 100644
--- a/airtime_mvc/application/forms/StreamSetting.php
+++ b/airtime_mvc/application/forms/StreamSetting.php
@@ -22,6 +22,26 @@ class Application_Form_StreamSetting extends Zend_Form
 
         $setting = $this->setting;
 
+        $output_sound_device = new Zend_Form_Element_Checkbox('output_sound_device');
+        $output_sound_device->setLabel(_('Hardware Audio Output:'))
+                            ->setRequired(false)
+                            ->setValue(($setting['output_sound_device'] == "true")?1:0)
+                            ->setDecorators(array('ViewHelper'));
+        $this->addElement($output_sound_device);
+
+        $output_sound_device_type = new Zend_Form_Element_Select('output_sound_device_type');
+        $output_sound_device_type->setLabel(_('Output Type'))
+            ->setMultiOptions(array(
+                "ALSA"=>_("ALSA"),
+                "AO"=>_("AO"),
+                "OSS"=>_("OSS"),
+                "Portaudio"=>_("Portaudio"),
+                "Pulseaudio"=>_("Pulseaudio"),
+                "Jack"=>_("Jack")))
+            ->setValue(isset($setting['output_sound_device_type'])?$setting['output_sound_device_type']:0)
+            ->setDecorators(array('ViewHelper'));
+        $this->addElement($output_sound_device_type);
+
         $icecast_vorbis_metadata = new Zend_Form_Element_Checkbox('icecast_vorbis_metadata');
         $icecast_vorbis_metadata->setLabel(_('Icecast Vorbis Metadata'))
                                 ->setRequired(false)
diff --git a/install b/install
index afb1f1b00..e1a2cb7db 100755
--- a/install
+++ b/install
@@ -456,7 +456,7 @@ loud "          * Installing Airtime Services *            "
 loud "-----------------------------------------------------"
 
 verbose "\n * Installing necessary python services..."
-loudCmd "pip install setuptools"
+loudCmd "pip install setuptools --upgrade"
 verbose "...Done"
 
 verbose "\n * Creating /run/airtime..."