[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Remove ability to disable MP3 ingestion

2018-01-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393975 )

Change subject: Remove ability to disable MP3 ingestion
..


Remove ability to disable MP3 ingestion

Change-Id: I3f1c9f93b2231d5c65c8b2821b6fd29f0e2c8623
---
M TimedMediaHandler.php
M TimedMediaHandlerHooks.php
2 files changed, 1 insertion(+), 12 deletions(-)

Approvals:
  Brion VIBBER: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php
index f5ac8bb..4a2a1ae 100644
--- a/TimedMediaHandler.php
+++ b/TimedMediaHandler.php
@@ -197,9 +197,6 @@
// WebVideoTranscode::ENC_AAC,
 ];
 
-// If mp3 source assets can be ingested:
-$wgTmhEnableMp3Uploads = true;
-
 // If mp4 source assets can be ingested:
 $wgTmhEnableMp4Uploads = false;
 
diff --git a/TimedMediaHandlerHooks.php b/TimedMediaHandlerHooks.php
index 448f9b4..9559880 100644
--- a/TimedMediaHandlerHooks.php
+++ b/TimedMediaHandlerHooks.php
@@ -206,7 +206,7 @@
public static function register() {
global $wgHooks, $wgJobClasses, 
$wgJobTypesExcludedFromDefaultQueue, $wgMediaHandlers,
$wgResourceModules, $wgExcludeFromThumbnailPurge,
-   $wgFileExtensions, $wgTmhEnableMp3Uploads, 
$wgTmhEnableMp4Uploads, $wgExtensionAssetsPath,
+   $wgFileExtensions, $wgTmhEnableMp4Uploads, 
$wgExtensionAssetsPath,
$wgMwEmbedModuleConfig, $wgEnableLocalTimedText, 
$wgTmhFileExtensions,
$wgWikimediaJenkinsCI;
 
@@ -215,14 +215,6 @@
global $wgEnableTranscode, $wgFFmpegLocation;
$wgEnableTranscode = false;
$wgFFmpegLocation = '/usr/bin/ffmpeg';
-   }
-
-   // Remove mp3 if not enabled:
-   if ( $wgTmhEnableMp3Uploads === false ) {
-   $index = array_search( 'mp3', $wgFileExtensions );
-   if ( $index !== false ) {
-   array_splice( $wgFileExtensions, $index, 1 );
-   }
}
 
// Remove mp4 if not enabled:

-- 
To view, visit https://gerrit.wikimedia.org/r/393975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f1c9f93b2231d5c65c8b2821b6fd29f0e2c8623
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Remove ability to disable MP3 ingestion

2017-11-28 Thread Jforrester (Code Review) 
Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393975 )

Change subject: Remove ability to disable MP3 ingestion
..

Remove ability to disable MP3 ingestion

Change-Id: I3f1c9f93b2231d5c65c8b2821b6fd29f0e2c8623
---
M TimedMediaHandler.hooks.php
M TimedMediaHandler.php
2 files changed, 1 insertion(+), 12 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/75/393975/1

diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 175c5e1..94fec8a 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -206,7 +206,7 @@
public static function register() {
global $wgHooks, $wgJobClasses, 
$wgJobTypesExcludedFromDefaultQueue, $wgMediaHandlers,
$wgResourceModules, $wgExcludeFromThumbnailPurge,
-   $wgFileExtensions, $wgTmhEnableMp3Uploads, 
$wgTmhEnableMp4Uploads, $wgExtensionAssetsPath,
+   $wgFileExtensions, $wgTmhEnableMp4Uploads, 
$wgExtensionAssetsPath,
$wgMwEmbedModuleConfig, $wgEnableLocalTimedText, 
$wgTmhFileExtensions,
$wgTmhTheoraTwoPassEncoding, $wgWikimediaJenkinsCI;
 
@@ -215,14 +215,6 @@
global $wgEnableTranscode, $wgFFmpegLocation;
$wgEnableTranscode = false;
$wgFFmpegLocation = '/usr/bin/ffmpeg';
-   }
-
-   // Remove mp3 if not enabled:
-   if ( $wgTmhEnableMp3Uploads === false ) {
-   $index = array_search( 'mp3', $wgFileExtensions );
-   if ( $index !== false ) {
-   array_splice( $wgFileExtensions, $index, 1 );
-   }
}
 
// Remove mp4 if not enabled:
diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php
index 1f912cc..76a9a88 100644
--- a/TimedMediaHandler.php
+++ b/TimedMediaHandler.php
@@ -231,9 +231,6 @@
// WebVideoTranscode::ENC_AAC,
 ];
 
-// If mp3 source assets can be ingested:
-$wgTmhEnableMp3Uploads = true;
-
 // If mp4 source assets can be ingested:
 $wgTmhEnableMp4Uploads = false;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/393975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f1c9f93b2231d5c65c8b2821b6fd29f0e2c8623
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits