Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-2727: Limit number of streams and max bitrate 

- renamed
SetNumOfStream() -> SetNumOfStreams()
GetNumOfStream() -> GetNumOfStreams() \
- default bitrate is 320
- removed debugging code
This commit is contained in:
James 2011-08-31 16:28:20 -04:00
parent fefbd9ac79
commit 0a85d2ecf5
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/PreferenceController.php
View File

@ -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 = new Application_Form_StreamSetting();
$form->setSetting($setting); $form->setSetting($setting);
$form->startFrom(); $form->startFrom();

4
airtime_mvc/application/models/Preference.php
View File

@ -395,11 +395,11 @@ class Application_Model_Preference
return Application_Model_Preference::GetValue("privacy_policy"); 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)); 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"); return Application_Model_Preference::GetValue("num_of_streams");
} }

2
airtime_mvc/build/sql/defaultdata.sql
View File

@ -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_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('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('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'); INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('output_sound_device', 'false', 'boolean');

4
utils/airtime-stream.php
View File

@ -2,14 +2,12 @@
$airtimeIni = GetAirtimeConf(); $airtimeIni = GetAirtimeConf();
$airtime_base_dir = $airtimeIni['general']['airtime_dir']; $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()); set_include_path("$airtime_base_dir/application/models" . PATH_SEPARATOR . get_include_path());
require_once("$airtime_base_dir/library/propel/runtime/lib/Propel.php"); require_once("$airtime_base_dir/library/propel/runtime/lib/Propel.php");
Propel::init("$airtime_base_dir/application/configs/airtime-conf.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/configs/conf.php");
/*require_once("$airtime_base_dir/application/models/Users.php");*/
require_once("$airtime_base_dir/application/models/Preference.php"); require_once("$airtime_base_dir/application/models/Preference.php");
require_once('DB.php'); require_once('DB.php');
require_once('Console/Getopt.php'); require_once('Console/Getopt.php');
@ -71,7 +69,7 @@ $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
if ($action == "maxbitrate") { if ($action == "maxbitrate") {
Application_Model_Preference::SetMaxBitrate($optionArg); Application_Model_Preference::SetMaxBitrate($optionArg);
} elseif ($action == "numofstream") { } elseif ($action == "numofstream") {
Application_Model_Preference::SetNumOfStream($optionArg); Application_Model_Preference::SetNumOfStreams($optionArg);
} }
function GetAirtimeConf() function GetAirtimeConf()