diff -upr video/includes/common.inc video-natuk/includes/common.inc
--- video/includes/common.inc 2009-12-27 06:46:26.000000000 +0000
+++ video-natuk/includes/common.inc 2010-02-01 17:05:05.000000000 +0000
@@ -42,6 +42,7 @@ function _video_common_get_player($eleme
case 'mpeg':
return theme('video_play_windowsmedia', $element);
case 'ogg':
+ case 'ogv':
return theme('video_play_ogg_theora', $element);
default:
drupal_set_message('No video player is configured for ' .$op, 'error');
@@ -415,48 +416,16 @@ classid="clsid:6BF52A52-394A-11d3-B153-0
* string of content to display
*/
function theme_video_play_ogg_theora($element) {
- global $base_url;
- $cortado_location = variable_get('video_cortado', $base_url . '/cortado.jar');
//$url = _video_get_fileurl($node->vidfile);
$video = file_create_url($element['#item']['filepath']);
- $width = ($node->video_scaled_x ? $node->video_scaled_x : '425');
- $height = ($node->video_scaled_y ? $node->video_scaled_y : '350');
-
$output = '
-
-
+
';
/*
$output = theme('video_format_play', $output,
t('http://java.com/download/'), t('Link to java.com'), t('Download Java'));*/
return $output;
-}
\ No newline at end of file
+}
diff -upr video/types/uploadfield/uploadfield.module video-natuk/types/uploadfield/uploadfield.module
--- video/types/uploadfield/uploadfield.module 2010-01-09 15:18:55.000000000 +0000
+++ video-natuk/types/uploadfield/uploadfield.module 2010-02-01 16:27:23.000000000 +0000
@@ -243,7 +243,7 @@ function uploadfield_widget_upload_valid
'swf', // swf player
'dir', 'dcr', // dcr player
'asf', 'wmv', 'avi', 'mpg', 'mpeg', // windows media
- 'ogg' // ogg theora
+ 'ogg', 'ogv' // ogg theora
);
$extensions = array_filter(explode(' ', $field['widget']['file_extensions']));
if (empty($extensions)) {
@@ -507,4 +507,4 @@ function uploadfield_v_video($op, &$elem
// video_auto_transcode_process($element);
break;
}
-}
\ No newline at end of file
+}
diff -upr video/types/uploadfield/uploadfield_widget.inc video-natuk/types/uploadfield/uploadfield_widget.inc
--- video/types/uploadfield/uploadfield_widget.inc 2010-01-17 02:46:46.000000000 +0000
+++ video-natuk/types/uploadfield/uploadfield_widget.inc 2010-02-01 16:30:18.000000000 +0000
@@ -13,7 +13,7 @@ function uploadfield_widget_settings_for
$form = module_invoke('filefield', 'widget_settings', 'form', $widget);
if ($form['file_extensions']['#default_value'] == 'txt') {
- $form['file_extensions']['#default_value'] = 'mp4 mpeg avi mpg wmv flv';
+ $form['file_extensions']['#default_value'] = 'mp4 mpeg avi mpg wmv flv ogg ogv';
}
// Default video player settings.
@@ -154,7 +154,7 @@ function uploadfield_widget_settings_val
'swf', // swf player
'dir', 'dcr', // dcr player
'asf', 'wmv', 'avi', 'mpg', 'mpeg', // windows media
- 'ogg' // ogg theora
+ 'ogg', 'ogv' // ogg theora
);
if (count(array_diff($extensions, $web_extensions))) {
form_set_error('file_extensions', t('Only web-standard videos are supported through the video widget. If needing to upload other types of files, change the widget to use a standard file upload.'));