@@ -30,7 +30,7 @@ |
||
30 | 30 | * |
31 | 31 | * @param $filePath |
32 | 32 | * @param $videoOptions |
33 | - * @bool $generate |
|
33 | + * @bool $generate |
|
34 | 34 | * |
35 | 35 | * @return string |
36 | 36 | */ |
@@ -95,14 +95,14 @@ discard block |
||
95 | 95 | |
96 | 96 | $result = ''; |
97 | 97 | $settings = Transcoder::$plugin->getSettings(); |
98 | - $subfolder = ''; |
|
98 | + $subfolder = ''; |
|
99 | 99 | |
100 | - // sub folder check |
|
101 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
102 | - $subfolder = $filePath->folderPath; |
|
103 | - } |
|
100 | + // sub folder check |
|
101 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
102 | + $subfolder = $filePath->folderPath; |
|
103 | + } |
|
104 | 104 | |
105 | - // file path |
|
105 | + // file path |
|
106 | 106 | $filePath = $this->getAssetPath($filePath); |
107 | 107 | |
108 | 108 | if (!empty($filePath)) { |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | |
204 | 204 | // skip encoding |
205 | 205 | } elseif (!$generate) { |
206 | - $result = ""; |
|
206 | + $result = ""; |
|
207 | 207 | } else { |
208 | 208 | // Kick off the transcoding |
209 | 209 | $pid = $this->executeShellCommand($ffmpegCmd); |
@@ -232,12 +232,12 @@ discard block |
||
232 | 232 | { |
233 | 233 | $result = null; |
234 | 234 | $settings = Transcoder::$plugin->getSettings(); |
235 | - $subfolder = ''; |
|
235 | + $subfolder = ''; |
|
236 | 236 | |
237 | - // sub folder check |
|
238 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
239 | - $subfolder = $filePath->folderPath; |
|
240 | - } |
|
237 | + // sub folder check |
|
238 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
239 | + $subfolder = $filePath->folderPath; |
|
240 | + } |
|
241 | 241 | |
242 | 242 | $filePath = $this->getAssetPath($filePath); |
243 | 243 | |
@@ -324,12 +324,12 @@ discard block |
||
324 | 324 | { |
325 | 325 | $result = ''; |
326 | 326 | $settings = Transcoder::$plugin->getSettings(); |
327 | - $subfolder = ''; |
|
327 | + $subfolder = ''; |
|
328 | 328 | |
329 | - // sub folder check |
|
330 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
331 | - $subfolder = $filePath->folderPath; |
|
332 | - } |
|
329 | + // sub folder check |
|
330 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
331 | + $subfolder = $filePath->folderPath; |
|
332 | + } |
|
333 | 333 | |
334 | 334 | $filePath = $this->getAssetPath($filePath); |
335 | 335 | |
@@ -588,12 +588,12 @@ discard block |
||
588 | 588 | { |
589 | 589 | $result = ''; |
590 | 590 | $settings = Transcoder::$plugin->getSettings(); |
591 | - $subfolder = ''; |
|
591 | + $subfolder = ''; |
|
592 | 592 | |
593 | - // sub folder check |
|
594 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
595 | - $subfolder = $filePath->folderPath; |
|
596 | - } |
|
593 | + // sub folder check |
|
594 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
595 | + $subfolder = $filePath->folderPath; |
|
596 | + } |
|
597 | 597 | |
598 | 598 | $filePath = $this->getAssetPath($filePath); |
599 | 599 |