summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--admin/plugins/mime_flv.php14
-rw-r--r--plugins/mime.flv.php22
-rw-r--r--templates/mime/flv/admin.tpl28
-rw-r--r--templates/mime/flv/view.tpl10
4 files changed, 29 insertions, 45 deletions
diff --git a/admin/plugins/mime_flv.php b/admin/plugins/mime_flv.php
index dbeb528..b80795a 100644
--- a/admin/plugins/mime_flv.php
+++ b/admin/plugins/mime_flv.php
@@ -14,7 +14,7 @@ if( extension_loaded( 'ffmpeg' )) {
$feedback = array();
-$rates = array(
+$options = array(
'mp3_param' => array(
'libmp3lame' => 'libmp3lame',
'mp3' => 'mp3',
@@ -39,13 +39,6 @@ $rates = array(
480 => 480,
640 => 640,
),
- 'display_size' => array(
- 0 => tra( 'Same as encoded video' ),
- 240 => tra( 'Small' ),
- 320 => tra( 'Medium' ),
- 480 => tra( 'Large' ),
- 640 => tra( 'Huge' ),
- ),
'audio_bitrate' => array(
32000 => 32,
64000 => 64,
@@ -58,7 +51,8 @@ $rates = array(
44100 => 44100,
),
);
-$gBitSmarty->assign( 'rates', $rates );
+$options['display_size'] = get_image_size_options( 'Same as encoded video' );
+$gBitSmarty->assign( 'options', $options );
if( !empty( $_REQUEST['plugin_settings'] )) {
$flvSettings = array(
@@ -87,7 +81,7 @@ if( !empty( $_REQUEST['plugin_settings'] )) {
'type' => 'numeric',
),
'mime_flv_default_size' => array(
- 'type' => 'numeric',
+ 'type' => 'text',
),
'mime_flv_backcolor' => array(
'type' => 'text',
diff --git a/plugins/mime.flv.php b/plugins/mime.flv.php
index 1bc3fa1..087172d 100644
--- a/plugins/mime.flv.php
+++ b/plugins/mime.flv.php
@@ -1,9 +1,9 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_liberty/plugins/Attic/mime.flv.php,v 1.25 2008/12/23 20:24:38 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_liberty/plugins/Attic/mime.flv.php,v 1.26 2008/12/25 19:14:24 squareing Exp $
*
* @author xing <xing@synapse.plus.com>
- * @version $Revision: 1.25 $
+ * @version $Revision: 1.26 $
* created Thursday May 08, 2008
* @package liberty
* @subpackage liberty_mime_handler
@@ -528,7 +528,7 @@ function mime_flv_create_thumbnail( $pFile, $pOffset = 60 ) {
* @return void
*/
function mime_flv_calculate_videosize( &$pMetaData, $pParams ) {
- global $gBitSystem;
+ global $gBitSystem, $gThumbSizes;
// fetch default if width is missing
if( empty( $pMetaData['width'] )) {
@@ -539,18 +539,10 @@ function mime_flv_calculate_videosize( &$pMetaData, $pParams ) {
$pMetaData['height'] = ( $pMetaData['width'] / ( !empty( $pMetaData['aspect'] ) ? $pMetaData['aspect'] : 4 / 3 ));
// if we want to display a different size
- if( !empty( $pParams['size'] )) {
- if( $pParams['size'] == 'small' ) {
- $new_width = 160;
- } elseif( $pParams['size'] == 'medium' ) {
- $new_width = 320;
- } elseif( $pParams['size'] == 'large' ) {
- $new_width = 480;
- } elseif( $pParams['size'] == 'huge' ) {
- $new_width = 600;
- }
- } else {
- $new_width = $gBitSystem->getConfig( 'mime_flv_default_size' );
+ if( !empty( $pParams['size'] ) && !empty( $gThumbSizes[$pParams['size']]['width'] )) {
+ $new_width = $gThumbSizes[$pParams['size']]['width'];
+ } elseif( $gBitSystem->isFeatureActive( 'mime_flv_default_size' )) {
+ $new_width = $gThumbSizes[$gBitSystem->getConfig( 'mime_flv_default_size' )]['width'];
}
// if we want to change the video size
diff --git a/templates/mime/flv/admin.tpl b/templates/mime/flv/admin.tpl
index 9f72ae0..daba60f 100644
--- a/templates/mime/flv/admin.tpl
+++ b/templates/mime/flv/admin.tpl
@@ -37,8 +37,8 @@
{formlabel label="Video codec" for="mime_flv_video_codec"}
{forminput}
{html_options
- options=$rates.video_codec
- values=$rates.video_codec
+ options=$options.video_codec
+ values=$options.video_codec
name=mime_flv_video_codec
id=mime_flv_video_codec
selected=$gBitSystem->getConfig('mime_flv_video_codec')|default:flv}
@@ -55,8 +55,8 @@
{formlabel label="ffmpeg mp3 param" for="ffmpeg_mp3_param"}
{forminput}
{html_options
- options=$rates.mp3_param
- values=$rates.mp3_param
+ options=$options.mp3_param
+ values=$options.mp3_param
name=ffmpeg_mp3_param
id=ffmpeg_mp3_param
selected=$gBitSystem->getConfig('ffmpeg_mp3_param')|default:libmp3lame}
@@ -76,8 +76,8 @@
{formlabel label="Video bitrate" for="mime_flv_video_bitrate"}
{forminput}
{html_options
- options=$rates.video_bitrate
- values=$rates.video_bitrate
+ options=$options.video_bitrate
+ values=$options.video_bitrate
name=mime_flv_video_bitrate
id=mime_flv_video_bitrate
selected=$gBitSystem->getConfig('mime_flv_video_bitrate')|default:200000} kbits/s
@@ -89,8 +89,8 @@
{formlabel label="Video width" for="mime_flv_width"}
{forminput}
{html_options
- options=$rates.video_width
- values=$rates.video_width
+ options=$options.video_width
+ values=$options.video_width
name=mime_flv_width
id=mime_flv_width
selected=$gBitSystem->getConfig('mime_flv_width')|default:320} pixel
@@ -102,8 +102,8 @@
{formlabel label="Audio sample rate" for="mime_flv_audio_samplerate"}
{forminput}
{html_options
- options=$rates.audio_samplerate
- values=$rates.audio_samplerate
+ options=$options.audio_samplerate
+ values=$options.audio_samplerate
name=mime_flv_audio_samplerate
id=mime_flv_audio_samplerate
selected=$gBitSystem->getConfig('mime_flv_audio_samplerate')|default:22050} Hz
@@ -115,8 +115,8 @@
{formlabel label="Audio bitrate" for="mime_flv_audio_bitrate"}
{forminput}
{html_options
- options=$rates.audio_bitrate
- values=$rates.audio_bitrate
+ options=$options.audio_bitrate
+ values=$options.audio_bitrate
name=mime_flv_audio_bitrate
id=mime_flv_audio_bitrate
selected=$gBitSystem->getConfig('mime_flv_audio_bitrate')|default:32000} kbits/s
@@ -128,8 +128,8 @@
{formlabel label="Default displayed size" for="mime_flv_default_size"}
{forminput}
{html_options
- options=$rates.display_size
- values=$rates.display_size
+ options=$options.display_size
+ values=$options.display_size
name=mime_flv_default_size
id=mime_flv_default_size
selected=$gBitSystem->getConfig('mime_flv_default_size')}
diff --git a/templates/mime/flv/view.tpl b/templates/mime/flv/view.tpl
index 1a0682c..4ec02e3 100644
--- a/templates/mime/flv/view.tpl
+++ b/templates/mime/flv/view.tpl
@@ -6,12 +6,10 @@
<div class="pagination">
{tr}View other sizes{/tr}<br />
- &nbsp;&bull;&nbsp;
- <a href="{$attachment.display_url}&size=small">{tr}Small{/tr}</a>&nbsp;&bull;&nbsp;
- <a href="{$attachment.display_url}&size=medium">{tr}Medium{/tr}</a>&nbsp;&bull;&nbsp;
- <a href="{$attachment.display_url}&size=large">{tr}Large{/tr}</a>&nbsp;&bull;&nbsp;
- <a href="{$attachment.display_url}&size=huge">{tr}Huge{/tr}</a>&nbsp;&bull;&nbsp;
- <a href="{$attachment.display_url}&size=original">{tr}Original{/tr}</a>&nbsp;&bull;&nbsp;
+ {foreach name=size key=size from=$attachment.thumbnail_url item=url}
+ <a href="{$attachment.display_url|escape}{if strpos($attachment.display_url,'?')}&amp;{else}?{/if}size={$size}">{tr}{$size}{/tr}</a>
+ {if !$smarty.foreach.size.last}&nbsp;&bull;&nbsp;{/if}
+ {/foreach}
</div>
{elseif $attachment.status.processing}
<div class="row aligncenter">
generated by cgit v1.3 (git 2.53.0) at 2026-07-05 17:10:17 +0000