Skip to content

Commit 006fb0e

Browse files
author
Michael Christopher
committed
Merge pull request #15 from cladera/streamobject
Job Stream Object
2 parents 0aeb28e + 0303dca commit 006fb0e

File tree

7 files changed

+69
-0
lines changed

7 files changed

+69
-0
lines changed

.buildpath

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<buildpath>
3+
<buildpathentry kind="src" path=""/>
4+
<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
5+
</buildpath>

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
test.php
22
build_docs.sh
33
.DS_Store
4+
/nbproject/private/

.project

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>Zencoder PHP</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.wst.common.project.facet.core.builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.wst.validation.validationbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.dltk.core.scriptbuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
</buildSpec>
24+
<natures>
25+
<nature>org.eclipse.php.core.PHPNature</nature>
26+
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
27+
</natures>
28+
</projectDescription>

.settings/org.eclipse.php.core.prefs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
include_path=0;/Zencoder PHP
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<faceted-project>
3+
<fixed facet="php.core.component"/>
4+
<fixed facet="php.component"/>
5+
<installed facet="php.core.component" version="1"/>
6+
<installed facet="php.component" version="5.4"/>
7+
</faceted-project>

Services/Zencoder/Job.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@ class Services_Zencoder_Job extends Services_Zencoder_Object
3030
* @var Services_Zencoder_Input
3131
*/
3232
public $input;
33+
34+
/**
35+
* Services_Zencoder_Stream object containing information on the stream for
36+
* live transcoding
37+
*
38+
* @var Services_Zencoder_Stream
39+
*/
40+
public $stream;
41+
3342
/**
3443
* A copy of the raw API response for debug purposes
3544
*
@@ -57,6 +66,8 @@ private function _update_attributes($attributes = array())
5766
$this->_create_thumbnails($attr_value);
5867
} elseif ($attr_name == "input_media_file" && is_object($attr_value)) {
5968
$this->input = new Services_Zencoder_Input($attr_value);
69+
} elseif ($attr_name == "stream" && is_object($attr_value)){
70+
$this->stream = new Services_Zencoder_Stream($attr_value);
6071
} elseif (is_array($attr_value) || is_object($attr_value)) {
6172
$this->_update_attributes($attr_value);
6273
} elseif (empty($this->$attr_name)) {

Services/Zencoder/Stream.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
/**
3+
* Zencoder API client interface.
4+
*
5+
* @category Services
6+
* @package Services_Zencoder
7+
* @author Carles Galan Cladera <[email protected]>
8+
* @version Release: 2.1.1
9+
* @license http://creativecommons.org/licenses/MIT/MIT
10+
* @link http://github.com/zencoder/zencoder-php
11+
*/
12+
13+
class Services_Zencoder_Stream extends Services_Zencoder_Object
14+
{
15+
}

0 commit comments

Comments
 (0)