diff --git a/plugin/Live/install/nginx.conf b/plugin/Live/install/nginx.conf
index 06a59fb42e..ad1565ed0f 100644
--- a/plugin/Live/install/nginx.conf
+++ b/plugin/Live/install/nginx.conf
@@ -44,8 +44,6 @@ worker_processes 1;
# record_notify on;
# record_max_size 2048M;
# record_suffix -%d-%b-%y-%T.flv;
- ###If live-stream is over 30FPS and you want to limit it to 30FPS recording to light the encoding task #record_max_frames 30;
- # ## record_max_frames 30;
#}
### Record Audio Separately ( For podcast )
diff --git a/plugin/LiveLinks/view/liveVideo.php b/plugin/LiveLinks/view/liveVideo.php
index 385dc43535..313f18fa22 100644
--- a/plugin/LiveLinks/view/liveVideo.php
+++ b/plugin/LiveLinks/view/liveVideo.php
@@ -17,10 +17,7 @@ if ($t['id'] > 0) {
}
$posterURL = LiveLinks::getImage($t['id']);
-$disableYoutubeIntegration = false;
-if (!empty($advancedCustom->disableYoutubePlayerIntegration) || isMobile()) {
- $disableYoutubeIntegration = true;
-}
+$disableYoutubeIntegration = !PlayerSkins::isYoutubeIntegrationEnabled();
$video['videoLink'] = $liveLink;
if (isValidM3U8Link($liveLink)) {
diff --git a/plugin/PlayerSkins/PlayerSkins.php b/plugin/PlayerSkins/PlayerSkins.php
index 6f5083848f..0bda63a2a1 100644
--- a/plugin/PlayerSkins/PlayerSkins.php
+++ b/plugin/PlayerSkins/PlayerSkins.php
@@ -3,11 +3,13 @@
require_once $global['systemRootPath'] . 'plugin/Plugin.abstract.php';
require_once $global['systemRootPath'] . 'plugin/AVideoPlugin.php';
-class PlayerSkins extends PluginAbstract {
+class PlayerSkins extends PluginAbstract
+{
static public $hasMarks = false;
- public function getTags() {
+ public function getTags()
+ {
return array(
PluginTags::$FREE,
PluginTags::$PLAYER,
@@ -15,7 +17,8 @@ class PlayerSkins extends PluginAbstract {
);
}
- public function getDescription() {
+ public function getDescription()
+ {
global $global;
$desc = "Customize your playes Skin
The Skis options are: ";
$dir = $global['systemRootPath'] . 'plugin/PlayerSkins/skins/';
@@ -32,19 +35,23 @@ class PlayerSkins extends PluginAbstract {
return $desc;
}
- public function getName() {
+ public function getName()
+ {
return "PlayerSkins";
}
- public function getUUID() {
+ public function getUUID()
+ {
return "e9a568e6-ef61-4dcc-aad0-0109e9be8e36";
}
- public function getPluginVersion() {
+ public function getPluginVersion()
+ {
return "1.1";
}
- public function getEmptyDataObject() {
+ public function getEmptyDataObject()
+ {
global $global;
$obj = new stdClass();
$obj->skin = "avideo";
@@ -75,7 +82,8 @@ class PlayerSkins extends PluginAbstract {
return $obj;
}
- static function getPlaysinline() {
+ static function getPlaysinline()
+ {
$obj = AVideoPlugin::getObjectData('PlayerSkins');
if ($obj->playsinline) {
return ' playsinline webkit-playsinline="webkit-playsinline" ';
@@ -83,7 +91,21 @@ class PlayerSkins extends PluginAbstract {
return '';
}
- static function getMediaTag($filename, $htmlMediaTag = false) {
+ static function isYoutubeIntegrationEnabled()
+ {
+ global $advancedCustom;
+ if (isMobile()) {
+ return false;
+ }
+
+ if (empty($advancedCustom)) {
+ $advancedCustom = AVideoPlugin::loadPlugin("CustomizeAdvanced");
+ }
+ return empty($advancedCustom->disableYoutubePlayerIntegration);
+ }
+
+ static function getMediaTag($filename, $htmlMediaTag = false)
+ {
global $autoPlayURL, $global, $config, $isVideoTypeEmbed, $advancedCustom;
$obj = AVideoPlugin::getObjectData('PlayerSkins');
$html = '';
@@ -105,7 +127,7 @@ class PlayerSkins extends PluginAbstract {
$images = Video::getImageFromFilename($filename);
if ($vType == 'video') {
$htmlMediaTag = '