@@ -97,14 +97,14 @@ discard block |
||
97 | 97 | |
98 | 98 | $result = ''; |
99 | 99 | $settings = Transcoder::$plugin->getSettings(); |
100 | - $subfolder = ''; |
|
100 | + $subfolder = ''; |
|
101 | 101 | |
102 | - // sub folder check |
|
103 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
104 | - $subfolder = $filePath->folderPath; |
|
105 | - } |
|
102 | + // sub folder check |
|
103 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
104 | + $subfolder = $filePath->folderPath; |
|
105 | + } |
|
106 | 106 | |
107 | - // file path |
|
107 | + // file path |
|
108 | 108 | $filePath = $this->getAssetPath($filePath); |
109 | 109 | |
110 | 110 | if (!empty($filePath)) { |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | |
205 | 205 | // skip encoding |
206 | 206 | } elseif (!$generate) { |
207 | - $result = ""; |
|
207 | + $result = ""; |
|
208 | 208 | } else { |
209 | 209 | // Kick off the transcoding |
210 | 210 | $pid = $this->executeShellCommand($ffmpegCmd); |
@@ -238,12 +238,12 @@ discard block |
||
238 | 238 | { |
239 | 239 | $result = null; |
240 | 240 | $settings = Transcoder::$plugin->getSettings(); |
241 | - $subfolder = ''; |
|
241 | + $subfolder = ''; |
|
242 | 242 | |
243 | - // sub folder check |
|
244 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
245 | - $subfolder = $filePath->folderPath; |
|
246 | - } |
|
243 | + // sub folder check |
|
244 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
245 | + $subfolder = $filePath->folderPath; |
|
246 | + } |
|
247 | 247 | |
248 | 248 | $filePath = $this->getAssetPath($filePath); |
249 | 249 | |
@@ -334,12 +334,12 @@ discard block |
||
334 | 334 | { |
335 | 335 | $result = ''; |
336 | 336 | $settings = Transcoder::$plugin->getSettings(); |
337 | - $subfolder = ''; |
|
337 | + $subfolder = ''; |
|
338 | 338 | |
339 | - // sub folder check |
|
340 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
341 | - $subfolder = $filePath->folderPath; |
|
342 | - } |
|
339 | + // sub folder check |
|
340 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
341 | + $subfolder = $filePath->folderPath; |
|
342 | + } |
|
343 | 343 | |
344 | 344 | $filePath = $this->getAssetPath($filePath); |
345 | 345 | |
@@ -603,12 +603,12 @@ discard block |
||
603 | 603 | { |
604 | 604 | $result = ''; |
605 | 605 | $settings = Transcoder::$plugin->getSettings(); |
606 | - $subfolder = ''; |
|
606 | + $subfolder = ''; |
|
607 | 607 | |
608 | - // sub folder check |
|
609 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
610 | - $subfolder = $filePath->folderPath; |
|
611 | - } |
|
608 | + // sub folder check |
|
609 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
610 | + $subfolder = $filePath->folderPath; |
|
611 | + } |
|
612 | 612 | |
613 | 613 | $filePath = $this->getAssetPath($filePath); |
614 | 614 |