From fdfc4d875d446dc6d1bce368bc30be03915e1695 Mon Sep 17 00:00:00 2001
From: Fabio Varesano <fax8@13637.no-reply.drupal.org>
Date: Fri, 12 Jan 2007 16:35:40 +0000
Subject: Patch #108661 by omar (http://drupal.org/user/7909):   Adding Ogg
 Theora media type help links for video_multidownload Other minor fixes

---
 plugins/video_ffmpeg_helper/video_ffmpeg_helper.info   | 2 +-
 plugins/video_multidownload/video_multidownload.module | 3 ++-
 video.module                                           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/video_ffmpeg_helper/video_ffmpeg_helper.info b/plugins/video_ffmpeg_helper/video_ffmpeg_helper.info
index 5799a90..f2ed8e6 100644
--- a/plugins/video_ffmpeg_helper/video_ffmpeg_helper.info
+++ b/plugins/video_ffmpeg_helper/video_ffmpeg_helper.info
@@ -1,5 +1,5 @@
 ; $Id$
 name = Video ffmpeg Helper
 description = Provide apis for ffmpeg. Simplify video nodes creation.
-dependencies = video
+dependencies = video video_upload
 package = "Video"
diff --git a/plugins/video_multidownload/video_multidownload.module b/plugins/video_multidownload/video_multidownload.module
index 25bbea7..992b852 100644
--- a/plugins/video_multidownload/video_multidownload.module
+++ b/plugins/video_multidownload/video_multidownload.module
@@ -260,7 +260,7 @@ function video_multidownload_download() {
 function theme_video_multidownload_download($node) {
   $output = '';
   //Replace some common file types with full name and links.
-  $find = array('mov', 'wmv', 'rm', 'avi', 'zip', 'divx', 'flv');
+  $find = array('mov', 'wmv', 'rm', 'avi', 'zip', 'divx', 'flv', 'ogg');
   $replace = array('<a href="http://www.apple.com/quicktime" title="'. t('QuickTime Homepage') . '">' . t('Quicktime') . '</a>'
              , '<a href="http://www.microsoft.com/windowsmedia" title="'. t('Windows Media Homepage') . '">' . t('Windows Media') . '</a>'
              , '<a href="http://www.real.com" title="'. t('Real Media Homepage') . '">' . t('Real Media') . '</a>'
@@ -268,6 +268,7 @@ function theme_video_multidownload_download($node) {
              , '<a href="http://en.wikipedia.org/wiki/ZIP_file_format" title="'. t('ZIP Information at wikipedia.org') . '">' . t('ZIP') . '</a>'
              , '<a href="http://www.divx.com" title="'. t('Divx Homepage') . '">' . t('DIVX') . '</a>'
              , '<a href="http://www.macromedia.com/go/getflashplayer" title="'. t('Macromedia Flash Homepage') . '">' .t('Flash FLV') . '</a>'
+             , '<a href="http://www.theora.org/theorafaq.html" title="'. t('Ogg Theora FAQ at theora.org') . '">'.t('Ogg Theora FAQ') .'</a>, <a href="http://en.wikipedia.org/wiki/Wikipedia:Media_help_(Ogg)" title="'. t('Ogg Theora media help at Wikipedia') . '">' . t('Ogg Theora help') . '</a>'
              );
   $output .= '<br /><div class="videodownload">'; //Enclose all HTML in "videodownload" class.
   foreach($node->file_array as $file) { //Goes through the array of video files and gets them ready for display.
diff --git a/video.module b/video.module
index a3164dc..dd6bd78 100644
--- a/video.module
+++ b/video.module
@@ -354,7 +354,7 @@ function video_settings_form() {
   $form['flash']['video_flvplayerloader'] = array(
     '#type' => 'textfield',
     '#title' => t('Filename of Flash loader'),
-    '#default_value' => variable_get('video_flvplayerloader', 'Player.swf'),
+    '#default_value' => variable_get('video_flvplayerloader', 'FlowPlayer.swf'),
     '#description' => t('The name of the Shockwave file that manages loading the FLV movie.'));
   $form['ogg'] = array('#type' => 'fieldset', '#title' => t('Ogg Theora settings'), '#collapsible' => TRUE, '#collapsed' => TRUE);
   $form['ogg']['video_cortado'] = array(
-- 
cgit v1.2.3