$bkpath
$name
@@ -215,8 +216,7 @@
htmlRadio( $subdirs, $files, $dir );
break;
case 'search':
- exec( 'mpc search -f "'.$format.'" any "'.$string.'" \
- | awk NF'
+ exec( 'mpc search -f "'.$format.'" any "'.$string.'" | awk NF'
, $lists );
htmlTrack( $lists, $f, 'search', $string );
break;
@@ -566,8 +566,8 @@ function htmlTrack( $lists, $f, $filemode = '', $string = '', $dirs = '' ) { //
$seconds = 0;
foreach( $hhmmss as $hms ) $seconds += HMS2second( $hms ); // hh:mm:ss > seconds
$totaltime = second2HMS( $seconds );
- $args = escape( implode( "\n", [ $artist, $album, $mpdpath ] ) );
- $coverart = exec( '/usr/bin/sudo /srv/http/bash/status-coverart.sh "'.$args.'"' );
+ $args = escape( implode( "\n", [ $artist, $album, $each0->file ] ) );
+ $coverart = exec( '/srv/http/bash/status-coverart.sh "'.$args.'"' );
$br = ! $hidegenre || !$hidedate ? '
' : '';
$mpdpath = str_replace( '\"', '"', $mpdpath );
$count = count( $array );
diff --git a/srv/http/mpdplaylist.php b/srv/http/mpdplaylist.php
index 9e1ebcf41..4d0913312 100644
--- a/srv/http/mpdplaylist.php
+++ b/srv/http/mpdplaylist.php
@@ -262,22 +262,10 @@ function htmlTrack( $lists, $plname = '' ) {
}
if ( $countradio ) $counthtml.= '
'.$countradio.'';
if ( $countupnp ) $counthtml.= '
';
- exec( "{ echo status; sleep 0.05; } \
- | telnet 127.0.0.1 6600 2> /dev/null \
- | grep -E '^song:|^elapsed:'"
- , $song_elapsed );
- $elapsed = '';
- foreach( $song_elapsed as $se ) {
- if ( substr( $se, 0, 4 ) === 'song' ) {
- $song = str_replace( 'song: ', '', $se );
- } else {
- $elapsed = round( str_replace( 'elapsed: ', '', $se ) );
- }
- }
+ $elapsed = exec( '/srv/http/bash/cmd.sh getelapsed' );
echo json_encode( [
'html' => $html
, 'counthtml' => $counthtml
- , 'song' => $song
, 'elapsed' => $elapsed
, 'add' => $add
], JSON_NUMERIC_CHECK );
diff --git a/srv/http/settings/features.php b/srv/http/settings/features.php
index 4f885558f..d8b8cabed 100644
--- a/srv/http/settings/features.php
+++ b/srv/http/settings/features.php
@@ -20,9 +20,9 @@
$body = [
[
'label' => 'AirPlay'
- , 'id' => 'shairport-sync'
, 'sublabel' => 'shairport-sync'
, 'icon' => 'airplay'
+ , 'id' => 'shairport-sync'
, 'setting' => false
, 'status' => 'shairport-sync'
, 'disabled' => '
AirPlay I^airplay^I is currently active.'
@@ -31,9 +31,9 @@
]
, [
'label' => 'DAB Radio'
- , 'id' => 'dabradio'
, 'sublabel' => 'rtsp-server'
, 'icon' => 'dabradio'
+ , 'id' => 'dabradio'
, 'setting' => false
, 'status' => 'rtsp-simple-server'
, 'disabled' => 'No DAB devices found.'
@@ -43,52 +43,52 @@
, [
'label' => 'SnapClient'
, 'sublabel' => 'snapclient'
- , 'id' => 'snapclient'
, 'icon' => 'snapcast'
+ , 'id' => 'snapclient'
, 'status' => 'snapclient'
, 'disabled' => '
SnapClient I^snapcast^I is currently active.'
, 'help' => <<< EOF
Snapcast - Multiroom client-server audio player.
- • SSH passwords must be default.
- • Connect: A^I^networks^I Networks^AI^snapcast sub^I
- • SnapClient and SnapServer can be enabled on the same device.
- - Enable | SnapServer | before | SnapClient |
- - SnapClient auto connect/disconnect on play/stop
+ · SSH passwords must be default.
+ · Connect: A^I^networks^I Networks^AI^snapcast sub^I
+ · SnapClient and SnapServer can be enabled on the same device.
+ · Enable | SnapServer | before | SnapClient |
+ · SnapClient auto connect/disconnect on play/stop
EOF
, 'exist' => file_exists( '/usr/bin/snapclient' )
]
, [
'label' => 'Spotify'
- , 'id' => 'spotifyd'
, 'sublabel' => 'spotifyd'
, 'icon' => 'spotify'
+ , 'id' => 'spotifyd'
, 'status' => 'spotifyd'
, 'disabled' => '
Spotify I^spotify^I is currently active.'
, 'help' => <<< EOF
Spotifyd - Spotify Connect device.
- • Require Premium account. (No Spotify password saved on rAudio.)
- • Get credential from
Spotify private app: (
Screenshots )
+ · Require Premium account. (No Spotify password saved on rAudio.)
+ · Get credential from
Spotify private app: (
Screenshots )
Spotify for Developers (Replace
YELLOW with actual values)
| LOG IN |
- - with normal Spotify account
+ · with normal Spotify account
| CREATE AN APP |
- - App name:
Name
- - App description:
Description
+ · App name:
Name
+ · App description:
Description
| EDIT SETTINGS |
- - Redirect URIs:
+ · Redirect URIs:
| USERS AND ACCESS | ADD NEW USER |
- - Name:
user
- - Spotify Account:
email
-• |
Spotify I^spotify^I ◨ |
- - Paste
Client ID and
Client Secret from the created app
+ · Name:
user
+ · Spotify Account:
email
+· |
Spotify I^spotify^I ◨ |
+ · Paste
Client ID and
Client Secret from the created app
EOF
, 'exist' => file_exists( '/usr/bin/spotifyd' )
]
, [
'label' => 'UPnP'
- , 'id' => 'upmpdcli'
, 'sublabel' => 'upmpdcli'
, 'icon' => 'upnp'
+ , 'id' => 'upmpdcli'
, 'status' => 'upmpdcli'
, 'disabled' => '
UPnP I^upnp^I is currently active.'
, 'help' => '
upmpdcli - UPnP / DLNA rendering device.'
@@ -102,9 +102,9 @@
$body = [
[
'label' => 'For browsers'
- , 'id' => 'httpd'
, 'sublabel' => 'MPD httpd'
, 'icon' => 'webradio'
+ , 'id' => 'httpd'
, 'setting' => false
, 'help' => <<< EOF
HTTP streaming - Asynchronous streaming for browsers via
http://$ip:8000 (Latency - several seconds)
@@ -112,17 +112,17 @@
]
, [
'label' => 'SnapServer'
- , 'id' => 'snapserver'
, 'sublabel' => 'MPD snapcast'
, 'icon' => 'snapcast'
+ , 'id' => 'snapserver'
, 'setting' => false
, 'disabled' => '
SnapClient I^snapcast^I is currently connected.'
, 'help' => <<< EOF
Snapcast - Multiroom client-server audio player.
- • SSH passwords must be default. (For metadata update)
- • Snapcast control client and player:
- -
Snapweb
- -
Snapdroid
+ · SSH passwords must be default. (For metadata update)
+ · Snapcast control client and player:
+ ·
Snapweb
+ ·
Snapdroid
EOF
, 'exist' => file_exists( '/usr/bin/snapclient' )
]
@@ -132,9 +132,9 @@
$body = [
[
'label' => 'DSP'
- , 'id' => 'camilladsp'
, 'sublabel' => 'camilladsp'
, 'icon' => 'camilladsp'
+ , 'id' => 'camilladsp'
, 'status' => 'camilladsp'
, 'disabled' => $disableddsp
, 'help' => <<< EOF
@@ -146,19 +146,19 @@
, [
'label' => 'Equalizer'
, 'sublabel' => 'alsaequal'
- , 'id' => 'equalizer'
, 'icon' => 'equalizer'
+ , 'id' => 'equalizer'
, 'setting' => false
, 'disabled' => '
DSP I^camilladsp^I is currently enabled.'
, 'help' => <<< EOF
Alsaequal - 10 band graphic equalizer with user presets.
Control: A^I^features^I Features^AI^equalizer sub^I
Presets:
- •
Flat: All bands at 0dB
- • New: Adjust | I^plus-circle^I Add | I^save^I Save |
- • Existing: Adjust | I^save^I Save |
- • Adjusted values will be listed as
(unnamed) until saved.
- • If distortions occurred, lower all bands collectively and increase volume
+ ·
Flat: All bands at 0dB
+ · New: Adjust | I^plus-circle^I Add | I^save^I Save |
+ · Existing: Adjust | I^save^I Save |
+ · Adjusted values will be listed as
(unnamed) until saved.
+ · If distortions occurred, lower all bands collectively and increase volume
EOF
]
];
@@ -167,78 +167,79 @@
$body = [
[
'label' => 'Access Point'
- , 'id' => 'hostapd'
, 'sublabel' => 'hostapd'
, 'icon' => 'accesspoint'
+ , 'id' => 'hostapd'
, 'status' => 'hostapd'
, 'disabled' => 'Wi-Fi is currently connected.'
, 'help' => <<< EOF
hostapd - Connect with rAudio hotspot directly when no routers available.
- • This should be used only when necessary.
- • Avoid double quotes
" in password.
+ · This should be used only when necessary.
+ · Avoid double quotes
" in password.
EOF
, 'exist' => file_exists( '/usr/bin/hostapd' )
]
, [
'label' => 'AutoPlay'
- , 'id' => 'autoplay'
, 'icon' => 'play'
+ , 'id' => 'autoplay'
, 'help' => <<< EOF
Start playing automatically on:
- • Bluetooth connected
- • Audio CD inserting
- • Power on / Reboot
+ · Bluetooth connected
+ · Audio CD inserting
+ · Power on / Reboot
EOF
]
, [
'label' => 'Browser on RPi'
- , 'id' => 'localbrowser'
, 'sublabel' => 'chromium'
, 'icon' => 'chromium'
+ , 'id' => 'localbrowser'
, 'status' => 'localbrowser'
, 'help' => <<< EOF
Chromium - Browser on RPi connected screen.
- • TFT 3.5" LCD: Rotate needs reboot.
- • Screen off: A^I^power^I Power^AI^screenoff sub^I
- - Also by timer in | I^gear^I |
- - Backlight still on - no energy saved
- • HDMI display: Must be connected before boot.
+ · TFT 3.5" LCD: Rotate needs reboot.
+ · Screen off: A^I^power^I Power^AI^screenoff sub^I
+ · Also by timer in | I^gear^I |
+ · Backlight still on - no energy saved
+ · HDMI display must be connected before boot.
EOF
, 'exist' => file_exists( '/usr/bin/chromium' )
]
, [
'label' => 'File Sharing'
- , 'id' => 'smb'
, 'sublabel' => 'smb'
, 'icon' => 'networks'
+ , 'id' => 'smb'
, 'status' => 'smb'
, 'disabled' => '
Server rAudio I^rserver^I is currently active.'
, 'help' => <<< EOF
Samba - Share files on network for Windows clients.
- • Much faster than SCP / WinSCP when transfer large or a lot of files
- • Set sources permissions for read + write - directory:
0777 file:
0555
- • Windows: $fileexplorer
+ · Much faster than SCP / WinSCP when transfer large or a lot of files
+ · Set sources permissions for read + write - directory:
0777 file:
0555
+ · Windows: $fileexplorer
(For even better performance: | Server rAudio I^rserver^I | )
EOF
, 'exist' => file_exists( '/usr/bin/smbd' )
]
, [
- 'label' => 'Lyrics in File'
- , 'id' => 'lyricsembedded'
- , 'icon' => 'lyrics'
+ 'label' => 'Lyrics in File'
+ , 'sublabel' => 'embedded ID3'
+ , 'icon' => 'lyrics'
+ , 'id' => 'lyricsembedded'
, 'setting' => false
- , 'help' => <<< EOF
- • Get embedded lyrics from local files.
- • Search online if not available.
- • Should be disable if most lyrics are not embedded.
- • Online fetched lyrics are saved as separate files, not embedded.
+ , 'help' => <<< EOF
+ · Get embedded lyrics from local files.
+ · Search online if not available.
+ · Should be disable if most lyrics are not embedded.
+ · Online fetched lyrics are saved as separate files, not embedded.
EOF
]
, [
'label' => 'Multiple rAudios'
- , 'id' => 'multiraudio'
, 'icon' => 'raudiobox'
+ , 'id' => 'multiraudio'
, 'help' => <<< EOF
Switch between multiple rAudio devices.
Switch: A^I^playlist^I Playlist^AI^raudiobox sub^I
@@ -248,9 +249,9 @@
]
, [
'label' => 'Password Login'
- , 'id' => 'login'
, 'sublabel' => 'password_hash'
, 'icon' => 'lock'
+ , 'id' => 'login'
, 'setting' => 'custom'
, 'help' => <<< EOF
password_hash - Force browser interface login with password using
PASSWORD_BCRYPT.
@@ -259,23 +260,23 @@
]
, [
'label' => 'Scrobbler'
- , 'id' => 'scrobble'
, 'sublabel' => 'Last.fm'
, 'icon' => 'lastfm'
+ , 'id' => 'scrobble'
, 'help' => <<< EOF
- • Send artist, title and album of played tracks to
Last.fm to save in user's database.
- • Require Last.fm account.
- • No Last.fm password saved on rAudio.
- • Option to include renderers - Exclude if already scrobbleed by sender devices.
- • SnapClient already scrobbled by SnapServer.
- • Web Radio must be manually scrobbled: | Playing title | I^lastfm wh^I Scrobble |
+ · Send artist, title and album of played tracks to
Last.fm to save in user's database.
+ · Require Last.fm account.
+ · No Last.fm password saved on rAudio.
+ · Option to include renderers - Exclude if already scrobbleed by sender devices.
+ · SnapClient already scrobbled by SnapServer.
+ · Web Radio must be manually scrobbled: | Playing title | I^lastfm wh^I Scrobble |
EOF
]
, [
'label' => 'Server rAudio'
- , 'id' => 'nfsserver'
, 'sublabel' => 'nfs-server'
, 'icon' => 'rserver'
+ , 'id' => 'nfsserver'
, 'setting' => 'custom'
, 'settingicon' => false
, 'status' => 'nfs-server'
@@ -283,36 +284,36 @@
, 'help' => <<< EOF
NFS - Network File System - Server for files and | Shared Data I^networks^I |
•
rAudio Shared Data server:
- - Must be set to
static IP address which should be set on router.
- - In | I^library^I | Library:
- - | I^microsd^I SD | and | I^usbdrive^I USB | will be hidden.
- - | I^usb^I USB | items will be displayed in | I^networks^I NAS | instead.
- - On reboot / power off:
- - Shared Data on clients will be temporarily disabled
- - Re-enabled by itself once the server is back online.
+ · Must be set to
static IP address which should be set on router.
+ · In | I^library^I | Library:
+ · | I^microsd^I SD | and | I^usbdrive^I USB | will be hidden.
+ · | I^usb^I USB | items will be displayed in | I^networks^I NAS | instead.
+ · On reboot / power off:
+ · Shared Data on clients will be temporarily disabled
+ · Re-enabled by itself once the server is back online.
•
rAudio Shared Data clients:
- - | I^system^I System |
Shared Data I^networks^I ◨ | • rAudio |
- - Automatically setup: discover, connect shared files and data
+ · | I^system^I System |
Shared Data I^networks^I ◨ | • rAudio |
+ · Automatically setup: discover, connect shared files and data
•
Windows NFS clients:
- - Windows Features > Services for NFS > Client for NFS - Enable
- - $fileexplorer
+ · Windows Features > Services for NFS > Client for NFS - Enable
+ · $fileexplorer
(SSH password must be default.)
EOF
]
, [
'label' => 'Stop Timer'
- , 'id' => 'stoptimer'
, 'icon' => 'stopwatch'
+ , 'id' => 'stoptimer'
, 'disabled' => 'Player is currently not playing.'
, 'help' => <<< EOF
Stop timer:
- • Mute
- • Stop player
- • Set volume back as before mute
- • If set, power off.
+ · Mute
+ · Stop player
+ · Set volume back as before mute
+ · If set, power off.
EOF
]
];
diff --git a/srv/http/settings/networks.php b/srv/http/settings/networks.php
index 53e9fd837..e8e37d46f 100644
--- a/srv/http/settings/networks.php
+++ b/srv/http/settings/networks.php
@@ -14,19 +14,19 @@
rAudio as sender: (or pairing non-audio devices)
• Pair:
- - On receiver: Turn on Discovery / Pairing mode
- - On rAudio: | Bluetooth I^search wh^I | Select to pair
+ · On receiver: Turn on Discovery / Pairing mode
+ · On rAudio: | Bluetooth I^search wh^I | Select to pair
• Connect:
- - On receiver: Power on / Power off > Connect / Disconnect
- - Receiver buttons can be used to control playback
+ · On receiver: Power on / Power off > Connect / Disconnect
+ · Receiver buttons can be used to control playback
rAudio as receiver:
• Pair:
- - On rAudio: | I^system^I System | Bluetooth I^bluetooth^I | • Discoverable by senders |
- - On sender: Search > Select
rAudio to pair
- - Forget / remove should be done on both rAudio and sender
+ · On rAudio: | I^system^I System | Bluetooth I^bluetooth^I | • Discoverable by senders |
+ · On sender: Search > Select
rAudio to pair
+ · Forget / remove should be done on both rAudio and sender
• Connect:
- - On sender: Select rAudio > Connect / Disconnect
+ · On sender: Select rAudio > Connect / Disconnect
EOF;
echoSetIcon( $html );
@@ -45,9 +45,9 @@
| I^plus-circle^I | Manually connect
| I^search^I | Scan to connect
- • Avoid double quotes
in Wi-Fi name and password.
-
-(Access points with 1 bar icon I^wifi1^I might be unstable.)' ) )?>