Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
test.php
build_docs.sh
.DS_Store
/nbproject/private/
.settings/
.project
.buildpath
9 changes: 9 additions & 0 deletions Services/Zencoder/Job.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ class Services_Zencoder_Job extends Services_Zencoder_Object
* @var Services_Zencoder_Input
*/
public $input;

/**
* Services_Zencoder_Stream object containing information on the stream for
* LIVE transcoding
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a blank line at the end of this, and change LIVE to live.

* @var Services_Zencoder_Stream
*/
public $stream;
/**
* A copy of the raw API response for debug purposes
*
Expand Down Expand Up @@ -57,6 +64,8 @@ private function _update_attributes($attributes = array())
$this->_create_thumbnails($attr_value);
} elseif ($attr_name == "input_media_file" && is_object($attr_value)) {
$this->input = new Services_Zencoder_Input($attr_value);
} elseif ($attr_name == "stream" && is_object($attr_value)){
$this->stream = new Services_Zencoder_Stream($attr_value);
} elseif (is_array($attr_value) || is_object($attr_value)) {
$this->_update_attributes($attr_value);
} elseif (empty($this->$attr_name)) {
Expand Down
15 changes: 15 additions & 0 deletions Services/Zencoder/Stream.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this blank line, and add a blank line under the comment section.

/**
* Zencoder API client interface.
*
* @category Services
* @package Services_Zencoder
* @author Carles Galan Cladera <cgcladera@gmail.com>
* @version Release: 2.1.1
* @license http://creativecommons.org/licenses/MIT/MIT
* @link http://github.com/zencoder/zencoder-php
*/
class Services_Zencoder_Stream extends Services_Zencoder_Object
{
}