From 0a85d2ecf553e43a3e98c006bd496a7f896e0cdd Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 31 Aug 2011 16:28:20 -0400
Subject: [PATCH] CC-2727: Limit number of streams and max bitrate

- renamed
SetNumOfStream() -> SetNumOfStreams()
GetNumOfStream() -> GetNumOfStreams() \
- default bitrate is 320
- removed debugging code
---
 airtime_mvc/application/controllers/PreferenceController.php | 2 +-
 airtime_mvc/application/models/Preference.php                | 4 ++--
 airtime_mvc/build/sql/defaultdata.sql                        | 2 +-
 utils/airtime-stream.php                                     | 4 +---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 24be53d3e..ff67faa67 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -147,7 +147,7 @@ class PreferenceController extends Zend_Controller_Action
             }
         }
         
-        $num_of_stream = intval(Application_Model_Preference::GetNumOfStream());
+        $num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
         $form = new Application_Form_StreamSetting();
         $form->setSetting($setting);
         $form->startFrom();
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 0bd171980..139e05590 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -395,11 +395,11 @@ class Application_Model_Preference
         return Application_Model_Preference::GetValue("privacy_policy");
     }
     
-    public static function SetNumOfStream($num){
+    public static function SetNumOfStreams($num){
         Application_Model_Preference::SetValue("num_of_streams", intval($num));
     }
     
-    public static function GetNumOfStream(){
+    public static function GetNumOfStreams(){
         return Application_Model_Preference::GetValue("num_of_streams");
     }
     
diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql
index eea302d89..427121792 100644
--- a/airtime_mvc/build/sql/defaultdata.sql
+++ b/airtime_mvc/build/sql/defaultdata.sql
@@ -4,7 +4,7 @@ INSERT INTO cc_subjs ("login", "type", "pass") VALUES ('admin', 'A', md5('admin'
 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');
 INSERT INTO cc_pref("keystr", "valstr") VALUES('num_of_streams', '3');
-INSERT INTO cc_pref("keystr", "valstr") VALUES('max_bitrate', '128');
+INSERT INTO cc_pref("keystr", "valstr") VALUES('max_bitrate', '320');
 
 INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('output_sound_device', 'false', 'boolean');
 
diff --git a/utils/airtime-stream.php b/utils/airtime-stream.php
index 7378f8cdd..14f839f40 100644
--- a/utils/airtime-stream.php
+++ b/utils/airtime-stream.php
@@ -2,14 +2,12 @@
 
 $airtimeIni = GetAirtimeConf();
 $airtime_base_dir = $airtimeIni['general']['airtime_dir'];
-$airtime_base_dir = "/home/james/src/airtime/airtime_mvc";
 
 set_include_path("$airtime_base_dir/application/models" . PATH_SEPARATOR . get_include_path());
 require_once("$airtime_base_dir/library/propel/runtime/lib/Propel.php");
 Propel::init("$airtime_base_dir/application/configs/airtime-conf.php");
 
 require_once("$airtime_base_dir/application/configs/conf.php");
-/*require_once("$airtime_base_dir/application/models/Users.php");*/
 require_once("$airtime_base_dir/application/models/Preference.php");
 require_once('DB.php');
 require_once('Console/Getopt.php');
@@ -71,7 +69,7 @@ $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
 if ($action == "maxbitrate") {
     Application_Model_Preference::SetMaxBitrate($optionArg);
 } elseif ($action == "numofstream") {
-    Application_Model_Preference::SetNumOfStream($optionArg);
+    Application_Model_Preference::SetNumOfStreams($optionArg);
 }
 
 function GetAirtimeConf()