aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/video_ui/video.admin.inc17
-rw-r--r--modules/video_ui/video.preset.inc3
-rw-r--r--modules/video_ui/video_ui.module19
3 files changed, 2 insertions, 37 deletions
diff --git a/modules/video_ui/video.admin.inc b/modules/video_ui/video.admin.inc
index 51f9a1c..8ab19b3 100644
--- a/modules/video_ui/video.admin.inc
+++ b/modules/video_ui/video.admin.inc
@@ -161,21 +161,4 @@ function video_cron_admin_settings() {
'#description' => t('How many videos do you want to process on each cron run? Either through hook_cron or the video_scheduler.php.'),
);
return system_settings_form($form);
-}
-
-/**
- * File system admin settings
- * @return <type>
- */
-function video_filesystem_admin_settings() {
- $filesystem = new video_filesystem;
- $form = $filesystem->admin_settings();
- return system_settings_form($form);
-}
-
-function video_filesystem_admin_settings_validate($form, &$form_state) {
- // add vallidations by metadata interface
- $filesystem = $form_state['values']['video_filesystem'];
- $filesystem = new video_filesystem($filesystem);
- $filesystem->admin_settings_validate($form, $form_state);
} \ No newline at end of file
diff --git a/modules/video_ui/video.preset.inc b/modules/video_ui/video.preset.inc
index 981370b..42680cd 100644
--- a/modules/video_ui/video.preset.inc
+++ b/modules/video_ui/video.preset.inc
@@ -50,7 +50,8 @@ function video_preset_default_form($form, &$form_state, $preset) {
'#type' => 'select',
'#title' => t('Video output extension'),
'#description' => t('Extension of the output video.'),
- '#options' => $video_extension
+ '#options' => $video_extension,
+ '#default_value' => (!empty($preset['settings']['video_extension'])) ? $preset['settings']['video_extension'] : 'flv'
);
$form['settings']['video']['video_codec'] = array(
'#type' => 'select',
diff --git a/modules/video_ui/video_ui.module b/modules/video_ui/video_ui.module
index d2edb9e..97a9f4a 100644
--- a/modules/video_ui/video_ui.module
+++ b/modules/video_ui/video_ui.module
@@ -61,14 +61,6 @@ function video_ui_menu() {
'type' => MENU_LOCAL_TASK,
'weight' => 3,
);
-
-// $items['admin/structure/video'] = array(
-// 'title' => 'Video Presets',
-// 'file' => 'includes/video.preset.inc',
-// 'description' => 'Manage and configure the presets for Video.',
-// 'page callback' => 'video_presets_overview',
-// 'access arguments' => array('administer video presets')
-// );
$items['admin/config/media/video/presets/all'] = array(
'title' => 'Presets',
'description' => 'Configure your transcoder presets to convert your videos.',
@@ -149,17 +141,6 @@ function video_ui_menu() {
'type' => MENU_LOCAL_TASK,
'weight' => 4,
);
- // Filesystem settings
- $items['admin/config/media/video/filesystem'] = array(
- 'title' => 'Filesystem',
- 'description' => 'Configure your filesystem settings.',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('video_filesystem_admin_settings'),
- 'access arguments' => array('administer site configuration'),
- 'file' => 'video.admin.inc',
- 'type' => MENU_LOCAL_TASK,
- 'weight' => 5,
- );
// Cron settings
$items['admin/config/media/video/cron'] = array(
'title' => 'Cron Settings',