File type:
@@ -2105,7 +2210,26 @@ function view3all() {
-
1) echo '' . html($track['track_artist']) . ''; else echo html($track['track_artist']); ?> |
+
+ 1) {
+ for ($j=0; $j<$l; $j++) {
+ $artist = $artist . '' . html($exploded[$j]) . '';
+ if ($j != $l - 1) {
+ $delimiter = getInbetweenStrings($exploded[$j],$exploded[$j + 1], $track['track_artist']);
+ $artist = $artist . '' . $delimiter[0] . '';
+ }
+ }
+ echo $artist;
+ }
+ else {
+ echo '' . html($track['track_artist']) . '';
+ }
+ ?>
+ |
' . html($track['title']) . '';
elseif ($cfg['access_add']) echo '' . html($track['title']) . '';
@@ -2733,6 +2857,14 @@ function viewNewStartPage() {
request.always(function() {
$('#iframeRefresh').addClass("icon-anchor");
$('#iframeRefresh').removeClass("icon-selected fa-spin");
+ $('#suggested_container [id^="add_"]').click(function(){
+ $(this).removeClass('fa-plus-circle').addClass('fa-cog fa-spin icon-selected');
+ });
+
+ $('#suggested_container [id^="play_"]').click(function(){
+ $(this).removeClass('fa-play-circle-o').addClass('fa-cog fa-spin icon-selected');
+ });
+
});
});
diff --git a/javascript-src/arts.functions.js b/javascript-src/arts.functions.js
index a30b0e2..7c30ee2 100644
--- a/javascript-src/arts.functions.js
+++ b/javascript-src/arts.functions.js
@@ -139,6 +139,7 @@ function evaluateAdd(data) {
if (data.file_id) {data.album_id = data.file_id};
if (data.random) {data.album_id = 'random'};
if (data.disc) {data.album_id = data.album_id + '_' + data.disc};
+ if (data.addType) {data.album_id = data.addType};
if (data.album_id) {
if (data.addResult == 'add_OK') {
$('[id="add_' + data.album_id +'"]').removeClass('fa-cog fa-spin icon-selected').addClass('fa-check-square icon-ok');
diff --git a/play.php b/play.php
index c42819d..9a4e698 100644
--- a/play.php
+++ b/play.php
@@ -46,6 +46,7 @@
elseif ($action == 'playSelect') playSelect();
elseif ($action == 'addSelect') addSelect();
elseif ($action == 'addSelectUrl') addSelectUrl();
+elseif ($action == 'addMultitrack') addMultitrack();
elseif ($action == 'insertSelect') insertSelect();
elseif ($action == 'seekImageMap') seekImageMap();
elseif ($action == 'playIndex') playIndex();
@@ -317,6 +318,52 @@ function addSelect() {
//return 'add_OK';
}
+
+
+
+// +------------------------------------------------------------------------+
+// | Add multitrack |
+// +------------------------------------------------------------------------+
+function addMultitrack() {
+ global $cfg, $db;
+ authenticate('access_add');
+ require_once('include/play.inc.php');
+
+ $track_ids = explode(';', get('track_ids'));
+ $addType = get('addType');
+ $data = array();
+ $addResult = 'add_error';
+
+
+ $status = mpd('status');
+ if ($cfg['add_autoplay'] && $status['playlistlength'] == 0) {
+ $addResult = addTracks('play', '', '', $track_ids[0]);
+ if (count($track_ids) > 1) {
+ foreach($track_ids as $key => $value) {
+ if ($key > 0) {
+ $addResult = addTracks('add', '', '', $value);
+ }
+ }
+ }
+ }
+ else {
+ foreach($track_ids as $value) {
+ $addResult = addTracks('add', '', '', $value);
+ }
+ }
+
+ $data['addResult'] = $addResult;
+ $data['addType'] = $addType;
+
+ ob_start();
+ echo safe_json_encode($data);
+ header('Connection: close');
+ header('Content-Length: ' . ob_get_length());
+ ob_end_flush();
+ ob_flush();
+ flush();
+}
+
// +------------------------------------------------------------------------+
// | Add select url |
// +------------------------------------------------------------------------+
@@ -400,10 +447,10 @@ function insertSelect() {
// +------------------------------------------------------------------------+
// | Add tracks |
// +------------------------------------------------------------------------+
-function addTracks($mode = 'play', $insPos = '', $playAfterInsert = '') {
+function addTracks($mode = 'play', $insPos = '', $playAfterInsert = '', $track_id = '') {
global $cfg, $db;
- $track_id = get('track_id');
+ $track_id = ($track_id == '' ? get('track_id') : $track_id);
$album_id = get('album_id');
$disc = get('disc');
$filepath = get('filepath');
@@ -417,7 +464,7 @@ function addTracks($mode = 'play', $insPos = '', $playAfterInsert = '') {
if ($track_id) {
- $query = mysqli_query($db,'SELECT relative_file FROM track WHERE track_id = "' . mysqli_real_escape_string($db,$track_id) . '"');
+ $query = mysqli_query($db,'SELECT relative_file, track_id FROM track WHERE track_id = "' . mysqli_real_escape_string($db,$track_id) . '"');
}
elseif ($album_id) {
$select_md = '';
@@ -1642,6 +1689,7 @@ function playlistTrack() {
$data['track_artist'] = $exploded;
$data['track_artist_url'] = $exploded;
$data['track_artist_url_all'] = (string) rawurlencode($currentsong['Artist']);
+ $data['track_artist_all'] = (string) ($currentsong['Artist']);
$data['title'] = (string) $title;
$data['album'] = (string) $album;
$data['by'] = (string) '';
diff --git a/search.php b/search.php
index 6cf41ef..5317eb9 100644
--- a/search.php
+++ b/search.php
@@ -1,4 +1,4 @@
-
|
|
|