Skip to content

Commit 82469b1

Browse files
committed
Remove references to sdcard (repl by osdisk)
1 parent a73fcf1 commit 82469b1

File tree

5 files changed

+5
-13
lines changed

5 files changed

+5
-13
lines changed

etc/samba/smb.overwrite.conf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,3 @@ comment = OSDisk Storage
2929
path = /mnt/OSDISK
3030
read only = No
3131
guest ok = Yes
32-
[SDCard]
33-
comment = SDCard Storage
34-
path = /mnt/SDCARD
35-
read only = No
36-
guest ok = Yes

www/inc/constants.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
const DASHBOARD_CACHE_FILE = '/var/local/www/dashboard.txt';
4141
// Library/Playback
4242
const LIBCACHE_BASE = '/var/local/www/libcache';
43-
const ROOT_DIRECTORIES = array('NAS', 'NVME', 'OSDISK', 'RADIO', 'SATA', 'SDCARD', 'USB');
43+
const ROOT_DIRECTORIES = array('NAS', 'NVME', 'OSDISK', 'RADIO', 'SATA', 'USB');
4444
const DEFAULT_RADIO_TITLE = 'Radio station';
4545
const DEFAULT_RADIO_COVER = 'images/default-album-cover.png';
4646
const DEFAULT_ALBUM_COVER = 'images/default-album-cover.png';

www/js/playerlib.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,7 +1911,6 @@ s
19111911
data[i].directory == 'NVME' ||
19121912
data[i].directory == 'OSDISK' ||
19131913
data[i].directory == 'SATA' ||
1914-
data[i].directory == 'SDCARD' ||
19151914
data[i].directory == 'USB') {
19161915
rootFolderIcon = getKeyOrValue('value', data[i].directory);
19171916
}
@@ -2026,7 +2025,6 @@ function getDirDisplayName(dirName) {
20262025
NVME: 'NVMe',
20272026
OSDISK: 'OSDisk',
20282027
SATA: 'SATA',
2029-
SDCARD: 'SDCard',
20302028
USB: 'USB'
20312029
}
20322030

@@ -5164,7 +5162,6 @@ function containsBaseFolderName(name) {
51645162
~name.indexOf('OSDISK') ||
51655163
~name.indexOf('RADIO') ||
51665164
~name.indexOf('SATA') ||
5167-
~name.indexOf('SDCARD') ||
51685165
~name.indexOf('USB')
51695166
);
51705167
}
@@ -5224,7 +5221,7 @@ function getKeyOrValue (type, item) {
52245221
['Shutdown','poweroff'],['Restart','reboot'],
52255222
['Play','play'],['Pause','pause'],['Stop','stop'],['Next','next'],['Previous','prev'],
52265223
// Root folder icons
5227-
['NAS','fa-computer'],['NVME','fa-memory'],['OSDISK','fa-folders'],['RADIO','fa-microphone'],['SATA','fa-hard-drive'],['SDCARD','fa-sd-card'],['USB','fa-usb-drive'],
5224+
['NAS','fa-computer'],['NVME','fa-memory'],['OSDISK','fa-folders'],['RADIO','fa-microphone'],['SATA','fa-hard-drive'],['USB','fa-usb-drive'],
52285225
// Now-playing icon
52295226
['None','None'],['Waveform','waveform'],['Equalizer (Animated)','equalizer'],
52305227
// View -> Item position

www/js/scripts-panels.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ jQuery(document).ready(function($) { 'use strict';
715715

716716
if (plName) {
717717
if (containsBaseFolderName(plName)) {
718-
notify(NOTIFY_TITLE_ALERT, 'playlist_name_error', 'NAS, NVME, OSDISK, RADIO, SATA, SDCARD and USB cannot be used in the name.');
718+
notify(NOTIFY_TITLE_ALERT, 'playlist_name_error', 'NAS, NVME, OSDISK, RADIO, SATA and USB cannot be used in the name.');
719719
} else {
720720
notify(NOTIFY_TITLE_INFO, 'saving_queue', NOTIFY_DURATION_SHORT);
721721
$.get('command/playlist.php?cmd=save_queue_to_playlist&name=' + plName, function() {
@@ -739,7 +739,7 @@ jQuery(document).ready(function($) { 'use strict';
739739

740740
if (favoritesName) {
741741
if (containsBaseFolderName(favoritesName)) {
742-
notify(NOTIFY_TITLE_ALERT, 'playlist_name_error', 'NAS, NVME, OSDISK, RADIO, SATA, SDCARD and USB cannot be used in the name.');
742+
notify(NOTIFY_TITLE_ALERT, 'playlist_name_error', 'NAS, NVME, OSDISK, RADIO, SATA and USB cannot be used in the name.');
743743
} else {
744744
notify(NOTIFY_TITLE_INFO, 'setting_favorites_name', NOTIFY_DURATION_SHORT);
745745
$.get('command/playlist.php?cmd=set_favorites_name&name=' + favoritesName, function(){

www/templates/sys-config.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ <h1 class="sys-config">System</h1>
329329
<button id="btn-set-fs-smb" class="hide btn btn-primary btn-small config-btn-set btn-submit" type="submit" name="update_fs_smb" value="novalue"><i class="fa fa-solid fa-sharp fa-arrow-turn-down-left"></i></button>
330330
<span class="config-help-static">
331331
Server Message Block (SMB) allows files to be shared over a network with Windows, Mac and Linux clients.<br>
332-
<b>Shares:</b> NAS, NVMe, SATA, SDCard, Playlists and USB drives (by label).
332+
<b>Shares:</b> NAS, NVMe, OSDisk, SATA, Playlists and USB drives (by label).
333333
</span>
334334
</div>
335335

0 commit comments

Comments
 (0)