@@ -298,6 +331,10 @@ function audiofield_soundmanager2($player_path, $audio_file) {
}
if (module_exists('flowplayer')) {
+
+ /**
+ * Audio Callback Functions.
+ */
function audiofield_flowplayer($player_path, $audio_file) {
static $seq = 1;
$variables = array(
@@ -310,32 +347,37 @@ if (module_exists('flowplayer')) {
'id' => 'audiofield-' . $seq++,
'attributes' => array('style' => 'height: 24px'),
);
- return theme('flowplayer', $variables);
+ return _theme('flowplayer', $variables);
}
}
if (module_exists('mediaelement')) {
function audiofield_mediaelement($player_path, $audio_file) {
static $seq = 1;
- drupal_add_library('mediaelement', 'mediaelement');
- drupal_add_js(drupal_get_path('module', 'mediaelement') . '/mediaelement.js');
- drupal_add_js(array('mediaelementAll' => TRUE), array('type' => 'setting'));
+ _drupal_add_library('mediaelement', 'mediaelement');
+ _drupal_add_js(drupal_get_path('module', 'mediaelement') . '/mediaelement.js');
+ _drupal_add_js(array('mediaelementAll' => TRUE), array('type' => 'setting'));
$class = 'mediaelement-formatter-identifier-' . time() . '-' . $seq++;
$variables = array(
'settings' => array(
- 'controls' => variable_get('mediaelement_audio_default_controls', TRUE),
- 'width' => variable_get('mediaelement_audio_default_width', '300'),
- 'height' => variable_get('mediaelement_audio_default_height', '30'),
- 'download_link' => variable_get('mediaelement_audio_default_download_link', FALSE),
- 'download_text' => variable_get('mediaelement_audio_default_download_text', t('Download')),
+// 'controls' => variable_get('mediaelement_audio_default_controls', TRUE),
+ 'controls' => \Drupal::config('audiofield.settings')->get('mediaelement_audio_default_controls'),
+// 'width' => variable_get('mediaelement_audio_default_width', '300'),
+ 'width' => \Drupal::config('audiofield.settings')->get('mediaelement_audio_default_width'),
+// 'height' => variable_get('mediaelement_audio_default_height', '30'),
+ 'height' => \Drupal::config('audiofield.settings')->get('mediaelement_audio_default_height'),
+// 'download_link' => variable_get('mediaelement_audio_default_download_link', FALSE),
+ 'download_link' => \Drupal::config('audiofield.settings')->get('mediaelement_audio_default_download_link'),
+// 'download_text' => variable_get('mediaelement_audio_default_download_text', t('Download')),
+ 'download_text' => \Drupal::config('audiofield.settings')->get('mediaelement_audio_default_download_link'),
),
'attributes' => array(
'src' => $audio_file,
'class' => $class,
),
);
- return theme('mediaelement_audio', $variables);
+ return _theme('mediaelement_audio', $variables);
}
}
@@ -344,13 +386,13 @@ function audiofield_googlereader($player_path, $audio_file) {
'player_path' => $player_path,
'audio_file' => $audio_file,
);
- return theme('audiofield_googlereader', $variables);
+ return _theme('audiofield_googlereader', $variables);
}
function theme_audiofield_googlereader($variables) {
$player_path = $variables['player_path'];
$audio_file = $variables['audio_file'];
- return '
';
}
function audiofield_jplayer($player_path, $audio_file) {
@@ -363,9 +405,9 @@ function audiofield_jplayer($player_path, $audio_file) {
$path_parts = explode('/', $player_path);
$audio_file_name = array_pop($path_parts);
$player_base_path = implode('/', $path_parts);
- drupal_add_js($player_path);
+ _drupal_add_js($player_path);
$audio_players = audiofield_players();
- drupal_add_css($audio_players['jplayer']['css']);
+ _drupal_add_css($audio_players['jplayer']['css']);
return '
diff --git a/audiofield_formatter.inc b/audiofield_formatter.inc
index 3dc7e97..402891f 100644
--- a/audiofield_formatter.inc
+++ b/audiofield_formatter.inc
@@ -1,48 +1,58 @@
entity) ? $item->entity : $item;
+ $options['attributes']['type'] = $file->getMimeType() . '; length=' . $file->getSize();
- if (!$file) {
- return '';
+ // Use the description as the link text if available.
+ if (empty($variables['description'])) {
+ $link_text = $file->getFilename();
+ }
+ else {
+ $link_text = $variables['description'];
+ $options['attributes']['title'] = check_plain($file->getFilename());
}
- $audiofile = file_create_url($file->uri);
- $info = pathinfo($audiofile);
- $op = $info['extension'];
- $output = audiofield_get_player($audiofile, $op);
+ $file_icon = array(
+ '#theme' => 'file_icon',
+ '#file' => $file,
+ );
+ $uri = file_create_url($file->getFileUri());
- //If user is file owner check for download permission and display download link
- if ($user->uid == $file->uid && user_access('download own audio files')) {
- $output .= '
Download:' . theme('file_link', array('file' => (object) $file)) . '
';
+ $info = pathinfo($uri);
+ $op = $info['extension'];
+ $output = audiofield_get_player($uri, $op);
+ if (user_access('download own audio files')) {
+ //If user is file owner check for download permission and display download link.
+ $output .= '
' .
+ 'Download:' .
+ drupal_render($file_icon) . ' ' .
+ l($link_text, file_create_url($file->getFileUri()), $options) . '
';
}
elseif (user_access('download all audio files')) {
- //If user has permission to download all audio files, then display download link
- $output .= '
Download:' . theme('file_link', array('file' => (object) $file)) . '
';
+ //If user has permission to download all audio files, then display download link.
+ $output .= '
' . 'Download:' .
+ drupal_render($file_icon) . ' ' .
+ l($link_text, file_create_url($file->getFileUri()), $options) . '
';
}
return $output;
}
-/*
+/**
* Theme function for 'embedded' audio.
*/
function theme_audiofield_formatter_audiofield_nodownload($variables) {
- global $user;
- $file = $variables['file'];
-
- if (!$file) {
- return '';
- }
-
- $audiofile = file_create_url($file->uri);
- $info = pathinfo($audiofile);
+ $item = $variables['item'];
+ $uri = file_create_url($item->entity->getFileUri());
+ $info = pathinfo($uri);
$op = $info['extension'];
- $output = audiofield_get_player($audiofile, $op);
+ $output = audiofield_get_player($uri, $op);
return $output;
}
diff --git a/config/audiofield.settings.yml b/config/audiofield.settings.yml
index f421d29..814b923 100644
--- a/config/audiofield.settings.yml
+++ b/config/audiofield.settings.yml
@@ -1 +1,2 @@
audiofield_audioplayer: 'google_reader'
+audiofield_players_dir: 'sites/all/libraries/player'
diff --git a/lib/Drupal/audiofield/Form/AudiofieldSettingsForm.php b/lib/Drupal/audiofield/Form/AudiofieldSettingsForm.php
deleted file mode 100644
index 312adf0..0000000
--- a/lib/Drupal/audiofield/Form/AudiofieldSettingsForm.php
+++ /dev/null
@@ -1,97 +0,0 @@
-configFactory->get('audiofield.settings');
- $audio_players = audiofield_players();
- $players = array();
- $download_players = '';
- foreach ($audio_players as $id => $player) {
- if (file_exists($player['path']) || (isset($player['external']) && $player['external'])) {
- foreach ($player['filetypes'] as $filetype) {
- $players[$filetype][$id] = $player['name'] . '
'; /* . call_user_func($player['callback'], $base_path . $player['path'], "");*/
- }
- }
- else {
- if (isset($player['download_link'])) {
- $download_players .= '
Download ' . l($player['name'], $player['download_link']) . '';
- }
- }
- }
-
- //MP3 Players list
- if (!empty($players['mp3'])) {
- $form['audiofield_audioplayer'] = array(
- '#type' => 'radios',
- '#title' => t('MP3 Audio Players'),
- '#options' => $players['mp3'],
- '#default_value' => $config->get('audiofield_audioplayer'),
- );
- unset($players['mp3']);
- }
-
- //Other players list (wav, wma,...)
- foreach ($players as $filetype => $type_player) {
- $form['audiofield_audioplayer_' . $filetype] = array(
- '#type' => 'radios',
- '#title' => check_plain($filetype . ' ' . t('Audio Players')),
- '#options' => $type_player,
- '#default_value' => $config->get('audiofield_audioplayer_' . $filetype),
- );
- }
-
- $form['audiofield_players_dir'] = array(
- '#type' => 'textfield',
- '#title' => t('Audio Players Directory'),
- '#description' => t('Download and extract audio players in this directory'),
- '#default_value' => $config->get('audiofield_players_dir'),
- );
-
- if (!empty($download_players)) {
- $form['audiofield_downloadaudioplayer'] = array(
- '#type' => 'item',
- '#title' => t('Download and install audio players'),
- '#markup' => '
' . $download_players . '
',
- );
- }
-
- return parent::buildForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, array &$form_state) {
- $config = $this->configFactory->get('audiofield.settings');
- foreach($form_state['values'] as $field_name => $value) {
- //@todo validate that this is audiofield setting
- $config->set($field_name, $value);
- }
-
- $config->save();
- parent::submitForm($form, $form_state);
- }
-}
diff --git a/src/Form/AudiofieldSettingsForm.php b/src/Form/AudiofieldSettingsForm.php
new file mode 100644
index 0000000..9a5238f
--- /dev/null
+++ b/src/Form/AudiofieldSettingsForm.php
@@ -0,0 +1,97 @@
+config('audiofield.settings');
+ $audio_players = audiofield_players();
+ $players = array();
+ $download_players = '';
+ foreach ($audio_players as $id => $player) {
+ if (file_exists($player['path']) || (isset($player['external']) && $player['external'])) {
+ foreach ($player['filetypes'] as $filetype) {
+ $players[$filetype][$id] = $player['name'] . '
'; /* . call_user_func($player['callback'], $base_path . $player['path'], "");*/
+ }
+ }
+ else {
+ if (isset($player['download_link'])) {
+ $download_players .= '
Download ' . l($player['name'], $player['download_link']) . '';
+ }
+ }
+ }
+
+ //MP3 Players list
+ if (!empty($players['mp3'])) {
+ $form['audiofield_audioplayer'] = array(
+ '#type' => 'radios',
+ '#title' => t('MP3 Audio Players'),
+ '#options' => $players['mp3'],
+ '#default_value' => $config->get('audiofield_audioplayer'),
+ );
+ unset($players['mp3']);
+ }
+
+ //Other players list (wav, wma,...)
+ foreach ($players as $filetype => $type_player) {
+ $form['audiofield_audioplayer_' . $filetype] = array(
+ '#type' => 'radios',
+ '#title' => check_plain($filetype . ' ' . t('Audio Players')),
+ '#options' => $type_player,
+ '#default_value' => $config->get('audiofield_audioplayer_' . $filetype),
+ );
+ }
+
+ $form['audiofield_players_dir'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Audio Players Directory'),
+ '#description' => t('Download and extract audio players in this directory'),
+ '#default_value' => $config->get('audiofield_players_dir'),
+ );
+
+ if (!empty($download_players)) {
+ $form['audiofield_downloadaudioplayer'] = array(
+ '#type' => 'item',
+ '#title' => t('Download and install audio players'),
+ '#markup' => '
' . $download_players . '
',
+ );
+ }
+
+ return parent::buildForm($form, $form_state);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function submitForm(array &$form, array &$form_state) {
+ $config = $this->config('audiofield.settings');
+ foreach($form_state['values'] as $field_name => $value) {
+ //@todo validate that this is audiofield setting
+ $config->set($field_name, $value);
+ }
+
+ $config->save();
+ parent::submitForm($form, $form_state);
+ }
+}
diff --git a/src/Plugin/Field/FieldFormatter/AudioFormatter.php b/src/Plugin/Field/FieldFormatter/AudioFormatter.php
new file mode 100644
index 0000000..18d0ad1
--- /dev/null
+++ b/src/Plugin/Field/FieldFormatter/AudioFormatter.php
@@ -0,0 +1,55 @@
+ $item) {
+
+ if ($this->getPluginId() == 'audio_formatter') {
+
+ if ($item->entity) {
+ $audio_uri = $item->entity->getFileUri();
+ $uri = array(
+ 'path' => file_create_url($audio_uri),
+ 'options' => array(),
+ );
+ $item_attributes = $item->_attributes;
+ $elements[$delta] = array(
+ '#theme' => 'audiofield_formatter_audiofield_embedded',
+ '#item' => $item,
+ '#item_attributes' => $item_attributes,
+ '#path' => isset($uri) ? $uri : '',
+ );
+ }
+ }
+ }
+
+ return $elements;
+ }
+}
diff --git a/src/Plugin/Field/FieldFormatter/AudioFormatterNoDownload.php b/src/Plugin/Field/FieldFormatter/AudioFormatterNoDownload.php
new file mode 100644
index 0000000..bd37153
--- /dev/null
+++ b/src/Plugin/Field/FieldFormatter/AudioFormatterNoDownload.php
@@ -0,0 +1,48 @@
+ $item) {
+ if ($this->getPluginId() == 'audio_formatter_no_download') {
+
+ if ($item->entity) {
+ $audio_uri = $item->entity->getFileUri();
+ $uri = array(
+ 'path' => file_create_url($audio_uri),
+ 'options' => array(),
+ );
+ $item_attributes = $item->_attributes;
+ $elements[$delta] = array(
+ '#theme' => 'audiofield_formatter_audiofield_nodownload',
+ '#item' => $item,
+ '#item_attributes' => $item_attributes,
+ '#path' => isset($uri) ? $uri : '',
+ );
+ }
+ }
+ }
+
+ return $elements;
+ }
+}
+
diff --git a/src/Plugin/Field/FieldWidget/AudioDefaultWidget.php b/src/Plugin/Field/FieldWidget/AudioDefaultWidget.php
new file mode 100644
index 0000000..6c9ac2d
--- /dev/null
+++ b/src/Plugin/Field/FieldWidget/AudioDefaultWidget.php
@@ -0,0 +1,92 @@
+getFileUri());
+ $info = pathinfo($audiofile);
+ $op = $info['extension'];
+ $element['filename'] = array(
+ '#type' => 'markup',
+ '#markup' => audiofield_get_player($audiofile, $op),
+ '#weight' => -10,
+ );
+ }
+
+ return $element;
+ }
+
+ /**
+ * Form API callback. Retrieves the value for the file_generic field element.
+ *
+ * This method is assigned as a #value_callback in formElement() method.
+ */
+ public static function value($element, $input = FALSE, $form_state) {
+ if ($input) {
+ // Checkboxes lose their value when empty.
+ // If the display field is present make sure its unchecked value is saved.
+ if (empty($input['display'])) {
+ $input['display'] = $element['#display_field'] ? 0 : 1;
+ }
+ }
+
+ // We depend on the managed file element to handle uploads.
+ $return = file_managed_file_value($element, $input, $form_state);
+
+ // Ensure that all the required properties are returned even if empty.
+ $return += array(
+ 'fids' => array(),
+ 'display' => 1,
+ 'description' => '',
+ );
+
+ return $return;
+ }
+
+}