Rename audio devices to audio options
This commit is contained in:
@@ -14,7 +14,7 @@ import (
|
|||||||
"rhemawavetech.com/rhemawave/internal/shaderManager"
|
"rhemawavetech.com/rhemawave/internal/shaderManager"
|
||||||
)
|
)
|
||||||
|
|
||||||
type AudioDevices struct {
|
type AudioOptions struct {
|
||||||
Base
|
Base
|
||||||
font *fontManager.FontEntry
|
font *fontManager.FontEntry
|
||||||
textShader *shaderManager.Shader
|
textShader *shaderManager.Shader
|
||||||
@@ -34,7 +34,7 @@ type AudioDevices struct {
|
|||||||
volumeBarH int32
|
volumeBarH int32
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *AudioDevices) Init(ctx *PageCtx) error {
|
func (p *AudioOptions) Init(ctx *PageCtx) error {
|
||||||
var err error
|
var err error
|
||||||
p.verticalMargin = int32(20)
|
p.verticalMargin = int32(20)
|
||||||
|
|
||||||
@@ -84,11 +84,11 @@ func (p *AudioDevices) Init(ctx *PageCtx) error {
|
|||||||
p.prompt.Scale(p.ItemScale)
|
p.prompt.Scale(p.ItemScale)
|
||||||
|
|
||||||
if err = p.CreateAudioStatusItem(); err != nil {
|
if err = p.CreateAudioStatusItem(); err != nil {
|
||||||
logger.Error("failed to create AudioStatusItem in AudioDevices.Init()")
|
logger.Error("failed to create AudioStatusItem in AudioOptions.Init()")
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = p.CreateVolumePercentItem(); err != nil {
|
if err = p.CreateVolumePercentItem(); err != nil {
|
||||||
logger.Error("failed to create VolumePercentItem in AudioDevices.Init()")
|
logger.Error("failed to create VolumePercentItem in AudioOptions.Init()")
|
||||||
}
|
}
|
||||||
|
|
||||||
p.VolumeLabel, err = NewStringItem("Volume", p.font, colors.White)
|
p.VolumeLabel, err = NewStringItem("Volume", p.font, colors.White)
|
||||||
@@ -101,7 +101,7 @@ func (p *AudioDevices) Init(ctx *PageCtx) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *AudioDevices) CreateAudioStatusItem() error {
|
func (p *AudioOptions) CreateAudioStatusItem() error {
|
||||||
on := p.Context.CfgPtr.AudioEnabled
|
on := p.Context.CfgPtr.AudioEnabled
|
||||||
statusString := "Turn Audio Off" // The audio is ON
|
statusString := "Turn Audio Off" // The audio is ON
|
||||||
color := colors.Green
|
color := colors.Green
|
||||||
@@ -120,7 +120,7 @@ func (p *AudioDevices) CreateAudioStatusItem() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// CreateVolumePercentItem creates (or recreates) the percentage label beside the volume bar.
|
// CreateVolumePercentItem creates (or recreates) the percentage label beside the volume bar.
|
||||||
func (p *AudioDevices) CreateVolumePercentItem() error {
|
func (p *AudioOptions) CreateVolumePercentItem() error {
|
||||||
// Free the old texture if one exists
|
// Free the old texture if one exists
|
||||||
if p.volumePercent.ID != 0 {
|
if p.volumePercent.ID != 0 {
|
||||||
gl.DeleteTextures(1, &p.volumePercent.ID)
|
gl.DeleteTextures(1, &p.volumePercent.ID)
|
||||||
@@ -138,7 +138,7 @@ func (p *AudioDevices) CreateVolumePercentItem() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *AudioDevices) layout() {
|
func (p *AudioOptions) layout() {
|
||||||
// Position title at the top
|
// Position title at the top
|
||||||
p.title.X = p.ScreenCenterX - p.title.W/2
|
p.title.X = p.ScreenCenterX - p.title.W/2
|
||||||
p.title.Y = p.ScreenHeight - p.title.H - p.verticalMargin*2
|
p.title.Y = p.ScreenHeight - p.title.H - p.verticalMargin*2
|
||||||
@@ -172,7 +172,7 @@ func (p *AudioDevices) layout() {
|
|||||||
p.volumePercent.Y = barY + (barH-p.volumePercent.H)/2
|
p.volumePercent.Y = barY + (barH-p.volumePercent.H)/2
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *AudioDevices) ToggleAudio() {
|
func (p *AudioOptions) ToggleAudio() {
|
||||||
// Toggle current setting
|
// Toggle current setting
|
||||||
p.Context.CfgPtr.AudioEnabled = !p.Context.CfgPtr.AudioEnabled
|
p.Context.CfgPtr.AudioEnabled = !p.Context.CfgPtr.AudioEnabled
|
||||||
|
|
||||||
@@ -188,7 +188,7 @@ func (p *AudioDevices) ToggleAudio() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// UpdateVolume increments or decrements system volume by level (percent change)
|
// UpdateVolume increments or decrements system volume by level (percent change)
|
||||||
func (p *AudioDevices) UpdateVolume(level int) {
|
func (p *AudioOptions) UpdateVolume(level int) {
|
||||||
// Calculate the new volume
|
// Calculate the new volume
|
||||||
newVol := mixer.ConvertVolume(level) + p.Context.CfgPtr.SavedVolume
|
newVol := mixer.ConvertVolume(level) + p.Context.CfgPtr.SavedVolume
|
||||||
// Check that it's within bounds
|
// Check that it's within bounds
|
||||||
@@ -220,7 +220,7 @@ func (p *AudioDevices) UpdateVolume(level int) {
|
|||||||
p.volumePercent.Y = p.volumeBarY + (p.volumeBarH-p.volumePercent.H)/2
|
p.volumePercent.Y = p.volumeBarY + (p.volumeBarH-p.volumePercent.H)/2
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *AudioDevices) HandleEvent(event *sdl.Event) error {
|
func (p *AudioOptions) HandleEvent(event *sdl.Event) error {
|
||||||
e, ok := (*event).(*sdl.KeyboardEvent)
|
e, ok := (*event).(*sdl.KeyboardEvent)
|
||||||
if !ok || e.Type != sdl.KEYDOWN {
|
if !ok || e.Type != sdl.KEYDOWN {
|
||||||
return nil
|
return nil
|
||||||
@@ -241,7 +241,7 @@ func (p *AudioDevices) HandleEvent(event *sdl.Event) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// renderVolumeBar draws the green outline and the white filled portion.
|
// renderVolumeBar draws the green outline and the white filled portion.
|
||||||
func (p *AudioDevices) renderVolumeBar() error {
|
func (p *AudioOptions) renderVolumeBar() error {
|
||||||
vol := p.Context.CfgPtr.SavedVolume
|
vol := p.Context.CfgPtr.SavedVolume
|
||||||
|
|
||||||
// --- White fill (clipped to current volume fraction) ---
|
// --- White fill (clipped to current volume fraction) ---
|
||||||
@@ -281,7 +281,7 @@ func (p *AudioDevices) renderVolumeBar() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *AudioDevices) Render() error {
|
func (p *AudioOptions) Render() error {
|
||||||
if err := p.RenderTexture(p.textShader, p.title.ID, p.title.Position(), p.title.RawDimensions(), p.title.Color); err != nil {
|
if err := p.RenderTexture(p.textShader, p.title.ID, p.title.Position(), p.title.RawDimensions(), p.title.Color); err != nil {
|
||||||
logger.Error("unable to render title texture: %v", err)
|
logger.Error("unable to render title texture: %v", err)
|
||||||
return fmt.Errorf("unable to render title texture: %w", err)
|
return fmt.Errorf("unable to render title texture: %w", err)
|
||||||
@@ -315,7 +315,7 @@ func (p *AudioDevices) Render() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *AudioDevices) Destroy() error {
|
func (p *AudioOptions) Destroy() error {
|
||||||
gl.DeleteTextures(1, &p.title.ID)
|
gl.DeleteTextures(1, &p.title.ID)
|
||||||
gl.DeleteTextures(1, &p.prompt.ID)
|
gl.DeleteTextures(1, &p.prompt.ID)
|
||||||
gl.DeleteTextures(1, &p.volumePercent.ID)
|
gl.DeleteTextures(1, &p.volumePercent.ID)
|
||||||
@@ -60,7 +60,7 @@ func (r *Router) NavigateTo(p pageType) {
|
|||||||
case WIFI:
|
case WIFI:
|
||||||
r.ActivePage = &WiFiSetupPage{}
|
r.ActivePage = &WiFiSetupPage{}
|
||||||
case AUDIO:
|
case AUDIO:
|
||||||
r.ActivePage = &AudioDevices{}
|
r.ActivePage = &AudioOptions{}
|
||||||
case PROCLAMATIONS:
|
case PROCLAMATIONS:
|
||||||
r.ActivePage = &ProclamationOptions{}
|
r.ActivePage = &ProclamationOptions{}
|
||||||
case LICENSE_KEY:
|
case LICENSE_KEY:
|
||||||
|
|||||||
Reference in New Issue
Block a user