From 081746fe631449a2dfd416849f36ab5b8612bd56 Mon Sep 17 00:00:00 2001 From: cgcladera-vancast Date: Tue, 19 Feb 2013 13:15:25 +0100 Subject: [PATCH 1/6] Imported project to NetBeans --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 1ca1a7e..a81f5dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ test.php build_docs.sh .DS_Store +/nbproject/private/ +nbproject/ From 694db0b12dc02f56244058893af9da12437e178f Mon Sep 17 00:00:00 2001 From: cgcladera-vancast Date: Tue, 19 Feb 2013 13:29:35 +0100 Subject: [PATCH 2/6] Created Services_Zencoder_Stream object. --- Services/Zencoder/Job.php | 9 +++++++++ Services/Zencoder/Stream.php | 15 +++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 Services/Zencoder/Stream.php diff --git a/Services/Zencoder/Job.php b/Services/Zencoder/Job.php index 8e7ef69..e588241 100644 --- a/Services/Zencoder/Job.php +++ b/Services/Zencoder/Job.php @@ -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 + * @var Services_Zencoder_Stream + */ + public $stream; /** * A copy of the raw API response for debug purposes * @@ -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)) { diff --git a/Services/Zencoder/Stream.php b/Services/Zencoder/Stream.php new file mode 100644 index 0000000..1912d4c --- /dev/null +++ b/Services/Zencoder/Stream.php @@ -0,0 +1,15 @@ + + * @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 +{ +} From b4fc72ba8c2f9b4ce090f58f1a6ba33f588ffd4a Mon Sep 17 00:00:00 2001 From: cgcladera-vancast Date: Tue, 19 Feb 2013 13:54:40 +0100 Subject: [PATCH 3/6] Import project to eclipse --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a81f5dd..4316e07 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ test.php build_docs.sh .DS_Store /nbproject/private/ -nbproject/ +.settings/ +.project +.buildpath From fcd6e02482fd99432deb162b5e6657a12c482b20 Mon Sep 17 00:00:00 2001 From: cgcladera-vancast Date: Wed, 20 Feb 2013 10:24:54 +0100 Subject: [PATCH 4/6] Fixed stream attribute description --- Services/Zencoder/Job.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Services/Zencoder/Job.php b/Services/Zencoder/Job.php index e588241..17b0819 100644 --- a/Services/Zencoder/Job.php +++ b/Services/Zencoder/Job.php @@ -33,10 +33,12 @@ class Services_Zencoder_Job extends Services_Zencoder_Object /** * Services_Zencoder_Stream object containing information on the stream for - * LIVE transcoding + * live transcoding + * * @var Services_Zencoder_Stream */ public $stream; + /** * A copy of the raw API response for debug purposes * From 78e17c35f97b268cc740b08f698811b001b29087 Mon Sep 17 00:00:00 2001 From: cgcladera-vancast Date: Wed, 20 Feb 2013 10:48:06 +0100 Subject: [PATCH 5/6] Restored original .gitignore file --- .buildpath | 5 ++++ .gitignore | 3 -- .project | 28 +++++++++++++++++++ .settings/org.eclipse.php.core.prefs | 2 ++ ....eclipse.wst.common.project.facet.core.xml | 7 +++++ 5 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 .buildpath create mode 100644 .project create mode 100644 .settings/org.eclipse.php.core.prefs create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml diff --git a/.buildpath b/.buildpath new file mode 100644 index 0000000..8bcb4b5 --- /dev/null +++ b/.buildpath @@ -0,0 +1,5 @@ + + + + + diff --git a/.gitignore b/.gitignore index 4316e07..96396af 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,3 @@ test.php build_docs.sh .DS_Store /nbproject/private/ -.settings/ -.project -.buildpath diff --git a/.project b/.project new file mode 100644 index 0000000..2a31c0d --- /dev/null +++ b/.project @@ -0,0 +1,28 @@ + + + Zencoder PHP + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.eclipse.dltk.core.scriptbuilder + + + + + + org.eclipse.php.core.PHPNature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs new file mode 100644 index 0000000..b18489f --- /dev/null +++ b/.settings/org.eclipse.php.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +include_path=0;/Zencoder PHP diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 0000000..ad32966 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,7 @@ + + + + + + + From 0303dca2263cb35345eed1dc7a9ba1d20c90a24d Mon Sep 17 00:00:00 2001 From: cgcladera-vancast Date: Wed, 20 Feb 2013 10:50:34 +0100 Subject: [PATCH 6/6] Fixed Stream object code format --- Services/Zencoder/Stream.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Services/Zencoder/Stream.php b/Services/Zencoder/Stream.php index 1912d4c..88f2b59 100644 --- a/Services/Zencoder/Stream.php +++ b/Services/Zencoder/Stream.php @@ -1,5 +1,4 @@