Skip to content

Commit c94f59d

Browse files
authored
Merge pull request #1963 from rern/UPDATE
Update
2 parents f5b314f + ba2ddb0 commit c94f59d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1820
-1696
lines changed

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Audio player for
1414
- Control via GUI
1515
- Remote with any browsers
1616
- Android - [rAudio app](https://play.google.com/store/apps/details?id=com.raudio)
17-
- Local display ${\textsf{\color{gray}(not on RPi Zero and 1)}}$
17+
- Local display (not on RPi Zero and 1)
1818
- Share data and files between multiple rAudios
1919
- Server rAudio : clients (Easy setup with server IP address only)
2020
- File server : clients
@@ -28,9 +28,9 @@ Audio player for
2828
- `*.jpg`, `*.png` and animated `*.gif` applicable
2929
- `*.wav` - album artists and sort tracks
3030
- `*.cue` - virtually as individual tracks in all modes and user playlists
31-
- VU meter as coverart ${\textsf{\color{gray}(for remote screen)}}$
31+
- VU meter as coverart (for remote screen)
3232
- Wi-Fi connection can be pre-configured for headless mode.
33-
- Access point - `hostapd`
33+
- Access point - `iwd`
3434
- File sharing - `samba`
3535
- Easy update and extra features with Addons
3636
- Support boot from USB drive without SD card ([DIY](https://github.com/rern/rOS))
@@ -48,12 +48,12 @@ Audio player for
4848
- DLNA / UPnP
4949
- Streamers
5050
- Bluetooth audio sender
51-
- HTTP ${\textsf{\color{gray}(no metadata)}}$
51+
- HTTP (no metadata)
5252
- SnapServer - Multiroom audio client
5353
- Web Radio
54-
- DAB Radio ${\textsf{\color{gray}(not on RPi Zero and 1)}}$
54+
- DAB Radio (not on RPi Zero and 1)
5555
- Digital Signal Processors
56-
- CamillaDSP ${\textsf{\color{gray}(not on RPi Zero and 1)}}$
56+
- CamillaDSP (not on RPi Zero and 1)
5757
- Equalizer
5858

5959
### Supported devices
@@ -64,17 +64,17 @@ Audio player for
6464
- Bluetooth
6565
- DAC
6666
- Keyboard and mouse
67-
- SDR ${\textsf{\color{gray}(for DAB Radio)}}$
67+
- SDR (for DAB Radio)
6868
- Wi-Fi
6969
- GPIO:
7070
- [I²S audio module](https://github.com/rern/rAudio/blob/main/I2S_modules.md)
71-
- [Character LCD](https://github.com/rern/rAudio/raw/main/srv/http/assets/img/lcdchar.jpg) ${\textsf{\color{gray}(16x2, 20x4)}}$
71+
- [Character LCD](https://github.com/rern/rAudio/raw/main/srv/http/assets/img/lcdchar.jpg) (16x2, 20x4)
7272
- Power on/off button
7373
- [Relay module](https://github.com/rern/rAudio/raw/main/srv/http/assets/img/relays.jpg)
7474
- [Rotary encoder](https://github.com/rern/rAudio/raw/main/srv/http/assets/img/rotaryencoder.jpg)
75-
- [Spectrum OLED](https://github.com/rern/rAudio/raw/main/srv/http/assets/img/mpdoled.jpg) ${\textsf{\color{gray}(128x64)}}$
76-
- [TFT 3.5" LCD](https://github.com/rern/rAudio/raw/main/srv/http/assets/img/lcd.jpg) ${\textsf{\color{gray}(320x420)}}$
77-
- VU LED ${\textsf{\color{gray}(LEDs+Rs)}}$
75+
- [Spectrum OLED](https://github.com/rern/rAudio/raw/main/srv/http/assets/img/mpdoled.jpg) (128x64)
76+
- [TFT 3.5" LCD](https://github.com/rern/rAudio/raw/main/srv/http/assets/img/lcd.jpg) (320x420)
77+
- VU LED (LEDs+Rs)
7878

7979
### Default root password
8080
- `ros`

install.sh

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,20 @@ alias=r1
44

55
. /srv/http/bash/settings/addons.sh
66

7-
# 20250530
7+
# 20250627
88
file=/etc/pacman.conf
99
grep -q mpd $file && sed -i 's/ mpd//' $file
1010

11+
if ! locale | grep -q ^LANG=.*UTF-8; then
12+
[[ -e /usr/share/i18n/locales/C ]] && loc=C || loc=en_US
13+
loc+=.UTF-8
14+
if ! grep -q ^$loc /etc/locale.gen; then
15+
echo "$loc UTF-8" >> /etc/locale.gen
16+
locale-gen
17+
fi
18+
localectl set-locale LANG=$loc
19+
fi
20+
1121
# 20250502
1222
if [[ -e $dirmpd/album && $( uniq -d $dirmpd/album ) ]]; then
1323
for t in album latest; do
@@ -16,11 +26,6 @@ if [[ -e $dirmpd/album && $( uniq -d $dirmpd/album ) ]]; then
1626
done
1727
fi
1828

19-
if ! locale | grep -qi ^LANG=.*utf-*8; then
20-
! locale -a | grep -q ^C.utf8 && locale-gen C.utf8
21-
localectl set-locale LANG=C.utf8
22-
fi
23-
2429
file=/etc/systemd/system/cava.service
2530
if ! grep -q ^User $file; then
2631
sed -i -e '/^ExecStart/ i\User=root' -e 's/cava/vu/' $file
@@ -34,23 +39,6 @@ if ! grep -q ^User $file; then
3439
[[ -e $dirsystem/vuled ]] && systemctl start cava
3540
fi
3641

37-
# 20250404
38-
file=/etc/systemd/system/localbrowser.service
39-
if grep -q startx$ $file; then
40-
sed -i -E 's|^(ExecStart=).*|\1/usr/bin/startx /srv/http/bash/startx.sh|' $file
41-
systemctl daemon-reload
42-
rm /etc/X11/xinit/xinitrc
43-
fi
44-
45-
if [[ $( pacman -Q snapcast ) != 'snapcast 0.31.0-3' ]]; then
46-
pacman -Sy --noconfirm snapcast
47-
if [[ $? == 0 ]]; then
48-
sed -i -e '/^bind_to_address/ d' -e '/^#bind_to_address/ a\bind_to_address = 0.0.0.0' /etc/snapserver.conf
49-
else
50-
echo $warn upgrade snapcast failed.
51-
fi
52-
fi
53-
5442
#-------------------------------------------------------------------------------
5543
installstart "$1"
5644

srv/http/assets/css/camilla.css

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
line-height: 17px;
2424
text-align: center;
2525
background: var( --cg );
26-
border-radius: 3px;
26+
border-radius: var( --radius-chk );
2727
}
2828
#in::before {
2929
color: #000;
@@ -64,6 +64,9 @@
6464
background: var( --cm );
6565
transition-duration: 0.1s;
6666
}
67+
.bar.local {
68+
transition-duration: 0s !important; /* lower cpu load on localbrowser */
69+
}
6770
#vugrid {
6871
position: absolute;
6972
width: 100%;
@@ -130,7 +133,8 @@
130133
color: var( --cg60 );
131134
}
132135
.db,
133-
#volume-level {
136+
#volume-level,
137+
#volume-mute {
134138
display: inline-block;
135139
width: 45px;
136140
min-width: 45px;
@@ -139,6 +143,9 @@
139143
text-align: center;
140144
color: var( --cw );
141145
}
146+
#volume-mute {
147+
color: var( --cml );
148+
}
142149
.db {
143150
float: left;
144151
}
@@ -203,12 +210,6 @@ i.bypassed {
203210
line-height: 14px;
204211
color: var( --cg60 );
205212
}
206-
.tab .select2-container {
207-
margin-bottom: 1px;
208-
}
209-
.tab .select2-container.channel {
210-
width: 65px !important;
211-
}
212213
#divsampling .statuslist {
213214
margin-top: 15px;
214215
}
@@ -257,11 +258,6 @@ i.bypassed {
257258
.lihead.main {
258259
background: var( --cgd );
259260
}
260-
.lihead .select2 {
261-
float: none;
262-
display: inline-block;
263-
width: 65px !important;
264-
}
265261
.lihead .i-back {
266262
float: right !important;
267263
margin-right: 3px !important;
@@ -303,17 +299,10 @@ i.bypassed {
303299
width: 142px;
304300
min-width: 142px;
305301
}
306-
.liinput.main div:first-child,
307-
.liinput .select2-container {
302+
.liinput.main div:first-child {
308303
width: 60px !important;
309304
min-width: 60px;
310305
}
311-
.liinput .selection,
312-
.liinput .select2-selection,
313-
.liinput .select2-selection__rendered {
314-
width: 100% !important;
315-
height: 40px !important;
316-
}
317306
.liinput i {
318307
height: 38px;
319308
}
@@ -392,14 +381,20 @@ i.disabled {
392381
top: 0;
393382
left: 0;
394383
}
395-
.slider .thumb {
384+
#vol {
396385
position: relative;
386+
width: 190px;
387+
height: 40px;
388+
}
389+
.slider .thumb {
390+
position: absolute;
397391
width: 40px;
398392
height: 40px;
399-
border-radius: 4px;
393+
border-radius: var( --radius-btn );
400394
background: var( --glossy-btn );
401395
background-color: var( --cm );
402396
box-shadow: var( --shadow-btn );
397+
transition: all 0s linear;
403398
}
404399
.slider.disabled .thumb {
405400
background-color: var( --cmd );

srv/http/assets/css/colors.css

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,26 @@
2424
--cma : hsl( var( --h ), var( --s ), var( --ml30 ) );
2525
--cmd : hsl( var( --h ), var( --s ), var( --ml20 ) );
2626

27-
--shadow-btn : -2px 2px 4px #000;
28-
--shadow-btn-u : -2px -2px 4px #000;
27+
--shadow-btn : -2px 2px 4px #000;
28+
--shadow-btn-u : -2px -2px 4px #000;
2929
--shadow-bar : 0 0 10px 4px #000;
30-
--shadow-check : -1px 1px 2px 1px #000;
30+
--shadow-check : -1px 1px 2px 1px #000;
31+
--shadow-drop : -2px 2px 4px 2px #000;
3132
--shadow-menu : 4px 4px 10px #000;
3233
--shadow-menu-l : -4px 4px 10px #000;
3334
--shadow-menu-u : -4px -4px 10px #000;
34-
--shadow-search : -2px 2px 4px #000;
35-
--shadow-select : -1px 1px 1px #000;
36-
--shadow-text : -1px 0 2px #000;
35+
--shadow-select : -1px 1px 1px #000;
36+
--shadow-text : -1px 0 2px #000;
3737
/* w h x y inner(color) w outer(color) w */
3838
--glossy-btn : radial-gradient( 225% 90% at 100% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%, 0) 55% );
3939
--glossy-btn-l : radial-gradient( 225% 90% at 100% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%, 0) 55% );
4040
--glossy-btn-r : radial-gradient( 300% 90% at 0% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%, 0) 55% );
4141
--glossy-btn-m : linear-gradient( to bottom, hsla(0,0%,100%,.3) 0%, hsla(0,0%,100%,.3) 45%, hsla(0,0%,0%,0) 50%, hsla(0,0%,0%,0) 100% );
4242

4343
--wheel : conic-gradient( in hsl longer hue, red 0 100% );
44+
45+
--radius-btn : 4px;
46+
--radius-chk : 3px;
4447
}
4548

4649
bl, .bl { color : var( --cm ) !important }

0 commit comments

Comments
 (0)