CC-3224: "On-the-fly" stream rebroadcasting
- removed "Allow override" checkbox from show live stream section. - removed "auto enable live stream" checkbox from stream setting page. - implemented authentication functionality of live dj source connection.
This commit is contained in:
James
parent
efee025691
commit
540f262a77
14 changed files with 49 additions and 171 deletions
|
|
@ -69,12 +69,6 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
*/
|
||||
protected $background_color;
|
||||
|
||||
/**
|
||||
* The value for the allow_live_stream field.
|
||||
* @var boolean
|
||||
*/
|
||||
protected $allow_live_stream;
|
||||
|
||||
/**
|
||||
* The value for the live_stream_using_airtime_auth field.
|
||||
* @var boolean
|
||||
|
|
@ -226,16 +220,6 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
return $this->background_color;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the [allow_live_stream] column value.
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function getDbAllowLiveStream()
|
||||
{
|
||||
return $this->allow_live_stream;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the [live_stream_using_airtime_auth] column value.
|
||||
*
|
||||
|
|
@ -416,26 +400,6 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
return $this;
|
||||
} // setDbBackgroundColor()
|
||||
|
||||
/**
|
||||
* Set the value of [allow_live_stream] column.
|
||||
*
|
||||
* @param boolean $v new value
|
||||
* @return CcShow The current object (for fluent API support)
|
||||
*/
|
||||
public function setDbAllowLiveStream($v)
|
||||
{
|
||||
if ($v !== null) {
|
||||
$v = (boolean) $v;
|
||||
}
|
||||
|
||||
if ($this->allow_live_stream !== $v) {
|
||||
$this->allow_live_stream = $v;
|
||||
$this->modifiedColumns[] = CcShowPeer::ALLOW_LIVE_STREAM;
|
||||
}
|
||||
|
||||
return $this;
|
||||
} // setDbAllowLiveStream()
|
||||
|
||||
/**
|
||||
* Set the value of [live_stream_using_airtime_auth] column.
|
||||
*
|
||||
|
|
@ -567,11 +531,10 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
$this->description = ($row[$startcol + 4] !== null) ? (string) $row[$startcol + 4] : null;
|
||||
$this->color = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null;
|
||||
$this->background_color = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null;
|
||||
$this->allow_live_stream = ($row[$startcol + 7] !== null) ? (boolean) $row[$startcol + 7] : null;
|
||||
$this->live_stream_using_airtime_auth = ($row[$startcol + 8] !== null) ? (boolean) $row[$startcol + 8] : null;
|
||||
$this->live_stream_using_custom_auth = ($row[$startcol + 9] !== null) ? (boolean) $row[$startcol + 9] : null;
|
||||
$this->live_stream_user = ($row[$startcol + 10] !== null) ? (string) $row[$startcol + 10] : null;
|
||||
$this->live_stream_pass = ($row[$startcol + 11] !== null) ? (string) $row[$startcol + 11] : null;
|
||||
$this->live_stream_using_airtime_auth = ($row[$startcol + 7] !== null) ? (boolean) $row[$startcol + 7] : null;
|
||||
$this->live_stream_using_custom_auth = ($row[$startcol + 8] !== null) ? (boolean) $row[$startcol + 8] : null;
|
||||
$this->live_stream_user = ($row[$startcol + 9] !== null) ? (string) $row[$startcol + 9] : null;
|
||||
$this->live_stream_pass = ($row[$startcol + 10] !== null) ? (string) $row[$startcol + 10] : null;
|
||||
$this->resetModified();
|
||||
|
||||
$this->setNew(false);
|
||||
|
|
@ -580,7 +543,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
$this->ensureConsistency();
|
||||
}
|
||||
|
||||
return $startcol + 12; // 12 = CcShowPeer::NUM_COLUMNS - CcShowPeer::NUM_LAZY_LOAD_COLUMNS).
|
||||
return $startcol + 11; // 11 = CcShowPeer::NUM_COLUMNS - CcShowPeer::NUM_LAZY_LOAD_COLUMNS).
|
||||
|
||||
} catch (Exception $e) {
|
||||
throw new PropelException("Error populating CcShow object", $e);
|
||||
|
|
@ -973,18 +936,15 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
return $this->getDbBackgroundColor();
|
||||
break;
|
||||
case 7:
|
||||
return $this->getDbAllowLiveStream();
|
||||
break;
|
||||
case 8:
|
||||
return $this->getDbLiveStreamUsingAirtimeAuth();
|
||||
break;
|
||||
case 9:
|
||||
case 8:
|
||||
return $this->getDbLiveStreamUsingCustomAuth();
|
||||
break;
|
||||
case 10:
|
||||
case 9:
|
||||
return $this->getDbLiveStreamUser();
|
||||
break;
|
||||
case 11:
|
||||
case 10:
|
||||
return $this->getDbLiveStreamPass();
|
||||
break;
|
||||
default:
|
||||
|
|
@ -1017,11 +977,10 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
$keys[4] => $this->getDbDescription(),
|
||||
$keys[5] => $this->getDbColor(),
|
||||
$keys[6] => $this->getDbBackgroundColor(),
|
||||
$keys[7] => $this->getDbAllowLiveStream(),
|
||||
$keys[8] => $this->getDbLiveStreamUsingAirtimeAuth(),
|
||||
$keys[9] => $this->getDbLiveStreamUsingCustomAuth(),
|
||||
$keys[10] => $this->getDbLiveStreamUser(),
|
||||
$keys[11] => $this->getDbLiveStreamPass(),
|
||||
$keys[7] => $this->getDbLiveStreamUsingAirtimeAuth(),
|
||||
$keys[8] => $this->getDbLiveStreamUsingCustomAuth(),
|
||||
$keys[9] => $this->getDbLiveStreamUser(),
|
||||
$keys[10] => $this->getDbLiveStreamPass(),
|
||||
);
|
||||
return $result;
|
||||
}
|
||||
|
|
@ -1075,18 +1034,15 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
$this->setDbBackgroundColor($value);
|
||||
break;
|
||||
case 7:
|
||||
$this->setDbAllowLiveStream($value);
|
||||
break;
|
||||
case 8:
|
||||
$this->setDbLiveStreamUsingAirtimeAuth($value);
|
||||
break;
|
||||
case 9:
|
||||
case 8:
|
||||
$this->setDbLiveStreamUsingCustomAuth($value);
|
||||
break;
|
||||
case 10:
|
||||
case 9:
|
||||
$this->setDbLiveStreamUser($value);
|
||||
break;
|
||||
case 11:
|
||||
case 10:
|
||||
$this->setDbLiveStreamPass($value);
|
||||
break;
|
||||
} // switch()
|
||||
|
|
@ -1120,11 +1076,10 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
if (array_key_exists($keys[4], $arr)) $this->setDbDescription($arr[$keys[4]]);
|
||||
if (array_key_exists($keys[5], $arr)) $this->setDbColor($arr[$keys[5]]);
|
||||
if (array_key_exists($keys[6], $arr)) $this->setDbBackgroundColor($arr[$keys[6]]);
|
||||
if (array_key_exists($keys[7], $arr)) $this->setDbAllowLiveStream($arr[$keys[7]]);
|
||||
if (array_key_exists($keys[8], $arr)) $this->setDbLiveStreamUsingAirtimeAuth($arr[$keys[8]]);
|
||||
if (array_key_exists($keys[9], $arr)) $this->setDbLiveStreamUsingCustomAuth($arr[$keys[9]]);
|
||||
if (array_key_exists($keys[10], $arr)) $this->setDbLiveStreamUser($arr[$keys[10]]);
|
||||
if (array_key_exists($keys[11], $arr)) $this->setDbLiveStreamPass($arr[$keys[11]]);
|
||||
if (array_key_exists($keys[7], $arr)) $this->setDbLiveStreamUsingAirtimeAuth($arr[$keys[7]]);
|
||||
if (array_key_exists($keys[8], $arr)) $this->setDbLiveStreamUsingCustomAuth($arr[$keys[8]]);
|
||||
if (array_key_exists($keys[9], $arr)) $this->setDbLiveStreamUser($arr[$keys[9]]);
|
||||
if (array_key_exists($keys[10], $arr)) $this->setDbLiveStreamPass($arr[$keys[10]]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1143,7 +1098,6 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
if ($this->isColumnModified(CcShowPeer::DESCRIPTION)) $criteria->add(CcShowPeer::DESCRIPTION, $this->description);
|
||||
if ($this->isColumnModified(CcShowPeer::COLOR)) $criteria->add(CcShowPeer::COLOR, $this->color);
|
||||
if ($this->isColumnModified(CcShowPeer::BACKGROUND_COLOR)) $criteria->add(CcShowPeer::BACKGROUND_COLOR, $this->background_color);
|
||||
if ($this->isColumnModified(CcShowPeer::ALLOW_LIVE_STREAM)) $criteria->add(CcShowPeer::ALLOW_LIVE_STREAM, $this->allow_live_stream);
|
||||
if ($this->isColumnModified(CcShowPeer::LIVE_STREAM_USING_AIRTIME_AUTH)) $criteria->add(CcShowPeer::LIVE_STREAM_USING_AIRTIME_AUTH, $this->live_stream_using_airtime_auth);
|
||||
if ($this->isColumnModified(CcShowPeer::LIVE_STREAM_USING_CUSTOM_AUTH)) $criteria->add(CcShowPeer::LIVE_STREAM_USING_CUSTOM_AUTH, $this->live_stream_using_custom_auth);
|
||||
if ($this->isColumnModified(CcShowPeer::LIVE_STREAM_USER)) $criteria->add(CcShowPeer::LIVE_STREAM_USER, $this->live_stream_user);
|
||||
|
|
@ -1215,7 +1169,6 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
$copyObj->setDbDescription($this->description);
|
||||
$copyObj->setDbColor($this->color);
|
||||
$copyObj->setDbBackgroundColor($this->background_color);
|
||||
$copyObj->setDbAllowLiveStream($this->allow_live_stream);
|
||||
$copyObj->setDbLiveStreamUsingAirtimeAuth($this->live_stream_using_airtime_auth);
|
||||
$copyObj->setDbLiveStreamUsingCustomAuth($this->live_stream_using_custom_auth);
|
||||
$copyObj->setDbLiveStreamUser($this->live_stream_user);
|
||||
|
|
@ -1818,7 +1771,6 @@ abstract class BaseCcShow extends BaseObject implements Persistent
|
|||
$this->description = null;
|
||||
$this->color = null;
|
||||
$this->background_color = null;
|
||||
$this->allow_live_stream = null;
|
||||
$this->live_stream_using_airtime_auth = null;
|
||||
$this->live_stream_using_custom_auth = null;
|
||||
$this->live_stream_user = null;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue