nemunaire/reveil
1
0
Fork 0
Code Issues 1 Pull requests Releases 27 Activity

New setting: Start volume

Browse source
This commit is contained in:
nemunaire 2025-03-25 18:34:59 +01:00
commit 34917043ce
4 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
model/settings.go
View file

@ -16,6 +16,7 @@ type Settings struct {
PreAlarmAction string `json:"pre_alarm_action"` PreAlarmAction string `json:"pre_alarm_action"`
MaxRunTime time.Duration `json:"max_run_time"` MaxRunTime time.Duration `json:"max_run_time"`
MaxVolume uint16 `json:"max_volume"` MaxVolume uint16 `json:"max_volume"`
StartVolume uint16 `json:"start_volume"`
Federation map[string]FederationServer `json:"federation"` Federation map[string]FederationServer `json:"federation"`
} }

14
player/player.go
View file

@ -22,6 +22,7 @@ type Player struct {
Playlist []string Playlist []string
MaxRunTime time.Duration MaxRunTime time.Duration
MaxVolume uint16 MaxVolume uint16
StartVolume uint16
Stopper chan bool Stopper chan bool
currentCmd *exec.Cmd currentCmd *exec.Cmd
currentCmdCh chan bool currentCmdCh chan bool
@ -95,6 +96,7 @@ func NewPlayer(cfg *config.Config, routines []reveil.Identifier) (*Player, error
currentCmdCh: make(chan bool, 1), currentCmdCh: make(chan bool, 1),
MaxRunTime: settings.MaxRunTime * time.Minute, MaxRunTime: settings.MaxRunTime * time.Minute,
MaxVolume: uint16(settings.MaxVolume), MaxVolume: uint16(settings.MaxVolume),
StartVolume: uint16(settings.StartVolume),
weatherTime: settings.WeatherDelay * time.Minute, weatherTime: settings.WeatherDelay * time.Minute,
weatherAction: wact, weatherAction: wact,
claironTime: settings.GongInterval * time.Minute, claironTime: settings.GongInterval * time.Minute,
@ -204,7 +206,7 @@ loop:
} else { } else {
p.dontUpdateVolume = false p.dontUpdateVolume = false
p.volume = uint16(math.Log(1+float64(p.ntick)/8) * 9500) p.volume = uint16(math.Log(1+float64(p.ntick)/8) * 9500)
p.SetVolume(p.volume) p.SetVolume(p.StartVolume + p.volume)
if p.reverseOrder { if p.reverseOrder {
p.playedItem -= 1 p.playedItem -= 1
@ -226,7 +228,7 @@ loop:
p.ntick += 1 p.ntick += 1
if !p.dontUpdateVolume { if !p.dontUpdateVolume {
p.volume = 3500 + uint16(math.Log(1+float64(p.ntick)/8)*9500) p.volume = 3500 + uint16(math.Log(1+float64(p.ntick)/8)*9500)
p.SetVolume(p.volume) p.SetVolume(p.StartVolume + p.volume)
} }
case <-p.Stopper: case <-p.Stopper:
@ -249,8 +251,12 @@ loopcalm:
for i := 0; i < 128 && p.volume >= 768; i += 1 { for i := 0; i < 128 && p.volume >= 768; i += 1 {
timer := time.NewTimer(40 * time.Millisecond) timer := time.NewTimer(40 * time.Millisecond)
p.volume -= 768 if p.volume <= 0 {
p.SetVolume(p.volume) p.StartVolume -= 768
} else {
p.volume -= 768
}
p.SetVolume(p.StartVolume + p.volume)
select { select {
case <-p.Stopper: case <-p.Stopper:

3
ui/src/lib/settings.js
View file

@ -5,7 +5,7 @@ export class Settings {
} }
} }
update({ language, gong_interval, weather_delay, weather_action, pre_alarm_delay, pre_alarm_action, max_run_time, max_volume, federation }) { update({ language, gong_interval, weather_delay, weather_action, pre_alarm_delay, pre_alarm_action, max_run_time, max_volume, start_volume, federation }) {
this.language = language; this.language = language;
this.gong_interval = gong_interval; this.gong_interval = gong_interval;
this.weather_delay = weather_delay; this.weather_delay = weather_delay;
@ -14,6 +14,7 @@ export class Settings {
this.pre_alarm_action = pre_alarm_action; this.pre_alarm_action = pre_alarm_action;
this.max_run_time = max_run_time; this.max_run_time = max_run_time;
this.max_volume = max_volume; this.max_volume = max_volume;
this.start_volume = start_volume;
this.federation = federation; this.federation = federation;
} }

14
ui/src/routes/settings/+page.svelte
View file

@ -160,6 +160,20 @@
</InputGroup> </InputGroup>
</FormGroup> </FormGroup>
<FormGroup>
<Label for="startVolume">Volume de départ</Label>
<InputGroup>
<Input
type="range"
id="startVolume"
min="0"
max="65535"
bind:value={settings.start_volume}
on:input={() => submitSettings(settings)}
/>
</InputGroup>
</FormGroup>
<FormGroup> <FormGroup>
<Label for="federation">Federation</Label> <Label for="federation">Federation</Label>
<FederationSettings <FederationSettings