From c0fcb633cf0b3500a33590c710dac44703122459 Mon Sep 17 00:00:00 2001 From: zacaj Date: Sat, 17 Jan 2026 21:53:00 -0500 Subject: [PATCH 01/25] All Tracks tab for Artist page --- ui/browsing/artistpage.go | 193 ++++++++++++++++++++++++++++---------- 1 file changed, 146 insertions(+), 47 deletions(-) diff --git a/ui/browsing/artistpage.go b/ui/browsing/artistpage.go index 9989db0..e5fa289 100644 --- a/ui/browsing/artistpage.go +++ b/ui/browsing/artistpage.go @@ -31,9 +31,10 @@ var ( var _ fyne.Widget = (*ArtistPage)(nil) type artistPageState struct { - artistID string - activeView int - trackSort widgets.TracklistSort + artistID string + activeView int + topTrackSort widgets.TracklistSort + allTrackSort widgets.TracklistSort pool *util.WidgetPool cfg *backend.ArtistPageConfig @@ -42,8 +43,9 @@ type artistPageState struct { im *backend.ImageManager contr *controller.Controller - gridScrollPos float32 // for album grid (or grouped releases) - listScrollPos float32 // for Top Tracks list + gridScrollPos float32 // for album grid (or grouped releases) + topListScrollPos float32 // for Top Tracks list + allListScrollPos float32 // for All Tracks list sectionVis widgets.GroupedReleasesSectionVisibility sectionVisNeedApply bool @@ -69,13 +71,21 @@ type ArtistPage struct { const ( viewTopTracks = "Top Tracks" viewDiscography = "Discography" + viewAllTracks = "All Tracks" ) func NewArtistPage(artistID string, cfg *backend.ArtistPageConfig, pool *util.WidgetPool, pm *backend.PlaybackManager, mp mediaprovider.MediaProvider, im *backend.ImageManager, contr *controller.Controller) *ArtistPage { activeView := 0 - if cfg.InitialView == viewTopTracks { + + switch cfg.InitialView { + case viewDiscography: + activeView = 0 + case viewTopTracks: activeView = 1 + case viewAllTracks: + activeView = 2 } + return newArtistPage(artistPageState{ artistID: artistID, cfg: cfg, @@ -102,7 +112,7 @@ func newArtistPage(state artistPageState) *ArtistPage { if img, ok := state.im.GetCachedArtistImage(state.artistID); ok { a.header.artistImage.SetImage(img, true /*tappable*/) } - viewToggle := widgets.NewToggleText(0, []string{lang.L("Discography"), lang.L("Top Tracks")}) + viewToggle := widgets.NewToggleText(0, []string{lang.L("Discography"), lang.L("Top Tracks"), lang.L("All Tracks")}) viewToggle.SetActivatedLabel(a.activeView) viewToggle.OnChanged = a.onViewChange a.sortButton = widgets.NewSortChooserButton(util.LocalizeSlice(discographySorts), func(selIdx int) { @@ -155,8 +165,14 @@ func (a *ArtistPage) Save() SavedPage { s := a.artistPageState if a.tracklistCtr != nil { tl := a.tracklistCtr.Objects[0].(*widgets.Tracklist) - s.listScrollPos = tl.GetScrollOffset() - s.trackSort = tl.Sorting() + switch a.activeView { + case 1: + s.topListScrollPos = tl.GetScrollOffset() + s.topTrackSort = tl.Sorting() + case 2: + s.allListScrollPos = tl.GetScrollOffset() + s.allTrackSort = tl.Sorting() + } tl.Clear() a.pool.Release(util.WidgetTypeTracklist, tl) } @@ -195,7 +211,7 @@ func (g *ArtistPage) Scroll(scrollAmt float32) { g.albumGrid.ScrollToOffset(g.albumGrid.GetScrollOffset() + scrollAmt) } else if g.activeView == 0 && g.groupedReleases != nil { g.groupedReleases.ScrollToOffset(g.groupedReleases.GetScrollOffset() + scrollAmt) - } else if g.activeView == 1 && g.tracklistCtr != nil { + } else if (g.activeView == 1 || g.activeView == 2) && g.tracklistCtr != nil { tl := g.tracklistCtr.Objects[0].(*widgets.Tracklist) tl.ScrollBy(scrollAmt) } @@ -300,17 +316,13 @@ func (a *ArtistPage) load() { } a.artistInfo = artist a.header.Update(artist, a.im) - if a.activeView == 0 { - a.showAlbumGrid(false /*reSort*/) - } else { - go a.showTopTracks() - } }) info, err := a.mp.GetArtistInfo(a.artistID) if err != nil { log.Printf("Failed to get artist info: %s", err.Error()) } + a.onViewChange(a.activeView) fyne.Do(func() { if !a.disposed { a.header.UpdateInfo(info) @@ -329,9 +341,9 @@ func (a *ArtistPage) showAlbumGrid(reSort bool) { useGroupedReleases := a.artistInfo != nil && len(a.artistInfo.Albums) <= 50 && !allAlbums() if a.albumGrid == nil && a.groupedReleases == nil { + a.activeView = 0 if a.artistInfo == nil { // page not loaded yet or invalid artist - a.activeView = 0 // if page still loading, will show discography view first return } if useGroupedReleases { @@ -393,29 +405,20 @@ func (a *ArtistPage) showTopTracks() { a.container.Objects[0].Refresh() } - if a.tracklistCtr == nil { + if a.tracklistCtr == nil || a.activeView != 1 { + a.activeView = 1 if a.artistInfo == nil { // page not loaded yet or invalid artist - a.activeView = 1 // if page still loading, will show tracks view first return } - ts, err := a.mp.GetTopTracks(a.artistInfo.Artist, 20) - if err != nil { - log.Printf("error getting top songs: %s", err.Error()) - return - } - if a.disposed { - return - } - updated = true // mark that updatePage() will be called here + var tl *widgets.Tracklist fyne.Do(func() { - var tl *widgets.Tracklist if t := a.pool.Obtain(util.WidgetTypeTracklist); t != nil { tl = t.(*widgets.Tracklist) tl.Reset() - tl.SetTracks(ts) + tl.SetTracks([]*mediaprovider.Track{}) } else { - tl = widgets.NewTracklist(ts, a.im, false) + tl = widgets.NewTracklist([]*mediaprovider.Track{}, a.im, false) } tl.Options = widgets.TracklistOptions{AutoNumber: true} _, canRate := a.mp.(mediaprovider.SupportsRating) @@ -423,21 +426,106 @@ func (a *ArtistPage) showTopTracks() { tl.Options.DisableRating = !canRate tl.Options.DisableSharing = !canShare tl.SetVisibleColumns(a.cfg.TracklistColumns) - tl.SetSorting(a.trackSort) + tl.SetSorting(a.topTrackSort) tl.OnVisibleColumnsChanged = func(cols []string) { a.cfg.TracklistColumns = cols } - tl.SetNowPlaying(a.nowPlayingID) - a.contr.ConnectTracklistActions(tl) - if a.listScrollPos != 0 { - tl.ScrollToOffset(a.listScrollPos) - a.listScrollPos = 0 - } + a.tracklistCtr = container.New( &layout.CustomPaddedLayout{LeftPadding: 15, RightPadding: 15, BottomPadding: 10}, tl) updatePage() }) + + ts, err := a.mp.GetTopTracks(a.artistInfo.Artist, 20) + if err != nil { + log.Printf("error getting all songs: %s", err.Error()) + return + } + if a.disposed { + return + } + + updated = true // mark that updatePage() will be called here + fyne.Do(func() { + tl.SetTracks(ts) + + tl.SetNowPlaying(a.nowPlayingID) + a.contr.ConnectTracklistActions(tl) + if a.topListScrollPos != 0 { + tl.ScrollToOffset(a.topListScrollPos) + a.topListScrollPos = 0 + } + }) + + } + + if !updated { + fyne.Do(updatePage) + } +} + +// should be called asynchronously +func (a *ArtistPage) showAllTracks() { + updated := false + updatePage := func() { + a.sortButton.Hide() + a.container.Objects[0].(*fyne.Container).Objects[0] = a.tracklistCtr + a.container.Objects[0].Refresh() + } + + if a.tracklistCtr == nil || a.activeView != 2 { + a.activeView = 2 + if a.artistInfo == nil { + // page not loaded yet or invalid artist + return + } + var tl *widgets.Tracklist + fyne.Do(func() { + if t := a.pool.Obtain(util.WidgetTypeTracklist); t != nil { + tl = t.(*widgets.Tracklist) + tl.Reset() + tl.SetTracks([]*mediaprovider.Track{}) + } else { + tl = widgets.NewTracklist([]*mediaprovider.Track{}, a.im, false) + } + tl.Options = widgets.TracklistOptions{AutoNumber: true} + _, canRate := a.mp.(mediaprovider.SupportsRating) + _, canShare := a.mp.(mediaprovider.SupportsSharing) + tl.Options.DisableRating = !canRate + tl.Options.DisableSharing = !canShare + tl.SetVisibleColumns(a.cfg.TracklistColumns) + tl.SetSorting(a.allTrackSort) + tl.OnVisibleColumnsChanged = func(cols []string) { + a.cfg.TracklistColumns = cols + } + + a.tracklistCtr = container.New( + &layout.CustomPaddedLayout{LeftPadding: 15, RightPadding: 15, BottomPadding: 10}, + tl) + updatePage() + }) + + tracks, err := a.mp.GetArtistTracks(a.artistInfo.ID) + if err != nil { + log.Printf("error getting all songs: %s", err.Error()) + return + } + if a.disposed { + return + } + + updated = true // mark that updatePage() will be called here + fyne.Do(func() { + tl.SetTracks(tracks) + + tl.SetNowPlaying(a.nowPlayingID) + a.contr.ConnectTracklistActions(tl) + if a.allListScrollPos != 0 { + tl.ScrollToOffset(a.allListScrollPos) + a.allListScrollPos = 0 + } + }) } if !updated { @@ -446,18 +534,29 @@ func (a *ArtistPage) showTopTracks() { } func (a *ArtistPage) onViewChange(num int) { - if num == 0 { - a.showAlbumGrid(false /*reSort*/) - } else { - // needs to request info from server if first time, - // so call it asynchronously - go a.showTopTracks() + // save current data + if a.tracklistCtr != nil { + tl := a.tracklistCtr.Objects[0].(*widgets.Tracklist) + switch a.activeView { + case 1: + a.topListScrollPos = tl.GetScrollOffset() + a.topTrackSort = tl.Sorting() + case 2: + a.allListScrollPos = tl.GetScrollOffset() + a.allTrackSort = tl.Sorting() + } } - a.activeView = num - if num == 1 { - a.cfg.InitialView = viewTopTracks - } else { + + switch num { + case 0: + a.showAlbumGrid(false /*reSort*/) a.cfg.InitialView = viewDiscography + case 1: + go a.showTopTracks() + a.cfg.InitialView = viewTopTracks + case 2: + go a.showAllTracks() + a.cfg.InitialView = viewAllTracks } } From f20e37fc5cd9b29ed7dbbae72ce976bf8e97001a Mon Sep 17 00:00:00 2001 From: zacaj Date: Sun, 18 Jan 2026 17:19:23 +0000 Subject: [PATCH 02/25] fix artist error logs --- ui/browsing/artistpage.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/browsing/artistpage.go b/ui/browsing/artistpage.go index e5fa289..33916cd 100644 --- a/ui/browsing/artistpage.go +++ b/ui/browsing/artistpage.go @@ -439,7 +439,7 @@ func (a *ArtistPage) showTopTracks() { ts, err := a.mp.GetTopTracks(a.artistInfo.Artist, 20) if err != nil { - log.Printf("error getting all songs: %s", err.Error()) + log.Printf("error getting top songs: %s", err.Error()) return } if a.disposed { @@ -508,7 +508,7 @@ func (a *ArtistPage) showAllTracks() { tracks, err := a.mp.GetArtistTracks(a.artistInfo.ID) if err != nil { - log.Printf("error getting all songs: %s", err.Error()) + log.Printf("error getting all songs for artist: %s", err.Error()) return } if a.disposed { From 53b91f5d43e9cd52b9cdbc525b9514840c573a2c Mon Sep 17 00:00:00 2001 From: Gianluca Boiano Date: Sun, 1 Feb 2026 22:18:00 +0100 Subject: [PATCH 03/25] Disable waveform seekbar by default --- backend/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/config.go b/backend/config.go index d02679f..fa94c1a 100644 --- a/backend/config.go +++ b/backend/config.go @@ -260,7 +260,7 @@ func DefaultConfig(appVersionTag string) *Config { Playback: PlaybackConfig{ Autoplay: false, RepeatMode: "None", - UseWaveformSeekbar: true, + UseWaveformSeekbar: false, }, LocalPlayback: LocalPlaybackConfig{ // "auto" is the name to pass to MPV for autoselecting the output device From 43e8d0a4534505838d67088ba351e6b7d3cb27e8 Mon Sep 17 00:00:00 2001 From: Gianluca Boiano Date: Sun, 1 Feb 2026 22:29:28 +0100 Subject: [PATCH 04/25] Optimize resource usage in waveform generation and image cache - Replace sleep-based polling in waveform generation with channel-based synchronization to reduce CPU usage and improve responsiveness - Add sync.Pool for audio buffers in waveform analysis to reduce memory allocations - Fix critical bug in ImageCache where struct field updates were not being persisted to the map, causing LRU tracking to fail - Optimize ImageCache evictOne() to use single pass instead of two separate iterations through all cache items - Upgrade read locks to write locks in ImageCache Get methods to ensure struct updates are properly saved --- backend/imagecache.go | 51 ++++++++++++++++++++++++++-------------- backend/waveformimage.go | 47 +++++++++++++++++++++++++++++------- 2 files changed, 72 insertions(+), 26 deletions(-) diff --git a/backend/imagecache.go b/backend/imagecache.go index cd52212..3b1d667 100644 --- a/backend/imagecache.go +++ b/backend/imagecache.go @@ -51,11 +51,13 @@ func (i *ImageCache) SetWithTTL(key string, val image.Image, ttl time.Duration) i.mu.Lock() defer i.mu.Unlock() + now := time.Now().Unix() if v, ok := i.cache[key]; ok { v.val = val v.ttl = ttl v.expiresAt = time.Now().Add(v.ttl).Unix() - v.lastAccessed = time.Now().Unix() + v.lastAccessed = now + i.cache[key] = v // Update the map with modified struct return } if len(i.cache) == i.MaxSize { @@ -65,7 +67,7 @@ func (i *ImageCache) SetWithTTL(key string, val image.Image, ttl time.Duration) val: val, ttl: ttl, expiresAt: time.Now().Add(ttl).Unix(), - lastAccessed: time.Now().Unix(), + lastAccessed: now, } } @@ -86,14 +88,15 @@ func (i *ImageCache) Get(key string) (image.Image, error) { } func (i *ImageCache) GetResetTTL(key string, resetTTL bool) (image.Image, error) { - i.mu.RLock() - defer i.mu.RUnlock() + i.mu.Lock() + defer i.mu.Unlock() if v, ok := i.cache[key]; ok { v.lastAccessed = time.Now().Unix() if resetTTL { v.expiresAt = time.Now().Add(v.ttl).Unix() } + i.cache[key] = v // Update the map with modified struct return v.val, nil } return nil, ErrNotFound @@ -101,26 +104,29 @@ func (i *ImageCache) GetResetTTL(key string, resetTTL bool) (image.Image, error) // Gets the image if it exists and extends TTL to time.Now + ttl iff the image would expire before then func (i *ImageCache) GetExtendTTL(key string, ttl time.Duration) (image.Image, error) { - i.mu.RLock() - defer i.mu.RUnlock() + i.mu.Lock() + defer i.mu.Unlock() if v, ok := i.cache[key]; ok { v.lastAccessed = time.Now().Unix() - if v.expiresAt < time.Now().Add(ttl).Unix() { - v.expiresAt = time.Now().Add(ttl).Unix() + newExpiry := time.Now().Add(ttl).Unix() + if v.expiresAt < newExpiry { + v.expiresAt = newExpiry } + i.cache[key] = v // Update the map with modified struct return v.val, nil } return nil, ErrNotFound } func (i *ImageCache) GetWithNewTTL(key string, newTtl time.Duration) (image.Image, error) { - i.mu.RLock() - defer i.mu.RUnlock() + i.mu.Lock() + defer i.mu.Unlock() if v, ok := i.cache[key]; ok { v.lastAccessed = time.Now().Unix() v.expiresAt = time.Now().Add(newTtl).Unix() v.ttl = newTtl + i.cache[key] = v // Update the map with modified struct return v.val, nil } return nil, ErrNotFound @@ -137,24 +143,33 @@ func (i *ImageCache) Clear() { func (i *ImageCache) evictOne() { now := time.Now().Unix() var lruKey string - lruTime := now + lruTime := now + 1 // Initialize to future time so any item will be less var lruExpiredKey string - lruExpiredTime := now + lruExpiredTime := now + 1 // Initialize to future time + hasExpired := false + + // Single pass through the cache to find both LRU expired and LRU items for k, v := range i.cache { - if v.expiresAt < now && v.lastAccessed < lruExpiredTime { - lruExpiredTime = v.lastAccessed - lruExpiredKey = k + if v.expiresAt < now { + // This item is expired + if v.lastAccessed < lruExpiredTime { + lruExpiredTime = v.lastAccessed + lruExpiredKey = k + hasExpired = true + } } + // Track LRU regardless of expiration if v.lastAccessed < lruTime { lruTime = v.lastAccessed lruKey = k } } - if lruExpiredTime < now { - // deleting LRU expired item + + if hasExpired { + // Prefer deleting LRU expired item delete(i.cache, lruExpiredKey) } else { - // no expired items, delete LRU non-expired item + // No expired items, delete LRU non-expired item delete(i.cache, lruKey) } } diff --git a/backend/waveformimage.go b/backend/waveformimage.go index 89d1603..3900cb5 100644 --- a/backend/waveformimage.go +++ b/backend/waveformimage.go @@ -25,6 +25,13 @@ type WaveformImageGenerator struct { audioCache *AudioCache } +// Buffer pool for waveform analysis to reduce allocations +var audioBufferPool = sync.Pool{ + New: func() any { + return &audio.IntBuffer{Data: make([]int, 4096)} + }, +} + type WaveformImage = image.NRGBA func NewWaveformImage() *WaveformImage { @@ -192,13 +199,19 @@ func (w *WaveformImageGenerator) StartWaveformGeneration(item *mediaprovider.Tra } // Start analyzing the converted wav file - data := &waveformData{} + data := &waveformData{notify: make(chan struct{}, 1)} go func() { err := analyzeWavFile(ctx, transcodeFile, data, item.Duration.Milliseconds(), func() bool { return wavConvertDone }) if err != nil { job.setError(err) } data.done = true + // Final notification that processing is complete + select { + case data.notify <- struct{}{}: + default: + } + close(data.notify) }() // Start generating the waveform image @@ -216,6 +229,7 @@ type waveformData struct { progress int // first invalid index for Peak/RMS data done bool + notify chan struct{} // signals when new data is available } func generateWaveformImage(ctx context.Context, data *waveformData, job *WaveformImageJob) { @@ -227,14 +241,18 @@ func generateWaveformImage(ctx context.Context, data *waveformData, job *Wavefor translucentColor := color.NRGBA{R: 255, G: 255, B: 255, A: 128} for x := range 1024 { - for data.progress <= x { - if data.done { - return - } - if ctx.Err() != nil { + // Wait for data to be available instead of polling + for data.progress <= x && !data.done { + select { + case <-ctx.Done(): return // expired + case <-data.notify: + // New data available or processing complete } - time.Sleep(50 * time.Millisecond) + } + + if data.progress <= x { + return // done but data not available for this x } rmsPixels := int(data.RMS[x]) * centerY / 255 @@ -282,7 +300,10 @@ func analyzeWavFile(ctx context.Context, transcodeFile string, data *waveformDat return err } - buf := &audio.IntBuffer{Data: make([]int, 4096)} + // Get buffer from pool to reduce allocations + buf := audioBufferPool.Get().(*audio.IntBuffer) + defer audioBufferPool.Put(buf) + curChunk := 0 chunkSamples := make([]float64, 0, samplesPerChunk) bytesPerSample := int64(2 * format.NumChannels) // 16-bit = 2 bytes per channel @@ -353,6 +374,11 @@ func analyzeWavFile(ctx context.Context, transcodeFile string, data *waveformDat } curChunk++ data.progress = curChunk + // Notify that new data is available (non-blocking) + select { + case data.notify <- struct{}{}: + default: + } chunkSamples = chunkSamples[:0] if curChunk >= 1024 { break @@ -367,6 +393,11 @@ func analyzeWavFile(ctx context.Context, transcodeFile string, data *waveformDat data.Peak[curChunk] = float64ToByte(peak) data.RMS[curChunk] = float64ToByte(rms) data.progress = curChunk + 1 + // Notify that final data is available (non-blocking) + select { + case data.notify <- struct{}{}: + default: + } } return nil From ada1564be7c7f4c609846fae02e56d8f60771195 Mon Sep 17 00:00:00 2001 From: Gianluca Boiano Date: Sun, 1 Feb 2026 22:33:12 +0100 Subject: [PATCH 05/25] Fix WidgetPool goroutine and ticker leak - Add context cancellation to WidgetPool cleanup goroutine - Properly stop ticker when context is canceled - Add BackgroundContext() getter method to App for context access - Pass application context to NewWidgetPool for lifecycle management This fixes a resource leak where the cleanup goroutine would run indefinitely without any way to stop it, preventing proper cleanup on application shutdown. --- backend/app.go | 6 ++++++ ui/browsing/router.go | 2 +- ui/util/widgetpool.go | 22 ++++++++++++++++------ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/backend/app.go b/backend/app.go index 4d66c90..e1e71b5 100644 --- a/backend/app.go +++ b/backend/app.go @@ -504,6 +504,12 @@ func (a *App) DeleteServerCacheDir(serverID uuid.UUID) error { return os.RemoveAll(path) } +// BackgroundContext returns the application's background context +// which is canceled when the application shuts down. +func (a *App) BackgroundContext() context.Context { + return a.bgrndCtx +} + func (a *App) Shutdown() { if a.logFile != nil { a.logFile.Close() diff --git a/ui/browsing/router.go b/ui/browsing/router.go index 0530e7c..7d16c38 100644 --- a/ui/browsing/router.go +++ b/ui/browsing/router.go @@ -26,7 +26,7 @@ func NewRouter(app *backend.App, controller *controller.Controller, nav Navigati App: app, Controller: controller, Nav: nav, - widgetPool: util.NewWidgetPool(), + widgetPool: util.NewWidgetPool(app.BackgroundContext()), } return r } diff --git a/ui/util/widgetpool.go b/ui/util/widgetpool.go index d41e69e..a81d1cc 100644 --- a/ui/util/widgetpool.go +++ b/ui/util/widgetpool.go @@ -1,6 +1,7 @@ package util import ( + "context" "sync" "time" @@ -31,8 +32,9 @@ const ( // A pool to share commonly-used widgets across pages to reduce // creation of new widgets and memory allocations. type WidgetPool struct { - mut sync.Mutex - pools [][]pooledWidget + mut sync.Mutex + pools [][]pooledWidget + cancel context.CancelFunc } type pooledWidget struct { @@ -40,14 +42,22 @@ type pooledWidget struct { releasedAt int64 // unixMillis } -func NewWidgetPool() *WidgetPool { +func NewWidgetPool(ctx context.Context) *WidgetPool { + ctx, cancel := context.WithCancel(ctx) p := &WidgetPool{ - pools: make([][]pooledWidget, numWidgetTypes), + pools: make([][]pooledWidget, numWidgetTypes), + cancel: cancel, } go func() { t := time.NewTicker(2 * time.Minute) - for range t.C { - p.cleanUpExpiredItems() + defer t.Stop() + for { + select { + case <-ctx.Done(): + return + case <-t.C: + p.cleanUpExpiredItems() + } } }() return p From df9311e8b140d557f08b4d64fbc5f33074b30221 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Mon, 2 Feb 2026 07:54:52 -0800 Subject: [PATCH 06/25] remove cancel which is no longer used --- ui/util/widgetpool.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/ui/util/widgetpool.go b/ui/util/widgetpool.go index a81d1cc..c3f53f9 100644 --- a/ui/util/widgetpool.go +++ b/ui/util/widgetpool.go @@ -34,7 +34,6 @@ const ( type WidgetPool struct { mut sync.Mutex pools [][]pooledWidget - cancel context.CancelFunc } type pooledWidget struct { @@ -43,10 +42,8 @@ type pooledWidget struct { } func NewWidgetPool(ctx context.Context) *WidgetPool { - ctx, cancel := context.WithCancel(ctx) p := &WidgetPool{ pools: make([][]pooledWidget, numWidgetTypes), - cancel: cancel, } go func() { t := time.NewTicker(2 * time.Minute) From 6ab0258584a769cbc44a4f991a0c07fceab8c719 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Mon, 2 Feb 2026 07:55:18 -0800 Subject: [PATCH 07/25] gofmt --- ui/util/widgetpool.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/util/widgetpool.go b/ui/util/widgetpool.go index c3f53f9..8f373c8 100644 --- a/ui/util/widgetpool.go +++ b/ui/util/widgetpool.go @@ -32,8 +32,8 @@ const ( // A pool to share commonly-used widgets across pages to reduce // creation of new widgets and memory allocations. type WidgetPool struct { - mut sync.Mutex - pools [][]pooledWidget + mut sync.Mutex + pools [][]pooledWidget } type pooledWidget struct { @@ -43,7 +43,7 @@ type pooledWidget struct { func NewWidgetPool(ctx context.Context) *WidgetPool { p := &WidgetPool{ - pools: make([][]pooledWidget, numWidgetTypes), + pools: make([][]pooledWidget, numWidgetTypes), } go func() { t := time.NewTicker(2 * time.Minute) From 13cb67284cc5a9af7cb1acde14e5b8b6f1c9b3e8 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Tue, 3 Feb 2026 08:40:30 -0800 Subject: [PATCH 08/25] some reworking --- ui/browsing/artistpage.go | 214 +++++++++++++++++++------------------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/ui/browsing/artistpage.go b/ui/browsing/artistpage.go index 33916cd..f2553b6 100644 --- a/ui/browsing/artistpage.go +++ b/ui/browsing/artistpage.go @@ -59,6 +59,9 @@ type ArtistPage struct { artistInfo *mediaprovider.ArtistWithAlbums + topTracks []*mediaprovider.Track + allTracks []*mediaprovider.Track + albumGrid *widgets.GridView groupedReleases *widgets.GroupedReleases tracklistCtr *fyne.Container @@ -157,6 +160,8 @@ func (a *ArtistPage) Route() controller.Route { } func (a *ArtistPage) Reload() { + a.topTracks = nil + a.allTracks = nil go a.load() } @@ -316,13 +321,13 @@ func (a *ArtistPage) load() { } a.artistInfo = artist a.header.Update(artist, a.im) + a.onViewChange(a.activeView) }) info, err := a.mp.GetArtistInfo(a.artistID) if err != nil { log.Printf("Failed to get artist info: %s", err.Error()) } - a.onViewChange(a.activeView) fyne.Do(func() { if !a.disposed { a.header.UpdateInfo(info) @@ -331,6 +336,11 @@ func (a *ArtistPage) load() { } func (a *ArtistPage) showAlbumGrid(reSort bool) { + if a.activeView == 0 && a.albumGrid != nil { + return // already showing album grid + } + a.activeView = 0 + allAlbums := func() bool { return slices.IndexFunc(a.artistInfo.Albums, func(al *mediaprovider.Album) bool { return al.ReleaseTypes&mediaprovider.ReleaseTypeCompilation > 0 || @@ -341,7 +351,6 @@ func (a *ArtistPage) showAlbumGrid(reSort bool) { useGroupedReleases := a.artistInfo != nil && len(a.artistInfo.Albums) <= 50 && !allAlbums() if a.albumGrid == nil && a.groupedReleases == nil { - a.activeView = 0 if a.artistInfo == nil { // page not loaded yet or invalid artist return @@ -396,141 +405,129 @@ func (a *ArtistPage) showAlbumGrid(reSort bool) { a.container.Objects[0].Refresh() } -// should be called asynchronously func (a *ArtistPage) showTopTracks() { - updated := false - updatePage := func() { - a.sortButton.Hide() - a.container.Objects[0].(*fyne.Container).Objects[0] = a.tracklistCtr - a.container.Objects[0].Refresh() + if a.activeView == 1 && a.tracklistCtr != nil { + return // already showing top tracks } - if a.tracklistCtr == nil || a.activeView != 1 { - a.activeView = 1 - if a.artistInfo == nil { - // page not loaded yet or invalid artist - return + var tl *widgets.Tracklist + if a.tracklistCtr == nil { + tl = a.obtainNewTracklist() + a.tracklistCtr = container.New( + &layout.CustomPaddedLayout{LeftPadding: 15, RightPadding: 15, BottomPadding: 10}, + tl) + a.contr.ConnectTracklistActions(tl) + } else { + tl = a.tracklistCtr.Objects[0].(*widgets.Tracklist) + tl.Clear() + } + a.activeView = 1 + tl.SetSorting(a.topTrackSort) + a.container.Objects[0].(*fyne.Container).Objects[0] = a.tracklistCtr + a.container.Objects[0].Refresh() + + updateTracklist := func(ts []*mediaprovider.Track) { + tl.SetTracks(ts) + tl.SetNowPlaying(a.nowPlayingID) + if a.topListScrollPos != 0 { + tl.ScrollToOffset(a.topListScrollPos) } - var tl *widgets.Tracklist - fyne.Do(func() { - if t := a.pool.Obtain(util.WidgetTypeTracklist); t != nil { - tl = t.(*widgets.Tracklist) - tl.Reset() - tl.SetTracks([]*mediaprovider.Track{}) - } else { - tl = widgets.NewTracklist([]*mediaprovider.Track{}, a.im, false) - } - tl.Options = widgets.TracklistOptions{AutoNumber: true} - _, canRate := a.mp.(mediaprovider.SupportsRating) - _, canShare := a.mp.(mediaprovider.SupportsSharing) - tl.Options.DisableRating = !canRate - tl.Options.DisableSharing = !canShare - tl.SetVisibleColumns(a.cfg.TracklistColumns) - tl.SetSorting(a.topTrackSort) - tl.OnVisibleColumnsChanged = func(cols []string) { - a.cfg.TracklistColumns = cols - } - - a.tracklistCtr = container.New( - &layout.CustomPaddedLayout{LeftPadding: 15, RightPadding: 15, BottomPadding: 10}, - tl) - updatePage() - }) + } + if a.topTracks != nil { + updateTracklist(a.topTracks) + return + } + tl.SetLoading(true) + go func() { ts, err := a.mp.GetTopTracks(a.artistInfo.Artist, 20) if err != nil { log.Printf("error getting top songs: %s", err.Error()) return } - if a.disposed { + if a.disposed || a.activeView != 1 { return } - updated = true // mark that updatePage() will be called here fyne.Do(func() { - tl.SetTracks(ts) - - tl.SetNowPlaying(a.nowPlayingID) - a.contr.ConnectTracklistActions(tl) - if a.topListScrollPos != 0 { - tl.ScrollToOffset(a.topListScrollPos) - a.topListScrollPos = 0 - } + a.topTracks = ts + tl.SetLoading(false) + updateTracklist(ts) }) - - } - - if !updated { - fyne.Do(updatePage) - } + }() } -// should be called asynchronously func (a *ArtistPage) showAllTracks() { - updated := false - updatePage := func() { - a.sortButton.Hide() - a.container.Objects[0].(*fyne.Container).Objects[0] = a.tracklistCtr - a.container.Objects[0].Refresh() + if a.activeView == 2 && a.tracklistCtr != nil { + return // already showing all tracks } - if a.tracklistCtr == nil || a.activeView != 2 { - a.activeView = 2 - if a.artistInfo == nil { - // page not loaded yet or invalid artist - return + var tl *widgets.Tracklist + if a.tracklistCtr == nil { + tl = a.obtainNewTracklist() + a.tracklistCtr = container.New( + &layout.CustomPaddedLayout{LeftPadding: 15, RightPadding: 15, BottomPadding: 10}, + tl) + a.contr.ConnectTracklistActions(tl) + } else { + tl = a.tracklistCtr.Objects[0].(*widgets.Tracklist) + tl.Clear() + } + a.activeView = 2 + tl.SetSorting(a.allTrackSort) + a.container.Objects[0].(*fyne.Container).Objects[0] = a.tracklistCtr + a.container.Objects[0].Refresh() + + updateTracklist := func(ts []*mediaprovider.Track) { + tl.SetTracks(ts) + tl.SetNowPlaying(a.nowPlayingID) + if a.allListScrollPos != 0 { + tl.ScrollToOffset(a.allListScrollPos) } - var tl *widgets.Tracklist - fyne.Do(func() { - if t := a.pool.Obtain(util.WidgetTypeTracklist); t != nil { - tl = t.(*widgets.Tracklist) - tl.Reset() - tl.SetTracks([]*mediaprovider.Track{}) - } else { - tl = widgets.NewTracklist([]*mediaprovider.Track{}, a.im, false) - } - tl.Options = widgets.TracklistOptions{AutoNumber: true} - _, canRate := a.mp.(mediaprovider.SupportsRating) - _, canShare := a.mp.(mediaprovider.SupportsSharing) - tl.Options.DisableRating = !canRate - tl.Options.DisableSharing = !canShare - tl.SetVisibleColumns(a.cfg.TracklistColumns) - tl.SetSorting(a.allTrackSort) - tl.OnVisibleColumnsChanged = func(cols []string) { - a.cfg.TracklistColumns = cols - } + } + if a.allTracks != nil { + updateTracklist(a.allTracks) + return + } - a.tracklistCtr = container.New( - &layout.CustomPaddedLayout{LeftPadding: 15, RightPadding: 15, BottomPadding: 10}, - tl) - updatePage() - }) - - tracks, err := a.mp.GetArtistTracks(a.artistInfo.ID) + tl.SetLoading(true) + go func() { + ts, err := a.mp.GetArtistTracks(a.artistID) if err != nil { - log.Printf("error getting all songs for artist: %s", err.Error()) + log.Printf("error getting all songs: %s", err.Error()) return } - if a.disposed { + if a.disposed || a.activeView != 2 { return } - updated = true // mark that updatePage() will be called here fyne.Do(func() { - tl.SetTracks(tracks) - - tl.SetNowPlaying(a.nowPlayingID) - a.contr.ConnectTracklistActions(tl) - if a.allListScrollPos != 0 { - tl.ScrollToOffset(a.allListScrollPos) - a.allListScrollPos = 0 - } + a.allTracks = ts + tl.SetLoading(false) + updateTracklist(ts) }) - } + }() +} - if !updated { - fyne.Do(updatePage) +func (a *ArtistPage) obtainNewTracklist() *widgets.Tracklist { + var tl *widgets.Tracklist + if t := a.pool.Obtain(util.WidgetTypeTracklist); t != nil { + tl = t.(*widgets.Tracklist) + tl.Reset() + tl.SetTracks([]*mediaprovider.Track{}) + } else { + tl = widgets.NewTracklist([]*mediaprovider.Track{}, a.im, false) } + tl.Options = widgets.TracklistOptions{AutoNumber: true} + _, canRate := a.mp.(mediaprovider.SupportsRating) + _, canShare := a.mp.(mediaprovider.SupportsSharing) + tl.Options.DisableRating = !canRate + tl.Options.DisableSharing = !canShare + tl.SetVisibleColumns(a.cfg.TracklistColumns) + tl.OnVisibleColumnsChanged = func(cols []string) { + a.cfg.TracklistColumns = cols + } + return tl } func (a *ArtistPage) onViewChange(num int) { @@ -550,12 +547,15 @@ func (a *ArtistPage) onViewChange(num int) { switch num { case 0: a.showAlbumGrid(false /*reSort*/) + a.sortButton.Show() a.cfg.InitialView = viewDiscography case 1: - go a.showTopTracks() + a.showTopTracks() + a.sortButton.Hide() a.cfg.InitialView = viewTopTracks case 2: - go a.showAllTracks() + a.showAllTracks() + a.sortButton.Hide() a.cfg.InitialView = viewAllTracks } } From 2e33b81914b9c5ae873f10ac59dc671dae47c72f Mon Sep 17 00:00:00 2001 From: Gianluca Boiano <491117+M0Rf30@users.noreply.github.com> Date: Tue, 3 Feb 2026 20:39:47 +0100 Subject: [PATCH 09/25] Improve code quality and thread safety (#844) - Format Go files (gofmt) for backend/windows/notify*.go - Add thread safety to Stopwatch with sync.Mutex - Add comprehensive unit tests for Stopwatch with race detection - Add godoc comments to ImageCache public APIs - Improve IPC documentation with platform-specific socket path details - Document portable mode TODO for future enhancement --- backend/imagecache.go | 34 +++++- backend/ipc/conn_other.go | 14 ++- backend/util/stopwatch.go | 29 ++++- backend/util/stopwatch_test.go | 167 ++++++++++++++++++++++++++ backend/windows/notify.go | 150 +++++++++++------------ backend/windows/notify_unsupported.go | 20 +-- 6 files changed, 324 insertions(+), 90 deletions(-) create mode 100644 backend/util/stopwatch_test.go diff --git a/backend/imagecache.go b/backend/imagecache.go index 3b1d667..8357035 100644 --- a/backend/imagecache.go +++ b/backend/imagecache.go @@ -18,7 +18,9 @@ type CacheItem struct { lastAccessed int64 } -// A custom in-memory cache for images with the following eviction strategy: +// ImageCache is a thread-safe in-memory cache for images with LRU eviction. +// +// Eviction strategy: // 1. If there are fewer than MinSize items in the cache, none will be evicted // 2. If a new addition would make the cache exceed MaxSize, an item will be immediately evicted // 2a. in this case, evict the LRU expired item or if none expired, the LRU item @@ -39,14 +41,19 @@ type ImageCache struct { cache map[string]CacheItem } +// ErrNotFound is returned when a requested cache item does not exist. var ErrNotFound = errors.New("item not found") +// Init initializes the cache and starts a background goroutine for periodic eviction. +// The goroutine stops when the provided context is cancelled. func (i *ImageCache) Init(ctx context.Context, evictionInterval time.Duration) { i.cache = make(map[string]CacheItem) go i.periodicallyEvict(ctx, evictionInterval) } -// holds writer lock for O(i.MaxSize) worst case +// SetWithTTL stores an image in the cache with a custom time-to-live duration. +// If the cache is at MaxSize, an item will be evicted using LRU strategy. +// Thread-safe. Holds writer lock for O(MaxSize) worst case. func (i *ImageCache) SetWithTTL(key string, val image.Image, ttl time.Duration) { i.mu.Lock() defer i.mu.Unlock() @@ -71,10 +78,14 @@ func (i *ImageCache) SetWithTTL(key string, val image.Image, ttl time.Duration) } } +// Set stores an image in the cache with the default TTL. +// See SetWithTTL for more details. func (i *ImageCache) Set(key string, val image.Image) { i.SetWithTTL(key, val, i.DefaultTTL) } +// Has returns true if the key exists in the cache, expired or not. +// Thread-safe. func (i *ImageCache) Has(key string) bool { i.mu.RLock() defer i.mu.RUnlock() @@ -83,10 +94,17 @@ func (i *ImageCache) Has(key string) bool { return ok } +// Get retrieves an image from the cache and updates its last accessed time. +// Returns ErrNotFound if the key doesn't exist. +// Thread-safe. func (i *ImageCache) Get(key string) (image.Image, error) { return i.GetResetTTL(key, false) } +// GetResetTTL retrieves an image and optionally resets its expiration time. +// If resetTTL is true, the expiration is reset to now + original TTL. +// Returns ErrNotFound if the key doesn't exist. +// Thread-safe. func (i *ImageCache) GetResetTTL(key string, resetTTL bool) (image.Image, error) { i.mu.Lock() defer i.mu.Unlock() @@ -102,7 +120,11 @@ func (i *ImageCache) GetResetTTL(key string, resetTTL bool) (image.Image, error) return nil, ErrNotFound } -// Gets the image if it exists and extends TTL to time.Now + ttl iff the image would expire before then +// GetExtendTTL retrieves an image and extends its TTL if it would expire sooner. +// The expiration time is extended to now + ttl only if the current expiration +// is earlier than that time. +// Returns ErrNotFound if the key doesn't exist. +// Thread-safe. func (i *ImageCache) GetExtendTTL(key string, ttl time.Duration) (image.Image, error) { i.mu.Lock() defer i.mu.Unlock() @@ -118,6 +140,10 @@ func (i *ImageCache) GetExtendTTL(key string, ttl time.Duration) (image.Image, e return nil, ErrNotFound } +// GetWithNewTTL retrieves an image and replaces its TTL with a new value. +// The expiration time is set to now + newTtl. +// Returns ErrNotFound if the key doesn't exist. +// Thread-safe. func (i *ImageCache) GetWithNewTTL(key string, newTtl time.Duration) (image.Image, error) { i.mu.Lock() defer i.mu.Unlock() @@ -132,6 +158,8 @@ func (i *ImageCache) GetWithNewTTL(key string, newTtl time.Duration) (image.Imag return nil, ErrNotFound } +// Clear removes all items from the cache. +// Thread-safe. func (i *ImageCache) Clear() { i.mu.Lock() defer i.mu.Unlock() diff --git a/backend/ipc/conn_other.go b/backend/ipc/conn_other.go index 5ac6a45..0318bd5 100644 --- a/backend/ipc/conn_other.go +++ b/backend/ipc/conn_other.go @@ -11,6 +11,12 @@ import ( "runtime" ) +// socketPath is automatically initialized based on platform conventions: +// - macOS: ~/Library/Caches/supersonic/supersonic.sock (or /tmp/supersonic-{uid}.sock as fallback) +// - Linux/Unix: $XDG_RUNTIME_DIR/supersonic.sock (or /tmp/supersonic-{uid}.sock as fallback) +// +// TODO: Add support for portable mode by allowing override via environment variable +// or configuration file (e.g., SUPERSONIC_SOCKET_PATH). var socketPath = "/tmp/supersonic.sock" func init() { @@ -29,15 +35,21 @@ func init() { } } +// Dial establishes a connection to the IPC socket. +// Returns an error if the socket doesn't exist or connection fails. func Dial() (net.Conn, error) { - // TODO - use XDG runtime dir, also handle portable mode return net.Dial("unix", socketPath) } +// Listen creates a Unix domain socket listener at the configured path. +// The socket file is created automatically and should be cleaned up +// with DestroyConn() when done. func Listen() (net.Listener, error) { return net.Listen("unix", socketPath) } +// DestroyConn removes the Unix socket file from the filesystem. +// Should be called during application shutdown. func DestroyConn() error { return os.Remove(socketPath) } diff --git a/backend/util/stopwatch.go b/backend/util/stopwatch.go index f3610a2..609795c 100644 --- a/backend/util/stopwatch.go +++ b/backend/util/stopwatch.go @@ -1,14 +1,26 @@ package util -import "time" +import ( + "sync" + "time" +) +// Stopwatch is a thread-safe timer for measuring elapsed time. +// It can be started, stopped, and reset, and supports reading +// the elapsed time while running or stopped. type Stopwatch struct { + mu sync.Mutex running bool started time.Time elapsed time.Duration } +// Start begins or resumes the stopwatch. +// If already running, this is a no-op. func (s *Stopwatch) Start() { + s.mu.Lock() + defer s.mu.Unlock() + if s.running { return } @@ -16,7 +28,12 @@ func (s *Stopwatch) Start() { s.running = true } +// Stop pauses the stopwatch and accumulates the elapsed time. +// If already stopped, this is a no-op. func (s *Stopwatch) Stop() { + s.mu.Lock() + defer s.mu.Unlock() + if !s.running { return } @@ -24,7 +41,13 @@ func (s *Stopwatch) Stop() { s.running = false } +// Elapsed returns the total elapsed time. +// If the stopwatch is running, includes time since last Start(). +// Safe to call concurrently with other methods. func (s *Stopwatch) Elapsed() time.Duration { + s.mu.Lock() + defer s.mu.Unlock() + e := s.elapsed if s.running { e += time.Since(s.started) @@ -32,7 +55,11 @@ func (s *Stopwatch) Elapsed() time.Duration { return e } +// Reset stops the stopwatch and clears the elapsed time. func (s *Stopwatch) Reset() { + s.mu.Lock() + defer s.mu.Unlock() + s.running = false s.elapsed = time.Duration(0) } diff --git a/backend/util/stopwatch_test.go b/backend/util/stopwatch_test.go new file mode 100644 index 0000000..60b265f --- /dev/null +++ b/backend/util/stopwatch_test.go @@ -0,0 +1,167 @@ +package util + +import ( + "sync" + "testing" + "time" +) + +func TestStopwatch_Basic(t *testing.T) { + sw := &Stopwatch{} + + // Test initial state + if elapsed := sw.Elapsed(); elapsed != 0 { + t.Errorf("Expected initial elapsed time to be 0, got %v", elapsed) + } + + // Test start and elapsed + sw.Start() + time.Sleep(10 * time.Millisecond) + elapsed := sw.Elapsed() + if elapsed < 10*time.Millisecond { + t.Errorf("Expected at least 10ms elapsed, got %v", elapsed) + } + + // Test stop + sw.Stop() + stoppedElapsed := sw.Elapsed() + time.Sleep(10 * time.Millisecond) + if sw.Elapsed() != stoppedElapsed { + t.Error("Elapsed time should not increase after Stop()") + } + + // Test reset + sw.Reset() + if elapsed := sw.Elapsed(); elapsed != 0 { + t.Errorf("Expected elapsed time to be 0 after reset, got %v", elapsed) + } +} + +func TestStopwatch_StartStop(t *testing.T) { + sw := &Stopwatch{} + + // Start, accumulate some time + sw.Start() + time.Sleep(10 * time.Millisecond) + sw.Stop() + firstElapsed := sw.Elapsed() + + // Start again, accumulate more time + sw.Start() + time.Sleep(10 * time.Millisecond) + sw.Stop() + secondElapsed := sw.Elapsed() + + if secondElapsed <= firstElapsed { + t.Errorf("Expected elapsed time to accumulate, first=%v second=%v", firstElapsed, secondElapsed) + } +} + +func TestStopwatch_DoubleStart(t *testing.T) { + sw := &Stopwatch{} + + sw.Start() + time.Sleep(5 * time.Millisecond) + firstStart := sw.Elapsed() + + // Second Start() should be no-op + sw.Start() + time.Sleep(5 * time.Millisecond) + secondStart := sw.Elapsed() + + // Time should continue from first start + if secondStart < firstStart { + t.Error("Second Start() affected timing") + } +} + +func TestStopwatch_DoubleStop(t *testing.T) { + sw := &Stopwatch{} + + sw.Start() + time.Sleep(10 * time.Millisecond) + sw.Stop() + elapsed := sw.Elapsed() + + // Second Stop() should be no-op + sw.Stop() + if sw.Elapsed() != elapsed { + t.Error("Second Stop() changed elapsed time") + } +} + +func TestStopwatch_ConcurrentAccess(t *testing.T) { + sw := &Stopwatch{} + var wg sync.WaitGroup + + // Test concurrent Start/Stop/Elapsed calls + // This should not cause data races + const goroutines = 10 + const iterations = 100 + + wg.Add(goroutines * 3) + + // Concurrent starts + for i := 0; i < goroutines; i++ { + go func() { + defer wg.Done() + for j := 0; j < iterations; j++ { + sw.Start() + time.Sleep(time.Microsecond) + } + }() + } + + // Concurrent stops + for i := 0; i < goroutines; i++ { + go func() { + defer wg.Done() + for j := 0; j < iterations; j++ { + sw.Stop() + time.Sleep(time.Microsecond) + } + }() + } + + // Concurrent reads + for i := 0; i < goroutines; i++ { + go func() { + defer wg.Done() + for j := 0; j < iterations; j++ { + _ = sw.Elapsed() + time.Sleep(time.Microsecond) + } + }() + } + + wg.Wait() + + // If we got here without data races, the test passes + // Run with: go test -race +} + +func TestStopwatch_Reset(t *testing.T) { + sw := &Stopwatch{} + + // Reset when stopped + sw.Reset() + if elapsed := sw.Elapsed(); elapsed != 0 { + t.Errorf("Expected 0 after reset, got %v", elapsed) + } + + // Reset when running + sw.Start() + time.Sleep(10 * time.Millisecond) + sw.Reset() + if elapsed := sw.Elapsed(); elapsed != 0 { + t.Errorf("Expected 0 after reset while running, got %v", elapsed) + } + + // After reset, should be able to start again + sw.Start() + time.Sleep(5 * time.Millisecond) + elapsed := sw.Elapsed() + if elapsed < 5*time.Millisecond { + t.Errorf("Expected at least 5ms after reset and start, got %v", elapsed) + } +} diff --git a/backend/windows/notify.go b/backend/windows/notify.go index d9ff896..bc7659c 100644 --- a/backend/windows/notify.go +++ b/backend/windows/notify.go @@ -1,75 +1,75 @@ -//go:build windows - -package windows - -import ( - "fmt" - "os" - "os/exec" - "path/filepath" - "strings" - "syscall" - - "fyne.io/fyne/v2" -) - -// The general approach here is copied from Fyne. -// While it seems very hacky (create a temporary Powershell script and execute it), -// shockingly it may be the best approach, at least in the non-installed case. -// The proper Windows APIs for this require WinRT (ie C++/ a DLL), and also require -// the app to be installed with a unique ID in the start menu, and to pass this ID -// when sending the notification. This could be a future exploration for the installer. - -const notificationTemplate = `$title = "%s" -$content = "%s" -$iconPath = "file:///%s" -[Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null -$template = [Windows.UI.Notifications.ToastNotificationManager]::GetTemplateContent([Windows.UI.Notifications.ToastTemplateType]::ToastImageAndText02) -$toastXml = [xml] $template.GetXml() -$toastXml.GetElementsByTagName("text")[0].AppendChild($toastXml.CreateTextNode($title)) > $null -$toastXml.GetElementsByTagName("text")[1].AppendChild($toastXml.CreateTextNode($content)) > $null -$toastXml.GetElementsByTagName("image")[0].SetAttribute("src", $iconPath) > $null -$audio = $toastXml.CreateElement("audio") -$audio.SetAttribute("silent", "true") > $null -$toastXml.DocumentElement.AppendChild($audio) > $null -$xml = New-Object Windows.Data.Xml.Dom.XmlDocument -$xml.LoadXml($toastXml.OuterXml) -$toast = [Windows.UI.Notifications.ToastNotification]::new($xml) -[Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier("%s").Show($toast);` - -func SendNotification(n *fyne.Notification, iconFilePath string) { - title := escapeNotificationString(n.Title) - content := escapeNotificationString(n.Content) - - script := fmt.Sprintf(notificationTemplate, title, content, iconFilePath, "supersonic") - go runScript("notify", script) -} - -func escapeNotificationString(in string) string { - noSlash := strings.ReplaceAll(in, "`", "``") - return strings.ReplaceAll(noSlash, "\"", "`\"") -} - -var scriptNum = 0 - -func runScript(name, script string) { - scriptNum++ - appID := fyne.CurrentApp().UniqueID() - fileName := fmt.Sprintf("supersonic-%s-%s-%d.ps1", appID, name, scriptNum) - - tmpFilePath := filepath.Join(os.TempDir(), fileName) - err := os.WriteFile(tmpFilePath, []byte(script), 0o600) - if err != nil { - fyne.LogError("Could not write script to show notification", err) - return - } - defer os.Remove(tmpFilePath) - - launch := "(Get-Content -Encoding UTF8 -Path " + tmpFilePath + " -Raw) | Invoke-Expression" - cmd := exec.Command("PowerShell", "-ExecutionPolicy", "Bypass", launch) - cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true} - err = cmd.Run() - if err != nil { - fyne.LogError("Failed to launch windows notify script", err) - } -} +//go:build windows + +package windows + +import ( + "fmt" + "os" + "os/exec" + "path/filepath" + "strings" + "syscall" + + "fyne.io/fyne/v2" +) + +// The general approach here is copied from Fyne. +// While it seems very hacky (create a temporary Powershell script and execute it), +// shockingly it may be the best approach, at least in the non-installed case. +// The proper Windows APIs for this require WinRT (ie C++/ a DLL), and also require +// the app to be installed with a unique ID in the start menu, and to pass this ID +// when sending the notification. This could be a future exploration for the installer. + +const notificationTemplate = `$title = "%s" +$content = "%s" +$iconPath = "file:///%s" +[Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null +$template = [Windows.UI.Notifications.ToastNotificationManager]::GetTemplateContent([Windows.UI.Notifications.ToastTemplateType]::ToastImageAndText02) +$toastXml = [xml] $template.GetXml() +$toastXml.GetElementsByTagName("text")[0].AppendChild($toastXml.CreateTextNode($title)) > $null +$toastXml.GetElementsByTagName("text")[1].AppendChild($toastXml.CreateTextNode($content)) > $null +$toastXml.GetElementsByTagName("image")[0].SetAttribute("src", $iconPath) > $null +$audio = $toastXml.CreateElement("audio") +$audio.SetAttribute("silent", "true") > $null +$toastXml.DocumentElement.AppendChild($audio) > $null +$xml = New-Object Windows.Data.Xml.Dom.XmlDocument +$xml.LoadXml($toastXml.OuterXml) +$toast = [Windows.UI.Notifications.ToastNotification]::new($xml) +[Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier("%s").Show($toast);` + +func SendNotification(n *fyne.Notification, iconFilePath string) { + title := escapeNotificationString(n.Title) + content := escapeNotificationString(n.Content) + + script := fmt.Sprintf(notificationTemplate, title, content, iconFilePath, "supersonic") + go runScript("notify", script) +} + +func escapeNotificationString(in string) string { + noSlash := strings.ReplaceAll(in, "`", "``") + return strings.ReplaceAll(noSlash, "\"", "`\"") +} + +var scriptNum = 0 + +func runScript(name, script string) { + scriptNum++ + appID := fyne.CurrentApp().UniqueID() + fileName := fmt.Sprintf("supersonic-%s-%s-%d.ps1", appID, name, scriptNum) + + tmpFilePath := filepath.Join(os.TempDir(), fileName) + err := os.WriteFile(tmpFilePath, []byte(script), 0o600) + if err != nil { + fyne.LogError("Could not write script to show notification", err) + return + } + defer os.Remove(tmpFilePath) + + launch := "(Get-Content -Encoding UTF8 -Path " + tmpFilePath + " -Raw) | Invoke-Expression" + cmd := exec.Command("PowerShell", "-ExecutionPolicy", "Bypass", launch) + cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true} + err = cmd.Run() + if err != nil { + fyne.LogError("Failed to launch windows notify script", err) + } +} diff --git a/backend/windows/notify_unsupported.go b/backend/windows/notify_unsupported.go index f5864e9..91f0d16 100644 --- a/backend/windows/notify_unsupported.go +++ b/backend/windows/notify_unsupported.go @@ -1,10 +1,10 @@ -//go:build !windows - -package windows - -import "fyne.io/fyne/v2" - -func SendNotification(n *fyne.Notification, iconFilePath string) { - fyne.LogError("windows.SendNotification should not be invoked on non-Windows platform", nil) - fyne.CurrentApp().SendNotification(n) -} +//go:build !windows + +package windows + +import "fyne.io/fyne/v2" + +func SendNotification(n *fyne.Notification, iconFilePath string) { + fyne.LogError("windows.SendNotification should not be invoked on non-Windows platform", nil) + fyne.CurrentApp().SendNotification(n) +} From 7e9506d121c60dbf9c5a12346fc514d051e16585 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Wed, 4 Feb 2026 18:17:27 -0800 Subject: [PATCH 10/25] #841: use fyne tools version with linux packaging bugfix --- .github/workflows/build-ubuntu-22.04.yml | 2 +- .github/workflows/build-ubuntu-24.04.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ubuntu-22.04.yml b/.github/workflows/build-ubuntu-22.04.yml index 10da4f2..809a0c1 100644 --- a/.github/workflows/build-ubuntu-22.04.yml +++ b/.github/workflows/build-ubuntu-22.04.yml @@ -25,7 +25,7 @@ jobs: run: sudo apt update && sudo apt install libmpv-dev gcc libegl1-mesa-dev xorg-dev - name: Install Fyne tool - run: go install fyne.io/tools/cmd/fyne@latest + run: go install fyne.io/tools/cmd/fyne@f8f18246771be44fdb1bcae50c932e1b7b1eeac3 - name: Fyne package run: make package_linux diff --git a/.github/workflows/build-ubuntu-24.04.yml b/.github/workflows/build-ubuntu-24.04.yml index 26554fd..adfa90c 100644 --- a/.github/workflows/build-ubuntu-24.04.yml +++ b/.github/workflows/build-ubuntu-24.04.yml @@ -25,7 +25,7 @@ jobs: run: sudo apt update && sudo apt install libmpv-dev gcc libegl1-mesa-dev xorg-dev - name: Install Fyne tool - run: go install fyne.io/tools/cmd/fyne@latest + run: go install fyne.io/tools/cmd/fyne@f8f18246771be44fdb1bcae50c932e1b7b1eeac3 - name: Fyne package run: make package_linux From 08c8c6e421f613dcece08ca5a38d047d9bb12508 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Wed, 4 Feb 2026 18:20:11 -0800 Subject: [PATCH 11/25] Revert "#841: use fyne tools version with linux packaging bugfix" This reverts commit 7e9506d121c60dbf9c5a12346fc514d051e16585. --- .github/workflows/build-ubuntu-22.04.yml | 2 +- .github/workflows/build-ubuntu-24.04.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ubuntu-22.04.yml b/.github/workflows/build-ubuntu-22.04.yml index 809a0c1..10da4f2 100644 --- a/.github/workflows/build-ubuntu-22.04.yml +++ b/.github/workflows/build-ubuntu-22.04.yml @@ -25,7 +25,7 @@ jobs: run: sudo apt update && sudo apt install libmpv-dev gcc libegl1-mesa-dev xorg-dev - name: Install Fyne tool - run: go install fyne.io/tools/cmd/fyne@f8f18246771be44fdb1bcae50c932e1b7b1eeac3 + run: go install fyne.io/tools/cmd/fyne@latest - name: Fyne package run: make package_linux diff --git a/.github/workflows/build-ubuntu-24.04.yml b/.github/workflows/build-ubuntu-24.04.yml index adfa90c..26554fd 100644 --- a/.github/workflows/build-ubuntu-24.04.yml +++ b/.github/workflows/build-ubuntu-24.04.yml @@ -25,7 +25,7 @@ jobs: run: sudo apt update && sudo apt install libmpv-dev gcc libegl1-mesa-dev xorg-dev - name: Install Fyne tool - run: go install fyne.io/tools/cmd/fyne@f8f18246771be44fdb1bcae50c932e1b7b1eeac3 + run: go install fyne.io/tools/cmd/fyne@latest - name: Fyne package run: make package_linux From 3c46889014fab977e436c74293d3d2c812a9092e Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Thu, 5 Feb 2026 07:51:15 -0800 Subject: [PATCH 12/25] Extract and display radio ICY metadata (#845) * extract and display radio ICY metadata * fix crash when casting radio station --- backend/app.go | 9 +++++++++ backend/mpmedia_mac.go | 27 +++++++++++++++++++++------ backend/mpris.go | 30 +++++++++++++++++++++++++++--- backend/playbackengine.go | 19 +++++++++++++++++++ backend/playbackmanager.go | 5 +++++ backend/player/mpv/player.go | 19 +++++++++++++++++++ ui/bottompanel.go | 11 +++++++++++ ui/mainwindow.go | 9 +++++++++ 8 files changed, 120 insertions(+), 9 deletions(-) diff --git a/backend/app.go b/backend/app.go index e1e71b5..9d21d48 100644 --- a/backend/app.go +++ b/backend/app.go @@ -449,6 +449,15 @@ func (a *App) SetupWindowsSMTC(hwnd uintptr) { } }() }) + a.PlaybackManager.OnRadioMetadataChange(func(radioName, title, artist string) { + if title != "" { + smtc.UpdateMetadata(title, artist) + smtc.UpdatePosition(0, 0) + } else { + smtc.UpdateMetadata(radioName, "") + smtc.UpdatePosition(0, 0) + } + }) a.PlaybackManager.OnSeek(func() { playbackStatus := a.PlaybackManager.PlaybackStatus() smtc.UpdatePosition(int(playbackStatus.TimePos*1000), int(playbackStatus.Duration*1000)) diff --git a/backend/mpmedia_mac.go b/backend/mpmedia_mac.go index e6d36ab..ccbbdad 100644 --- a/backend/mpmedia_mac.go +++ b/backend/mpmedia_mac.go @@ -69,15 +69,28 @@ func InitMPMediaHandler(playbackManager *PlaybackManager, artURLLookup func(trac mpMediaEventRecipient = mp C.register_os_remote_commands() - mp.playbackManager.OnSongChange(func(track mediaprovider.MediaItem, _ *mediaprovider.Track) { + mp.playbackManager.OnSongChange(func(item mediaprovider.MediaItem, _ *mediaprovider.Track) { // Asynchronously because artwork fetching can take time var meta *mediaprovider.MediaItemMetadata - if track != nil { - m := track.Metadata() + if item != nil { + m := item.Metadata() meta = &m } go mp.updateMetadata(meta) }) + mp.playbackManager.OnRadioMetadataChange(func(radioName, title, artist string) { + if title != "" { + go mp.updateMetadata(&mediaprovider.MediaItemMetadata{ + Name: title, + Artists: []string{artist}, + Album: radioName, + }) + } else { + go mp.updateMetadata(&mediaprovider.MediaItemMetadata{ + Name: radioName, + }) + } + }) mp.playbackManager.OnStopped(func() { C.set_os_playback_state_stopped() @@ -103,16 +116,18 @@ func InitMPMediaHandler(playbackManager *PlaybackManager, artURLLookup func(trac func (mp *MPMediaHandler) updateMetadata(meta *mediaprovider.MediaItemMetadata) { var title, artist, artURL string var duration int - if meta != nil && meta.ID != "" { + if meta != nil { title = meta.Name + artist = strings.Join(meta.Artists, ", ") + duration = int(meta.Duration.Seconds()) + } + if meta != nil && meta.ID != "" { var err error if artURL, err = mp.artURLLookup(meta.CoverArtID); err != nil { if meta.CoverArtID != "" { log.Printf("error fetching art url: %s", err.Error()) } } - artist = strings.Join(meta.Artists, ", ") - duration = int(meta.Duration.Seconds()) } cTitle := C.CString(title) diff --git a/backend/mpris.go b/backend/mpris.go index 72fe67d..b910601 100644 --- a/backend/mpris.go +++ b/backend/mpris.go @@ -43,6 +43,11 @@ type MPRISHandler struct { pm *PlaybackManager s *server.Server evt *events.EventHandler + + // current radio metadata + radioStationName string + radioIcyTitle string + radioIcyArtist string } func NewMPRISHandler(playerName string, pm *PlaybackManager) *MPRISHandler { @@ -66,6 +71,14 @@ func NewMPRISHandler(playerName string, pm *PlaybackManager) *MPRISHandler { m.evt.Player.OnTitle() } }) + pm.OnRadioMetadataChange(func(radioName, title, artist string) { + m.radioStationName = radioName + m.radioIcyTitle = title + m.radioIcyArtist = artist + if m.connErr == nil { + m.evt.Player.OnTitle() + } + }) pm.OnVolumeChange(func(vol int) { if m.connErr == nil { m.evt.Player.OnVolume() @@ -276,12 +289,23 @@ func (m *MPRISHandler) Metadata() (types.Metadata, error) { artURL = u } } + + title := meta.Name + artists := meta.Artists + album := meta.Album + // if playing a radio station, override title/artist with current Icy metadata if present + if m.radioStationName == title && m.radioIcyTitle != "" { + title = m.radioIcyTitle + artists = []string{m.radioIcyArtist} + album = m.radioStationName + } + mprisMeta := types.Metadata{ TrackId: dbus.ObjectPath(trackObjPath), Length: secondsToMicroseconds(status.Duration), - Title: meta.Name, - Album: meta.Album, - Artist: meta.Artists, + Title: title, + Album: album, + Artist: artists, DiscNumber: discNumber, TrackNumber: trackNumber, UserRating: float64(userRating) / 5, diff --git a/backend/playbackengine.go b/backend/playbackengine.go index 53d89f0..20e31bb 100644 --- a/backend/playbackengine.go +++ b/backend/playbackengine.go @@ -6,6 +6,7 @@ import ( "fmt" "log" "math/rand" + "strings" "time" "github.com/dweymouth/supersonic/backend/mediaprovider" @@ -103,6 +104,8 @@ type playbackEngine struct { onStopped []func() onPlaying []func() onQueueChange []func() + + onRadioMetadataChange []func(radioName, title, artist string) } func NewPlaybackEngine( @@ -698,6 +701,22 @@ func (p *playbackEngine) setTrack(idx int, next bool, startTime float64) error { url = filepath } } + if mpvP, ok := p.player.(*mpv.Player); ok && !isTrack { + mpvP.ObserveIcyRadioTitle(func(icytitle string) { + var title, artist string + if s := strings.Split(icytitle, " - "); len(s) == 2 { + title, artist = s[1], s[0] + } else { + title = icytitle + } + log.Println("Radio metadata changed: ", icytitle) + for _, cb := range p.onRadioMetadataChange { + cb(meta.Name, title, artist) + } + }) + } else if ok { + mpvP.UnobserveIcyRadioTitle() + } if url == "" { return errors.New("no stream URL") } diff --git a/backend/playbackmanager.go b/backend/playbackmanager.go index 3757de6..8b9e361 100644 --- a/backend/playbackmanager.go +++ b/backend/playbackmanager.go @@ -318,6 +318,11 @@ func (p *PlaybackManager) OnSongChange(cb func(nowPlaying mediaprovider.MediaIte p.engine.onSongChange = append(p.engine.onSongChange, cb) } +// Sets a callback that is notified whenever the Icy radio metadata changes. +func (p *PlaybackManager) OnRadioMetadataChange(cb func(radioName, title, artist string)) { + p.engine.onRadioMetadataChange = append(p.engine.onRadioMetadataChange, cb) +} + // Registers a callback that is notified whenever the play time should be updated. func (p *PlaybackManager) OnPlayTimeUpdate(cb func(curTime float64, totalTime float64, seeked bool)) { p.engine.onPlayTimeUpdate = append(p.engine.onPlayTimeUpdate, cb) diff --git a/backend/player/mpv/player.go b/backend/player/mpv/player.go index 89140ed..b74059d 100644 --- a/backend/player/mpv/player.go +++ b/backend/player/mpv/player.go @@ -72,6 +72,8 @@ type Player struct { peaksEnabled bool pauseFade bool + icyTitleCb func(string) + fileLoadedLock sync.Mutex fileLoadedSig *sync.Cond @@ -130,6 +132,8 @@ func (p *Player) Init(maxCacheMB int) error { m.SetOptionString("audio-client-name", p.clientName) } + m.ObserveProperty(0, "metadata", mpv.FORMAT_NODE) + if err := m.Initialize(); err != nil { return fmt.Errorf("error initializing mpv: %s", err.Error()) } @@ -442,6 +446,16 @@ func (p *Player) GetMediaInfo() (MediaInfo, error) { return info, nil } +func (p *Player) ObserveIcyRadioTitle(cb func(string)) { + p.icyTitleCb = cb + p.mpv.ObserveProperty(1, "metadata/icy-title", mpv.FORMAT_STRING) +} + +func (p *Player) UnobserveIcyRadioTitle() { + p.icyTitleCb = nil + p.mpv.UnobserveProperty(1) +} + func (p *Player) getInt64Property(propName string) (int64, error) { playpos, err := p.mpv.GetProperty(propName, mpv.FORMAT_INT64) if err != nil { @@ -548,6 +562,11 @@ func (p *Player) eventHandler(ctx context.Context) { p.status.Duration = 0 p.status.TimePos = 0 p.setState(player.Stopped) + case mpv.EVENT_PROPERTY_CHANGE: + if e.Reply_Userdata == 1 && p.icyTitleCb != nil { + p.icyTitleCb(p.mpv.GetPropertyString("metadata/icy-title")) + } + } } } diff --git a/ui/bottompanel.go b/ui/bottompanel.go index 01b413c..ba98b93 100644 --- a/ui/bottompanel.go +++ b/ui/bottompanel.go @@ -35,6 +35,7 @@ func NewBottomPanel(pm *backend.PlaybackManager, im *backend.ImageManager, contr bp.ExtendBaseWidget(bp) pm.OnSongChange(bp.onSongChange) + pm.OnRadioMetadataChange(bp.onRadioMetadataChange) pm.OnWaveformImgUpdate(bp.updateWaveformImg) pm.OnPlayTimeUpdate(func(cur, total float64, _ bool) { fyne.Do(func() { @@ -143,6 +144,16 @@ func (bp *BottomPanel) onSongChange(song mediaprovider.MediaItem, _ *mediaprovid }) } +func (bp *BottomPanel) onRadioMetadataChange(radioName, title, artist string) { + fyne.Do(func() { + bp.NowPlaying.Update(&mediaprovider.Track{ + Title: title, + ArtistNames: []string{artist}, + Album: radioName, + }) + }) +} + func (bp *BottomPanel) updateWaveformImg(img *backend.WaveformImage) { fyne.Do(func() { bp.Controls.UpdateWaveformImg(img) diff --git a/ui/mainwindow.go b/ui/mainwindow.go index e5665c1..7e11c4e 100644 --- a/ui/mainwindow.go +++ b/ui/mainwindow.go @@ -109,6 +109,15 @@ func NewMainWindow(fyneApp fyne.App, appName, displayAppName, appVersion string, app.PlaybackManager.OnSongChange(func(item mediaprovider.MediaItem, _ *mediaprovider.Track) { fyne.Do(func() { m.UpdateOnTrackChange(item) }) }) + app.PlaybackManager.OnRadioMetadataChange(func(radioName, title, artist string) { + fyne.Do(func() { + if title != "" { + m.Window.SetTitle(fmt.Sprintf("%s – %s · %s", title, artist, res.DisplayName)) + } else { + m.Window.SetTitle(fmt.Sprintf("%s · %s", radioName, res.DisplayName)) + } + }) + }) app.PlaybackManager.OnQueueChange(func() { fyne.Do(func() { m.Sidebar.SetQueueTracks(app.PlaybackManager.GetPlayQueue()) }) }) From 0097b0a05214afaa6418ff9f30df7d2a4ef04bbe Mon Sep 17 00:00:00 2001 From: Gianluca Boiano Date: Fri, 6 Feb 2026 02:50:39 +0100 Subject: [PATCH 13/25] Add 10-band equalizer support and AutoEQ integration --- backend/autoeq.go | 521 +++++++++++++++++++++++++++++ backend/autoeq_interpolate.go | 173 ++++++++++ backend/autoeq_interpolate_test.go | 180 ++++++++++ backend/config.go | 5 + backend/eqpresets.go | 150 +++++++++ backend/player/mpv/equalizer.go | 46 +++ 6 files changed, 1075 insertions(+) create mode 100644 backend/autoeq.go create mode 100644 backend/autoeq_interpolate.go create mode 100644 backend/autoeq_interpolate_test.go create mode 100644 backend/eqpresets.go diff --git a/backend/autoeq.go b/backend/autoeq.go new file mode 100644 index 0000000..2efcb9e --- /dev/null +++ b/backend/autoeq.go @@ -0,0 +1,521 @@ +package backend + +import ( + "bufio" + "context" + "crypto/md5" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "io" + "log" + "net/http" + "net/url" + "os" + "path/filepath" + "regexp" + "strconv" + "strings" + "sync" + "time" + + "github.com/20after4/configdir" +) + +const ( + autoEQIndexURL = "https://raw.githubusercontent.com/jaakkopasanen/AutoEq/master/results/INDEX.md" + autoEQBaseURL = "https://raw.githubusercontent.com/jaakkopasanen/AutoEq/master/results/" + indexCacheTTL = 7 * 24 * time.Hour // 7 days + profileCacheTTL = 30 * 24 * time.Hour // 30 days + maxMemoryCacheSize = 20 // LRU cache size +) + +var ( + ErrProfileNotFound = errors.New("AutoEQ profile not found") + ErrInvalidFormat = errors.New("invalid AutoEQ profile format") +) + +// AutoEQProfile represents a headphone equalizer profile from AutoEQ +type AutoEQProfile struct { + Name string // Display name (e.g., "Sennheiser HD 650") + Path string // Full path in repo (e.g., "oratory1990/over-ear/Sennheiser HD 650") + Source string // Measurement source (e.g., "oratory1990") + Type string // Headphone type (e.g., "over-ear") + Preamp float64 // Preamp gain in dB + Bands [10]float64 // 10-band equalizer gains in dB +} + +// AutoEQProfileMetadata contains just the metadata without the EQ data +type AutoEQProfileMetadata struct { + Name string + Path string + Source string + Type string +} + +// AutoEQManager manages fetching and caching of AutoEQ profiles +type AutoEQManager struct { + cachePath string + timeout time.Duration + + // Memory cache (LRU) + memCache map[string]*memoryCacheEntry + memCacheMutex sync.RWMutex + memCacheLRU []string // Keys in LRU order (most recently used at end) + + // Index cache + indexCache []AutoEQProfileMetadata + indexCacheTime time.Time + indexCacheMutex sync.RWMutex +} + +type memoryCacheEntry struct { + profile *AutoEQProfile + lastAccessed time.Time +} + +// NewAutoEQManager creates a new AutoEQ manager +func NewAutoEQManager(cachePath string, timeout time.Duration) *AutoEQManager { + configdir.MakePath(cachePath) + log.Printf("Initializing AutoEQ manager: cache=%s, timeout=%v", cachePath, timeout) + return &AutoEQManager{ + cachePath: cachePath, + timeout: timeout, + memCache: make(map[string]*memoryCacheEntry), + memCacheLRU: make([]string, 0, maxMemoryCacheSize), + } +} + +// FetchIndex fetches the list of all available AutoEQ profiles +// Results are cached for 7 days +func (m *AutoEQManager) FetchIndex(ctx context.Context) ([]AutoEQProfileMetadata, error) { + // Check if index is already cached in memory + m.indexCacheMutex.RLock() + if len(m.indexCache) > 0 && time.Since(m.indexCacheTime) < indexCacheTTL { + cached := m.indexCache + m.indexCacheMutex.RUnlock() + return cached, nil + } + m.indexCacheMutex.RUnlock() + + // Try to load from disk cache + indexCachePath := filepath.Join(m.cachePath, "index.json") + if profiles, err := m.loadIndexFromDisk(indexCachePath); err == nil { + m.indexCacheMutex.Lock() + m.indexCache = profiles + m.indexCacheTime = time.Now() + m.indexCacheMutex.Unlock() + return profiles, nil + } + + // Fetch from network + profiles, err := m.fetchIndexFromNetwork(ctx) + if err != nil { + return nil, err + } + + // Cache in memory and disk + m.indexCacheMutex.Lock() + m.indexCache = profiles + m.indexCacheTime = time.Now() + m.indexCacheMutex.Unlock() + + m.saveIndexToDisk(indexCachePath, profiles) + + return profiles, nil +} + +func (m *AutoEQManager) loadIndexFromDisk(cachePath string) ([]AutoEQProfileMetadata, error) { + info, err := os.Stat(cachePath) + if err != nil { + return nil, err + } + + // Check if cache is expired + if time.Since(info.ModTime()) > indexCacheTTL { + return nil, errors.New("cache expired") + } + + data, err := os.ReadFile(cachePath) + if err != nil { + return nil, err + } + + var profiles []AutoEQProfileMetadata + if err := json.Unmarshal(data, &profiles); err != nil { + return nil, err + } + + return profiles, nil +} + +func (m *AutoEQManager) saveIndexToDisk(cachePath string, profiles []AutoEQProfileMetadata) { + data, err := json.Marshal(profiles) + if err != nil { + log.Printf("Failed to marshal AutoEQ index: %v", err) + return + } + + if err := os.WriteFile(cachePath, data, 0644); err != nil { + log.Printf("Failed to write AutoEQ index cache: %v", err) + } +} + +func (m *AutoEQManager) fetchIndexFromNetwork(ctx context.Context) ([]AutoEQProfileMetadata, error) { + log.Printf("Fetching AutoEQ index from: %s (timeout: %v)", autoEQIndexURL, m.timeout) + + ctx, cancel := context.WithTimeout(ctx, m.timeout) + defer cancel() + + req, err := http.NewRequestWithContext(ctx, http.MethodGet, autoEQIndexURL, nil) + if err != nil { + return nil, fmt.Errorf("creating request: %w", err) + } + + resp, err := http.DefaultClient.Do(req) + if err != nil { + log.Printf("HTTP request failed: %v", err) + return nil, fmt.Errorf("fetching index: %w", err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + return nil, fmt.Errorf("HTTP %d: %s", resp.StatusCode, resp.Status) + } + + profiles, err := m.parseIndex(resp.Body) + if err != nil { + log.Printf("Failed to parse AutoEQ index: %v", err) + return nil, err + } + + log.Printf("Successfully parsed %d profiles from AutoEQ index", len(profiles)) + return profiles, nil +} + +// parseIndex parses the INDEX.md markdown file +// Format: [Display Name](./path/to/profile) by source +var indexLinkRegex = regexp.MustCompile(`-\s*\[([^\]]+)\]\(\./([^)]+)\)`) + +func (m *AutoEQManager) parseIndex(r io.Reader) ([]AutoEQProfileMetadata, error) { + scanner := bufio.NewScanner(r) + var profiles []AutoEQProfileMetadata + lineCount := 0 + matchCount := 0 + + for scanner.Scan() { + line := scanner.Text() + lineCount++ + matches := indexLinkRegex.FindStringSubmatch(line) + if len(matches) == 3 { + matchCount++ + name := matches[1] + path := matches[2] + + // URL-decode the name to handle any encoded characters + if decodedName, err := url.QueryUnescape(name); err == nil { + name = decodedName + } + + // Extract source and type from path + // Format: source/type/name (e.g., "oratory1990/over-ear/Sennheiser HD 650") + parts := strings.Split(path, "/") + source := "" + typ := "" + if len(parts) >= 2 { + source = parts[0] + typ = parts[1] + + // URL-decode source and type to display clean text + if decodedSource, err := url.QueryUnescape(source); err == nil { + source = decodedSource + } + if decodedType, err := url.QueryUnescape(typ); err == nil { + typ = decodedType + } + } + + profiles = append(profiles, AutoEQProfileMetadata{ + Name: name, + Path: path, + Source: source, + Type: typ, + }) + } + } + + if err := scanner.Err(); err != nil { + return nil, fmt.Errorf("reading index: %w", err) + } + + log.Printf("Parsed %d lines, found %d profile matches", lineCount, matchCount) + return profiles, nil +} + +// FetchProfile fetches a specific AutoEQ profile by its path +// Results are cached with LRU eviction +func (m *AutoEQManager) FetchProfile(ctx context.Context, path string) (*AutoEQProfile, error) { + // Check memory cache + m.memCacheMutex.RLock() + if entry, ok := m.memCache[path]; ok { + entry.lastAccessed = time.Now() + profile := entry.profile + m.memCacheMutex.RUnlock() + m.updateLRU(path) + return profile, nil + } + m.memCacheMutex.RUnlock() + + // Check disk cache + profile, err := m.loadProfileFromDisk(path) + if err == nil { + m.addToMemoryCache(path, profile) + return profile, nil + } + + // Fetch from network + profile, err = m.fetchProfileFromNetwork(ctx, path) + if err != nil { + return nil, err + } + + // Cache in memory and disk + m.addToMemoryCache(path, profile) + m.saveProfileToDisk(path, profile) + + return profile, nil +} + +func (m *AutoEQManager) loadProfileFromDisk(path string) (*AutoEQProfile, error) { + cacheKey := m.profileCacheKey(path) + cachePath := filepath.Join(m.cachePath, cacheKey+".json") + + info, err := os.Stat(cachePath) + if err != nil { + return nil, err + } + + // Check if cache is expired + if time.Since(info.ModTime()) > profileCacheTTL { + os.Remove(cachePath) + return nil, errors.New("cache expired") + } + + data, err := os.ReadFile(cachePath) + if err != nil { + return nil, err + } + + var profile AutoEQProfile + if err := json.Unmarshal(data, &profile); err != nil { + return nil, err + } + + return &profile, nil +} + +func (m *AutoEQManager) saveProfileToDisk(path string, profile *AutoEQProfile) { + cacheKey := m.profileCacheKey(path) + cachePath := filepath.Join(m.cachePath, cacheKey+".json") + + data, err := json.Marshal(profile) + if err != nil { + log.Printf("Failed to marshal AutoEQ profile: %v", err) + return + } + + if err := os.WriteFile(cachePath, data, 0644); err != nil { + log.Printf("Failed to write AutoEQ profile cache: %v", err) + } +} + +func (m *AutoEQManager) profileCacheKey(path string) string { + hash := md5.Sum([]byte(path)) + return hex.EncodeToString(hash[:]) +} + +func (m *AutoEQManager) fetchProfileFromNetwork(ctx context.Context, path string) (*AutoEQProfile, error) { + // URL-decode the path first (INDEX.md contains HTML-encoded paths like %20 for spaces) + decodedPath, err := url.QueryUnescape(path) + if err != nil { + log.Printf("Failed to decode path %s: %v", path, err) + decodedPath = path // fallback to original + } + + // Extract the headphone name from the path (last component) + // Path format: "source/type/Headphone Name" + pathComponents := strings.Split(decodedPath, "/") + if len(pathComponents) == 0 { + return nil, fmt.Errorf("invalid path format: %s", path) + } + headphoneName := pathComponents[len(pathComponents)-1] + + // Construct the URL by properly encoding each path component + for i, component := range pathComponents { + pathComponents[i] = url.PathEscape(component) + } + encodedPath := strings.Join(pathComponents, "/") + + // The file is named "{HeadphoneName} FixedBandEQ.txt" + encodedFileName := url.PathEscape(headphoneName + " FixedBandEQ.txt") + profileURL := autoEQBaseURL + encodedPath + "/" + encodedFileName + log.Printf("Fetching profile from: %s", profileURL) + + ctx, cancel := context.WithTimeout(ctx, m.timeout) + defer cancel() + + req, err := http.NewRequestWithContext(ctx, http.MethodGet, profileURL, nil) + if err != nil { + return nil, fmt.Errorf("creating request: %w", err) + } + + resp, err := http.DefaultClient.Do(req) + if err != nil { + return nil, fmt.Errorf("fetching profile: %w", err) + } + defer resp.Body.Close() + + log.Printf("Profile fetch response: %d", resp.StatusCode) + if resp.StatusCode == http.StatusNotFound { + return nil, ErrProfileNotFound + } + + if resp.StatusCode != http.StatusOK { + return nil, fmt.Errorf("HTTP %d: %s", resp.StatusCode, resp.Status) + } + + return m.parseProfile(path, resp.Body) +} + +// parseProfile parses the FixedBandEQ.txt file +// Format: +// Preamp: -6.0 dB +// Filter 1: ON PK Fc 31 Hz Gain 5.0 dB Q 0.70 +// ... (10 filters total) +var preampRegex = regexp.MustCompile(`Preamp:\s*([-+]?\d+\.?\d*)\s*dB`) +var filterRegex = regexp.MustCompile(`Filter\s+\d+:.*?Fc\s+(\d+)\s+Hz.*?Gain\s+([-+]?\d+\.?\d*)\s*dB`) + +func (m *AutoEQManager) parseProfile(path string, r io.Reader) (*AutoEQProfile, error) { + data, err := io.ReadAll(r) + if err != nil { + return nil, fmt.Errorf("reading profile: %w", err) + } + + content := string(data) + + // Parse preamp + preampMatch := preampRegex.FindStringSubmatch(content) + if len(preampMatch) < 2 { + return nil, fmt.Errorf("%w: preamp not found", ErrInvalidFormat) + } + + preamp, err := strconv.ParseFloat(preampMatch[1], 64) + if err != nil { + return nil, fmt.Errorf("%w: invalid preamp value", ErrInvalidFormat) + } + + // Parse filters + filterMatches := filterRegex.FindAllStringSubmatch(content, -1) + if len(filterMatches) != 10 { + return nil, fmt.Errorf("%w: expected 10 filters, found %d", ErrInvalidFormat, len(filterMatches)) + } + + var bands [10]float64 + expectedFreqs := []int{31, 62, 125, 250, 500, 1000, 2000, 4000, 8000, 16000} + + for i, match := range filterMatches { + if len(match) < 3 { + return nil, fmt.Errorf("%w: invalid filter %d", ErrInvalidFormat, i+1) + } + + freq, err := strconv.Atoi(match[1]) + if err != nil { + return nil, fmt.Errorf("%w: invalid frequency in filter %d", ErrInvalidFormat, i+1) + } + + // Verify frequency matches expected (with tolerance for rounding) + if freq != expectedFreqs[i] { + log.Printf("Warning: AutoEQ filter %d has unexpected frequency %d Hz (expected %d Hz)", + i+1, freq, expectedFreqs[i]) + } + + gain, err := strconv.ParseFloat(match[2], 64) + if err != nil { + return nil, fmt.Errorf("%w: invalid gain in filter %d", ErrInvalidFormat, i+1) + } + + bands[i] = gain + } + + // Extract name and metadata from path + // URL-decode the path first to get clean names + decodedPath, err := url.QueryUnescape(path) + if err != nil { + decodedPath = path // fallback to original if decode fails + } + + parts := strings.Split(decodedPath, "/") + name := decodedPath + source := "" + typ := "" + + if len(parts) >= 3 { + name = parts[len(parts)-1] + source = parts[0] + typ = parts[1] + } + + return &AutoEQProfile{ + Name: name, + Path: path, + Source: source, + Type: typ, + Preamp: preamp, + Bands: bands, + }, nil +} + +func (m *AutoEQManager) addToMemoryCache(path string, profile *AutoEQProfile) { + m.memCacheMutex.Lock() + defer m.memCacheMutex.Unlock() + + // If already in cache, just update + if _, exists := m.memCache[path]; exists { + m.memCache[path].profile = profile + m.memCache[path].lastAccessed = time.Now() + return + } + + // Evict LRU if at capacity + if len(m.memCache) >= maxMemoryCacheSize { + lruKey := m.memCacheLRU[0] + delete(m.memCache, lruKey) + m.memCacheLRU = m.memCacheLRU[1:] + } + + // Add new entry + m.memCache[path] = &memoryCacheEntry{ + profile: profile, + lastAccessed: time.Now(), + } + m.memCacheLRU = append(m.memCacheLRU, path) +} + +func (m *AutoEQManager) updateLRU(path string) { + m.memCacheMutex.Lock() + defer m.memCacheMutex.Unlock() + + // Find and move to end + for i, key := range m.memCacheLRU { + if key == path { + m.memCacheLRU = append(m.memCacheLRU[:i], m.memCacheLRU[i+1:]...) + m.memCacheLRU = append(m.memCacheLRU, path) + break + } + } +} + +// InterpolateTo15Band converts this profile's 10-band EQ to Supersonic's 15-band format +func (p *AutoEQProfile) InterpolateTo15Band() [15]float64 { + return InterpolateAutoEQTo15Band(p.Bands) +} diff --git a/backend/autoeq_interpolate.go b/backend/autoeq_interpolate.go new file mode 100644 index 0000000..81dde07 --- /dev/null +++ b/backend/autoeq_interpolate.go @@ -0,0 +1,173 @@ +package backend + +import "math" + +// AutoEQ uses 10 bands at these frequencies (in Hz) +var autoEQFreqs = []float64{31.25, 62.5, 125, 250, 500, 1000, 2000, 4000, 8000, 16000} + +// Supersonic uses 15 bands at these frequencies (in Hz) +var supersonicFreqs = []float64{25, 40, 63, 100, 160, 250, 400, 630, 1000, 1600, 2500, 4000, 6300, 10000, 16000} + +// InterpolateAutoEQTo15Band converts a 10-band AutoEQ profile to Supersonic's 15-band ISO equalizer. +// Uses logarithmic frequency positioning with linear dB interpolation. +// +// Parameters: +// - autoEQGains: Array of 10 gain values (dB) from AutoEQ at 31, 62, 125, 250, 500, 1k, 2k, 4k, 8k, 16k Hz +// +// Returns: +// - Array of 15 gain values (dB) for Supersonic at 25, 40, 63, 100, 160, 250, 400, 630, 1k, 1.6k, 2.5k, 4k, 6.3k, 10k, 16k Hz +func InterpolateAutoEQTo15Band(autoEQGains [10]float64) [15]float64 { + var result [15]float64 + + for i, targetFreq := range supersonicFreqs { + // Find the surrounding AutoEQ bands for this target frequency + lowerIdx, upperIdx := findSurroundingBands(targetFreq) + + if lowerIdx == upperIdx { + // Exact match - use the AutoEQ gain directly + result[i] = autoEQGains[lowerIdx] + } else if lowerIdx == -1 { + // Target frequency is below the lowest AutoEQ band (25 Hz < 31.25 Hz) + // Extrapolate using the first two AutoEQ bands + result[i] = extrapolateBelow(targetFreq, autoEQGains) + } else if upperIdx == -1 { + // Target frequency is above the highest AutoEQ band (should not happen with our ranges) + // Use the highest AutoEQ gain + result[i] = autoEQGains[len(autoEQGains)-1] + } else { + // Interpolate between two AutoEQ bands + fLow := autoEQFreqs[lowerIdx] + fHigh := autoEQFreqs[upperIdx] + gLow := autoEQGains[lowerIdx] + gHigh := autoEQGains[upperIdx] + + // Calculate logarithmic position between the two bands + // t = log(targetFreq/fLow) / log(fHigh/fLow) + t := math.Log(targetFreq/fLow) / math.Log(fHigh/fLow) + + // Linear interpolation of gain values + result[i] = gLow + t*(gHigh-gLow) + } + } + + return result +} + +// findSurroundingBands finds the AutoEQ band indices that surround the target frequency. +// Returns (idx, idx) if there's an exact match, (lowerIdx, upperIdx) if between bands, +// (-1, 0) if below all bands, or (lastIdx, -1) if above all bands. +func findSurroundingBands(targetFreq float64) (lowerIdx, upperIdx int) { + const epsilon = 0.01 // Tolerance for floating point comparison + + // Check if below all bands + if targetFreq < autoEQFreqs[0]-epsilon { + return -1, 0 + } + + // Check if above all bands + if targetFreq > autoEQFreqs[len(autoEQFreqs)-1]+epsilon { + return len(autoEQFreqs) - 1, -1 + } + + // Find surrounding bands + for i := 0; i < len(autoEQFreqs)-1; i++ { + // Check for exact match + if math.Abs(targetFreq-autoEQFreqs[i]) < epsilon { + return i, i + } + + // Check if between this band and the next + if targetFreq > autoEQFreqs[i] && targetFreq < autoEQFreqs[i+1] { + return i, i + 1 + } + } + + // Check for exact match with last band + if math.Abs(targetFreq-autoEQFreqs[len(autoEQFreqs)-1]) < epsilon { + return len(autoEQFreqs) - 1, len(autoEQFreqs) - 1 + } + + // Should not reach here with valid input + return len(autoEQFreqs) - 1, -1 +} + +// extrapolateBelow extrapolates the gain for frequencies below the lowest AutoEQ band. +// Uses the slope between the first two AutoEQ bands. +func extrapolateBelow(targetFreq float64, autoEQGains [10]float64) float64 { + // Use the slope between the first two bands to extrapolate + f1 := autoEQFreqs[0] + f2 := autoEQFreqs[1] + g1 := autoEQGains[0] + g2 := autoEQGains[1] + + // Calculate the slope in log-frequency space + slope := (g2 - g1) / math.Log(f2/f1) + + // Extrapolate + return g1 + slope*math.Log(targetFreq/f1) +} + +// Interpolate15BandTo10Band converts a 15-band ISO equalizer to 10-band format. +// Uses logarithmic frequency positioning with linear dB interpolation. +func Interpolate15BandTo10Band(gains15Band [15]float64) [10]float64 { + var result [10]float64 + + for i, targetFreq := range autoEQFreqs { + // Find the surrounding 15-band frequencies for this target + lowerIdx, upperIdx := findSurrounding15Bands(targetFreq) + + if lowerIdx == upperIdx { + // Exact match + result[i] = gains15Band[lowerIdx] + } else if lowerIdx == -1 { + // Below lowest band - use first band value + result[i] = gains15Band[0] + } else if upperIdx == -1 { + // Above highest band - use last band value + result[i] = gains15Band[len(gains15Band)-1] + } else { + // Interpolate between two 15-band frequencies + fLow := supersonicFreqs[lowerIdx] + fHigh := supersonicFreqs[upperIdx] + gLow := gains15Band[lowerIdx] + gHigh := gains15Band[upperIdx] + + // Logarithmic position + t := math.Log(targetFreq/fLow) / math.Log(fHigh/fLow) + + // Linear interpolation of gain + result[i] = gLow + t*(gHigh-gLow) + } + } + + return result +} + +// findSurrounding15Bands finds the 15-band indices that surround the target frequency +func findSurrounding15Bands(targetFreq float64) (lowerIdx, upperIdx int) { + const epsilon = 0.01 + + if targetFreq < supersonicFreqs[0]-epsilon { + return -1, 0 + } + + if targetFreq > supersonicFreqs[len(supersonicFreqs)-1]+epsilon { + return len(supersonicFreqs) - 1, -1 + } + + for i := 0; i < len(supersonicFreqs)-1; i++ { + if math.Abs(targetFreq-supersonicFreqs[i]) < epsilon { + return i, i + } + + if targetFreq > supersonicFreqs[i] && targetFreq < supersonicFreqs[i+1] { + return i, i + 1 + } + } + + if math.Abs(targetFreq-supersonicFreqs[len(supersonicFreqs)-1]) < epsilon { + return len(supersonicFreqs) - 1, len(supersonicFreqs) - 1 + } + + return len(supersonicFreqs) - 1, -1 +} diff --git a/backend/autoeq_interpolate_test.go b/backend/autoeq_interpolate_test.go new file mode 100644 index 0000000..1eeb7e7 --- /dev/null +++ b/backend/autoeq_interpolate_test.go @@ -0,0 +1,180 @@ +package backend + +import ( + "math" + "testing" +) + +func TestInterpolateAutoEQTo15Band_FlatProfile(t *testing.T) { + // Test with a flat profile (all zeros) + flatProfile := [10]float64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0} + result := InterpolateAutoEQTo15Band(flatProfile) + + for i, gain := range result { + if math.Abs(gain) > 0.001 { + t.Errorf("Flat profile should result in zero gains, got %f at index %d", gain, i) + } + } +} + +func TestInterpolateAutoEQTo15Band_ExactMatches(t *testing.T) { + // Test that exact frequency matches use the AutoEQ gain directly + // AutoEQ bands: 31, 62, 125, 250, 500, 1k, 2k, 4k, 8k, 16k Hz + // Supersonic bands: 25, 40, 63, 100, 160, 250, 400, 630, 1k, 1.6k, 2.5k, 4k, 6.3k, 10k, 16k Hz + // Exact matches: 250 (idx 5→3), 1k (idx 5→8), 4k (idx 7→11), 16k (idx 9→14) + + testProfile := [10]float64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10} + result := InterpolateAutoEQTo15Band(testProfile) + + tests := []struct { + supersonicIdx int + autoEQIdx int + expectedGain float64 + }{ + {5, 3, 4}, // 250 Hz + {8, 5, 6}, // 1000 Hz + {11, 7, 8}, // 4000 Hz + {14, 9, 10}, // 16000 Hz + } + + for _, tt := range tests { + if math.Abs(result[tt.supersonicIdx]-tt.expectedGain) > 0.001 { + t.Errorf("Exact match at index %d (AutoEQ idx %d): expected %f, got %f", + tt.supersonicIdx, tt.autoEQIdx, tt.expectedGain, result[tt.supersonicIdx]) + } + } +} + +func TestInterpolateAutoEQTo15Band_Interpolation(t *testing.T) { + // Test interpolation between bands + // Use a profile with known values to verify interpolation + testProfile := [10]float64{0, 0, 0, 0, 0, 10, 0, 0, 0, 0} + // Only 1000 Hz (index 5) has gain of 10 dB + + result := InterpolateAutoEQTo15Band(testProfile) + + // Check that 1000 Hz (index 8) has the exact value + if math.Abs(result[8]-10) > 0.001 { + t.Errorf("1000 Hz should be 10 dB, got %f", result[8]) + } + + // Check that nearby frequencies are interpolated (should be between 0 and 10) + // 630 Hz (index 7) should be between 500 Hz (0 dB) and 1000 Hz (10 dB) + if result[7] < 0 || result[7] > 10 { + t.Errorf("630 Hz interpolation out of range: %f", result[7]) + } + + // 1600 Hz (index 9) should be between 1000 Hz (10 dB) and 2000 Hz (0 dB) + if result[9] < 0 || result[9] > 10 { + t.Errorf("1600 Hz interpolation out of range: %f", result[9]) + } +} + +func TestInterpolateAutoEQTo15Band_Extrapolation(t *testing.T) { + // Test extrapolation for 25 Hz (below lowest AutoEQ band of 31.25 Hz) + testProfile := [10]float64{5, 10, 0, 0, 0, 0, 0, 0, 0, 0} + // 31.25 Hz = 5 dB, 62.5 Hz = 10 dB + + result := InterpolateAutoEQTo15Band(testProfile) + + // 25 Hz should be extrapolated below 31.25 Hz + // Since the slope is positive (5 to 10), 25 Hz should be < 5 dB + if result[0] > 5 { + t.Errorf("25 Hz extrapolation should be < 5 dB, got %f", result[0]) + } + + // It should be a reasonable value (not too extreme) + if math.Abs(result[0]) > 20 { + t.Errorf("25 Hz extrapolation too extreme: %f", result[0]) + } +} + +func TestInterpolateAutoEQTo15Band_RealProfile(t *testing.T) { + // Test with a realistic profile shape (bass and treble boost) + // Approximating a V-shaped response + testProfile := [10]float64{6, 5, 3, 1, 0, 0, 1, 3, 5, 6} + + result := InterpolateAutoEQTo15Band(testProfile) + + // Verify output is reasonable + if len(result) != 15 { + t.Errorf("Expected 15 bands, got %d", len(result)) + } + + // Check that interpolated values are between neighboring AutoEQ values + // For example, 40 Hz (index 1) should be between 31.25 Hz and 62.5 Hz values + if result[1] < math.Min(testProfile[0], testProfile[1])-1 || + result[1] > math.Max(testProfile[0], testProfile[1])+1 { + t.Errorf("40 Hz interpolation out of reasonable range: %f (between %f and %f)", + result[1], testProfile[0], testProfile[1]) + } +} + +func TestInterpolateAutoEQTo15Band_MonotonicPreservation(t *testing.T) { + // Test that monotonic sections are preserved + // If AutoEQ gains are monotonically increasing, interpolated values should also increase + monotonicProfile := [10]float64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9} + + result := InterpolateAutoEQTo15Band(monotonicProfile) + + // Check general increasing trend (allowing for some extrapolation variance at edges) + for i := 2; i < len(result)-1; i++ { + if result[i] < result[i-1]-0.5 { + t.Errorf("Monotonicity not preserved at index %d: %f < %f", + i, result[i], result[i-1]) + } + } +} + +func TestFindSurroundingBands_ExactMatches(t *testing.T) { + tests := []struct { + freq float64 + expectedLower int + expectedUpper int + }{ + {31.25, 0, 0}, + {62.5, 1, 1}, + {125, 2, 2}, + {250, 3, 3}, + {1000, 5, 5}, + {4000, 7, 7}, + {16000, 9, 9}, + } + + for _, tt := range tests { + lower, upper := findSurroundingBands(tt.freq) + if lower != tt.expectedLower || upper != tt.expectedUpper { + t.Errorf("findSurroundingBands(%f): expected (%d, %d), got (%d, %d)", + tt.freq, tt.expectedLower, tt.expectedUpper, lower, upper) + } + } +} + +func TestFindSurroundingBands_BetweenBands(t *testing.T) { + tests := []struct { + freq float64 + expectedLower int + expectedUpper int + }{ + {40, 0, 1}, // Between 31.25 and 62.5 + {100, 1, 2}, // Between 62.5 and 125 + {500, 4, 4}, // Exact match at 500 + {2000, 6, 6}, // Exact match at 2000 + {10000, 8, 9}, // Between 8000 and 16000 + } + + for _, tt := range tests { + lower, upper := findSurroundingBands(tt.freq) + if lower != tt.expectedLower || upper != tt.expectedUpper { + t.Errorf("findSurroundingBands(%f): expected (%d, %d), got (%d, %d)", + tt.freq, tt.expectedLower, tt.expectedUpper, lower, upper) + } + } +} + +func TestFindSurroundingBands_BelowRange(t *testing.T) { + lower, upper := findSurroundingBands(25) + if lower != -1 || upper != 0 { + t.Errorf("findSurroundingBands(25): expected (-1, 0), got (%d, %d)", lower, upper) + } +} diff --git a/backend/config.go b/backend/config.go index fa94c1a..6883f21 100644 --- a/backend/config.go +++ b/backend/config.go @@ -135,8 +135,12 @@ type LocalPlaybackConfig struct { InMemoryCacheSizeMB int Volume int EqualizerEnabled bool + EqualizerType string // "ISO10Band" or "ISO15Band" EqualizerPreamp float64 GraphicEqualizerBands []float64 + ActiveEQPresetName string // Name of currently selected EQ preset + AutoEQProfilePath string // Path to applied AutoEQ profile (e.g., "oratory1990/over-ear/Sennheiser HD 650") + AutoEQProfileName string // Display name of applied profile (e.g., "Sennheiser HD 650") PauseFade bool } @@ -269,6 +273,7 @@ func DefaultConfig(appVersionTag string) *Config { InMemoryCacheSizeMB: 30, Volume: 100, EqualizerEnabled: false, + EqualizerType: "ISO15Band", EqualizerPreamp: 0, GraphicEqualizerBands: make([]float64, 15), PauseFade: true, diff --git a/backend/eqpresets.go b/backend/eqpresets.go new file mode 100644 index 0000000..28d90b0 --- /dev/null +++ b/backend/eqpresets.go @@ -0,0 +1,150 @@ +package backend + +import ( + "encoding/json" + "fmt" + "os" + "path/filepath" + "sort" +) + +const eqPresetsDir = "eq_presets" + +// EQPreset represents an equalizer preset that can be saved/loaded +type EQPreset struct { + Name string `json:"name"` + Type string `json:"type"` // "ISO10Band" or "ISO15Band" + Preamp float64 `json:"preamp"` + Bands []float64 `json:"bands"` + IsBuiltin bool `json:"-"` // not saved to file, determined at load time +} + +// EQPresetManager handles loading and saving EQ presets +type EQPresetManager struct { + presetsDir string + builtinPresets []EQPreset +} + +// NewEQPresetManager creates a new preset manager +func NewEQPresetManager(configDir string) *EQPresetManager { + return &EQPresetManager{ + presetsDir: filepath.Join(configDir, eqPresetsDir), + builtinPresets: getBuiltinPresets(), + } +} + +// getBuiltinPresets returns the built-in equalizer presets +func getBuiltinPresets() []EQPreset { + return []EQPreset{ + {Name: "Flat", Type: "ISO15Band", Preamp: 0, Bands: []float64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, IsBuiltin: true}, + {Name: "Rock", Type: "ISO15Band", Preamp: 0, Bands: []float64{5, 4, 3, 1, -1, -1, 0, 2, 3, 4, 4, 4, 3, 2, 2}, IsBuiltin: true}, + {Name: "Pop", Type: "ISO15Band", Preamp: 0, Bands: []float64{-1, -1, 0, 2, 4, 4, 2, 0, -1, -1, 0, 1, 2, 3, 3}, IsBuiltin: true}, + {Name: "Jazz", Type: "ISO15Band", Preamp: 0, Bands: []float64{4, 3, 1, 2, -2, -2, 0, 2, 3, 3, 3, 4, 4, 4, 4}, IsBuiltin: true}, + {Name: "Classical", Type: "ISO15Band", Preamp: 0, Bands: []float64{5, 4, 3, 2, -1, -1, 0, 2, 3, 3, 3, 2, 2, 2, -1}, IsBuiltin: true}, + {Name: "Bass Boost", Type: "ISO15Band", Preamp: 0, Bands: []float64{6, 5, 4, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, IsBuiltin: true}, + {Name: "Treble Boost", Type: "ISO15Band", Preamp: 0, Bands: []float64{0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 4, 5, 6, 6}, IsBuiltin: true}, + {Name: "Vocal", Type: "ISO15Band", Preamp: 0, Bands: []float64{-2, -3, -3, 1, 4, 4, 4, 3, 2, 1, 0, -1, -2, -2, -3}, IsBuiltin: true}, + {Name: "Electronic", Type: "ISO15Band", Preamp: 0, Bands: []float64{5, 4, 2, 0, -2, -2, 0, 2, 3, 4, 4, 3, 4, 4, 3}, IsBuiltin: true}, + {Name: "Acoustic", Type: "ISO15Band", Preamp: 0, Bands: []float64{5, 4, 3, 1, 2, 1, 1, 2, 2, 2, 1, 2, 2, 3, 2}, IsBuiltin: true}, + {Name: "R&B", Type: "ISO15Band", Preamp: 0, Bands: []float64{3, 6, 5, 2, -2, -2, 2, 3, 2, 2, 3, 3, 3, 3, 4}, IsBuiltin: true}, + {Name: "Loudness", Type: "ISO15Band", Preamp: 0, Bands: []float64{6, 5, 3, 0, -1, -1, -1, -1, 0, 1, 2, 4, 5, 5, 3}, IsBuiltin: true}, + } +} + +// LoadPresets loads all presets (builtin + user-defined) +func (m *EQPresetManager) LoadPresets() ([]EQPreset, error) { + // Start with builtin presets + presets := make([]EQPreset, len(m.builtinPresets)) + copy(presets, m.builtinPresets) + + // Create presets directory if it doesn't exist + if err := os.MkdirAll(m.presetsDir, 0o755); err != nil { + return presets, err + } + + // Load user presets + entries, err := os.ReadDir(m.presetsDir) + if err != nil { + return presets, nil // Return builtins if can't read dir + } + + for _, entry := range entries { + if entry.IsDir() || filepath.Ext(entry.Name()) != ".json" { + continue + } + + presetPath := filepath.Join(m.presetsDir, entry.Name()) + data, err := os.ReadFile(presetPath) + if err != nil { + continue // Skip invalid files + } + + var preset EQPreset + if err := json.Unmarshal(data, &preset); err != nil { + continue // Skip invalid JSON + } + + preset.IsBuiltin = false + presets = append(presets, preset) + } + + // Sort: builtins first, then user presets alphabetically + sort.Slice(presets, func(i, j int) bool { + if presets[i].IsBuiltin != presets[j].IsBuiltin { + return presets[i].IsBuiltin + } + return presets[i].Name < presets[j].Name + }) + + return presets, nil +} + +// SavePreset saves a preset to disk +func (m *EQPresetManager) SavePreset(preset EQPreset) error { + if preset.IsBuiltin { + return fmt.Errorf("cannot overwrite builtin preset") + } + + // Create presets directory if it doesn't exist + if err := os.MkdirAll(m.presetsDir, 0o755); err != nil { + return err + } + + // Sanitize filename + filename := sanitizeFilename(preset.Name) + ".json" + presetPath := filepath.Join(m.presetsDir, filename) + + data, err := json.MarshalIndent(preset, "", " ") + if err != nil { + return err + } + + return os.WriteFile(presetPath, data, 0o644) +} + +// DeletePreset deletes a user preset +func (m *EQPresetManager) DeletePreset(name string) error { + // Check if it's a builtin preset + for _, bp := range m.builtinPresets { + if bp.Name == name { + return fmt.Errorf("cannot delete builtin preset") + } + } + + filename := sanitizeFilename(name) + ".json" + presetPath := filepath.Join(m.presetsDir, filename) + + return os.Remove(presetPath) +} + +// sanitizeFilename removes characters that aren't safe for filenames +func sanitizeFilename(name string) string { + // Simple sanitization - could be enhanced + var result []rune + for _, r := range name { + if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') || r == '-' || r == '_' || r == ' ' { + result = append(result, r) + } + } + return string(result) +} diff --git a/backend/player/mpv/equalizer.go b/backend/player/mpv/equalizer.go index e3a1eaa..36c59d0 100644 --- a/backend/player/mpv/equalizer.go +++ b/backend/player/mpv/equalizer.go @@ -120,3 +120,49 @@ func (w WidthType) String() string { } return "x" // not reached } + +type ISO10BandEqualizer struct { + Disabled bool + EQPreamp float64 + BandGains [10]float64 +} + +var ( + iso10Bands = []string{"31", "62", "125", "250", "500", "1k", "2k", "4k", "8k", "16k"} + iso10FMult = 2.0 // Octave doubling +) + +var _ Equalizer = (*ISO10BandEqualizer)(nil) + +func (i *ISO10BandEqualizer) IsEnabled() bool { + return !i.Disabled +} + +func (i *ISO10BandEqualizer) Preamp() float64 { + return i.EQPreamp +} + +func (i *ISO10BandEqualizer) Curve() EqualizerCurve { + fC := float64(31) + curve := make([]EqualizerBand, 0, len(i.BandGains)) + for _, bandGain := range i.BandGains { + curve = append(curve, EqualizerBand{ + Frequency: int(math.Round(fC)), + Width: 1.0, + WidthType: WidthTypeOctave, + Gain: bandGain, + }) + fC *= iso10FMult + } + return curve +} + +func (*ISO10BandEqualizer) BandFrequencies() []string { + ret := make([]string, len(iso10Bands)) + copy(ret, iso10Bands) + return ret +} + +func (*ISO10BandEqualizer) Type() string { + return "ISO10Band" +} From b0b2dc46f975506e66c3cf6c8885bfe94a7f5109 Mon Sep 17 00:00:00 2001 From: Gianluca Boiano Date: Fri, 6 Feb 2026 02:50:40 +0100 Subject: [PATCH 14/25] Update player to support both 10-band and 15-band equalizers --- backend/app.go | 57 +++++++++++++++++++++++++++---------- ui/controller/controller.go | 35 +++++++++++++++++++---- 2 files changed, 71 insertions(+), 21 deletions(-) diff --git a/backend/app.go b/backend/app.go index e1e71b5..71d5e86 100644 --- a/backend/app.go +++ b/backend/app.go @@ -43,17 +43,19 @@ var ( ) type App struct { - Config *Config - ServerManager *ServerManager - LyricsManager *LyricsManager - ImageManager *ImageManager - AudioCache *AudioCache - PlaybackManager *PlaybackManager - LocalPlayer *mpv.Player - UpdateChecker UpdateChecker - MPRISHandler *MPRISHandler - WinSMTC *windows.SMTC - ipcServer ipc.IPCServer + Config *Config + ServerManager *ServerManager + LyricsManager *LyricsManager + ImageManager *ImageManager + AudioCache *AudioCache + AutoEQManager *AutoEQManager + EQPresetManager *EQPresetManager + PlaybackManager *PlaybackManager + LocalPlayer *mpv.Player + UpdateChecker UpdateChecker + MPRISHandler *MPRISHandler + WinSMTC *windows.SMTC + ipcServer ipc.IPCServer // UI callbacks to be set in main OnReactivate func() @@ -165,6 +167,11 @@ func StartupApp(appName, displayAppName, appVersion, appVersionTag, latestReleas fetch = NewLrcLibFetcher(a.cacheDir, a.Config.Application.CustomLrcLibUrl, timeout) } a.LyricsManager = NewLyricsManager(a.ServerManager, fetch) + a.EQPresetManager = NewEQPresetManager(confDir) + + // Initialize AutoEQ manager + autoEQTimeout := time.Duration(a.Config.Application.RequestTimeoutSeconds) * time.Second + a.AutoEQManager = NewAutoEQManager(filepath.Join(cacheDir, "autoeq"), autoEQTimeout) // Periodically scan for remote players go a.PlaybackManager.ScanRemotePlayers(a.bgrndCtx, true /*fastScan*/) @@ -386,11 +393,31 @@ func (a *App) setupMPV() error { a.LocalPlayer.SetAudioExclusive(a.Config.LocalPlayback.AudioExclusive) a.LocalPlayer.SetPauseFade(a.Config.LocalPlayback.PauseFade) - eq := &mpv.ISO15BandEqualizer{ - EQPreamp: a.Config.LocalPlayback.EqualizerPreamp, - Disabled: !a.Config.LocalPlayback.EqualizerEnabled, + // Initialize the appropriate equalizer type based on config + var eq mpv.Equalizer + if a.Config.LocalPlayback.EqualizerType == "ISO10Band" { + eq10 := &mpv.ISO10BandEqualizer{ + EQPreamp: a.Config.LocalPlayback.EqualizerPreamp, + Disabled: !a.Config.LocalPlayback.EqualizerEnabled, + } + // Copy up to 10 bands + numBands := min(len(a.Config.LocalPlayback.GraphicEqualizerBands), 10) + for i := 0; i < numBands; i++ { + eq10.BandGains[i] = a.Config.LocalPlayback.GraphicEqualizerBands[i] + } + eq = eq10 + } else { + eq15 := &mpv.ISO15BandEqualizer{ + EQPreamp: a.Config.LocalPlayback.EqualizerPreamp, + Disabled: !a.Config.LocalPlayback.EqualizerEnabled, + } + // Copy up to 15 bands + numBands := min(len(a.Config.LocalPlayback.GraphicEqualizerBands), 15) + for i := 0; i < numBands; i++ { + eq15.BandGains[i] = a.Config.LocalPlayback.GraphicEqualizerBands[i] + } + eq = eq15 } - copy(eq.BandGains[:], a.Config.LocalPlayback.GraphicEqualizerBands) a.LocalPlayer.SetEqualizer(eq) return nil diff --git a/ui/controller/controller.go b/ui/controller/controller.go index 9c9421a..0c73893 100644 --- a/ui/controller/controller.go +++ b/ui/controller/controller.go @@ -327,7 +327,10 @@ func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func(), themeFiles map devs, themeFiles, bands, c.App.ServerManager.Server.ClientDecidesScrobble(), isLocalPlayer, isReplayGainPlayer, isEqualizerPlayer, canSavePlayQueue, - c.MainWindow) + c.App.EQPresetManager, + c.MainWindow, + c.App.AutoEQManager, + c.App.ImageManager) dlg.OnReplayGainSettingsChanged = func() { c.App.PlaybackManager.SetReplayGainOptions(c.App.Config.ReplayGain) } @@ -342,11 +345,31 @@ func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func(), themeFiles map } dlg.OnThemeSettingChanged = themeUpdateCallbk dlg.OnEqualizerSettingsChanged = func() { - // currently we only have one equalizer type - eq := c.App.LocalPlayer.Equalizer().(*mpv.ISO15BandEqualizer) - eq.Disabled = !c.App.Config.LocalPlayback.EqualizerEnabled - eq.EQPreamp = c.App.Config.LocalPlayback.EqualizerPreamp - copy(eq.BandGains[:], c.App.Config.LocalPlayback.GraphicEqualizerBands) + // Create the appropriate equalizer type based on config + var eq mpv.Equalizer + if c.App.Config.LocalPlayback.EqualizerType == "ISO10Band" { + eq10 := &mpv.ISO10BandEqualizer{ + Disabled: !c.App.Config.LocalPlayback.EqualizerEnabled, + EQPreamp: c.App.Config.LocalPlayback.EqualizerPreamp, + } + // Copy up to 10 bands + numBands := min(len(c.App.Config.LocalPlayback.GraphicEqualizerBands), 10) + for i := 0; i < numBands; i++ { + eq10.BandGains[i] = c.App.Config.LocalPlayback.GraphicEqualizerBands[i] + } + eq = eq10 + } else { + eq15 := &mpv.ISO15BandEqualizer{ + Disabled: !c.App.Config.LocalPlayback.EqualizerEnabled, + EQPreamp: c.App.Config.LocalPlayback.EqualizerPreamp, + } + // Copy up to 15 bands + numBands := min(len(c.App.Config.LocalPlayback.GraphicEqualizerBands), 15) + for i := 0; i < numBands; i++ { + eq15.BandGains[i] = c.App.Config.LocalPlayback.GraphicEqualizerBands[i] + } + eq = eq15 + } c.App.LocalPlayer.SetEqualizer(eq) } dlg.OnPageNeedsRefresh = c.RefreshPageFunc From 7780efb344e4e71e1bcb8b6f80b0ea9174ad4c17 Mon Sep 17 00:00:00 2001 From: Gianluca Boiano Date: Fri, 6 Feb 2026 02:50:41 +0100 Subject: [PATCH 15/25] Add EQ type selector, preset management, and AutoEQ browser UI --- ui/dialogs/autoeqbrowser.go | 166 +++++++++++++ ui/dialogs/graphicequalizer.go | 421 +++++++++++++++++++++++++++++++-- ui/dialogs/settingsdialog.go | 173 +++++++++++++- 3 files changed, 739 insertions(+), 21 deletions(-) create mode 100644 ui/dialogs/autoeqbrowser.go diff --git a/ui/dialogs/autoeqbrowser.go b/ui/dialogs/autoeqbrowser.go new file mode 100644 index 0000000..a473141 --- /dev/null +++ b/ui/dialogs/autoeqbrowser.go @@ -0,0 +1,166 @@ +package dialogs + +import ( + "context" + "fmt" + "log" + "strings" + + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/lang" + "github.com/deluan/sanitize" + "github.com/dweymouth/supersonic/backend" + "github.com/dweymouth/supersonic/backend/mediaprovider" + "github.com/dweymouth/supersonic/sharedutil" + "github.com/dweymouth/supersonic/ui/util" +) + +// AutoEQBrowser allows users to browse and select AutoEQ headphone profiles +type AutoEQBrowser struct { + SearchDialog *SearchDialog + manager *backend.AutoEQManager + allProfileResults []*mediaprovider.SearchResult + OnProfileSelected func(*backend.AutoEQProfile) +} + +func NewAutoEQBrowser(manager *backend.AutoEQManager, im util.ImageFetcher) *AutoEQBrowser { + ab := &AutoEQBrowser{ + manager: manager, + } + sd := NewSearchDialog( + im, + lang.L("Browse Headphone Profiles"), + lang.L("Cancel"), + ab.onSearched, + ) + sd.PlaceholderText = lang.L("Search headphones...") + ab.SearchDialog = sd + return ab +} + +func (ab *AutoEQBrowser) fetchAllProfiles() error { + ctx := context.Background() + profiles, err := ab.manager.FetchIndex(ctx) + if err != nil { + log.Printf("Error fetching AutoEQ index: %v", err) + // Show empty results on error + ab.allProfileResults = []*mediaprovider.SearchResult{} + return fmt.Errorf("failed to fetch AutoEQ index: %w", err) + } + + log.Printf("Successfully fetched %d AutoEQ profiles", len(profiles)) + + // Convert to SearchResult format for display + ab.allProfileResults = sharedutil.MapSlice(profiles, ab.profileToSearchResult) + return nil +} + +func (ab *AutoEQBrowser) profileToSearchResult(profile backend.AutoEQProfileMetadata) *mediaprovider.SearchResult { + // Format secondary text as "type · source" (e.g., "over-ear · oratory1990") + subtitle := "" + if profile.Type != "" { + subtitle = profile.Type + } + if profile.Source != "" { + if subtitle != "" { + subtitle += " · " + } + subtitle += profile.Source + } + + return &mediaprovider.SearchResult{ + Name: profile.Name, + ID: profile.Path, // Store path as ID for retrieval + Type: mediaprovider.ContentTypeAlbum, // Use album icon (looks like headphones) + ArtistName: subtitle, + Size: 0, // Don't show track count + } +} + +func (ab *AutoEQBrowser) onSearched(query string) []*mediaprovider.SearchResult { + if ab.allProfileResults == nil { + if err := ab.fetchAllProfiles(); err != nil { + log.Printf("Failed to load AutoEQ profiles: %v", err) + // Return a single error result + return []*mediaprovider.SearchResult{ + { + Name: lang.L("Error loading AutoEQ profiles"), + ArtistName: lang.L("Check network connection and try again"), + Type: mediaprovider.ContentTypePlaylist, + }, + } + } + } + + if query == "" { + return ab.allProfileResults + } + + // Filter by name (case-insensitive, accent-insensitive) + return sharedutil.FilterSlice(ab.allProfileResults, func(result *mediaprovider.SearchResult) bool { + return strings.Contains( + sanitize.Accents(strings.ToLower(result.Name)), + sanitize.Accents(strings.ToLower(query)), + ) + }) +} + +func (ab *AutoEQBrowser) SetOnDismiss(onDismiss func()) { + ab.SearchDialog.OnDismiss = onDismiss +} + +func (ab *AutoEQBrowser) SetOnProfileSelected(callback func(*backend.AutoEQProfile)) { + ab.OnProfileSelected = callback + ab.SearchDialog.OnNavigateTo = func(_ mediaprovider.ContentType, profilePath string) { + // Fetch the full profile data + ctx := context.Background() + profile, err := ab.manager.FetchProfile(ctx, profilePath) + if err != nil { + log.Printf("Error fetching AutoEQ profile: %v", err) + // TODO: Show error dialog to user + return + } + + if ab.OnProfileSelected != nil { + ab.OnProfileSelected(profile) + } + } +} + +func (ab *AutoEQBrowser) MinSize() fyne.Size { + return ab.SearchDialog.MinSize() +} + +func (ab *AutoEQBrowser) GetSearchEntry() fyne.Focusable { + return ab.SearchDialog.GetSearchEntry() +} + +func (ab *AutoEQBrowser) Show() { + ab.SearchDialog.Show() +} + +func (ab *AutoEQBrowser) Hide() { + ab.SearchDialog.Hide() +} + +func (ab *AutoEQBrowser) Refresh() { + ab.SearchDialog.Refresh() +} + +// ShowErrorDialog displays an error message to the user +func ShowAutoEQError(window fyne.Window, err error) { + title := lang.L("Error") + message := lang.L("Failed to load profile") + + if err == backend.ErrProfileNotFound { + message = lang.L("Profile not found") + } else if strings.Contains(err.Error(), "context deadline exceeded") || + strings.Contains(err.Error(), "connection") { + message = lang.L("Network error. Check connection.") + } + + // Use a simple dialog (would need to import "fyne.io/fyne/v2/dialog") + // For now just log it + log.Printf("AutoEQ Error: %s - %v", message, err) + fmt.Printf("%s: %s\n", title, message) +} diff --git a/ui/dialogs/graphicequalizer.go b/ui/dialogs/graphicequalizer.go index c2b1579..0b5ff77 100644 --- a/ui/dialogs/graphicequalizer.go +++ b/ui/dialogs/graphicequalizer.go @@ -5,10 +5,13 @@ import ( "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" + "fyne.io/fyne/v2/dialog" + "fyne.io/fyne/v2/lang" "fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" ttwidget "github.com/dweymouth/fyne-tooltip/widget" + "github.com/dweymouth/supersonic/backend" "github.com/dweymouth/supersonic/ui/layouts" myTheme "github.com/dweymouth/supersonic/ui/theme" "github.com/dweymouth/supersonic/ui/util" @@ -17,43 +20,182 @@ import ( type GraphicEqualizer struct { widget.BaseWidget - OnChanged func(band int, gain float64) - OnPreampChanged func(gain float64) + OnChanged func(band int, gain float64) + OnPreampChanged func(gain float64) + OnLoadAutoEQProfile func() + OnManualAdjustment func() // Called when user manually changes a slider + OnPresetSelected func(presetName string) // Called when user selects a preset + OnPresetDeleted func(presetName string) // Called when user deletes a preset + OnEQTypeChanged func(eqType string) // Called when EQ type is changed - bandSliders []*eqSlider - container *fyne.Container + bandSliders []*eqSlider + preampSlider *eqSlider + presetSelect *widget.Select + eqTypeSelect *widget.Select + autoEQBtn *widget.Button + profileLabel *widget.Label + container *fyne.Container + sliderArea *fyne.Container // Stores the slider area for dynamic rebuilding + topBar *fyne.Container // Stores the top bar + eqPresets []backend.EQPreset + presetManager *backend.EQPresetManager + parentWindow fyne.Window + isApplyingPreset bool // Flag to prevent clearing profile during preset application + currentEQType string // Current EQ type ("ISO10Band" or "ISO15Band") } -func NewGraphicEqualizer(preamp float64, bandFreqs []string, bandGains []float64) *GraphicEqualizer { - g := &GraphicEqualizer{} +func NewGraphicEqualizer(preamp float64, bandFreqs []string, bandGains []float64, eqType string, presetMgr *backend.EQPresetManager, parentWindow fyne.Window, activePresetName string) *GraphicEqualizer { + g := &GraphicEqualizer{ + presetManager: presetMgr, + parentWindow: parentWindow, + currentEQType: eqType, + } g.ExtendBaseWidget(g) + g.loadPresets() g.buildSliders(preamp, bandFreqs, bandGains) + // Set the dropdown to the active preset if one exists + if activePresetName != "" { + g.setActivePreset(activePresetName) + } + return g } +func (g *GraphicEqualizer) loadPresets() { + presets, err := g.presetManager.LoadPresets() + if err != nil { + // Fallback to empty list if load fails + g.eqPresets = []backend.EQPreset{} + return + } + g.eqPresets = presets +} + func (g *GraphicEqualizer) buildSliders(preamp float64, bands []string, bandGains []float64) { + // Build preset selector + g.updatePresetSelect() + + // Build EQ type selector + if g.eqTypeSelect == nil { + g.eqTypeSelect = widget.NewSelect([]string{"ISO 15-Band", "ISO 10-Band"}, func(selected string) { + // Convert display name to type + newType := "ISO15Band" + if selected == "ISO 10-Band" { + newType = "ISO10Band" + } + + if newType != g.currentEQType { + g.currentEQType = newType + if g.OnEQTypeChanged != nil { + g.OnEQTypeChanged(newType) + } + } + }) + } + // Set current selection + if g.currentEQType == "ISO10Band" { + g.eqTypeSelect.SetSelected("ISO 10-Band") + } else { + g.eqTypeSelect.SetSelected("ISO 15-Band") + } + + // Reset button + resetBtn := widget.NewButton(lang.L("Reset"), func() { + // Find and apply the "Flat" preset + for _, p := range g.eqPresets { + if p.Name == "Flat" { + g.applyPreset(p) + g.presetSelect.SetSelected(p.Name) + if g.OnPresetSelected != nil { + g.OnPresetSelected(p.Name) + } + break + } + } + }) + + // Save button + saveBtn := widget.NewButton(lang.L("Save"), func() { + g.showSavePresetDialog() + }) + + // Delete button + deleteBtn := widget.NewButton(lang.L("Delete"), func() { + g.showDeletePresetDialog() + }) + + // AutoEQ button + g.autoEQBtn = widget.NewButton(lang.L("AutoEQ"), func() { + if g.OnLoadAutoEQProfile != nil { + g.OnLoadAutoEQProfile() + } + }) + + // Profile label (hidden by default) + g.profileLabel = widget.NewLabel("") + g.profileLabel.Hide() + + // Set minimum width for preset dropdown + g.presetSelect.Resize(fyne.NewSize(200, g.presetSelect.MinSize().Height)) + + // Top bar with controls - AutoEQ in main row for better discoverability + topBar := container.NewVBox( + // Main row: EQ type, preset selector, AutoEQ, and action buttons + container.NewHBox( + widget.NewLabel(lang.L("EQ Type:")), + g.eqTypeSelect, + widget.NewLabel(lang.L("EQ Preset:")), + g.presetSelect, + g.autoEQBtn, + layout.NewSpacer(), + saveBtn, + deleteBtn, + resetBtn, + ), + // Second row: Profile label (shown only when AutoEQ profile is active) + g.profileLabel, + ) + + // Build slider area + g.sliderArea = g.buildSliderArea(preamp, bands, bandGains) + + // Store topBar and create main container + g.topBar = topBar + g.container = container.NewBorder(g.topBar, nil, nil, nil, g.sliderArea) +} + +func (g *GraphicEqualizer) buildSliderArea(preamp float64, bands []string, bandGains []float64) *fyne.Container { + // Range labels rng := container.NewVBox( newCaptionTextSizeLabel("+12", fyne.TextAlignTrailing), layout.NewSpacer(), - newCaptionTextSizeLabel("0", fyne.TextAlignTrailing), + newCaptionTextSizeLabel("0 dB", fyne.TextAlignTrailing), layout.NewSpacer(), newCaptionTextSizeLabel("-12", fyne.TextAlignTrailing), ) + g.bandSliders = make([]*eqSlider, len(bands)) bandSlidersCtr := container.New(layouts.NewGridLayoutWithColumnsAndPadding(len(bands)+2, -16)) - pre := newCaptionTextSizeLabel("Pre", fyne.TextAlignCenter) - preampSlider := newEQSlider() - preampSlider.SetValue(preamp) - preampSlider.OnChanged = func(f float64) { + + // Preamp slider + pre := newCaptionTextSizeLabel(lang.L("EQ Preamp"), fyne.TextAlignCenter) + g.preampSlider = newEQSlider() + g.preampSlider.SetValue(preamp) + g.preampSlider.OnChanged = func(f float64) { if g.OnPreampChanged != nil { g.OnPreampChanged(f) } - preampSlider.UpdateToolTip() + g.preampSlider.UpdateToolTip() + if !g.isApplyingPreset && g.OnManualAdjustment != nil { + g.OnManualAdjustment() + } } - preampSlider.UpdateToolTip() - bandSlidersCtr.Add(container.NewBorder(nil, pre, nil, nil, preampSlider)) + g.preampSlider.UpdateToolTip() + bandSlidersCtr.Add(container.NewBorder(nil, pre, nil, nil, g.preampSlider)) bandSlidersCtr.Add(container.NewBorder(nil, widget.NewLabel(""), nil, nil, rng)) + + // Band sliders for i, band := range bands { s := newEQSlider() if i < len(bandGains) { @@ -66,13 +208,17 @@ func (g *GraphicEqualizer) buildSliders(preamp float64, bands []string, bandGain g.OnChanged(_i, f) } g.bandSliders[_i].UpdateToolTip() + if !g.isApplyingPreset && g.OnManualAdjustment != nil { + g.OnManualAdjustment() + } } l := newCaptionTextSizeLabel(band, fyne.TextAlignCenter) c := container.NewBorder(nil, l, nil, nil, s) bandSlidersCtr.Add(c) g.bandSliders[i] = s } - g.container = container.NewStack( + + return container.NewStack( container.NewBorder(nil, widget.NewLabel(""), nil, nil, container.NewBorder(nil, nil, util.NewHSpace(5), util.NewHSpace(5), container.NewVBox( @@ -86,6 +232,251 @@ func (g *GraphicEqualizer) buildSliders(preamp float64, bands []string, bandGain ) } +// RebuildForEQType rebuilds the sliders for a new EQ type +func (g *GraphicEqualizer) RebuildForEQType(eqType string, bandGains []float64) { + // Determine band frequencies for the new type + var bands []string + if eqType == "ISO10Band" { + bands = []string{"31", "62", "125", "250", "500", "1k", "2k", "4k", "8k", "16k"} + } else { + bands = []string{"25", "40", "63", "100", "160", "250", "400", "630", "1k", "1.6k", "2.5k", "4k", "6.3k", "10k", "16k"} + } + + // Get current preamp value + currentPreamp := 0.0 + if g.preampSlider != nil { + currentPreamp = g.preampSlider.Value + } + + // Rebuild the slider area + newSliderArea := g.buildSliderArea(currentPreamp, bands, bandGains) + + // Replace the old slider area in the container + g.sliderArea = newSliderArea + g.container.Objects = []fyne.CanvasObject{g.topBar, g.sliderArea} + g.container.Refresh() +} + +func (g *GraphicEqualizer) updatePresetSelect() { + presetNames := make([]string, len(g.eqPresets)) + for i, p := range g.eqPresets { + displayName := p.Name + if !p.IsBuiltin { + displayName = p.Name + " *" // Mark custom presets with asterisk + } + presetNames[i] = displayName + } + + if g.presetSelect == nil { + g.presetSelect = widget.NewSelect(presetNames, func(selected string) { + // Remove asterisk marker if present + cleanName := selected + if len(selected) > 2 && selected[len(selected)-2:] == " *" { + cleanName = selected[:len(selected)-2] + } + for _, p := range g.eqPresets { + if p.Name == cleanName { + g.applyPreset(p) + if g.OnPresetSelected != nil { + g.OnPresetSelected(cleanName) + } + break + } + } + }) + g.presetSelect.PlaceHolder = lang.L("EQ Preset") + } else { + g.presetSelect.Options = presetNames + g.presetSelect.Refresh() + } +} + +// setActivePreset sets the dropdown selection to match the given preset name +func (g *GraphicEqualizer) setActivePreset(presetName string) { + if presetName == "" { + return + } + + // Find the preset and determine display name (with asterisk for custom) + for _, p := range g.eqPresets { + if p.Name == presetName { + displayName := p.Name + if !p.IsBuiltin { + displayName = p.Name + " *" + } + g.presetSelect.SetSelected(displayName) + return + } + } +} + +func (g *GraphicEqualizer) applyPreset(preset backend.EQPreset) { + g.isApplyingPreset = true + defer func() { g.isApplyingPreset = false }() + + // If preset type differs from current type, switch type first + if preset.Type != "" && preset.Type != g.currentEQType { + g.currentEQType = preset.Type + // Update the type selector UI + if preset.Type == "ISO10Band" { + g.eqTypeSelect.SetSelected("ISO 10-Band") + } else { + g.eqTypeSelect.SetSelected("ISO 15-Band") + } + // Notify about type change + if g.OnEQTypeChanged != nil { + g.OnEQTypeChanged(preset.Type) + } + } + + // Apply preamp + g.preampSlider.SetValue(preset.Preamp) + g.preampSlider.UpdateToolTip() + if g.OnPreampChanged != nil { + g.OnPreampChanged(preset.Preamp) + } + + // Apply band gains + for i, gain := range preset.Bands { + if i < len(g.bandSliders) { + g.bandSliders[i].SetValue(gain) + g.bandSliders[i].UpdateToolTip() + if g.OnChanged != nil { + g.OnChanged(i, gain) + } + } + } +} + +func (g *GraphicEqualizer) getCurrentSettings() backend.EQPreset { + bands := make([]float64, len(g.bandSliders)) + for i, slider := range g.bandSliders { + bands[i] = slider.Value + } + return backend.EQPreset{ + Type: g.currentEQType, + Preamp: g.preampSlider.Value, + Bands: bands, + } +} + +func (g *GraphicEqualizer) showSavePresetDialog() { + nameEntry := widget.NewEntry() + nameEntry.SetPlaceHolder(lang.L("Preset name")) + + formDialog := dialog.NewForm( + lang.L("Save Preset"), + lang.L("Save"), + lang.L("Cancel"), + []*widget.FormItem{ + widget.NewFormItem(lang.L("Name"), nameEntry), + }, + func(confirmed bool) { + if !confirmed || nameEntry.Text == "" { + return + } + + preset := g.getCurrentSettings() + preset.Name = nameEntry.Text + preset.IsBuiltin = false + + if err := g.presetManager.SavePreset(preset); err != nil { + dialog.ShowError(err, g.parentWindow) + return + } + + // Reload presets and update UI + g.loadPresets() + g.updatePresetSelect() + + // Select the newly saved preset + g.presetSelect.SetSelected(preset.Name + " *") + if g.OnPresetSelected != nil { + g.OnPresetSelected(preset.Name) + } + }, + g.parentWindow, + ) + + formDialog.Resize(fyne.NewSize(400, 150)) + formDialog.Show() +} + +func (g *GraphicEqualizer) showDeletePresetDialog() { + selected := g.presetSelect.Selected + if selected == "" { + dialog.ShowInformation(lang.L("No Preset Selected"), lang.L("Please select a preset to delete"), g.parentWindow) + return + } + + // Remove asterisk marker if present + cleanName := selected + if len(selected) > 2 && selected[len(selected)-2:] == " *" { + cleanName = selected[:len(selected)-2] + } + + // Find the preset + var presetToDelete *backend.EQPreset + for i, p := range g.eqPresets { + if p.Name == cleanName { + presetToDelete = &g.eqPresets[i] + break + } + } + + if presetToDelete == nil || presetToDelete.IsBuiltin { + dialog.ShowInformation(lang.L("Cannot Delete"), lang.L("Cannot delete builtin presets"), g.parentWindow) + return + } + + dialog.ShowConfirm( + lang.L("Delete Preset"), + fmt.Sprintf(lang.L("Delete preset '%s'?"), cleanName), + func(confirmed bool) { + if !confirmed { + return + } + + if err := g.presetManager.DeletePreset(cleanName); err != nil { + dialog.ShowError(err, g.parentWindow) + return + } + + // Notify about deletion + if g.OnPresetDeleted != nil { + g.OnPresetDeleted(cleanName) + } + + // Reload presets and update UI + g.loadPresets() + g.updatePresetSelect() + g.presetSelect.ClearSelected() + }, + g.parentWindow, + ) +} + +// SetProfileLabel displays the name of the applied AutoEQ profile +func (g *GraphicEqualizer) SetProfileLabel(profileName string) { + if profileName == "" { + g.profileLabel.SetText("") + g.profileLabel.Hide() + } else { + g.profileLabel.SetText(fmt.Sprintf("%s: %s", lang.L("Profile"), profileName)) + g.profileLabel.Show() + } +} + +// ClearProfileLabel hides the profile label (called on manual adjustment) +func (g *GraphicEqualizer) ClearProfileLabel() { + g.SetProfileLabel("") +} + +// ClearPresetSelection clears the preset dropdown selection +func (g *GraphicEqualizer) ClearPresetSelection() { + g.presetSelect.ClearSelected() +} + func newCaptionTextSizeLabel(text string, alignment fyne.TextAlign) *widget.RichText { l := widget.NewRichTextWithText(text) ts := l.Segments[0].(*widget.TextSegment) diff --git a/ui/dialogs/settingsdialog.go b/ui/dialogs/settingsdialog.go index 8c65e20..41c3f4d 100644 --- a/ui/dialogs/settingsdialog.go +++ b/ui/dialogs/settingsdialog.go @@ -2,6 +2,7 @@ package dialogs import ( "errors" + "log" "math" "os" "slices" @@ -41,10 +42,14 @@ type SettingsDialog struct { OnPageNeedsRefresh func() OnClearCaches func() - config *backend.Config - audioDevices []mpv.AudioDevice - themeFiles map[string]string // filename -> displayName - promptText *widget.RichText + config *backend.Config + audioDevices []mpv.AudioDevice + themeFiles map[string]string // filename -> displayName + promptText *widget.RichText + eqPresetManager *backend.EQPresetManager + autoEQManager *backend.AutoEQManager + imageManager util.ImageFetcher + window fyne.Window clientDecidesScrobble bool @@ -62,9 +67,21 @@ func NewSettingsDialog( isReplayGainPlayer bool, isEqualizerPlayer bool, canSavePlayQueue bool, + eqPresetMgr *backend.EQPresetManager, window fyne.Window, + autoEQManager *backend.AutoEQManager, + imageManager util.ImageFetcher, ) *SettingsDialog { - s := &SettingsDialog{config: config, audioDevices: audioDeviceList, themeFiles: themeFileList, clientDecidesScrobble: clientDecidesScrobble} + s := &SettingsDialog{ + config: config, + audioDevices: audioDeviceList, + themeFiles: themeFileList, + clientDecidesScrobble: clientDecidesScrobble, + eqPresetManager: eqPresetMgr, + autoEQManager: autoEQManager, + imageManager: imageManager, + window: window, + } s.ExtendBaseWidget(s) // TODO: It may be a nicer UX to always create the equalizer tab, @@ -465,7 +482,11 @@ func (s *SettingsDialog) createEqualizerTab(eqBands []string) *container.TabItem enabled.Checked = s.config.LocalPlayback.EqualizerEnabled geq := NewGraphicEqualizer(s.config.LocalPlayback.EqualizerPreamp, eqBands, - s.config.LocalPlayback.GraphicEqualizerBands) + s.config.LocalPlayback.GraphicEqualizerBands, + s.config.LocalPlayback.EqualizerType, + s.eqPresetManager, + s.window, + s.config.LocalPlayback.ActiveEQPresetName) debouncer := util.NewDebouncer(350*time.Millisecond, func() { if s.OnEqualizerSettingsChanged != nil { s.OnEqualizerSettingsChanged() @@ -479,10 +500,150 @@ func (s *SettingsDialog) createEqualizerTab(eqBands []string) *container.TabItem s.config.LocalPlayback.EqualizerPreamp = g debouncer() } + geq.OnManualAdjustment = func() { + // Clear AutoEQ profile and preset when user manually adjusts sliders + s.config.LocalPlayback.AutoEQProfilePath = "" + s.config.LocalPlayback.AutoEQProfileName = "" + s.config.LocalPlayback.ActiveEQPresetName = "" + geq.ClearProfileLabel() + geq.ClearPresetSelection() + } + geq.OnLoadAutoEQProfile = func() { + s.openAutoEQBrowser(geq, debouncer) + } + geq.OnPresetSelected = func(presetName string) { + // Save the active preset name in config + s.config.LocalPlayback.ActiveEQPresetName = presetName + } + geq.OnPresetDeleted = func(presetName string) { + // Clear active preset name if the deleted preset was active + if s.config.LocalPlayback.ActiveEQPresetName == presetName { + s.config.LocalPlayback.ActiveEQPresetName = "" + } + } + geq.OnEQTypeChanged = func(eqType string) { + // Update config with new EQ type + s.config.LocalPlayback.EqualizerType = eqType + + // Convert bands using interpolation to preserve EQ curve shape + var newBands []float64 + currentBands := s.config.LocalPlayback.GraphicEqualizerBands + + if eqType == "ISO10Band" { + // Converting from 15-band to 10-band + if len(currentBands) == 15 { + // Use interpolation to downsample + var bands15 [15]float64 + copy(bands15[:], currentBands) + bands10 := backend.Interpolate15BandTo10Band(bands15) + newBands = bands10[:] + } else { + // Already 10-band or invalid size, just copy what we can + newBands = make([]float64, 10) + numCopy := min(len(currentBands), 10) + copy(newBands, currentBands[:numCopy]) + } + } else { + // Converting from 10-band to 15-band + if len(currentBands) == 10 { + // Use interpolation to upsample + var bands10 [10]float64 + copy(bands10[:], currentBands) + bands15 := backend.InterpolateAutoEQTo15Band(bands10) + newBands = bands15[:] + } else { + // Already 15-band or invalid size, just copy what we can + newBands = make([]float64, 15) + numCopy := min(len(currentBands), 15) + copy(newBands, currentBands[:numCopy]) + } + } + s.config.LocalPlayback.GraphicEqualizerBands = newBands + + // Dynamically rebuild the UI with the correct number of sliders + geq.RebuildForEQType(eqType, newBands) + + // Apply the change to the player + if s.OnEqualizerSettingsChanged != nil { + s.OnEqualizerSettingsChanged() + } + } + + // Restore profile label if a profile is currently applied + if s.config.LocalPlayback.AutoEQProfileName != "" { + geq.SetProfileLabel(s.config.LocalPlayback.AutoEQProfileName) + } + cont := container.NewBorder(enabled, nil, nil, nil, geq) return container.NewTabItem(lang.L("Equalizer"), cont) } +func (s *SettingsDialog) openAutoEQBrowser(geq *GraphicEqualizer, debouncer func()) { + if s.autoEQManager == nil { + log.Printf("ERROR: AutoEQ manager not available (nil)") + return + } + if s.imageManager == nil { + log.Printf("ERROR: Image manager not available (nil)") + return + } + + browser := NewAutoEQBrowser(s.autoEQManager, s.imageManager) + + // Show in a modal popup dialog + var popup *widget.PopUp + popup = widget.NewModalPopUp(browser.SearchDialog, s.window.Canvas()) + + browser.SetOnProfileSelected(func(profile *backend.AutoEQProfile) { + s.applyAutoEQProfile(profile, geq, debouncer) + popup.Hide() + }) + browser.SetOnDismiss(func() { + popup.Hide() + }) + + popup.Show() + s.window.Canvas().Focus(browser.GetSearchEntry()) +} + +func (s *SettingsDialog) applyAutoEQProfile(profile *backend.AutoEQProfile, geq *GraphicEqualizer, debouncer func()) { + // Use native 10-band AutoEQ profile + // Update config to use ISO10Band type + s.config.LocalPlayback.EqualizerType = "ISO10Band" + s.config.LocalPlayback.EqualizerPreamp = profile.Preamp + s.config.LocalPlayback.AutoEQProfilePath = profile.Path + s.config.LocalPlayback.AutoEQProfileName = profile.Name + s.config.LocalPlayback.ActiveEQPresetName = "" // Clear preset when applying AutoEQ + + // Ensure GraphicEqualizerBands has the right size for 10 bands + if len(s.config.LocalPlayback.GraphicEqualizerBands) != 10 { + s.config.LocalPlayback.GraphicEqualizerBands = make([]float64, 10) + } + + // Copy native 10-band values + for i := 0; i < 10; i++ { + s.config.LocalPlayback.GraphicEqualizerBands[i] = profile.Bands[i] + } + + // Update UI using applyPreset to avoid triggering manual adjustment + preset := backend.EQPreset{ + Name: profile.Name, + Type: "ISO10Band", + Preamp: profile.Preamp, + Bands: profile.Bands[:], + } + geq.applyPreset(preset) + + // Clear preset dropdown since AutoEQ is now active + geq.ClearPresetSelection() + + // Show profile label + geq.SetProfileLabel(profile.Name) + + // Trigger equalizer update + debouncer() +} + func (s *SettingsDialog) createAppearanceTab(window fyne.Window) *container.TabItem { themeNames := []string{"Default"} themeFileNames := []string{""} From 7e3b102fa45a2d2ff33f04c05a1933a8f4e099b2 Mon Sep 17 00:00:00 2001 From: Gianluca Boiano Date: Fri, 6 Feb 2026 02:50:42 +0100 Subject: [PATCH 16/25] Add translations for equalizer features --- res/translations/de.json | 29 ++++++++++++++++++++++++++++- res/translations/en.json | 29 ++++++++++++++++++++++++++++- res/translations/es.json | 29 ++++++++++++++++++++++++++++- res/translations/fr.json | 29 ++++++++++++++++++++++++++++- res/translations/it.json | 36 +++++++++++++++++++++++++++++++++++- res/translations/ja.json | 29 ++++++++++++++++++++++++++++- res/translations/ko.json | 29 ++++++++++++++++++++++++++++- res/translations/nl.json | 29 ++++++++++++++++++++++++++++- res/translations/pl.json | 29 ++++++++++++++++++++++++++++- res/translations/pt_BR.json | 29 ++++++++++++++++++++++++++++- res/translations/ro.json | 29 ++++++++++++++++++++++++++++- res/translations/ru.json | 29 ++++++++++++++++++++++++++++- res/translations/zh.json | 29 ++++++++++++++++++++++++++++- res/translations/zhHans.json | 29 ++++++++++++++++++++++++++++- res/translations/zhHant.json | 29 ++++++++++++++++++++++++++++- 15 files changed, 427 insertions(+), 15 deletions(-) diff --git a/res/translations/de.json b/res/translations/de.json index 5800c6a..284b81d 100644 --- a/res/translations/de.json +++ b/res/translations/de.json @@ -36,6 +36,7 @@ "Aug": "Aug", "Authentication failed": "Authentifizierung fehlgeschlagen", "Auto": "Auto", + "AutoEQ": "AutoEQ", "Automatically check for updates": "Automatically check for updates", "Autoplay": "Autoplay", "Autoselect device": "Automatische Geräteauswahl", @@ -46,6 +47,8 @@ "Bold font": "Bold font", "Broadcast": "Broadcast", "Cancel": "Abbrechen", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Nach Updates suchen", @@ -69,7 +72,10 @@ "DJ-Mix": "DJ-Mix", "Date added": "Date added", "Dec": "Dec", + "Delete": "Delete", "Delete Playlist": "Playlist löschen", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "Demo", "Disable automatic DPI adjustment": "Disable automatic DPI adjustment", "Disable server transcoding": "Server-Transkodierung deaktivieren", @@ -80,6 +86,21 @@ "Duration": "Dauer", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "Bearbeiten", "Edit Playlist": "Playlist bearbeiten", "Edit server": "Server bearbeiten", @@ -144,6 +165,7 @@ "New Playlist": "New Playlist", "Next": "Nächster", "Nickname": "Spitzname", + "No Preset Selected": "No Preset Selected", "No new version found": "Keine neue Version gefunden", "No radio stations available": "Keine Radiosender verfügbar", "None": "Keine", @@ -173,6 +195,8 @@ "Playlist": "Playlist", "Playlists": "Playlists", "Plays": "Wiedergaben", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "Übersteuerung vermeiden", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Vorheriger", @@ -193,8 +217,11 @@ "ReplayGain mode": "ReplayGain-Modus", "ReplayGain preamp": "ReplayGain-Vorverstärker", "Rescan Library": "Bibliothek neu scannen", + "Reset": "Reset", "Restart required": "Neustart erforderlich", "Sample rate": "Sample rate", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "Wiedergabeliste beim Verlassen speichern", "Saved at": "Gespeichert am", "Scrobble when": "Scrobble wenn", @@ -319,4 +346,4 @@ "{{.trackCount}} tracks": { "other": "{{.trackCount}} Titel" } -} +} \ No newline at end of file diff --git a/res/translations/en.json b/res/translations/en.json index b6130b1..ccec76c 100644 --- a/res/translations/en.json +++ b/res/translations/en.json @@ -35,6 +35,7 @@ "Audio device": "Audio device", "Audiobook": "Audiobook", "Aug": "Aug", + "AutoEQ": "AutoEQ", "Authentication failed": "Authentication failed", "Auto": "Auto", "Automatically check for updates": "Automatically check for updates", @@ -47,6 +48,8 @@ "Bold font": "Bold font", "Broadcast": "Broadcast", "Cancel": "Cancel", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Check for Updates", @@ -70,7 +73,10 @@ "DJ-Mix": "DJ-Mix", "Date added": "Date added", "Dec": "Dec", + "Delete": "Delete", "Delete Playlist": "Delete Playlist", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "Demo", "Disable automatic DPI adjustment": "Disable automatic DPI adjustment", "Disable server transcoding": "Disable server transcoding", @@ -81,6 +87,21 @@ "Duration": "Duration", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R\u0026B": "R\u0026B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "Edit", "Edit Playlist": "Edit Playlist", "Edit server": "Edit server", @@ -145,6 +166,7 @@ "New Playlist": "New Playlist", "Next": "Next", "Nickname": "Nickname", + "No Preset Selected": "No Preset Selected", "No new version found": "No new version found", "No radio stations available": "No radio stations available", "None": "None", @@ -174,6 +196,8 @@ "Playlist": "Playlist", "Playlists": "Playlists", "Plays": "Plays", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "Prevent clipping", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Previous", @@ -194,8 +218,11 @@ "ReplayGain mode": "ReplayGain mode", "ReplayGain preamp": "ReplayGain preamp", "Rescan Library": "Rescan Library", + "Reset": "Reset", "Restart required": "Restart required", "Sample rate": "Sample rate", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "Save play queue", "Saved at": "Saved at", "Scrobble when": "Scrobble when", @@ -340,4 +367,4 @@ "one": "{{.trackCount}} track", "other": "{{.trackCount}} tracks" } -} +} \ No newline at end of file diff --git a/res/translations/es.json b/res/translations/es.json index ee20a3d..14b7ae3 100644 --- a/res/translations/es.json +++ b/res/translations/es.json @@ -36,6 +36,7 @@ "Aug": "Ago", "Authentication failed": "Autenticación fallida", "Auto": "Automático", + "AutoEQ": "AutoEQ", "Automatically check for updates": "Automatically check for updates", "Autoplay": "Autoplay", "Autoselect device": "Seleccionar dispositivo automáticamente", @@ -46,6 +47,8 @@ "Bold font": "Bold font", "Broadcast": "Transmisión", "Cancel": "Cancelar", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Buscar actualizaciones", @@ -69,7 +72,10 @@ "DJ-Mix": "Mezcla de DJ", "Date added": "Date added", "Dec": "Dic", + "Delete": "Delete", "Delete Playlist": "Eliminar lista de reproducción", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "Demo", "Disable automatic DPI adjustment": "Disable automatic DPI adjustment", "Disable server transcoding": "Desactivar transcodificación del servidor", @@ -80,6 +86,21 @@ "Duration": "Duración", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "Editar", "Edit Playlist": "Editar lista de reproducción", "Edit server": "Editar servidor", @@ -144,6 +165,7 @@ "New Playlist": "Crear Nueva", "Next": "Siguiente", "Nickname": "Apodo", + "No Preset Selected": "No Preset Selected", "No new version found": "No se encontró nueva versión", "No radio stations available": "No hay estaciones de radio disponibles", "None": "Ninguno", @@ -173,6 +195,8 @@ "Playlist": "Lista de reproducción", "Playlists": "Listas de reproducción", "Plays": "Reproducciones", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "Prevenir recortes", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Anterior", @@ -193,8 +217,11 @@ "ReplayGain mode": "Modo ReplayGain", "ReplayGain preamp": "Preamp ReplayGain", "Rescan Library": "Reescanear la biblioteca", + "Reset": "Reset", "Restart required": "Reinicio requerido", "Sample rate": "Sample rate", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "Guardar cola de reproducción", "Saved at": "Guardado en", "Scrobble when": "Scrobble cuando", @@ -330,4 +357,4 @@ "one": "hace un año", "other": "hace {{.years}} años" } -} +} \ No newline at end of file diff --git a/res/translations/fr.json b/res/translations/fr.json index 8e1124d..1724828 100644 --- a/res/translations/fr.json +++ b/res/translations/fr.json @@ -37,6 +37,7 @@ "Aug": "Août", "Authentication failed": "Échec d'authentification", "Auto": "Automatique", + "AutoEQ": "AutoEQ", "Automatically check for updates": "Vérifier automatiquement les mises à jour", "Autoplay": "Lecture auto", "Autoselect device": "Sélection automatique", @@ -47,6 +48,8 @@ "Bold font": "Police en gras", "Broadcast": "Broadcast", "Cancel": "Annuler", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "Diffuser sur un appareil", "Channels": "Canaux", "Check for Updates": "Vérifier les mises à jour", @@ -70,7 +73,10 @@ "DJ-Mix": "DJ mix", "Date added": "Date added", "Dec": "Déc", + "Delete": "Delete", "Delete Playlist": "Supprimer la liste de lecture", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "Démo", "Disable automatic DPI adjustment": "Désactiver l'ajustement automatique de DPI", "Disable server transcoding": "Désactiver le transcodage par le serveur", @@ -81,6 +87,21 @@ "Duration": "Durée", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "Modifier", "Edit Playlist": "Modifier la liste de lecture", "Edit server": "Modifier le serveur", @@ -145,6 +166,7 @@ "New Playlist": "New Playlist", "Next": "Suivante", "Nickname": "Surnom", + "No Preset Selected": "No Preset Selected", "No new version found": "Aucune nouvelle version n'a été trouvée", "No radio stations available": "Aucune station de radio disponible", "None": "Aucun", @@ -174,6 +196,8 @@ "Playlist": "Liste de lecture", "Playlists": "Listes de lecture", "Plays": "Lectures", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "Empêcher le clipping", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Précédente", @@ -194,8 +218,11 @@ "ReplayGain mode": "Mode ReplayGain", "ReplayGain preamp": "Préamp. ReplayGain", "Rescan Library": "Analyser à nouveau la bibliothèque", + "Reset": "Reset", "Restart required": "Redémarrage nécessaire", "Sample rate": "Taux d'échantillonnage", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "Sauvegarder la file d'attente", "Saved at": "Sauvegardé sur", "Scrobble when": "Scrobbler quand", @@ -315,4 +342,4 @@ "x_minutes_ago": { "other": "59 minutes ago" } -} +} \ No newline at end of file diff --git a/res/translations/it.json b/res/translations/it.json index 673ddba..11d2f31 100644 --- a/res/translations/it.json +++ b/res/translations/it.json @@ -35,6 +35,7 @@ "Audio device": "Dispositivo audio", "Audiobook": "Audiobook", "Aug": "Ago", + "AutoEQ": "AutoEQ", "Authentication failed": "Autenticazione fallita", "Auto": "Automatico", "Automatically check for updates": "Controlla automaticamente gli aggiornamenti", @@ -47,6 +48,8 @@ "Bold font": "Font grassetto", "Broadcast": "Broadcast", "Cancel": "Annulla", + "Cannot Delete": "Impossibile Eliminare", + "Cannot delete builtin presets": "Impossibile eliminare i preset predefiniti", "Cast to device": "Trasmetti a dispositivo", "Channels": "Canali", "Check for Updates": "Controlla aggiornamenti", @@ -70,7 +73,10 @@ "DJ-Mix": "DJ-Mix", "Date added": "Data aggiunta", "Dec": "Dic", + "Delete": "Elimina", "Delete Playlist": "Elimina playlist", + "Delete Preset": "Elimina Preset", + "Delete preset '%s'?": "Eliminare il preset '%s'?", "Demo": "Demo", "Disable automatic DPI adjustment": "Disabilita regolazione automatica DPI", "Disable server transcoding": "Disabilita la transocodifica lato server", @@ -81,6 +87,28 @@ "Duration": "Durata", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acustico", + "EQ Bass Boost": "Amplifica Bassi", + "EQ Classical": "Classica", + "EQ Electronic": "Elettronica", + "EQ Flat": "Piatto", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Amplifica Alti", + "EQ Type:": "Tipo EQ:", + "EQ Vocal": "Vocale", + "Browse Headphone Profiles": "Sfoglia Profili Cuffie", + "Check network connection and try again": "Controlla la connessione di rete e riprova", + "Error loading AutoEQ profiles": "Errore nel caricamento dei profili AutoEQ", + "Load AutoEQ Profile": "Carica Profilo AutoEQ", + "Profile": "Profilo", + "Search headphones...": "Cerca cuffie...", "Edit": "Modifica", "Edit Playlist": "Modifica playlist", "Edit server": "Modifica server", @@ -145,6 +173,7 @@ "New Playlist": "Nuova playlist", "Next": "Successiva", "Nickname": "Nickname", + "No Preset Selected": "Nessun Preset Selezionato", "No new version found": "Nessuna nuova versione trovata", "No radio stations available": "Nessuna stazione radio disponibile", "None": "Nessuno", @@ -174,6 +203,8 @@ "Playlist": "Playlist", "Playlists": "Playlist", "Plays": "Nº ascolti", + "Please select a preset to delete": "Seleziona un preset da eliminare", + "Preset name": "Nome preset", "Prevent clipping": "Previeni clipping", "Prevent screensaver on Now Playing page": "Previeni screensaver sulla pagina In riproduzione", "Previous": "Precedente", @@ -194,8 +225,11 @@ "ReplayGain mode": "ReplayGain mode", "ReplayGain preamp": "ReplayGain preamp.", "Rescan Library": "Ricarica libreria", + "Reset": "Ripristina", "Restart required": "Riavvio richiesto", "Sample rate": "Frequenza di campionamento", + "Save": "Salva", + "Save Preset": "Salva Preset", "Save play queue": "Salva coda di ascolto", "Saved at": "Salvato in", "Scrobble when": "Scrobbla quando", @@ -340,4 +374,4 @@ "one": "{{.trackCount}} traccia", "other": "{{.trackCount}} tracce" } -} +} \ No newline at end of file diff --git a/res/translations/ja.json b/res/translations/ja.json index a03dbc0..2a5f73a 100644 --- a/res/translations/ja.json +++ b/res/translations/ja.json @@ -37,6 +37,7 @@ "Aug": "8月", "Authentication failed": "認証に失敗しました", "Auto": "自動", + "AutoEQ": "AutoEQ", "Automatically check for updates": "アップデートを自動的にチェックする", "Autoplay": "自動再生", "Autoselect device": "デバイスを自動選択", @@ -47,6 +48,8 @@ "Bold font": "太字フォント", "Broadcast": "ブロードキャスト", "Cancel": "取消", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "デバイスにキャスト", "Channels": "チャンネル", "Check for Updates": "アップデートの確認", @@ -70,7 +73,10 @@ "DJ-Mix": "DJ-Mix", "Date added": "追加日時", "Dec": "12月", + "Delete": "Delete", "Delete Playlist": "プレイリストの削除", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "デモ", "Disable automatic DPI adjustment": "自動DPI調整を無効にする", "Disable server transcoding": "サーバーのトランスコーディングを無効にする", @@ -81,6 +87,21 @@ "Duration": "演奏時間", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "編集", "Edit Playlist": "プレイリストを編集", "Edit server": "サーバーを編集", @@ -145,6 +166,7 @@ "New Playlist": "新しいプレイリスト", "Next": "次", "Nickname": "ニックネーム", + "No Preset Selected": "No Preset Selected", "No new version found": "新しいバージョンが見つかりません", "No radio stations available": "利用できるラジオ局はありません", "None": "なし", @@ -174,6 +196,8 @@ "Playlist": "プレイリスト", "Playlists": "プレイリスト", "Plays": "再生", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "クリッピングを防ぐ", "Prevent screensaver on Now Playing page": "再生中ページでスクリーンセーバーを無効にする", "Previous": "前", @@ -194,8 +218,11 @@ "ReplayGain mode": "リプレイゲインモード", "ReplayGain preamp": "リプレイゲイン プリアンプ", "Rescan Library": "ライブラリを再スキャン", + "Reset": "Reset", "Restart required": "再起動が必要です", "Sample rate": "サンプルレート", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "再生キューを保存", "Saved at": "保存場所", "Scrobble when": "スクロールすると", @@ -340,4 +367,4 @@ "one": "{{.trackCount}}トラック", "other": "{{.trackCount}}トラック" } -} +} \ No newline at end of file diff --git a/res/translations/ko.json b/res/translations/ko.json index 570e60e..4595738 100644 --- a/res/translations/ko.json +++ b/res/translations/ko.json @@ -37,6 +37,7 @@ "Aug": "8월", "Authentication failed": "인증 실패", "Auto": "자동", + "AutoEQ": "AutoEQ", "Automatically check for updates": "자동으로 업데이트 확인", "Autoplay": "자동 재생", "Autoselect device": "자동 선택 장치", @@ -47,6 +48,8 @@ "Bold font": "굵은 글꼴", "Broadcast": "방송", "Cancel": "취소", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "장치로 캐스트", "Channels": "Channels", "Check for Updates": "업데이트 확인", @@ -70,7 +73,10 @@ "DJ-Mix": "DJ-믹스", "Date added": "Date added", "Dec": "12월", + "Delete": "Delete", "Delete Playlist": "재생 목록 삭제", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "데모", "Disable automatic DPI adjustment": "자동 DPI 조정 비활성화", "Disable server transcoding": "서버 트랜스코딩 비활성화", @@ -81,6 +87,21 @@ "Duration": "기간", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "편집", "Edit Playlist": "재생 목록 편집", "Edit server": "서버 편집", @@ -145,6 +166,7 @@ "New Playlist": "New Playlist", "Next": "다음", "Nickname": "별명", + "No Preset Selected": "No Preset Selected", "No new version found": "새 버전을 찾을 수 없습니다", "No radio stations available": "라디오 방송국이 없습니다", "None": "없음", @@ -174,6 +196,8 @@ "Playlist": "재생 목록", "Playlists": "재생 목록", "Plays": "재생", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "클리핑 방지", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "이전", @@ -194,8 +218,11 @@ "ReplayGain mode": "리플레이게인 모드", "ReplayGain preamp": "리플레이게인 프리앰프", "Rescan Library": "라이브러리 재스캔", + "Reset": "Reset", "Restart required": "재시작 필요", "Sample rate": "Sample rate", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "Save play queue", "Save play queuet": "종료 시 재생 대기열 저장", "Saved at": "저장됨", @@ -317,4 +344,4 @@ "x_minutes_ago": { "other": "59 minutes ago" } -} +} \ No newline at end of file diff --git a/res/translations/nl.json b/res/translations/nl.json index 5104493..e6657d2 100644 --- a/res/translations/nl.json +++ b/res/translations/nl.json @@ -37,6 +37,7 @@ "Aug": "Aug", "Authentication failed": "Authenticatie mislukt", "Auto": "Auto", + "AutoEQ": "AutoEQ", "Automatically check for updates": "Automatisch controleren op updates", "Autoplay": "Automatisch afspelen", "Autoselect device": "Automatisch apparaat selecteren", @@ -47,6 +48,8 @@ "Bold font": "Bold font", "Broadcast": "Broadcast", "Cancel": "Annuleren", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "Cast naar apparaat", "Channels": "Channels", "Check for Updates": "Controleer op updates", @@ -70,7 +73,10 @@ "DJ-Mix": "DJ-Mix", "Date added": "Date added", "Dec": "Dec", + "Delete": "Delete", "Delete Playlist": "Wis afspeellijst", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "Demo", "Disable automatic DPI adjustment": "Automatische DPI-aanpassing uitschakelen", "Disable server transcoding": "Schakel server transcodering uit", @@ -81,6 +87,21 @@ "Duration": "Duur", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "Bewerken", "Edit Playlist": "Bewerk afspeellijst", "Edit server": "Bewerk server", @@ -145,6 +166,7 @@ "New Playlist": "New Playlist", "Next": "Volgende", "Nickname": "Nickname", + "No Preset Selected": "No Preset Selected", "No new version found": "Geen nieuwe versie gevonden", "No radio stations available": "Geen radio stations beschikbaar", "None": "Geen", @@ -174,6 +196,8 @@ "Playlist": "Afspeellijst", "Playlists": "Afspeellijsten", "Plays": "Afgespeeld", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "Voorkom clipping", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Vorige", @@ -194,8 +218,11 @@ "ReplayGain mode": "ReplayGain mode", "ReplayGain preamp": "ReplayGain preamp", "Rescan Library": "Bibliotheek opnieuw scannen", + "Reset": "Reset", "Restart required": "Herstart vereist", "Sample rate": "Sample rate", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "Bewaar wachtrij bij afsluiten", "Saved at": "Opgeslaan op", "Scrobble when": "Scrobble als", @@ -315,4 +342,4 @@ "x_minutes_ago": { "other": "59 minutes ago" } -} +} \ No newline at end of file diff --git a/res/translations/pl.json b/res/translations/pl.json index f694b15..92ee700 100644 --- a/res/translations/pl.json +++ b/res/translations/pl.json @@ -34,6 +34,7 @@ "Audiobook": "Audiobook", "Authentication failed": "Błąd autoryzacji", "Auto": "Auto", + "AutoEQ": "AutoEQ", "Automatically check for updates": "Automatycznie sprawdzaj aktualizacje", "Autoplay": "Auto odtwarzanie", "Autoselect device": "Automatyczny wybór", @@ -44,6 +45,8 @@ "Bold font": "Bold font", "Broadcast": "Broadcast", "Cancel": "Anuluj", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Sprawdź aktualizacje", @@ -66,7 +69,10 @@ "Create new playlist": "Utwórz nową playlistę", "DJ-Mix": "DJ-Mix", "Date added": "Date added", + "Delete": "Delete", "Delete Playlist": "Usuń playlistę", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "Demo", "Disable automatic DPI adjustment": "Wyłącz automatyczną zmianę DPI", "Disable server transcoding": "Wyłącz transkodowanie serwera", @@ -77,6 +83,21 @@ "Duration": "Czas trwania", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "Edytuj", "Edit Playlist": "Edytuj playlistę", "Edit server": "Edytuj serwer", @@ -135,6 +156,7 @@ "New Playlist": "New Playlist", "Next": "Następny", "Nickname": "Nazwa serwera", + "No Preset Selected": "No Preset Selected", "No new version found": "Nie znaleziono nowych wersji", "No radio stations available": "Brak dostępnych radio stacji", "None": "Nic", @@ -162,6 +184,8 @@ "Playlist": "Playlista", "Playlists": "Playlisty", "Plays": "Ilość odtworzeń", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "Zapobiegnij przycicnaniu", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Poprzednie", @@ -182,8 +206,11 @@ "ReplayGain mode": "ReplayGain mode", "ReplayGain preamp": "ReplayGain preamp", "Rescan Library": "Przeszukaj ponownie bibliotekę", + "Reset": "Reset", "Restart required": "Wymagany restart", "Sample rate": "Sample rate", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "Zapisz kolejkę odtwarzania po zamknięciu", "Saved at": "Zapisano w", "Scrobble when": "Wyślij gdy", @@ -301,4 +328,4 @@ "x_minutes_ago": { "other": "59 minutes ago" } -} +} \ No newline at end of file diff --git a/res/translations/pt_BR.json b/res/translations/pt_BR.json index 03b3b8a..3139807 100644 --- a/res/translations/pt_BR.json +++ b/res/translations/pt_BR.json @@ -37,6 +37,7 @@ "Aug": "Ago", "Authentication failed": "A autenticação falhou", "Auto": "Auto", + "AutoEQ": "AutoEQ", "Automatically check for updates": "Procurar atualizações automaticamente", "Autoplay": "Autoplay", "Autoselect device": "Selecionar dispositivo automaticamente", @@ -47,6 +48,8 @@ "Bold font": "Fonte em negrito", "Broadcast": "Transmissão", "Cancel": "Cancelar", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Buscar atualizações", @@ -70,7 +73,10 @@ "DJ-Mix": "DJ-Mix", "Date added": "Date added", "Dec": "Dez", + "Delete": "Delete", "Delete Playlist": "Remover lista de reprodução", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "Demo", "Disable automatic DPI adjustment": "Desabilitar ajuste automático de DPI", "Disable server transcoding": "Desabilitar transcodificação no servidor", @@ -81,6 +87,21 @@ "Duration": "Duração", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "Editar", "Edit Playlist": "Editar lista de reprodução", "Edit server": "Editar servidor", @@ -145,6 +166,7 @@ "New Playlist": "New Playlist", "Next": "Próximo", "Nickname": "Apelido", + "No Preset Selected": "No Preset Selected", "No new version found": "Nenhuma versão nova encontrada", "No radio stations available": "Nenhuma estação de rádio disponível", "None": "Nenhum", @@ -174,6 +196,8 @@ "Playlist": "Lista de reprodução", "Playlists": "Listas de reprodução", "Plays": "Reproduções", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "Evitar clipping", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Anterior", @@ -194,8 +218,11 @@ "ReplayGain mode": "Modo do ReplayGain", "ReplayGain preamp": "Pré-amp. do ReplayGain", "Rescan Library": "Reescanear biblioteca", + "Reset": "Reset", "Restart required": "Requer reinício", "Sample rate": "Sample rate", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "Salvar fila de reprodução", "Saved at": "Salvo em", "Scrobble when": "Fazer scrobble quando", @@ -314,4 +341,4 @@ "x_minutes_ago": { "other": "59 minutes ago" } -} +} \ No newline at end of file diff --git a/res/translations/ro.json b/res/translations/ro.json index 4b55b25..0dcb15b 100644 --- a/res/translations/ro.json +++ b/res/translations/ro.json @@ -36,6 +36,7 @@ "Aug": "Aug", "Authentication failed": "Autentificare eșuată", "Auto": "Auto", + "AutoEQ": "AutoEQ", "Automatically check for updates": "Automatically check for updates", "Autoplay": "Autoplay", "Autoselect device": "Selectează automat dispozitiv", @@ -46,6 +47,8 @@ "Bold font": "Bold font", "Broadcast": "Transmisiune", "Cancel": "Anulează", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Verifică actualizări", @@ -69,7 +72,10 @@ "DJ-Mix": "DJ-Mix", "Date added": "Date added", "Dec": "Dec", + "Delete": "Delete", "Delete Playlist": "Șterge playlist", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "Demo", "Disable automatic DPI adjustment": "Disable automatic DPI adjustment", "Disable server transcoding": "Dezactivează transcodare pe server", @@ -80,6 +86,21 @@ "Duration": "Durată", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "Editare", "Edit Playlist": "Editează playlist", "Edit server": "Editează server", @@ -144,6 +165,7 @@ "New Playlist": "New Playlist", "Next": "Următorul", "Nickname": "Supranume", + "No Preset Selected": "No Preset Selected", "No new version found": "Nicio versiune nouă", "No radio stations available": "Nicio stație radio disponibilă", "None": "Nimic", @@ -172,6 +194,8 @@ "Playlist": "Playlist", "Playlists": "Playlist-uri", "Plays": "Redări", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "Previne distorsiunea", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Anterior", @@ -192,8 +216,11 @@ "ReplayGain mode": "Mod ReplayGain", "ReplayGain preamp": "Preamplificare ReplayGain", "Rescan Library": "Rescanează librăria", + "Reset": "Reset", "Restart required": "Repornire necesară", "Sample rate": "Sample rate", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "Salvează listă de redare", "Saved at": "Salvat la", "Scrobble when": "Scrobblare când", @@ -312,4 +339,4 @@ "x_minutes_ago": { "other": "59 minutes ago" } -} +} \ No newline at end of file diff --git a/res/translations/ru.json b/res/translations/ru.json index 2ef5417..9df1b72 100644 --- a/res/translations/ru.json +++ b/res/translations/ru.json @@ -37,6 +37,7 @@ "Aug": "Авг", "Authentication failed": "Ошибка аутентикации", "Auto": "Автоматически", + "AutoEQ": "AutoEQ", "Automatically check for updates": "Проверять обновления автоматически", "Autoplay": "Автоматически", "Autoselect device": "Автоматически", @@ -47,6 +48,8 @@ "Bold font": "Полужирный", "Broadcast": "Радиопередача", "Cancel": "Отменить", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "Отправить на устройство", "Channels": "Channels", "Check for Updates": "Проверить обновления", @@ -70,7 +73,10 @@ "DJ-Mix": "DJ-микс", "Date added": "Date added", "Dec": "Дек", + "Delete": "Delete", "Delete Playlist": "Удалить", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "Демозапись", "Disable automatic DPI adjustment": "Отключить автоматическую подгонку DPI", "Disable server transcoding": "Отключить перекодирование на стороне сервера", @@ -81,6 +87,21 @@ "Duration": "Длительность", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "Изменить", "Edit Playlist": "Изменить список воспроизведения", "Edit server": "Изменить сервер", @@ -145,6 +166,7 @@ "New Playlist": "New Playlist", "Next": "Следующий", "Nickname": "Название сервера", + "No Preset Selected": "No Preset Selected", "No new version found": "Нет новой версии", "No radio stations available": "Радиостанции не доступны", "None": "Нет", @@ -174,6 +196,8 @@ "Playlist": "Список воспроизведения", "Playlists": "Списки воспроизведения", "Plays": "Прослушивания", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "Защита от перегрузки", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Предыдущий", @@ -194,8 +218,11 @@ "ReplayGain mode": "Режим", "ReplayGain preamp": "Предусиление", "Rescan Library": "Перечитать библиотеку", + "Reset": "Reset", "Restart required": "Требуется перезапуск", "Sample rate": "Sample rate", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "Сохранять очередь воспроизведения при выходе", "Saved at": "Сохранено в", "Scrobble when": "Отправлять когда", @@ -329,4 +356,4 @@ "one": "{{.trackCount}} композиция", "other": "{{.trackCount}} композиций" } -} +} \ No newline at end of file diff --git a/res/translations/zh.json b/res/translations/zh.json index d553f3a..d8f12a6 100644 --- a/res/translations/zh.json +++ b/res/translations/zh.json @@ -37,6 +37,7 @@ "Aug": "八月", "Authentication failed": "认证失败", "Auto": "自动", + "AutoEQ": "AutoEQ", "Automatically check for updates": "自动检查更新", "Autoplay": "自动播放", "Autoselect device": "自动选择设备", @@ -47,6 +48,8 @@ "Bold font": "粗体字体", "Broadcast": "广播", "Cancel": "取消", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "投屏到设备", "Channels": "频道", "Check for Updates": "检查更新", @@ -70,7 +73,10 @@ "DJ-Mix": "DJ混音", "Date added": "添加日期", "Dec": "十二月", + "Delete": "Delete", "Delete Playlist": "删除播放列表", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "演示", "Disable automatic DPI adjustment": "禁用自动 DPI 调整", "Disable server transcoding": "禁用服务器转码", @@ -81,6 +87,21 @@ "Duration": "持续时间", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "编辑", "Edit Playlist": "编辑播放列表", "Edit server": "编辑服务器", @@ -145,6 +166,7 @@ "New Playlist": "新播放列表", "Next": "下一个", "Nickname": "昵称", + "No Preset Selected": "No Preset Selected", "No new version found": "未找到新版本", "No radio stations available": "没有可用的电台", "None": "无", @@ -174,6 +196,8 @@ "Playlist": "播放列表", "Playlists": "播放列表", "Plays": "播放", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "防止削波", "Prevent screensaver on Now Playing page": "禁止在“正在播放”页面显示屏幕保护程序", "Previous": "上一个", @@ -194,8 +218,11 @@ "ReplayGain mode": "重播增益模式", "ReplayGain preamp": "重播增益前置放大", "Rescan Library": "重新扫描库", + "Reset": "Reset", "Restart required": "需要重启", "Sample rate": "采样率", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "退出时保存播放队列", "Saved at": "保存于", "Scrobble when": "记录播放时", @@ -340,4 +367,4 @@ "one": "{{.trackCount}} 曲目", "other": "{{.trackCount}} 曲目" } -} +} \ No newline at end of file diff --git a/res/translations/zhHans.json b/res/translations/zhHans.json index d553f3a..d8f12a6 100644 --- a/res/translations/zhHans.json +++ b/res/translations/zhHans.json @@ -37,6 +37,7 @@ "Aug": "八月", "Authentication failed": "认证失败", "Auto": "自动", + "AutoEQ": "AutoEQ", "Automatically check for updates": "自动检查更新", "Autoplay": "自动播放", "Autoselect device": "自动选择设备", @@ -47,6 +48,8 @@ "Bold font": "粗体字体", "Broadcast": "广播", "Cancel": "取消", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "投屏到设备", "Channels": "频道", "Check for Updates": "检查更新", @@ -70,7 +73,10 @@ "DJ-Mix": "DJ混音", "Date added": "添加日期", "Dec": "十二月", + "Delete": "Delete", "Delete Playlist": "删除播放列表", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "演示", "Disable automatic DPI adjustment": "禁用自动 DPI 调整", "Disable server transcoding": "禁用服务器转码", @@ -81,6 +87,21 @@ "Duration": "持续时间", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "编辑", "Edit Playlist": "编辑播放列表", "Edit server": "编辑服务器", @@ -145,6 +166,7 @@ "New Playlist": "新播放列表", "Next": "下一个", "Nickname": "昵称", + "No Preset Selected": "No Preset Selected", "No new version found": "未找到新版本", "No radio stations available": "没有可用的电台", "None": "无", @@ -174,6 +196,8 @@ "Playlist": "播放列表", "Playlists": "播放列表", "Plays": "播放", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "防止削波", "Prevent screensaver on Now Playing page": "禁止在“正在播放”页面显示屏幕保护程序", "Previous": "上一个", @@ -194,8 +218,11 @@ "ReplayGain mode": "重播增益模式", "ReplayGain preamp": "重播增益前置放大", "Rescan Library": "重新扫描库", + "Reset": "Reset", "Restart required": "需要重启", "Sample rate": "采样率", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "退出时保存播放队列", "Saved at": "保存于", "Scrobble when": "记录播放时", @@ -340,4 +367,4 @@ "one": "{{.trackCount}} 曲目", "other": "{{.trackCount}} 曲目" } -} +} \ No newline at end of file diff --git a/res/translations/zhHant.json b/res/translations/zhHant.json index 2c994d8..4fbaaf6 100644 --- a/res/translations/zhHant.json +++ b/res/translations/zhHant.json @@ -34,6 +34,7 @@ "Audiobook": "有聲書", "Authentication failed": "認證失敗", "Auto": "自動", + "AutoEQ": "AutoEQ", "Automatically check for updates": "Automatically check for updates", "Autoplay": "Autoplay", "Autoselect device": "自動選擇裝置", @@ -44,6 +45,8 @@ "Bold font": "Bold font", "Broadcast": "廣播", "Cancel": "取消", + "Cannot Delete": "Cannot Delete", + "Cannot delete builtin presets": "Cannot delete builtin presets", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "檢查更新", @@ -66,7 +69,10 @@ "Create new playlist": "建立新播放清單", "DJ-Mix": "DJ混音", "Date added": "Date added", + "Delete": "Delete", "Delete Playlist": "刪除播放清單", + "Delete Preset": "Delete Preset", + "Delete preset '%s'?": "Delete preset '%s'?", "Demo": "示範", "Disable automatic DPI adjustment": "Disable automatic DPI adjustment", "Disable server transcoding": "禁用伺服器轉碼", @@ -77,6 +83,21 @@ "Duration": "持續時間", "EP": "EP", "EPs": "EPs", + "EQ Acoustic": "Acoustic", + "EQ Bass Boost": "Bass Boost", + "EQ Classical": "Classical", + "EQ Electronic": "Electronic", + "EQ Flat": "Flat", + "EQ Jazz": "Jazz", + "EQ Loudness": "Loudness", + "EQ Pop": "Pop", + "EQ Preamp": "Pre", + "EQ Preset": "Preset", + "EQ Preset:": "Preset:", + "EQ R&B": "R&B", + "EQ Rock": "Rock", + "EQ Treble Boost": "Treble Boost", + "EQ Vocal": "Vocal", "Edit": "編輯", "Edit Playlist": "編輯播放清單", "Edit server": "編輯伺服器", @@ -135,6 +156,7 @@ "New Playlist": "New Playlist", "Next": "下一個", "Nickname": "暱稱", + "No Preset Selected": "No Preset Selected", "No new version found": "未找到新版本", "No radio stations available": "沒有可用的電台", "None": "無", @@ -161,6 +183,8 @@ "Playlist": "播放清單", "Playlists": "播放清單", "Plays": "播放", + "Please select a preset to delete": "Please select a preset to delete", + "Preset name": "Preset name", "Prevent clipping": "防止削波", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "上一個", @@ -181,8 +205,11 @@ "ReplayGain mode": "重播增益模式", "ReplayGain preamp": "重播增益前置放大", "Rescan Library": "重新掃描庫", + "Reset": "Reset", "Restart required": "需要重新啟動", "Sample rate": "Sample rate", + "Save": "Save", + "Save Preset": "Save Preset", "Save play queue": "退出時保存播放佇列", "Saved at": "保存於", "Scrobble when": "記錄播放時", @@ -299,4 +326,4 @@ "x_minutes_ago": { "other": "59 minutes ago" } -} +} \ No newline at end of file From daf0440fbc1cf940471ece6210acd8118a3e036e Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Fri, 6 Feb 2026 08:27:52 -0800 Subject: [PATCH 17/25] extend searchdialog / SearchResult to properly support headphone profiles --- backend/mediaprovider/model.go | 12 +++++++++++- ui/dialogs/autoeqbrowser.go | 6 ++++-- ui/dialogs/searchdialog.go | 34 ++++++++++++++++++++++++---------- ui/theme/theme.go | 2 +- ui/toolbar.go | 2 +- 5 files changed, 41 insertions(+), 15 deletions(-) diff --git a/backend/mediaprovider/model.go b/backend/mediaprovider/model.go index 238ccb4..596878e 100644 --- a/backend/mediaprovider/model.go +++ b/backend/mediaprovider/model.go @@ -1,6 +1,10 @@ package mediaprovider -import "time" +import ( + "time" + + "fyne.io/fyne/v2" +) // Bit field flag for the ReleaseTypes property type ReleaseType = int32 @@ -282,6 +286,7 @@ const ( ContentTypeTrack ContentTypeGenre ContentTypeRadioStation + ContentTypeOther ) func (c ContentType) String() string { @@ -298,6 +303,8 @@ func (c ContentType) String() string { return "Genre" case ContentTypeRadioStation: return "Radio station" + case ContentTypeOther: + return "Other" default: return "Unknown" } @@ -309,6 +316,9 @@ type SearchResult struct { CoverID string Type ContentType + // Optional icon to display instead of the default for this content type + Icon fyne.Resource + // for Album / Playlist: track count // Artist / Genre: album count // Track: length (seconds) diff --git a/ui/dialogs/autoeqbrowser.go b/ui/dialogs/autoeqbrowser.go index a473141..d5ae1d1 100644 --- a/ui/dialogs/autoeqbrowser.go +++ b/ui/dialogs/autoeqbrowser.go @@ -12,6 +12,7 @@ import ( "github.com/dweymouth/supersonic/backend" "github.com/dweymouth/supersonic/backend/mediaprovider" "github.com/dweymouth/supersonic/sharedutil" + "github.com/dweymouth/supersonic/ui/theme" "github.com/dweymouth/supersonic/ui/util" ) @@ -70,8 +71,9 @@ func (ab *AutoEQBrowser) profileToSearchResult(profile backend.AutoEQProfileMeta return &mediaprovider.SearchResult{ Name: profile.Name, - ID: profile.Path, // Store path as ID for retrieval - Type: mediaprovider.ContentTypeAlbum, // Use album icon (looks like headphones) + Icon: theme.HeadphonesIcon, // Use headphone icon for all profiles + ID: profile.Path, // Store path as ID for retrieval + Type: mediaprovider.ContentTypeOther, // Use "Other" content type for AutoEQ profiles ArtistName: subtitle, Size: 0, // Don't show track count } diff --git a/ui/dialogs/searchdialog.go b/ui/dialogs/searchdialog.go index faf2d4b..20e5689 100644 --- a/ui/dialogs/searchdialog.go +++ b/ui/dialogs/searchdialog.go @@ -272,7 +272,11 @@ func (s *searchResult) Update(result *mediaprovider.SearchResult) { } s.id = result.ID s.contentType = result.Type - s.image.PlaceholderIcon = placeholderIconForContentType(result.Type) + if result.Icon != nil { + s.image.PlaceholderIcon = result.Icon + } else { + s.image.PlaceholderIcon = placeholderIconForContentType(result.Type) + } s.imageLoader.Load(result.CoverID) s.title.SetText(result.Name) @@ -300,19 +304,29 @@ func (s *searchResult) Update(result *mediaprovider.SearchResult) { } else { secondaryText = "" } + case mediaprovider.ContentTypeOther: + secondaryText = result.ArtistName } - s.secondary.Segments = []widget.RichTextSegment{ - &widget.TextSegment{ - Text: result.Type.String(), - Style: widget.RichTextStyle{SizeName: theme.SizeNameCaptionText, TextStyle: fyne.TextStyle{Bold: true}, Inline: true}, - }, + + if result.Type == mediaprovider.ContentTypeOther { + s.secondary.Segments = []widget.RichTextSegment{} + } else { + s.secondary.Segments = []widget.RichTextSegment{ + &widget.TextSegment{ + Text: result.Type.String(), + Style: widget.RichTextStyle{SizeName: theme.SizeNameCaptionText, TextStyle: fyne.TextStyle{Bold: true}, Inline: true}, + }, + } } if secondaryText != "" { + if len(s.secondary.Segments) > 0 { + s.secondary.Segments = append(s.secondary.Segments, + &widget.TextSegment{ + Text: " · ", + Style: widget.RichTextStyle{SizeName: theme.SizeNameCaptionText, Inline: true}, + }) + } s.secondary.Segments = append(s.secondary.Segments, - &widget.TextSegment{ - Text: " · ", - Style: widget.RichTextStyle{SizeName: theme.SizeNameCaptionText, Inline: true}, - }, &widget.TextSegment{ Text: secondaryText, Style: widget.RichTextStyle{SizeName: theme.SizeNameCaptionText, Inline: true}, diff --git a/ui/theme/theme.go b/ui/theme/theme.go index 8318d1e..9f88961 100644 --- a/ui/theme/theme.go +++ b/ui/theme/theme.go @@ -54,7 +54,7 @@ var ( RadioIcon fyne.Resource = theme.NewThemedResource(res.ResBroadcastSvg) FavoriteIcon fyne.Resource = theme.NewThemedResource(res.ResHeartFilledSvg) NotFavoriteIcon fyne.Resource = theme.NewThemedResource(res.ResHeartOutlineSvg) - NowPlayingIcon fyne.Resource = theme.NewThemedResource(res.ResHeadphonesSvg) + HeadphonesIcon fyne.Resource = theme.NewThemedResource(res.ResHeadphonesSvg) PlaylistIcon fyne.Resource = theme.NewThemedResource(res.ResPlaylistSvg) PlayNextIcon fyne.Resource = theme.NewThemedResource(res.ResPlaylistAddNextSvg) PlayQueueIcon fyne.Resource = theme.NewThemedResource(res.ResPlayqueueSvg) diff --git a/ui/toolbar.go b/ui/toolbar.go index 1ba87ac..eedcb79 100644 --- a/ui/toolbar.go +++ b/ui/toolbar.go @@ -146,7 +146,7 @@ func (t *Toolbar) CreateRenderer() fyne.WidgetRenderer { } func (t *Toolbar) setupNavigationButtons(navigateFn func(controller.Route)) { - t.addNavigationButton(myTheme.NowPlayingIcon, controller.NowPlaying, func() { + t.addNavigationButton(myTheme.HeadphonesIcon, controller.NowPlaying, func() { navigateFn(controller.NowPlayingRoute()) }) t.addNavigationButton(myTheme.FavoriteIcon, controller.Favorites, func() { From 7956174c0e0859f978571299a10286e5d1b762aa Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Fri, 6 Feb 2026 08:48:30 -0800 Subject: [PATCH 18/25] fix fC of 10-band eq --- backend/player/mpv/equalizer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/player/mpv/equalizer.go b/backend/player/mpv/equalizer.go index 36c59d0..78435ae 100644 --- a/backend/player/mpv/equalizer.go +++ b/backend/player/mpv/equalizer.go @@ -143,7 +143,7 @@ func (i *ISO10BandEqualizer) Preamp() float64 { } func (i *ISO10BandEqualizer) Curve() EqualizerCurve { - fC := float64(31) + fC := float64(31.25) curve := make([]EqualizerBand, 0, len(i.BandGains)) for _, bandGain := range i.BandGains { curve = append(curve, EqualizerBand{ From f302612d53cc10413e7244629cbae25b4baf24a8 Mon Sep 17 00:00:00 2001 From: Gianluca Boiano Date: Fri, 6 Feb 2026 18:06:59 +0100 Subject: [PATCH 19/25] chore: remove dead code --- backend/autoeq.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/backend/autoeq.go b/backend/autoeq.go index 2efcb9e..b0e04c6 100644 --- a/backend/autoeq.go +++ b/backend/autoeq.go @@ -514,8 +514,3 @@ func (m *AutoEQManager) updateLRU(path string) { } } } - -// InterpolateTo15Band converts this profile's 10-band EQ to Supersonic's 15-band format -func (p *AutoEQProfile) InterpolateTo15Band() [15]float64 { - return InterpolateAutoEQTo15Band(p.Bands) -} From b52aa5b36fa48711142387fe3235afc384476a41 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Sat, 7 Feb 2026 10:18:51 -0800 Subject: [PATCH 20/25] rate-current CLI option (#847) --- backend/app.go | 15 +++++++++++++++ backend/cmdlineoptions.go | 12 +++++++++++- backend/ipc/api.go | 5 +++++ backend/ipc/client.go | 5 +++++ backend/ipc/server.go | 20 ++++++++++++++++++-- 5 files changed, 54 insertions(+), 3 deletions(-) diff --git a/backend/app.go b/backend/app.go index 9d21d48..d182afd 100644 --- a/backend/app.go +++ b/backend/app.go @@ -203,8 +203,21 @@ func StartupApp(appName, displayAppName, appVersion, appVersionTag, latestReleas ipc.DestroyConn() // cleanup socket possibly orphaned by crashed process listener, err := ipc.Listen() if err == nil { + ipcRatingHandler := func(rating int) { + if s := a.ServerManager.GetServer(); s != nil { + if tr := a.PlaybackManager.NowPlaying(); tr != nil && tr.Metadata().Type == mediaprovider.MediaItemTypeTrack { + if supportsRating, ok := s.(mediaprovider.SupportsRating); ok { + supportsRating.SetRating(mediaprovider.RatingFavoriteParameters{ + TrackIDs: []string{tr.Metadata().ID}, + }, rating) + } + } + } + } + a.ipcServer = ipc.NewServer( a.PlaybackManager, + ipcRatingHandler, a.ServerManager, a.callOnReactivate, func() { _ = a.callOnExit() }) @@ -650,6 +663,8 @@ func (a *App) checkFlagsAndSendIPCMsg(cli *ipc.Client) error { fmt.Println(data) } return err + case RateCurrentCLIArg >= 0: + return cli.RateCurrentTrack(RateCurrentCLIArg) default: return nil } diff --git a/backend/cmdlineoptions.go b/backend/cmdlineoptions.go index b114276..6bcc489 100644 --- a/backend/cmdlineoptions.go +++ b/backend/cmdlineoptions.go @@ -12,6 +12,7 @@ import ( var ( VolumeCLIArg int = -1 SeekToCLIArg float64 = -1 + RateCurrentCLIArg int = -1 SeekByCLIArg float64 = 0 VolumePctCLIArg float64 = 0 PlayAlbumCLIArg string = "" @@ -84,7 +85,9 @@ func init() { } flag.Func("first-track", "start playing from given track (positive integer, to be used with either -play-album or -play-playlist)", func(s string) error { v, err := strconv.Atoi(s) - FirstTrackCLIArg = v + if err == nil { + FirstTrackCLIArg = v + } return err }) @@ -100,6 +103,13 @@ func init() { SearchTrackCLIArg = s return nil }) + flag.Func("rate-current", "rate the current track with the given rating (0-5)", func(s string) error { + v, err := strconv.Atoi(s) + if err == nil { + RateCurrentCLIArg = v + } + return err + }) } func HaveCommandLineOptions() bool { diff --git a/backend/ipc/api.go b/backend/ipc/api.go index d52e09a..60028d6 100644 --- a/backend/ipc/api.go +++ b/backend/ipc/api.go @@ -27,6 +27,7 @@ const ( VolumeAdjustPath = "/volume/adjust" // ?pct=<+/- percentage> ShowPath = "/window/show" QuitPath = "/window/quit" + RateCurrentTrackPath = "/current_track/rate" // ?r= ) type Response struct { @@ -76,3 +77,7 @@ func BuildSearchTrackPath(search string) string { s := url.QueryEscape(search) return fmt.Sprintf("%s?s=%s", SearchTrackPath, s) } + +func BuildRateCurrentTrackPath(rating int) string { + return fmt.Sprintf("%s?r=%d", RateCurrentTrackPath, rating) +} diff --git a/backend/ipc/client.go b/backend/ipc/client.go index 46582eb..41cb310 100644 --- a/backend/ipc/client.go +++ b/backend/ipc/client.go @@ -118,6 +118,11 @@ func (c *Client) AdjustVolumePct(pct float64) error { return err } +func (c *Client) RateCurrentTrack(rating int) error { + _, err := c.sendRequest(BuildRateCurrentTrackPath(rating)) + return err +} + func (c *Client) Show() error { _, err := c.sendRequest(ShowPath) return err diff --git a/backend/ipc/server.go b/backend/ipc/server.go index 02b5b03..3ded536 100644 --- a/backend/ipc/server.go +++ b/backend/ipc/server.go @@ -43,13 +43,14 @@ type ServerManager interface { type serverImpl struct { server *http.Server pbHandler PlaybackHandler + rateFn func(int) sm ServerManager showFn func() quitFn func() } -func NewServer(pbHandler PlaybackHandler, sm ServerManager, showFn, quitFn func()) IPCServer { - s := &serverImpl{pbHandler: pbHandler, sm: sm, showFn: showFn, quitFn: quitFn} +func NewServer(pbHandler PlaybackHandler, rateFn func(int), sm ServerManager, showFn, quitFn func()) IPCServer { + s := &serverImpl{pbHandler: pbHandler, rateFn: rateFn, sm: sm, showFn: showFn, quitFn: quitFn} s.server = &http.Server{ Handler: s.createHandler(), } @@ -172,6 +173,21 @@ func (s *serverImpl) createHandler() http.Handler { return tracks, nil })) + m.HandleFunc(RateCurrentTrackPath, func(w http.ResponseWriter, r *http.Request) { + v := r.URL.Query().Get("r") + if rating, err := strconv.Atoi(v); err == nil { + // convert to 0-5 range if needed + if rating > 5 { + rating = 5 + } else if rating < 0 { + rating = 0 + } + s.rateFn(rating) + s.writeOK(w) + } else { + s.writeErr(w, err) + } + }) return m } From a2e4ab238075e0660533d915728bfda9887306bb Mon Sep 17 00:00:00 2001 From: Gianluca Boiano Date: Sun, 8 Feb 2026 12:28:32 +0100 Subject: [PATCH 21/25] Add Save/Save As buttons with dirty state tracking to EQ dialog --- res/translations/de.json | 17 +++- res/translations/en.json | 17 +++- res/translations/es.json | 17 +++- res/translations/fr.json | 17 +++- res/translations/it.json | 25 +++-- res/translations/ja.json | 17 +++- res/translations/ko.json | 17 +++- res/translations/nl.json | 17 +++- res/translations/pl.json | 17 +++- res/translations/pt_BR.json | 17 +++- res/translations/ro.json | 17 +++- res/translations/ru.json | 17 +++- res/translations/zh.json | 17 +++- res/translations/zhHans.json | 17 +++- res/translations/zhHant.json | 17 +++- ui/dialogs/graphicequalizer.go | 176 ++++++++++++++++++++++++++++----- ui/dialogs/settingsdialog.go | 8 +- 17 files changed, 397 insertions(+), 50 deletions(-) diff --git a/res/translations/de.json b/res/translations/de.json index 284b81d..de9771e 100644 --- a/res/translations/de.json +++ b/res/translations/de.json @@ -46,12 +46,15 @@ "Bit rate": "Bitrate", "Bold font": "Bold font", "Broadcast": "Broadcast", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "Abbrechen", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Nach Updates suchen", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "Clear caches", "Close": "Schließen", "Close to system tray": "In Taskleiste minimieren", @@ -97,9 +100,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "Bearbeiten", "Edit Playlist": "Playlist bearbeiten", @@ -112,9 +116,11 @@ "Equalizer": "Equalizer", "Error": "Error", "Error creating playlist": "Error creating playlist", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "Exklusiver Modus", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "Fav.", "Favorites": "Favoriten", "Feb": "Feb", @@ -138,6 +144,7 @@ "In order": "In order", "Internet Radio Stations": "Internet-Radiosender", "Interview": "Interview", + "Invalid Name": "Invalid Name", "Is favorite": "Ist Favorit", "Is not favorite": "Ist kein Favorit", "Jan": "Jan", @@ -162,6 +169,7 @@ "My Server": "Mein Server", "Name": "Name", "Name (A-Z)": "Name (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "New Playlist", "Next": "Nächster", "Nickname": "Spitzname", @@ -175,6 +183,7 @@ "Now Playing": "Aktuelle Wiedergabe", "OK": "OK", "Oct": "Okt", + "Overwrite Preset": "Overwrite Preset", "Owner": "Besitzer", "Password": "Passwort", "Pause": "Pause", @@ -196,11 +205,14 @@ "Playlists": "Playlists", "Plays": "Wiedergaben", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "Übersteuerung vermeiden", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Vorheriger", "Private playlist by": "Private Playlist von", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "Öffentliche Playlist von", "Quit": "Beenden", @@ -221,12 +233,15 @@ "Restart required": "Neustart erforderlich", "Sample rate": "Sample rate", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "Wiedergabeliste beim Verlassen speichern", "Saved at": "Gespeichert am", "Scrobble when": "Scrobble wenn", "Search": "Suche", "Search Everywhere": "Überall suchen", + "Search headphones...": "Search headphones...", "Search page": "Suchseite", "Search playlists or new playlist name": "Nach Playlist suchen oder Namen für neue Playlist eingeben", "Select Library": "Select Library", diff --git a/res/translations/en.json b/res/translations/en.json index ccec76c..8002d5d 100644 --- a/res/translations/en.json +++ b/res/translations/en.json @@ -35,9 +35,9 @@ "Audio device": "Audio device", "Audiobook": "Audiobook", "Aug": "Aug", - "AutoEQ": "AutoEQ", "Authentication failed": "Authentication failed", "Auto": "Auto", + "AutoEQ": "AutoEQ", "Automatically check for updates": "Automatically check for updates", "Autoplay": "Autoplay", "Autoselect device": "Autoselect device", @@ -47,12 +47,15 @@ "Bit rate": "Bit rate", "Bold font": "Bold font", "Broadcast": "Broadcast", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "Cancel", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Check for Updates", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "Clear caches", "Close": "Close", "Close to system tray": "Close to system tray", @@ -101,6 +104,7 @@ "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "Edit", "Edit Playlist": "Edit Playlist", @@ -113,9 +117,11 @@ "Equalizer": "Equalizer", "Error": "Error", "Error creating playlist": "Error creating playlist", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "Exclusive mode", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "Fav.", "Favorites": "Favorites", "Feb": "Feb", @@ -139,6 +145,7 @@ "In order": "In order", "Internet Radio Stations": "Internet Radio Stations", "Interview": "Interview", + "Invalid Name": "Invalid Name", "Is favorite": "Is favorite", "Is not favorite": "Is not favorite", "Jan": "Jan", @@ -163,6 +170,7 @@ "My Server": "My Server", "Name": "Name", "Name (A-Z)": "Name (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "New Playlist", "Next": "Next", "Nickname": "Nickname", @@ -176,6 +184,7 @@ "Now Playing": "Now Playing", "OK": "OK", "Oct": "Oct", + "Overwrite Preset": "Overwrite Preset", "Owner": "Owner", "Password": "Password", "Pause": "Pause", @@ -197,11 +206,14 @@ "Playlists": "Playlists", "Plays": "Plays", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "Prevent clipping", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Previous", "Private playlist by": "Private playlist by", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "Public playlist by", "Quit": "Quit", @@ -222,12 +234,15 @@ "Restart required": "Restart required", "Sample rate": "Sample rate", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "Save play queue", "Saved at": "Saved at", "Scrobble when": "Scrobble when", "Search": "Search", "Search Everywhere": "Search Everywhere", + "Search headphones...": "Search headphones...", "Search page": "Search page", "Search playlists or new playlist name": "Search playlists or new playlist name", "Select Library": "Select Library", diff --git a/res/translations/es.json b/res/translations/es.json index 14b7ae3..7eafe83 100644 --- a/res/translations/es.json +++ b/res/translations/es.json @@ -46,12 +46,15 @@ "Bit rate": "Tasa de bits", "Bold font": "Bold font", "Broadcast": "Transmisión", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "Cancelar", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Buscar actualizaciones", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "Borrar cachés", "Close": "Cerrar", "Close to system tray": "Cerrar a la bandeja del sistema", @@ -97,9 +100,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "Editar", "Edit Playlist": "Editar lista de reproducción", @@ -112,9 +116,11 @@ "Equalizer": "Ecualizador", "Error": "Error", "Error creating playlist": "Ha ocurrido un error al crear la lista de reproducción", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "Modo exclusivo", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "Fav.", "Favorites": "Favoritos", "Feb": "Feb", @@ -138,6 +144,7 @@ "In order": "In order", "Internet Radio Stations": "Estaciones de radio por Internet", "Interview": "Entrevista", + "Invalid Name": "Invalid Name", "Is favorite": "Es favorito", "Is not favorite": "No es favorito", "Jan": "Ene", @@ -162,6 +169,7 @@ "My Server": "Mi servidor", "Name": "Nombre", "Name (A-Z)": "Nombre (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "Crear Nueva", "Next": "Siguiente", "Nickname": "Apodo", @@ -175,6 +183,7 @@ "Now Playing": "Reproduciendo", "OK": "OK", "Oct": "Oct", + "Overwrite Preset": "Overwrite Preset", "Owner": "Propietario", "Password": "Contraseña", "Pause": "Pausar", @@ -196,11 +205,14 @@ "Playlists": "Listas de reproducción", "Plays": "Reproducciones", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "Prevenir recortes", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Anterior", "Private playlist by": "Lista de reproducción privada de", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "Lista de reproducción pública de", "Quit": "Salir", @@ -221,12 +233,15 @@ "Restart required": "Reinicio requerido", "Sample rate": "Sample rate", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "Guardar cola de reproducción", "Saved at": "Guardado en", "Scrobble when": "Scrobble cuando", "Search": "Buscar", "Search Everywhere": "Buscar en todas partes", + "Search headphones...": "Search headphones...", "Search page": "Buscar en la página", "Search playlists or new playlist name": "Buscar listas de reproducción o nombre de nueva lista", "Select Library": "Select Library", diff --git a/res/translations/fr.json b/res/translations/fr.json index 1724828..845ccca 100644 --- a/res/translations/fr.json +++ b/res/translations/fr.json @@ -47,12 +47,15 @@ "Bit rate": "Débit binaire", "Bold font": "Police en gras", "Broadcast": "Broadcast", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "Annuler", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "Diffuser sur un appareil", "Channels": "Canaux", "Check for Updates": "Vérifier les mises à jour", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "Vider les caches", "Close": "Fermer", "Close to system tray": "Réduire dans la barre d'état à la fermeture", @@ -98,9 +101,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "Modifier", "Edit Playlist": "Modifier la liste de lecture", @@ -113,9 +117,11 @@ "Equalizer": "Égaliseur", "Error": "Erreur", "Error creating playlist": "Error creating playlist", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "Mode exclusif", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "Fav.", "Favorites": "Favoris", "Feb": "Févr", @@ -139,6 +145,7 @@ "In order": "Dans l'ordre", "Internet Radio Stations": "Stations de radio Internet", "Interview": "Interview", + "Invalid Name": "Invalid Name", "Is favorite": "Favoris", "Is not favorite": "Non favoris", "Jan": "Janv", @@ -163,6 +170,7 @@ "My Server": "Mon serveur", "Name": "Nom", "Name (A-Z)": "Nom (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "New Playlist", "Next": "Suivante", "Nickname": "Surnom", @@ -176,6 +184,7 @@ "Now Playing": "Lecture en cours", "OK": "OK", "Oct": "Oct", + "Overwrite Preset": "Overwrite Preset", "Owner": "Propriétaire", "Password": "Mot de passe", "Pause": "Pause", @@ -197,11 +206,14 @@ "Playlists": "Listes de lecture", "Plays": "Lectures", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "Empêcher le clipping", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Précédente", "Private playlist by": "Liste de lecture privée créée par", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "Liste de lecture publique créée par", "Quit": "Quitter", @@ -222,12 +234,15 @@ "Restart required": "Redémarrage nécessaire", "Sample rate": "Taux d'échantillonnage", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "Sauvegarder la file d'attente", "Saved at": "Sauvegardé sur", "Scrobble when": "Scrobbler quand", "Search": "Recherche", "Search Everywhere": "Rechercher dans toutes les données du serveur", + "Search headphones...": "Search headphones...", "Search page": "Recherche", "Search playlists or new playlist name": "Nom de liste de lecture à rechercher ou à créer", "Select Library": "Choisir une bibliothèque", diff --git a/res/translations/it.json b/res/translations/it.json index 11d2f31..4fdc98e 100644 --- a/res/translations/it.json +++ b/res/translations/it.json @@ -35,9 +35,9 @@ "Audio device": "Dispositivo audio", "Audiobook": "Audiobook", "Aug": "Ago", - "AutoEQ": "AutoEQ", "Authentication failed": "Autenticazione fallita", "Auto": "Automatico", + "AutoEQ": "AutoEQ", "Automatically check for updates": "Controlla automaticamente gli aggiornamenti", "Autoplay": "Riproduzione automatica", "Autoselect device": "Seleziona dispositivo automaticamente", @@ -47,12 +47,15 @@ "Bit rate": "Bit rate", "Bold font": "Font grassetto", "Broadcast": "Broadcast", + "Browse Headphone Profiles": "Sfoglia Profili Cuffie", "Cancel": "Annulla", "Cannot Delete": "Impossibile Eliminare", "Cannot delete builtin presets": "Impossibile eliminare i preset predefiniti", + "Cannot use the name of a builtin preset": "Non è possibile usare il nome di un preset predefinito", "Cast to device": "Trasmetti a dispositivo", "Channels": "Canali", "Check for Updates": "Controlla aggiornamenti", + "Check network connection and try again": "Controlla la connessione di rete e riprova", "Clear caches": "Svuota cache", "Close": "Chiudi", "Close to system tray": "Chiudi nella barra di sistema", @@ -98,17 +101,11 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Amplifica Alti", "EQ Type:": "Tipo EQ:", "EQ Vocal": "Vocale", - "Browse Headphone Profiles": "Sfoglia Profili Cuffie", - "Check network connection and try again": "Controlla la connessione di rete e riprova", - "Error loading AutoEQ profiles": "Errore nel caricamento dei profili AutoEQ", - "Load AutoEQ Profile": "Carica Profilo AutoEQ", - "Profile": "Profilo", - "Search headphones...": "Cerca cuffie...", "Edit": "Modifica", "Edit Playlist": "Modifica playlist", "Edit server": "Modifica server", @@ -120,9 +117,11 @@ "Equalizer": "Equalizzatore", "Error": "Errore", "Error creating playlist": "Errore durante la creazione della playlist", + "Error loading AutoEQ profiles": "Errore nel caricamento dei profili AutoEQ", "Error updating playlist": "Errore durante l'aggiornamento della playlist", "Exclusive mode": "Modalità esclusiva", "Fade out on pause": "Dissolvenza in pausa", + "Failed to load profile": "Failed to load profile", "Fav.": "Pref.", "Favorites": "Preferiti", "Feb": "Feb", @@ -146,6 +145,7 @@ "In order": "In ordine", "Internet Radio Stations": "Stazioni radio via Internet", "Interview": "Interview", + "Invalid Name": "Nome non valido", "Is favorite": "Nei preferiti", "Is not favorite": "Non nei preferiti", "Jan": "Gen", @@ -155,6 +155,7 @@ "Larger": "Più grande", "Last played": "Ultimo ascolto", "Live": "Live", + "Load AutoEQ Profile": "Carica Profilo AutoEQ", "Locally": "Localmente", "Log Out": "Disconnetti", "Login to Server": "Accendi al server", @@ -170,6 +171,7 @@ "My Server": "Il mio server", "Name": "Nome", "Name (A-Z)": "Nome (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "Nuova playlist", "Next": "Successiva", "Nickname": "Nickname", @@ -183,6 +185,7 @@ "Now Playing": "In riproduzione", "OK": "OK", "Oct": "Ott", + "Overwrite Preset": "Sovrascrivi preset", "Owner": "Proprietario", "Password": "Password", "Pause": "Pausa", @@ -204,11 +207,14 @@ "Playlists": "Playlist", "Plays": "Nº ascolti", "Please select a preset to delete": "Seleziona un preset da eliminare", + "Preset '%s' already exists. Overwrite?": "Il preset '%s' esiste già. Sovrascrivere?", "Preset name": "Nome preset", "Prevent clipping": "Previeni clipping", "Prevent screensaver on Now Playing page": "Previeni screensaver sulla pagina In riproduzione", "Previous": "Precedente", "Private playlist by": "Playlist privata by", + "Profile": "Profilo", + "Profile not found": "Profile not found", "Public": "Pubblica", "Public playlist by": "Playlist pubblica by", "Quit": "Esci", @@ -229,12 +235,15 @@ "Restart required": "Riavvio richiesto", "Sample rate": "Frequenza di campionamento", "Save": "Salva", + "Save As": "Salva come", "Save Preset": "Salva Preset", + "Save Preset As": "Salva preset come", "Save play queue": "Salva coda di ascolto", "Saved at": "Salvato in", "Scrobble when": "Scrobbla quando", "Search": "Cerca", "Search Everywhere": "Cerca ovunque", + "Search headphones...": "Cerca cuffie...", "Search page": "Cerca nella pagina", "Search playlists or new playlist name": "Cerca tra le playlist o creane una nuova", "Select Library": "Seleziona libreria", diff --git a/res/translations/ja.json b/res/translations/ja.json index 2a5f73a..9dc1356 100644 --- a/res/translations/ja.json +++ b/res/translations/ja.json @@ -47,12 +47,15 @@ "Bit rate": "ビットレート", "Bold font": "太字フォント", "Broadcast": "ブロードキャスト", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "取消", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "デバイスにキャスト", "Channels": "チャンネル", "Check for Updates": "アップデートの確認", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "キャッシュクリア", "Close": "閉じる", "Close to system tray": "システムトレイに閉じる", @@ -98,9 +101,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "編集", "Edit Playlist": "プレイリストを編集", @@ -113,9 +117,11 @@ "Equalizer": "イコライザー", "Error": "エラー", "Error creating playlist": "プレイリストの作成中にエラーが発生しました", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "排他モード", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "お気に入り", "Favorites": "お気に入り", "Feb": "2月", @@ -139,6 +145,7 @@ "In order": "順番", "Internet Radio Stations": "インターネットラジオ局", "Interview": "インタビュー", + "Invalid Name": "Invalid Name", "Is favorite": "お気に入り", "Is not favorite": "お気に入りでない", "Jan": "1月", @@ -163,6 +170,7 @@ "My Server": "自分のサーバー", "Name": "名前", "Name (A-Z)": "名前 (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "新しいプレイリスト", "Next": "次", "Nickname": "ニックネーム", @@ -176,6 +184,7 @@ "Now Playing": "再生中", "OK": "OK", "Oct": "10月", + "Overwrite Preset": "Overwrite Preset", "Owner": "所有者", "Password": "パスワード", "Pause": "一時停止", @@ -197,11 +206,14 @@ "Playlists": "プレイリスト", "Plays": "再生", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "クリッピングを防ぐ", "Prevent screensaver on Now Playing page": "再生中ページでスクリーンセーバーを無効にする", "Previous": "前", "Private playlist by": "プライベートプレイリスト", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "公開プレイリスト", "Quit": "終了", @@ -222,12 +234,15 @@ "Restart required": "再起動が必要です", "Sample rate": "サンプルレート", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "再生キューを保存", "Saved at": "保存場所", "Scrobble when": "スクロールすると", "Search": "検索", "Search Everywhere": "全体から検索", + "Search headphones...": "Search headphones...", "Search page": "検索ページ", "Search playlists or new playlist name": "プレイリストを検索または新しいプレイリスト名", "Select Library": "ライブラリを選択", diff --git a/res/translations/ko.json b/res/translations/ko.json index 4595738..ffacf6d 100644 --- a/res/translations/ko.json +++ b/res/translations/ko.json @@ -47,12 +47,15 @@ "Bit rate": "비트레이트", "Bold font": "굵은 글꼴", "Broadcast": "방송", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "취소", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "장치로 캐스트", "Channels": "Channels", "Check for Updates": "업데이트 확인", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "Clear caches", "Close": "닫기", "Close to system tray": "시스템 트레이로 최소화", @@ -98,9 +101,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "편집", "Edit Playlist": "재생 목록 편집", @@ -113,9 +117,11 @@ "Equalizer": "이퀄라이저", "Error": "오류", "Error creating playlist": "Error creating playlist", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "독점 모드", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "즐겨찾기", "Favorites": "즐겨찾기", "Feb": "2월", @@ -139,6 +145,7 @@ "In order": "In order", "Internet Radio Stations": "인터넷 라디오 방송국", "Interview": "인터뷰", + "Invalid Name": "Invalid Name", "Is favorite": "즐겨찾기에 속한", "Is not favorite": "즐겨찾기에 속하지 않은", "Jan": "1월", @@ -163,6 +170,7 @@ "My Server": "내 서버", "Name": "이름", "Name (A-Z)": "이름 (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "New Playlist", "Next": "다음", "Nickname": "별명", @@ -176,6 +184,7 @@ "Now Playing": "현재 재생 중", "OK": "예", "Oct": "10월", + "Overwrite Preset": "Overwrite Preset", "Owner": "소유자", "Password": "비밀번호", "Pause": "일시정지", @@ -197,11 +206,14 @@ "Playlists": "재생 목록", "Plays": "재생", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "클리핑 방지", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "이전", "Private playlist by": "비공개 재생목록", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "공개 재생 목록", "Quit": "종료", @@ -222,13 +234,16 @@ "Restart required": "재시작 필요", "Sample rate": "Sample rate", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "Save play queue", "Save play queuet": "종료 시 재생 대기열 저장", "Saved at": "저장됨", "Scrobble when": "스크로블할 시점", "Search": "검색", "Search Everywhere": "전체 검색", + "Search headphones...": "Search headphones...", "Search page": "검색 페이지", "Search playlists or new playlist name": "재생 목록이나 새 재생 목록 이름 검색", "Select Library": "Select Library", diff --git a/res/translations/nl.json b/res/translations/nl.json index e6657d2..ad0fa51 100644 --- a/res/translations/nl.json +++ b/res/translations/nl.json @@ -47,12 +47,15 @@ "Bit rate": "Bit rate", "Bold font": "Bold font", "Broadcast": "Broadcast", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "Annuleren", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "Cast naar apparaat", "Channels": "Channels", "Check for Updates": "Controleer op updates", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "Clear caches", "Close": "Sluiten", "Close to system tray": "Sluiten naar systeemvak", @@ -98,9 +101,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "Bewerken", "Edit Playlist": "Bewerk afspeellijst", @@ -113,9 +117,11 @@ "Equalizer": "Equalizer", "Error": "Fout", "Error creating playlist": "Error creating playlist", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "Exclusieve modus", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "Fav.", "Favorites": "Favorieten", "Feb": "Feb", @@ -139,6 +145,7 @@ "In order": "In order", "Internet Radio Stations": "Internet Radio Stations", "Interview": "Interview", + "Invalid Name": "Invalid Name", "Is favorite": "Is favoriet", "Is not favorite": "Is niet favoriet", "Jan": "Jan", @@ -163,6 +170,7 @@ "My Server": "Mijn server", "Name": "Naam", "Name (A-Z)": "Naam (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "New Playlist", "Next": "Volgende", "Nickname": "Nickname", @@ -176,6 +184,7 @@ "Now Playing": "Nu aan het afspelen", "OK": "OK", "Oct": "Okt", + "Overwrite Preset": "Overwrite Preset", "Owner": "Eigenaar", "Password": "Wachtwoord", "Pause": "Pauzeer", @@ -197,11 +206,14 @@ "Playlists": "Afspeellijsten", "Plays": "Afgespeeld", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "Voorkom clipping", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Vorige", "Private playlist by": "Private afspeellijst door", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "Publieke afspeellijst door", "Quit": "Beëindigen", @@ -222,12 +234,15 @@ "Restart required": "Herstart vereist", "Sample rate": "Sample rate", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "Bewaar wachtrij bij afsluiten", "Saved at": "Opgeslaan op", "Scrobble when": "Scrobble als", "Search": "Zoeken", "Search Everywhere": "Overal zoeken", + "Search headphones...": "Search headphones...", "Search page": "Zoekpagina", "Search playlists or new playlist name": "Zoek afspeellijsten of nieuwe afspeellijst naam", "Select Library": "Select Library", diff --git a/res/translations/pl.json b/res/translations/pl.json index 92ee700..fb2b831 100644 --- a/res/translations/pl.json +++ b/res/translations/pl.json @@ -44,12 +44,15 @@ "Bit rate": "Bit rate", "Bold font": "Bold font", "Broadcast": "Broadcast", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "Anuluj", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Sprawdź aktualizacje", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "Clear caches", "Close": "Zamknij", "Close to system tray": "Zamknij do zasobnika systemowego", @@ -94,9 +97,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "Edytuj", "Edit Playlist": "Edytuj playlistę", @@ -109,9 +113,11 @@ "Equalizer": "Equalizer", "Error": "Error", "Error creating playlist": "Error creating playlist", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "Tryb exclusive", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "Ulub.", "Favorites": "Ulubione", "Field Recording": "Field Recording", @@ -134,6 +140,7 @@ "In order": "In order", "Internet Radio Stations": "Internetowe Stacje Radiowe", "Interview": "Wywiad", + "Invalid Name": "Invalid Name", "Is favorite": "Jest ulubione", "Is not favorite": "Nie jest ulubione", "Language": "Język", @@ -153,6 +160,7 @@ "My Server": "Mój serwer", "Name": "Nazwa", "Name (A-Z)": "Nazwa (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "New Playlist", "Next": "Następny", "Nickname": "Nazwa serwera", @@ -164,6 +172,7 @@ "Normal font": "Normal font", "Now Playing": "Teraz Odtwarzane", "OK": "OK", + "Overwrite Preset": "Overwrite Preset", "Owner": "Właściciel", "Password": "Hasło", "Pause": "Pauza", @@ -185,11 +194,14 @@ "Playlists": "Playlisty", "Plays": "Ilość odtworzeń", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "Zapobiegnij przycicnaniu", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Poprzednie", "Private playlist by": "Prywatna playlista przez", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "Publiczne playlista przez", "Quit": "Wyjdź", @@ -210,12 +222,15 @@ "Restart required": "Wymagany restart", "Sample rate": "Sample rate", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "Zapisz kolejkę odtwarzania po zamknięciu", "Saved at": "Zapisano w", "Scrobble when": "Wyślij gdy", "Search": "Szukaj", "Search Everywhere": "Szukaj wszędzie", + "Search headphones...": "Search headphones...", "Search page": "Przeszukaj stronę", "Search playlists or new playlist name": "Szukaj playlisty lub", "Select Library": "Select Library", diff --git a/res/translations/pt_BR.json b/res/translations/pt_BR.json index 3139807..7ebf3ac 100644 --- a/res/translations/pt_BR.json +++ b/res/translations/pt_BR.json @@ -47,12 +47,15 @@ "Bit rate": "Taxa de bits", "Bold font": "Fonte em negrito", "Broadcast": "Transmissão", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "Cancelar", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Buscar atualizações", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "Clear caches", "Close": "Fechar", "Close to system tray": "Fechar para a bandeja do sistema", @@ -98,9 +101,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "Editar", "Edit Playlist": "Editar lista de reprodução", @@ -113,9 +117,11 @@ "Equalizer": "Equalizador", "Error": "Erro", "Error creating playlist": "Error creating playlist", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "Modo exclusivo", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "Fav.", "Favorites": "Favoritos", "Feb": "Fev", @@ -139,6 +145,7 @@ "In order": "In order", "Internet Radio Stations": "Estacões de Rádio da Internet", "Interview": "Entrevista", + "Invalid Name": "Invalid Name", "Is favorite": "É favorito", "Is not favorite": "Não é favorito", "Jan": "Jan", @@ -163,6 +170,7 @@ "My Server": "Meu Servidor", "Name": "Nome", "Name (A-Z)": "Nome (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "New Playlist", "Next": "Próximo", "Nickname": "Apelido", @@ -176,6 +184,7 @@ "Now Playing": "Tocando agora", "OK": "OK", "Oct": "Out", + "Overwrite Preset": "Overwrite Preset", "Owner": "Proprietário", "Password": "Senha", "Pause": "Pausar", @@ -197,11 +206,14 @@ "Playlists": "Listas de reprodução", "Plays": "Reproduções", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "Evitar clipping", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Anterior", "Private playlist by": "Lista de reprodução privada por", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "Lista de reprodução pública por", "Quit": "Sair", @@ -222,12 +234,15 @@ "Restart required": "Requer reinício", "Sample rate": "Sample rate", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "Salvar fila de reprodução", "Saved at": "Salvo em", "Scrobble when": "Fazer scrobble quando", "Search": "Pesquisar", "Search Everywhere": "Pesquisar em todos os lugares", + "Search headphones...": "Search headphones...", "Search page": "Pesquisar na página", "Search playlists or new playlist name": "Pesquisar listas de reprodução ou criar uma nova", "Select Library": "Select Library", diff --git a/res/translations/ro.json b/res/translations/ro.json index 0dcb15b..8d00d49 100644 --- a/res/translations/ro.json +++ b/res/translations/ro.json @@ -46,12 +46,15 @@ "Bit rate": "Bit rate", "Bold font": "Bold font", "Broadcast": "Transmisiune", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "Anulează", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "Verifică actualizări", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "Clear caches", "Close": "Închide", "Close to system tray": "Închide în bara de sistem", @@ -97,9 +100,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "Editare", "Edit Playlist": "Editează playlist", @@ -112,9 +116,11 @@ "Equalizer": "Egalizator", "Error": "Error", "Error creating playlist": "Error creating playlist", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "Mod exclusiv", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "Fav.", "Favorites": "Favorite", "Feb": "Feb", @@ -138,6 +144,7 @@ "In order": "In order", "Internet Radio Stations": "Stații radio pe internet", "Interview": "Interviu", + "Invalid Name": "Invalid Name", "Is favorite": "Este favorit", "Is not favorite": "Nu este favorit", "Jan": "Ian", @@ -162,6 +169,7 @@ "My Server": "Serverul meu", "Name": "Nume", "Name (A-Z)": "Nume (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "New Playlist", "Next": "Următorul", "Nickname": "Supranume", @@ -174,6 +182,7 @@ "Nov": "Noiem", "OK": "OK", "Oct": "Oct", + "Overwrite Preset": "Overwrite Preset", "Owner": "Deținător", "Password": "Parolă", "Pause": "Pauză", @@ -195,11 +204,14 @@ "Playlists": "Playlist-uri", "Plays": "Redări", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "Previne distorsiunea", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Anterior", "Private playlist by": "Playlist privat de", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "Playlist public de", "Quit": "Ieșire", @@ -220,12 +232,15 @@ "Restart required": "Repornire necesară", "Sample rate": "Sample rate", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "Salvează listă de redare", "Saved at": "Salvat la", "Scrobble when": "Scrobblare când", "Search": "Caută", "Search Everywhere": "Caută peste tot", + "Search headphones...": "Search headphones...", "Search page": "Caută pagină", "Search playlists or new playlist name": "Caută playlisturi sau nume de playlist nou", "Select Library": "Select Library", diff --git a/res/translations/ru.json b/res/translations/ru.json index 9df1b72..d9a6539 100644 --- a/res/translations/ru.json +++ b/res/translations/ru.json @@ -47,12 +47,15 @@ "Bit rate": "Битрейт", "Bold font": "Полужирный", "Broadcast": "Радиопередача", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "Отменить", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "Отправить на устройство", "Channels": "Channels", "Check for Updates": "Проверить обновления", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "Clear caches", "Close": "Закрыть", "Close to system tray": "Закрывать в область уведомлений", @@ -98,9 +101,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "Изменить", "Edit Playlist": "Изменить список воспроизведения", @@ -113,9 +117,11 @@ "Equalizer": "Эквалайзер", "Error": "Ошибка", "Error creating playlist": "Error creating playlist", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "Исключительное использование", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "Избр.", "Favorites": "Избранное", "Feb": "Фев", @@ -139,6 +145,7 @@ "In order": "In order", "Internet Radio Stations": "Интернет-радио", "Interview": "Интервью", + "Invalid Name": "Invalid Name", "Is favorite": "В избранном", "Is not favorite": "Не в избранном", "Jan": "Янв", @@ -163,6 +170,7 @@ "My Server": "Мой сервер", "Name": "Название", "Name (A-Z)": "По названию (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "New Playlist", "Next": "Следующий", "Nickname": "Название сервера", @@ -176,6 +184,7 @@ "Now Playing": "Играет сейчас", "OK": "OK", "Oct": "Окт", + "Overwrite Preset": "Overwrite Preset", "Owner": "Составитель", "Password": "Пароль", "Pause": "Остановить", @@ -197,11 +206,14 @@ "Playlists": "Списки воспроизведения", "Plays": "Прослушивания", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "Защита от перегрузки", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "Предыдущий", "Private playlist by": "Приватный список вопроизведения", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "Публичный список воспроизведения", "Quit": "Выйти", @@ -222,12 +234,15 @@ "Restart required": "Требуется перезапуск", "Sample rate": "Sample rate", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "Сохранять очередь воспроизведения при выходе", "Saved at": "Сохранено в", "Scrobble when": "Отправлять когда", "Search": "Искать", "Search Everywhere": "Искать везде", + "Search headphones...": "Search headphones...", "Search page": "Искать на странице", "Search playlists or new playlist name": "Найти или создать новый", "Select Library": "Select Library", diff --git a/res/translations/zh.json b/res/translations/zh.json index d8f12a6..e94348f 100644 --- a/res/translations/zh.json +++ b/res/translations/zh.json @@ -47,12 +47,15 @@ "Bit rate": "比特率", "Bold font": "粗体字体", "Broadcast": "广播", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "取消", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "投屏到设备", "Channels": "频道", "Check for Updates": "检查更新", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "清除缓存", "Close": "关闭", "Close to system tray": "关闭到系统托盘", @@ -98,9 +101,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "编辑", "Edit Playlist": "编辑播放列表", @@ -113,9 +117,11 @@ "Equalizer": "均衡器", "Error": "错误", "Error creating playlist": "创建播放列表时出错", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "更新播放列表时出错", "Exclusive mode": "独占模式", "Fade out on pause": "暂停时淡出", + "Failed to load profile": "Failed to load profile", "Fav.": "收藏", "Favorites": "收藏", "Feb": "二月", @@ -139,6 +145,7 @@ "In order": "按顺序", "Internet Radio Stations": "网络电台", "Interview": "采访", + "Invalid Name": "Invalid Name", "Is favorite": "已收藏", "Is not favorite": "未收藏", "Jan": "一月", @@ -163,6 +170,7 @@ "My Server": "我的服务器", "Name": "名称", "Name (A-Z)": "名称 (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "新播放列表", "Next": "下一个", "Nickname": "昵称", @@ -176,6 +184,7 @@ "Now Playing": "正在播放", "OK": "确定", "Oct": "十月", + "Overwrite Preset": "Overwrite Preset", "Owner": "拥有者", "Password": "密码", "Pause": "暂停", @@ -197,11 +206,14 @@ "Playlists": "播放列表", "Plays": "播放", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "防止削波", "Prevent screensaver on Now Playing page": "禁止在“正在播放”页面显示屏幕保护程序", "Previous": "上一个", "Private playlist by": "私人播放列表", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "公开", "Public playlist by": "公开播放列表", "Quit": "退出", @@ -222,12 +234,15 @@ "Restart required": "需要重启", "Sample rate": "采样率", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "退出时保存播放队列", "Saved at": "保存于", "Scrobble when": "记录播放时", "Search": "搜索", "Search Everywhere": "搜索所有位置", + "Search headphones...": "Search headphones...", "Search page": "搜索页面", "Search playlists or new playlist name": "搜索播放列表或新播放列表名称", "Select Library": "选择库", diff --git a/res/translations/zhHans.json b/res/translations/zhHans.json index d8f12a6..e94348f 100644 --- a/res/translations/zhHans.json +++ b/res/translations/zhHans.json @@ -47,12 +47,15 @@ "Bit rate": "比特率", "Bold font": "粗体字体", "Broadcast": "广播", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "取消", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "投屏到设备", "Channels": "频道", "Check for Updates": "检查更新", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "清除缓存", "Close": "关闭", "Close to system tray": "关闭到系统托盘", @@ -98,9 +101,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "编辑", "Edit Playlist": "编辑播放列表", @@ -113,9 +117,11 @@ "Equalizer": "均衡器", "Error": "错误", "Error creating playlist": "创建播放列表时出错", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "更新播放列表时出错", "Exclusive mode": "独占模式", "Fade out on pause": "暂停时淡出", + "Failed to load profile": "Failed to load profile", "Fav.": "收藏", "Favorites": "收藏", "Feb": "二月", @@ -139,6 +145,7 @@ "In order": "按顺序", "Internet Radio Stations": "网络电台", "Interview": "采访", + "Invalid Name": "Invalid Name", "Is favorite": "已收藏", "Is not favorite": "未收藏", "Jan": "一月", @@ -163,6 +170,7 @@ "My Server": "我的服务器", "Name": "名称", "Name (A-Z)": "名称 (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "新播放列表", "Next": "下一个", "Nickname": "昵称", @@ -176,6 +184,7 @@ "Now Playing": "正在播放", "OK": "确定", "Oct": "十月", + "Overwrite Preset": "Overwrite Preset", "Owner": "拥有者", "Password": "密码", "Pause": "暂停", @@ -197,11 +206,14 @@ "Playlists": "播放列表", "Plays": "播放", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "防止削波", "Prevent screensaver on Now Playing page": "禁止在“正在播放”页面显示屏幕保护程序", "Previous": "上一个", "Private playlist by": "私人播放列表", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "公开", "Public playlist by": "公开播放列表", "Quit": "退出", @@ -222,12 +234,15 @@ "Restart required": "需要重启", "Sample rate": "采样率", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "退出时保存播放队列", "Saved at": "保存于", "Scrobble when": "记录播放时", "Search": "搜索", "Search Everywhere": "搜索所有位置", + "Search headphones...": "Search headphones...", "Search page": "搜索页面", "Search playlists or new playlist name": "搜索播放列表或新播放列表名称", "Select Library": "选择库", diff --git a/res/translations/zhHant.json b/res/translations/zhHant.json index 4fbaaf6..822ec53 100644 --- a/res/translations/zhHant.json +++ b/res/translations/zhHant.json @@ -44,12 +44,15 @@ "Bit rate": "比特率", "Bold font": "Bold font", "Broadcast": "廣播", + "Browse Headphone Profiles": "Browse Headphone Profiles", "Cancel": "取消", "Cannot Delete": "Cannot Delete", "Cannot delete builtin presets": "Cannot delete builtin presets", + "Cannot use the name of a builtin preset": "Cannot use the name of a builtin preset", "Cast to device": "Cast to device", "Channels": "Channels", "Check for Updates": "檢查更新", + "Check network connection and try again": "Check network connection and try again", "Clear caches": "Clear caches", "Close": "關閉", "Close to system tray": "關閉到系統匣", @@ -94,9 +97,10 @@ "EQ Preamp": "Pre", "EQ Preset": "Preset", "EQ Preset:": "Preset:", - "EQ R&B": "R&B", + "EQ R\u0026B": "R\u0026B", "EQ Rock": "Rock", "EQ Treble Boost": "Treble Boost", + "EQ Type:": "EQ Type:", "EQ Vocal": "Vocal", "Edit": "編輯", "Edit Playlist": "編輯播放清單", @@ -109,9 +113,11 @@ "Equalizer": "均衡器", "Error": "Error", "Error creating playlist": "Error creating playlist", + "Error loading AutoEQ profiles": "Error loading AutoEQ profiles", "Error updating playlist": "Error updating playlist", "Exclusive mode": "獨佔模式", "Fade out on pause": "Fade out on pause", + "Failed to load profile": "Failed to load profile", "Fav.": "收藏", "Favorites": "收藏", "Field Recording": "現場錄音", @@ -134,6 +140,7 @@ "In order": "In order", "Internet Radio Stations": "網路電台", "Interview": "訪談", + "Invalid Name": "Invalid Name", "Is favorite": "已收藏", "Is not favorite": "未收藏", "Language": "語言", @@ -153,6 +160,7 @@ "My Server": "我的伺服器", "Name": "名稱", "Name (A-Z)": "名稱 (A-Z)", + "Network error. Check connection.": "Network error. Check connection.", "New Playlist": "New Playlist", "Next": "下一個", "Nickname": "暱稱", @@ -163,6 +171,7 @@ "Normal": "Normal", "Normal font": "Normal font", "OK": "確定", + "Overwrite Preset": "Overwrite Preset", "Owner": "擁有者", "Password": "密碼", "Pause": "暫停", @@ -184,11 +193,14 @@ "Playlists": "播放清單", "Plays": "播放", "Please select a preset to delete": "Please select a preset to delete", + "Preset '%s' already exists. Overwrite?": "Preset '%s' already exists. Overwrite?", "Preset name": "Preset name", "Prevent clipping": "防止削波", "Prevent screensaver on Now Playing page": "Prevent screensaver on Now Playing page", "Previous": "上一個", "Private playlist by": "私人 播放清單作者", + "Profile": "Profile", + "Profile not found": "Profile not found", "Public": "Public", "Public playlist by": "公開 播放清單作者", "Quit": "退出", @@ -209,12 +221,15 @@ "Restart required": "需要重新啟動", "Sample rate": "Sample rate", "Save": "Save", + "Save As": "Save As", "Save Preset": "Save Preset", + "Save Preset As": "Save Preset As", "Save play queue": "退出時保存播放佇列", "Saved at": "保存於", "Scrobble when": "記錄播放時", "Search": "搜索", "Search Everywhere": "搜尋所有地方", + "Search headphones...": "Search headphones...", "Search page": "搜尋頁面", "Search playlists or new playlist name": "搜尋播放清單或新播放清單名稱", "Select Library": "Select Library", diff --git a/ui/dialogs/graphicequalizer.go b/ui/dialogs/graphicequalizer.go index 0b5ff77..a13962d 100644 --- a/ui/dialogs/graphicequalizer.go +++ b/ui/dialogs/graphicequalizer.go @@ -2,6 +2,7 @@ package dialogs import ( "fmt" + "math" "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" @@ -42,6 +43,9 @@ type GraphicEqualizer struct { parentWindow fyne.Window isApplyingPreset bool // Flag to prevent clearing profile during preset application currentEQType string // Current EQ type ("ISO10Band" or "ISO15Band") + isDirty bool // true when sliders modified since last preset load/save + loadedPreset *backend.EQPreset // currently loaded preset (nil if none) + saveBtn *widget.Button // reference for enable/disable control } func NewGraphicEqualizer(preamp float64, bandFreqs []string, bandGains []float64, eqType string, presetMgr *backend.EQPresetManager, parentWindow fyne.Window, activePresetName string) *GraphicEqualizer { @@ -57,7 +61,16 @@ func NewGraphicEqualizer(preamp float64, bandFreqs []string, bandGains []float64 // Set the dropdown to the active preset if one exists if activePresetName != "" { g.setActivePreset(activePresetName) + // Populate loadedPreset and detect dirty state on dialog reopen + for i, p := range g.eqPresets { + if p.Name == activePresetName { + g.loadedPreset = &g.eqPresets[i] + g.isDirty = !g.matchesPreset(p) + break + } + } } + g.updateSaveButtonState() return g } @@ -115,9 +128,15 @@ func (g *GraphicEqualizer) buildSliders(preamp float64, bands []string, bandGain } }) - // Save button - saveBtn := widget.NewButton(lang.L("Save"), func() { - g.showSavePresetDialog() + // Save button (overwrites current loaded preset) + g.saveBtn = widget.NewButton(lang.L("Save"), func() { + g.saveCurrentPreset() + }) + g.saveBtn.Disable() // starts disabled + + // Save As button (always enabled, opens name-entry dialog) + saveAsBtn := widget.NewButton(lang.L("Save As"), func() { + g.showSaveAsDialog() }) // Delete button @@ -149,7 +168,8 @@ func (g *GraphicEqualizer) buildSliders(preamp float64, bands []string, bandGain g.presetSelect, g.autoEQBtn, layout.NewSpacer(), - saveBtn, + g.saveBtn, + saveAsBtn, deleteBtn, resetBtn, ), @@ -187,8 +207,12 @@ func (g *GraphicEqualizer) buildSliderArea(preamp float64, bands []string, bandG g.OnPreampChanged(f) } g.preampSlider.UpdateToolTip() - if !g.isApplyingPreset && g.OnManualAdjustment != nil { - g.OnManualAdjustment() + if !g.isApplyingPreset { + g.isDirty = true + g.updateSaveButtonState() + if g.OnManualAdjustment != nil { + g.OnManualAdjustment() + } } } g.preampSlider.UpdateToolTip() @@ -208,8 +232,12 @@ func (g *GraphicEqualizer) buildSliderArea(preamp float64, bands []string, bandG g.OnChanged(_i, f) } g.bandSliders[_i].UpdateToolTip() - if !g.isApplyingPreset && g.OnManualAdjustment != nil { - g.OnManualAdjustment() + if !g.isApplyingPreset { + g.isDirty = true + g.updateSaveButtonState() + if g.OnManualAdjustment != nil { + g.OnManualAdjustment() + } } } l := newCaptionTextSizeLabel(band, fyne.TextAlignCenter) @@ -255,6 +283,11 @@ func (g *GraphicEqualizer) RebuildForEQType(eqType string, bandGains []float64) g.sliderArea = newSliderArea g.container.Objects = []fyne.CanvasObject{g.topBar, g.sliderArea} g.container.Refresh() + + // Clear loaded preset when EQ type changes + g.loadedPreset = nil + g.isDirty = false + g.updateSaveButtonState() } func (g *GraphicEqualizer) updatePresetSelect() { @@ -346,6 +379,12 @@ func (g *GraphicEqualizer) applyPreset(preset backend.EQPreset) { } } } + + // Track the loaded preset and clear dirty state + presetCopy := preset + g.loadedPreset = &presetCopy + g.isDirty = false + g.updateSaveButtonState() } func (g *GraphicEqualizer) getCurrentSettings() backend.EQPreset { @@ -360,12 +399,61 @@ func (g *GraphicEqualizer) getCurrentSettings() backend.EQPreset { } } -func (g *GraphicEqualizer) showSavePresetDialog() { +func (g *GraphicEqualizer) updateSaveButtonState() { + if g.saveBtn == nil { + return + } + if g.loadedPreset != nil && !g.loadedPreset.IsBuiltin && g.isDirty { + g.saveBtn.Enable() + } else { + g.saveBtn.Disable() + } +} + +func (g *GraphicEqualizer) saveCurrentPreset() { + if g.loadedPreset == nil || g.loadedPreset.IsBuiltin { + return + } + g.savePresetWithName(g.loadedPreset.Name) +} + +func (g *GraphicEqualizer) savePresetWithName(name string) { + preset := g.getCurrentSettings() + preset.Name = name + preset.IsBuiltin = false + + if err := g.presetManager.SavePreset(preset); err != nil { + dialog.ShowError(err, g.parentWindow) + return + } + + // Update loaded preset and clear dirty state + g.loadedPreset = &preset + g.isDirty = false + g.updateSaveButtonState() + + // Reload presets and update UI + g.loadPresets() + g.updatePresetSelect() + + // Select the newly saved preset + g.presetSelect.SetSelected(preset.Name + " *") + if g.OnPresetSelected != nil { + g.OnPresetSelected(preset.Name) + } +} + +func (g *GraphicEqualizer) showSaveAsDialog() { nameEntry := widget.NewEntry() nameEntry.SetPlaceHolder(lang.L("Preset name")) + // Pre-fill with loaded preset name if it's a custom preset + if g.loadedPreset != nil && !g.loadedPreset.IsBuiltin { + nameEntry.SetText(g.loadedPreset.Name) + } + formDialog := dialog.NewForm( - lang.L("Save Preset"), + lang.L("Save Preset As"), lang.L("Save"), lang.L("Cancel"), []*widget.FormItem{ @@ -376,24 +464,38 @@ func (g *GraphicEqualizer) showSavePresetDialog() { return } - preset := g.getCurrentSettings() - preset.Name = nameEntry.Text - preset.IsBuiltin = false + name := nameEntry.Text - if err := g.presetManager.SavePreset(preset); err != nil { - dialog.ShowError(err, g.parentWindow) - return + // Check if name matches a builtin preset + for _, p := range g.eqPresets { + if p.Name == name && p.IsBuiltin { + dialog.ShowInformation( + lang.L("Invalid Name"), + lang.L("Cannot use the name of a builtin preset"), + g.parentWindow, + ) + return + } } - // Reload presets and update UI - g.loadPresets() - g.updatePresetSelect() - - // Select the newly saved preset - g.presetSelect.SetSelected(preset.Name + " *") - if g.OnPresetSelected != nil { - g.OnPresetSelected(preset.Name) + // Check if name matches an existing custom preset + for _, p := range g.eqPresets { + if p.Name == name && !p.IsBuiltin { + dialog.ShowConfirm( + lang.L("Overwrite Preset"), + fmt.Sprintf(lang.L("Preset '%s' already exists. Overwrite?"), name), + func(overwrite bool) { + if overwrite { + g.savePresetWithName(name) + } + }, + g.parentWindow, + ) + return + } } + + g.savePresetWithName(name) }, g.parentWindow, ) @@ -402,6 +504,32 @@ func (g *GraphicEqualizer) showSavePresetDialog() { formDialog.Show() } +// matchesPreset compares current slider values against a preset +func (g *GraphicEqualizer) matchesPreset(preset backend.EQPreset) bool { + if g.preampSlider == nil { + return false + } + if math.Abs(g.preampSlider.Value-preset.Preamp) > 0.05 { + return false + } + if len(g.bandSliders) != len(preset.Bands) { + return false + } + for i, slider := range g.bandSliders { + if math.Abs(slider.Value-preset.Bands[i]) > 0.05 { + return false + } + } + return true +} + +// ClearLoadedPresetState clears the loaded preset and dirty state +func (g *GraphicEqualizer) ClearLoadedPresetState() { + g.loadedPreset = nil + g.isDirty = false + g.updateSaveButtonState() +} + func (g *GraphicEqualizer) showDeletePresetDialog() { selected := g.presetSelect.Selected if selected == "" { diff --git a/ui/dialogs/settingsdialog.go b/ui/dialogs/settingsdialog.go index 41c3f4d..bf99bb9 100644 --- a/ui/dialogs/settingsdialog.go +++ b/ui/dialogs/settingsdialog.go @@ -501,12 +501,11 @@ func (s *SettingsDialog) createEqualizerTab(eqBands []string) *container.TabItem debouncer() } geq.OnManualAdjustment = func() { - // Clear AutoEQ profile and preset when user manually adjusts sliders + // Clear AutoEQ profile when user manually adjusts sliders + // Preset name persists so Save button can overwrite the loaded preset s.config.LocalPlayback.AutoEQProfilePath = "" s.config.LocalPlayback.AutoEQProfileName = "" - s.config.LocalPlayback.ActiveEQPresetName = "" geq.ClearProfileLabel() - geq.ClearPresetSelection() } geq.OnLoadAutoEQProfile = func() { s.openAutoEQBrowser(geq, debouncer) @@ -634,8 +633,9 @@ func (s *SettingsDialog) applyAutoEQProfile(profile *backend.AutoEQProfile, geq } geq.applyPreset(preset) - // Clear preset dropdown since AutoEQ is now active + // Clear preset dropdown and loaded preset state since AutoEQ is now active geq.ClearPresetSelection() + geq.ClearLoadedPresetState() // Show profile label geq.SetProfileLabel(profile.Name) From 8cc4476aba8e805b94ed6405f9ff779cd9a1e097 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Sun, 8 Feb 2026 17:10:31 -0800 Subject: [PATCH 22/25] add save / save as icons, use icon buttons in eq dialog --- res/LICENSE | 674 ++++++++++++++++++++++++++++++ res/bundled.go | 274 +++++++----- res/bundled_gen.sh | 4 +- res/icons/publicdomain/save.svg | 35 ++ res/icons/publicdomain/saveas.svg | 35 ++ ui/dialogs/graphicequalizer.go | 31 +- ui/theme/theme.go | 2 + 7 files changed, 943 insertions(+), 112 deletions(-) create mode 100644 res/LICENSE create mode 100644 res/icons/publicdomain/save.svg create mode 100644 res/icons/publicdomain/saveas.svg diff --git a/res/LICENSE b/res/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/res/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/res/bundled.go b/res/bundled.go index f3660ab..32f7efa 100644 --- a/res/bundled.go +++ b/res/bundled.go @@ -3,165 +3,245 @@ package res -import "fyne.io/fyne/v2" +import ( + _ "embed" + "fyne.io/fyne/v2" +) +//go:embed appicon-256.png +var ResAppicon256PngData []byte var ResAppicon256Png = &fyne.StaticResource{ - StaticName: "appicon-256.png", - StaticContent: []byte( - "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x01\x00\x00\x00\x01\x00\b\x06\x00\x00\x00\\r\xa8f\x00\x00\x00\x04gAMA\x00\x00\xb1\x8f\v\xfca\x05\x00\x00\x00 cHRM\x00\x00z&\x00\x00\x80\x84\x00\x00\xfa\x00\x00\x00\x80\xe8\x00\x00u0\x00\x00\xea`\x00\x00:\x98\x00\x00\x17p\x9c\xbaQ<\x00\x00\x00\x06bKGD\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\x00\x00\atIME\a\xe7\x04\x13\x000\nO*\x00\xc6\x00\x000\xa8IDATx\xda\xed\x9dy\x9c\\Wu\xe7\xbf\xe7\xbeWU\xbd\xafj\xa9\xb5/-,\xe1E\x8b\x8dw\x03\x06\x12b\xb0cB\xc2L&l\x19&\x042\x9f\x84$\x93\xe4\x93\xcfd2\x81\xc96\xf9d\x92\xc9$\x93d\xc8\x02\f\xf8\xe3\x10\x02\t\t\xc6\x03\xc4`\xc0\x18\uf6cc-˲\xadŒ\xac\xa5\xd5\xfbZU\xef\xbd{\xe6\x8fW\xd5\xea\x96z\xa9\xea\xeeں\xefן\xf6\xa7\xd5U\xfd\xfa\xbeW\xf7\xfc\xee\xb9\xe7\x9e{\xaePE\xecܸ\x1fR\xa0\xa1&\x81\xb5\xc0v`W\xeek;\xb0\x19\xe8\x04Z\x81\x06 \x01$D\xa4\xd2Mw\xacBT\x15 \xc8}M\x00\xc3@?p\x028\x0e\xbc\b\x1c\x06\x8e\xa9\xd2k\x92\x04\xe1\xb8p\xfc\xec3\x95n\xfa\x14\x15\xb7\x9c\x9e\xcd\xfb\x00\fB;p9p#\xf0\x86\xdc\xf7\xeb\x81\x16\xc0wF\xee\xa8%\x14\x05%\x04F\x80\xd3\xc0\v\xc0\x93\xc0#\xc0!\xd4\x0e\"b\x8f\x9cx\xb6\xa2\xed\xac\x88U\xf5lދ\xaa\x8a\x18\xb3\x86\xd8\xd8\x7f\x18x\x13p\x19\xd0\xec\x8cݱ\x12\xc9y\f\xa3\xc4^\xc1\xf7\x80o\x02O\x06\x91\xf4{\x06=v\xb2\xfc\x9eAY-\xadg\xcb>\x88\xdd\xf6+\x81w\x01w\x00W\x00u\xce\xe8\x1d\xab\x89\x9c\x18L\x02\a\x81{\x80\xaf\xa8\xea!\x81\xe0\xc8\xc9\xf2y\x05%\xb7\xba\xad[\xf7㫂P\x87r\x03\xf0A\xe0\x9d\xc0:g\xf4\x0eǔ\x18\x9c\x01\xee\x05\xee\x02\x9e@\xc8Ȅ\xf0\xca\xf9\xd2z\x05%\xb5\xc0܈\x9f\x04n\x02>\x02\xbcC\xa0\rg\xf8\x0eǥ((:H,\x04\x7f\v\xf2(\x10\x1c9Q:\x11(\x89%\xf6lه*\"\xc2\xe5\xc0ǀ\x7f\v\xb4\xbb\x11\xdf\xe1(\x00\x05\x85~п\a\xfe\x92L\xe60\x89\x84\x1e9\xf5\x83e\xffS\xder_07귈\xf0a\xe0ρ\x1f\x12\x91zg\xfc\x0eG\x81\b\x88Ѐp\x1d\xf0#\xf8~\x06\x91\xc3\x1d\xad\xdd\xd9\xc1\xe1\xb3\xcb\xfd\xa7\x96\x87\xed[\xf6p\xb4\xf5Yv\x0e\xef\xdf\v|\x02\xb8CD\x12\xe5}r\x0e\xc7\xcaCU3\xc0\xbf\x00\xbf\x83o^ \x8cX\xae\xe5\xc3e\x11\x80ܨ\x9f\"v\xf5?.\xc8\xce\xcag\x188\x1c+\x87\\^\xc1\x8b\xc0\x7f\x03\xbe\f\x04GN\x1cX\xf2u\x974\x05\xe8\\\x7f\r\x1b;\xd6\x01\xac\x01>\x0e\xfc7\x11\xe9v\xc6\xefp,/\x82 \"k\x80\xb7\x03u\n\a:Z\xbb\xd3K\x9d\x12,\xdaT{6\xefGDQ\xd8\x01\xfcO\xe0N\x111\x95~P\x0e\xc7JGU#\xe0K\xc0\xaf\v\x9c\x8cTXl\x12Ѣ<\x80\xed[\xf7b\x10\x14\xf6\x02\x7f+\xf0vqQ>\x87\xa3,\xe4\x06\xda+\x81=\xc0\xe3\"\xf4u\xb4v\xb3\x18o\xa0h\x01رe\x1f&\xb6\xf5\xab\x81O\x89\xc8\rn]\xdf\xe1(/\xf1x+;\x80}\xc0c\xc0\xf9\x8e\xb6\xe2E\xa0(\x01عe\x1f\x88\x80\xb2\x1f\xf8\x14p\x8d\x1b\xf8\x1d\x8b%N\x80\x9b\x89\xebN\x85#\xf1r\xe1\x16`?\xf0\bB_g\xeb:\x06\x86\xcf\x15|\x8d\x82\x05\xa0g\xcb\xfe\xf8\xc3Q\xae\x02>%\x883~ǢP\x05\xab\xf17I\x03\r\x89\xf8ߡ\x95\xfc\x1a\xb8\xa3`\x04\x116\x03W\x01\x0f\v\xa6\xbf\xb5e-C#\x85\x89@A\x8fz\xdb\xc6=x\x9e\x01\xd8\x06|VD\xde\\\xe9\xdbv\xd4&\xaaq\xee\xfb\xae5\xcam\xd7)\xbbwCK\x9b\xd2w\xde\xf0\x83\xe7-\xff\xfa\xb4pj\xd8 F\xdcbR\x11\xc4ޔ~\x1d\xf8\x19\xe0\xccD\x10p\xe6\xcc\xc1\x05\x7f\xaf \x0f\xa0\xb3}=@\a\xf0\xa7\xc0\xedn\xe4_}Lw\xd7\x17\xfb\xf1kn\xd4\xff\xd1+-\x9f\xf8\x98\xf2\xd6w\xc0\xf6˔\xee\x8d\xc2\xce˔\x1b\xaeS\xae\uec7ct\xc4pvH\x9c'P\x04\x12;O\xaf\x03:T\xf9v\xd2\xf3\n\xca\x1a\\P\x00\xa6%\xf9|\x1c\xf8\xb0\x8b\xf6\xaf.\xacBd\xc1#v\xd7u\t\xae\xbaUط\x05~\xfb\x97\x95\r\xbb\x14\vX\x1b_\xc4Z\xc0\x13\xba7\t\x97o\x80\xc7\x0e\bC\x13N\x04\x8a\"~XW\x89\x90\x01}\xb8\xa3u\xbd]H\x04\xe6\x15\x80\x9e\xcd\xfb \xe1\x81\xd5\x0f\x01\x1f\x17\x91d\xa5\xef\xd1Q\x1e\x14P\v\xed\xf5\xcam\xfb\x95\xf7\xdd\x16\xf1oo\xb5ܰ۲&\t\xbdC0\x96\x95\xfcȳ\xf0\xf5\x14\x92F\xf9埴\\}\x93\x12\xd9|rK\xfcz.\xbe\x84\xa2\xac\xed\x86\xf1>x\xfc\xb0\x00N\x04\x8a!\xb7Dx5\xc8\x11\x11s\xb0\xbdu-\x83\xf3\x04\x05\xe7\x14\x80\x1d[\xf6\xc6\xcb}V\xaf\x05\xfe\\D\xba*}s\x8e\xf2\xa1\x16\xf6l\xb2\xfc\xceG\x95\x9f\xfaI\xe5\xaa}\xb0e'\xec\xbeBx\xe3\r\xb0o\x93r\xea\xb8\xf2ڰ)\xc8@\xad¶\x0e\xe5\xe7ޫ4\xb6\x01:\x8br\b\xa8\n\xc6S\x92\x16\xee{Đ\x8d\x9c\x00\x14\x8b\x88\xd4\x01W\x80~\x17\xe4|{[\x17\x83ý\xb3\xbew\xce\xcc=A\xb0\xd0\x0e|\\\x84m\x95\xbe)G\xf9\xb0\x16\xb6\xb6+\x1f\xff\xa8\xe5\xba7[\xbc:%\x8c\x84(\x12B\xabHJ\xb9\xe6\xcd\xcao|Բ\xbd\xc3\xc6\xee\xfb\x82(m\x8d\x86\xe6f\x89\xf3\xda\xe70jɉ\xc0\xda.eM\x83\xa5\xa0K;f\xe3\xf5\xc0o*4\x8a\xce\xed\xe8\xcf*\x00=\x9b\xf7\"\x9e\x87\xc0\xfb\x81۪\xa0v\xa8\xa3L\xa8\x82'\xca\xfb~(\xe4\xf2\xab\xe3\xf9?:\xcdUG@\x85\xc8\xc2\ueac5\xf7\xbeE1\xe8\xack\xfa3\xae\v\x88\xa1ஔHZ\x12~\xbc1\xdeQ<\xb9Pݻ\x05~B\x10\xb6o\xd9;\xeb\xfb\xcc\x1c\xbf\x8dF\xd1\xe5\xc0/\x8a\x88_\xe9\x9bq\x94\x0f\x05\xba\x1a\x95\x9b\xaf\x05\xbcx4\x9e\xcbUǃk\xafU:\x1b\xb4$v\xeal\x7fi\xe4\xa6\x02\xbf\xa2\xe8V3\x87\xf2^\"\x00=[\xf6\x81j\x02\xf8y`g\xa5o\xc2Q^T\xa1\xa9Ah\xe90\xa8\xea\x9c\xf3\xef8<\x04\xeb\xd6ZַD\vz\x00\xb9ߪ\xf4\xed\xadBd/\xf0\xb36\n\xa4g\xf3\xa5^\xc0%\x02 \x00\"7\x03\xffέ\xf8\xadF\xe2Zn\x98\xc2>{/\xa9$\x12n\xac\xaeVr&\xfc\uf357\xd8?\x9b\x9a\xcf\x10\x80\x1d[\xf6a\xa1\xce*\x1f\x8d,\x1da\xa8\x84\xa1\x12F\x9a\xaf\\\xeaX%\xe4V\xe5\x1c+\x83\x8d\xc0\x87\xadU\x7fG|\x10\xcf\x143\xe6\xf7u(\x93\x81\u07b2\xa1ͼsOO\x92\xae\x8e\x04\n\x9c8\x9b\xe5\a\xc7\x02\x86Ҋ\x11\xb7,\xe3p\xd4\x12\"\x82\xaa\xfe\xb81\xf2Y\xe0\xf1\xe9\xafM\t\xc0\xff\xf9\xc0~N\x1d\x9fHn\xbf\xb2\xf5\x83\xd7\xde\xd2Ѳ\xf3\x9aV\x12u\xf1\xf2\xc1\xe4X\xc8\xf3O\x8d\xf2\xa9\xbb\xfbx\xe8\xc5\x00\xeb\x923V8\xc5~\xb8\xae3\xd4\x00\xeb\x80\xf7\xda\xd0>ٳy\x9f=r\xf2\x000M\x00\xde\xfb\xb1\xed\xa0\xec\xf5[\xfcے\xadI\xac\xbd\xe0\x02ֵ'\xb9\xfe\xed\x9d\xf4lK\xf1[\xff\xfd\x14\xf7\xbf\x10\xe29\x05p8j\x86\x9c\x17\xf0.\xe3\x9bO\x12\x1fM\x06\xe4b\x00\xe9\x93\uf8ee\xbb\x81\xba\r\xf5\xef\xf6\x9b\x93]\x97$v(\x84\x11t^\xd6\xc4G>\xb4\x96\xaeF\xc1\xba\x98\x80\xc3Qkl\x03\xde)\"\xecش\x0f\xc8\a\x01E\xc0\xe8z\x15\xb9}\xae\xdf\x14\xc0Fp\xf9\xfe\x16\xaeە,0\xfb\xcb\xe1pT\v\xb9U\xbd\x1fS\xd5\xd6|\xf5N\x039W\xdfr\x13\xaa\xbb\x17\xbaH\xaa\xd1c\xe7\xb6\x14\xe2\x1c\x00\x87\xa3\x16\xd9O\\\xce\x0f\x00\xf3w\xb7n\xe0\xb6Mw{\x93\xe7\xc6\xdfY\xe8n?\xdf\xf7\\\xdc\xc7\xe1\xa8M\x9a\x81\xb7\x1b\xcfгy\x1f\xe6\v\xe7Zi\\\xb7\xad\xfb\xe4\xcb\xe37\x17\x1a\xd7s\xf1?\x87\xa36\xc9M\x03n\xb5\x91mC\xc0\xf4\x06>g\x13\rW\xf5\x0eڭΰ\x1d\x8eU\xc1.\xe02\x00\xd3\xe2+Y\xf1n\xcc\x06ZW\xb8\x00\xb8\x00\x80\xc3Qô\x03\u05ca\b\xe6\xf9\xd1D}\x84\\\xe3V\xf5\x1c\x8e\xd5An\x1a\xf0\x860\n\x8d\xa93lP\x91]\xce\xfdw8V\x15Wz\xc6\xeb4\"\xda\x03\xacu\x02\xe0p\xac*6\x01\x9b\fq頦J\xb7\xc6\xe1p\x94\x956`\xa7\x11\xd8\xcd<\xb5\x01\x1d\x0eNJ$\x05\\f\x80\xed\x95n\x89\xc3\xe1(/\xb9\xfd\xbc\xdb\f\xf1\\\xc0\xe1p\xac&\xe2\x98\xdf\x16C|\xe4\x97\xc3\xe1X}\xac5 \xad\x95n\x85\xc3\xe1\xa8\b\xad\x06h\xa8t+\x1c\x0eGEhr\xd1\x7f\x87c\xf5\xd2\xe0\x04\xc0\xe1X\xbd\xd4;\x01p8V)\"b\x9c\x008\x1c\xab\x18'\x00\x0e\xc7*\xc6\t\x80ñ\x8aq\x02\xe0p\xacb\x9c\x008\x1c\xab\x18'\x00\x0e\xc7*\xc6\t\x80ñ\x8aq\x02\xe0p\xacb\x9c\x008\x1c\xab\x18'\x00\x0e\xc7*\xc6_\xfa%\x1c\x8e\xeaA5>\xb5\xc2\xe6\xca\xdc\v`$\xfe\xc6ս\xbd\x14'\x00\x8e\x15\x82bU0\xc0\xa6\xe6\x88\xeev\xa5>\xa1\fO\x18\x8e\xf7\x1b\x862\x82\x11w\xac\xdd\xc58\x01p\xac\x00b\xe3oI)\xef\xbby\x82;\xdf8ƚu\x01ƃl\xda\xf0ʑ\x14\xffp\x7f\x13\xdfx!I\xa4\xe2D`\x1aN\x00\x1c5\x8fU\xa15\xa5\xfc\xe7\x9f\x18\xe1\xf6\xb7\x0fa\x92\x16\xb5\xf1k\xc9&\xb8\xa6+î]\x13\xb4\x7f\xbe\x93\xcf?ԀU\xe7\t\xe4qA@GM\xa3\n\xa2\xf0S\xb7\x8cq\xc7ۇ\x10\xdfb\xa3ܤ\x1f\x01\x15\xc2\b\x1a\xdaC>\xfa\x13C\xec\xdb\x1cL\xc5\a\x1cN\x00\x1c5\x8e\x02\xeb\x9b-w\xdc2\x1e\x8f\xfc\xb3\xb8\xf8\"\x82\xb5б.˻\xaeK\xe3K,\x1c\x0e'\x00\x8e\x1a\xc7*l\xeb\f\xe9^\x17`\xedܮ\xbd\xa8\xa0\xa2\\\xbes\x92֔u\xe7[\xe7p\x02\xb0\x82P\x8d\r\xc2ZŪN-\x89\xadh\x14\x92)\xc1K,\xf0\xbeܨ\xdfҜ\xa5!a+\xdd\xea\xaa\xc1\x05\x01W\x00\xb1\xe1+\t\x11:\x1a \x95\x12\x82,\fL(Y\v\xc8\n\x8f|\x17qs\xea\x12\x02f\xe0\x04\xa0\xa6\xd1xΫʾ\x8d\u008f\xbf\xd1g߾\x80\x86VKz\xcc\xe3\xa5\x17\xe1+\x0f\xc0#G\x95\xd0-\x7f\xe5X\xf1>QQ8\x01\xa8aT\x05\x83r\xe7~\xcb\xcf\xff\x8c\xb0aG\x06\x8c\x8d\x03\\b\xd9y\xa5p\xc3\xcd\xc2\xdf~N\xb8\xfbA\xdc\x1a\xb8\xe3\x12\\\f\xa0FQ@U\xb9a\xbd\xe5\x97>dذ3\xc2b\x89\"AU\xd0H\bUi\xdb`\xf9ȇ\xe0-\x97\x01\xaan\xfcs\xcc\xc0\t@\xad\xa2\xd0L\xc4{oȲv\xa7\xc5Z\x98:\xf35\xfe\x16!^\xfej\xeb\xb6\xfc\xf4\x8fd\xe9\xf0#\xb7\xfc嘁\x13\x80\x1aE\x81:\x116\xb6\x00&\x8e\x05̆ \xa8\u0086\xdd\x1eM-\xc6M\x81\x1d3\xb8D\x0047D\x88w\xe1g\x92{\x97\xeb;Յg\x84\xe4\x1a\x0fe\xfe@\xb8*4\xb4)\xed-n\n\xe0\x98\xc9%A@1Bf \xe4\xf4\x03\xc3\xf4\x1f\x1c\a\x85\xb5oh\xa6\xfb\xc6f\x92m\xbeS\x81j\u0080\xb4\x16\x16\xd5KyJ{*B\xd5+\xe8\xfd\x8e\xd5\xc1\f\x01\x10\x11\xc6N\xa4y\xe6\x8fN\xd1\xfb\xc4\x186\x8c\xad\xfdկ\x0f\xb2\xf6\rM\xec\xff\xb5M\xb4mMU\xba͎\xe9\xc4!\xff\x02\xdf[\xe9\xc6:\xaa\x8d\xa9)\x80 D\x81\xe5\xd0g\xceq\xf6\x91QT\x15\xe3\v\xc6\x174R\xce><ʋ\x9f;7%\n\x0e\x87\xa3\xf61ӿ\x1b9\x96\xe6\xec##\x88\x89\xbd\x81<\"\x82\x188\xff\xf48\x93\xe7\x03\xb7\x97\xd2\xe1X!\\\xf0\x00\f\x8c\x9f̒\x1d\x89\xe6\xf4(\xa3Ɉ(\xed\xf2\xa8\x1d\x8e\x95\u0094\x00(\x05L\x11\xc5\xe5Q;\x1c+\t\x97\a\xe0p\xacb\xa6V\x01\xca1\xb0OmOո&\xd3TҚ\xf3*\x1c\x8e\x8apa\x19\xb0\xc4\xc1}\xab\n\x16:꠹APU\x06Ǖ\x91\xac`\x8cۤ\xe2pT\x82\xb2\xec\x06\x8c\xac\xb2\xbeYxϛ\x1b\xb8\xf5\x96\x16\xd6lLa\xadr\xea\x95\t\xbeq\xff0_}2\xcbh\x00Ʃ\x80\xc3QVJ.\x00\x91Uv\xaf5\xfc\xe6ϯ康u \xf5\xdeT\xc5\xd6MW\xb4p\xf5\x9b;\xd8\xfd\xa5\xf3\xfc\xcf\xcf\r2\x9cQ'\x02\x0eG\x19)\xa9\x00X\x85\xce:\xe5W?\xdc\xc9\r\xefX\xc3\xc4PD\xdfCC\f\x1c\x9c\xc0\xab3\xac\xbd\xb6\x89\x8e\xd77\xf0\x9e\xf7w32\x10\xf0\xa7\xff8J\xe4J6;\x1ce\xa3\xa4\x02\xa0VyӕInz[\a\xc3'2<\xf3G\xaf\xd1\xfb\xe4(QV\x11\xe0\xe5\xcf{l\x7fw'\xaf\xff\xf7\xeb\xb8\xf3\xddk\xb8\xf7{\xe3\x1c:g\xf1\x9c\x02\xac8\x04(j+\x92\xba\x15\xe7rP\xd2e@\x01\xf6\\ل\x97\xf0x\xe1\xd3\xe78\xf3\xd0\b6T\x8c'\x88\x11\xb2#\x11\x87\xef\xea\xe5\xf8\xbd\x03tm\xac\xe3\xaa\x1d\t\xb7_}\x85R\xccǺ\xd0\xeeF\xc7\xf2Q2\x01P\x8dw\xa0m\xdc\xe83|,Ù\a\x87\x11oZ\x8a\xb1\xc4;\x0f\xd5\u0089o\f\x12LX\x1a\xdb\x12n\xc3\xca\nE\x10l\x14W+^\xf0\xbd\x02\x13\x93\x1e\x13YㄠĔ\xd4\x03\xf0\x8d\xd2\xd4\x04\xc3G\xd3\x04c\xb3\xa7\x10\x8b@f8\"\xca(\"./i\xc5\"0:\x121\xdeo\x11\x919==ոS\x9e>e\x18\x18\x177\r(1\xa5\xb58\x8d\vWF\x19\x8bZ\x9d\xb1\xc1h:2u|\xb3\x1b\xfe\xab\x83\x82\x12ËB\x80\x81Q\xe5\xc0\x13\x82X\x10\xb9\xf4Ђ8?L\x89\xb2\xf0\xe4\x930\x19V\xfa9\xac|ܐ븈8I\xcbZ-h\xf4\r\x02!\x13.\xfcN#ʀM\xf0\xa9\xfb|^>\x90\x88\x97{%/4\xf1\x97\x88b\x10\x9ez\xc8\xf0\xe5\xc7\xc0\xae\xf4\xf3\f\xaa\x00'\x00\x8e\x19\x88\xc0\u060422\x14\x7f?\xaf\xab.\xd0{\xd6pf\xd8+\xc0P\x05c\xe0\x85^\xf8\xc4'\x85'\x1eN1\x99M\xc4?\x17P\f\xa3\xe3u|\xfb\xeb)~\xff\xd3\xc2\xe9\xb1\xf8\xe7\x8e\xd2ra\x19\xb0*\x1evU4bU#\xc0ȸ\xf2\xc2S\x96\x1d\x97\x9b\x9c\xab~\xd1.М\xab\x8e\x15^y6bbB\x10Y\xb8Ԙ\x00\x88p\xe0D\xc8\x7f\xb9k\r\xdb_\xb9\x8e\xdd[\xfa騟\xe0\xccP\x17/\x1em\xe3\xd4#\xdf\xe6t\xdf0\xc6Y\x7fY\x98\x12\x007\xfbv@.\x02o\rw\xddo\xb8b\xbf\xb0cOHt\xf1y\xda\x02\xc6\b\xaf\x1e\x84\xbf\xfb\x8e\xcf$\x85G\xebE\xe2\xda\x13\xe7&\xbax\xec\x1b\xbfDhSx^\x960h\xa4\xce\f\xb1\x9d\xa712\x84\v\xff\x95\x87\x151\x05\xc8\x1f\x8a\x19徬\xba㟗\x82\x18\xe1\xf9^\xf8\xfd\xbf\x12\x9e\x7f*I\x18\xfa\x18\x01Ob\xb7?\x8c<\x0e>\xe9\xf3\x87\x9f\x14\x9e=g\xe2\x8aQE\xfd\x85\\\xba\xa7\xfa\xd8L\x1b\xc1\xc4Z4hd\x85tǚ\xa2Ə\x06\x8b\xeb\xe1\x1bQ6\x19e\x8dUB\x03\xa7\xd4Я2\xd5\xcf\x1cőw\xd5\x1f>b\xe9\xfd\x9b6\xae\xb8\xf5\x1a.\xdf\xd1OWk\x1f\xfd\xa3M\xbcp\xbc\x95\x17\xbe\xf5\"\x87\x8f\x0f#\x8b\xdc\xc9)z\xd1\x1ft\x82\xbd\xec贓\xa0\x04f]\x85\xabi\x01P\x15\x1aE\xb9]Bn\x8a\"\x1a\xad\xa2\x16Ίp\xafI\xf0\x04^\xbe\xf4\x80\xa3HbW]\xe9\x1d\xed\xe2\xc1\xaf\xfe\x12\xa16Q\xd7\xd8K6\xdd\f\x91\xa5\xc7\xfe:\xc6\f\xce<@\xc2Q\x15\xc4;\uf554\x11\xba\x92\x1e\x9e@_6b\xc4#\xfb\xe0$|\xf7p\x9a;d\xf6n)\x02\xc3\xe3\x96/>>ɤ1U\x91\xa6YE\xe2[\\\xbb5\xef~Y\x14A\x9197J9*\x8bj<Ь\xefh\xe7\x80~\x8cS}o\x02\xe0d\xf2&n\xe8\x14:&\xbe\xc2\xf9\x8c\xd6L\xe2\xd2\xc563\xedl@\b\xe7=c\x1a\xac@`\xdc\xe1 KAU\xf1\x8c\xd0Լ\x86\xfa\x8ekhl\xdbF2\xe1O\x89\x82\xa3\xdaPRƢ\xc9\x1d\x9c\x1b\xd9\x17\xffH \xcc6s:s#mu\xa9\x9a6\x87\x99\xa7\x03O\xfd\xbf\x16\x9c\xd3\xf2\xa0S\xa7\xef\xc6\x06\xba\x94\x91ZU\xf1Dh\xe8\xdc\xc5)\xf9\x05\x86'\xaf\"\xe5\xf7\xb3\xa9\xed\xefH\r}\x85L\x10:O\xa0\x1a\x11\xc8j\x03\x91\x9dy2v&\xdbEB\x12@\xa6\xd2-\\4U\x10ʫNT\x15\v$\x8d\xd0j\x94&/v\xd3mn\x9du\xb1$S\x8d\x9c\xe1g\xe9\x1b\xb9\x99 \xdb\xc2\xd8\xc4vNd\x7f\x1ai؆\x14W5\xcfQ.\x14f\x1f\x10\xe3\xe9ے/\x9f[Q\x88\xbf\xca\xdb\aj:\x13\xb0T\x83e~\xa4\xbe:\xa1\xbc\x89\x88\xce(\"0\x86\xe7}\x8fo\x85\x86\x81h\xb1[U\x15ϴ3:\xb9\xfb\x82\x93\xa5\x90\t\xbb\xd0\xe4z\x84\x97b\x8f\xc3y\x01\xab\x06\x9b3\xf8fO1\x02c\x11Se\xd3\xca\xe1\rִ\x00\x94\x82|\x96\xd4\x0f\xa5\x94\x1f\xcbf\xa8\vlN\x91#6\x9b\x90m\xa9\x04\x9f\xc1\xa7/bQ\"`\xf3\xe5\x8ff\xfcM\x0fK\xd2%ڬ2\xac*]I\x8fw\xado\xe4M\x1d)\x12F86\x1e\xf0\xe53c<5\x1c\xce\xc8\xd8+\x155-\x00\xe3V\xb0H\xae\x94\xd8\xf2<(EXo\xe0\x87\x83\x80T`\x89\x88\x97x\x14\x10\xab\\\x9e\x0e\xb8))\xdc#ޢ>\xa0\xd9\x17Y$\xcelr\xac\x1a\xac*\x1b\xea|>\xb1\xbb\x93[:\xeb1\xb9:\x89\xfb\xda\xe1\xa65\x8d\xfc\xee\xe1~\xee??Y\xf2H\\M\xc7\x00^\xcb\n\xc12\x8f\x98J\xbc\x97\xa0-\x8cf\x94\xa7\x16\xe2tcTy\x9d.>\xc3P\xb9\xd4\x03pT9\xcb\xfcq\xa9ƛr>\xb0\xa9\x897u6\xa0\b\xa1\x8dcN\xa1\x85uu\t>\xb2\xad\x8dΤWP\x15\xe5\xa5P\xd3\x02P\x92G#\xe0\x85Q\x9cK|\xd1\xe8\x9e\xff\x97\t,n\x9b\xa1c\xb1(О0\xdc\xd0Q?\x95\xaa\x9b\xf7$E\xe2\xbd,\xafkJrUs\x12\xbb\x94?T\x005-\x00\xa52\xbf8\xe8\xeb\x8c\xdbQ:\x92\x9e\xa1\xd1\xf7g\x9d\xbc\xaaB\xca\x18\xba\xea\xfc\x92DŽjZ\x00j\x93KKn\xe7j\xe2V\xbaa\xb3\xb7\xb6\x88M\xa2\xab\x8f\xa5\x95O\x9fk\xc1\xaf\x9cc\x8f\x13\x802#0\xbd\x12v\x8c\x02%w\xf6\x1c\xcbF~\x87\xb4\t.*mT{\xd4\xf4*@-\"&`M\xc7\v\xacoz\x88n;ȸ\xe7s$\xbb\x89\xc4\xd0\b\x99\xda\xeeK+\x1a%\xb7\xb7\xd6\x04 \x11Du\xa4\x1a\xce`Fk\xfb\xf4\x12'\x00e\xc4\"\xac\xa3\x9f_K\xfc\x1e\x97\x9f\x1f\xa4y\xc8ƥˍ\xe4k2a\x81\xeeL\xc0\xdb4\x8cs\x82\xaaƺ\x94(h \n\x1a+ݐ\x8aa\x817w\xa6x\xff\x9afvN\b\xa9\xac\xc1\v\x85\x8eI\xe1\x16|>\xb2\xa5\x8d\x16\xdf\xd4\xecnN'\x00eB\x056F\x11u\xaa\\\xbc{\\s\xa9\x86=6\xa4\xae\xaa\x82JB\"5\x8c\x9f\x1c\x99啕\x8f\xaa\x922p{w\x13-\t\x9f(_HO\x04+B\x84p}G\x03{[\x92\xb3\x17ѩ\x01\x9c\x00\x94\x99\xd9\xf2\x87\xf2[\x00:}K\xbdY\x9c\x00L\r@f\xda\x17,\xd9WW\xc9\"\xe6\xe2@\x97\x82\xda\xe5\xb8|\t\xb9x\xa9%Oq\xd2U\xef\x1965\xa4r\x9f\x9b\\r\x95zϰ\xab)Q\xcd\x0fb^\\\f\xa0\xeaX\xdc\xd8*\x064\xa3\x84'\x15\xcd(\x92\x10\xbc\r\x82iZ\xfcB\xbe\x02\x91F\x18\x9d\xb9DiDi\xf2,Yr³\x8c\xee\xc0ҏ\x88\xd7X\xfcl\x1c\xbc\x13\xd1x\xa9Ng\xbc\xa3\x88\xf6Ȃ\v\xf3\x9e\xa9\xd5\b\x80\x13\x80*c\x91\x96d 8h\x99\xf8R@\xf6\x80E\x83\xf8\xbc\x0e\xff2C\xe3\a|\x92W-\xbe\x83\x9aYR\x94\x12\xc9Q\x12\xdeD\xae\x94\xd9b\xaf\xacE\xfc\xb4\xf0ǧi\x83}\xbe\x19\xfbr#\x9a1Hk\x88w\xf50\xb2)\x8d\xf8\xba\xb8u\xfb\x1a\x1d\xdd\v\xc1\t@\xad#\x82\xedUF\xff\"K\xf0\x82\x9d\xfaD\x15\xc8>\x19a\xfb\x95\xd6\xdf\x10\xe8^\xe2ߙf\x04Q\xd0@Dj\xf1\u05ca\x1b>\xeb\xb5\x17ݸ\x9c\xf1\x87\xf7\xac#z\xa4\x1d\r/\\?z\xb2\x15\xff\x8e^\xcc̓K\xfdCUO!\xb9\x89\xd3_w1\x80ZG \xfd\xed\x90\xe0pl\xfc\"r\xe1\xcb\x17\xc2c\x96\x89\xaf\x86q\xa9\xe7Ŏ\xd6&«\x1b#Y?\x88I\x8d!&\\\x06W\x9d\xb8'z\x01R7\x02f)\x99\x90\xf1\x8dE\x0f\xb7\x13=\u070eZA\xf2i\xe6\xf3\xb55.u\xe7\x04`堠\x01\xf3ڶ\x16\xe2\x17^\xf2;\x8a\x87\xf0\xae0Ϳ;\xff\x00\xcd\xe9\bc\xc1z0\\\xef\xf1\xb9t\x96\xe3\x14\xdf\xe9U\x15#\u008fz\xfd\xbc7\xf8;6\fd\xf1\x03Ȧ\x9e\xe1XK\x8a\xbf\xb2\xe3|\x0f).\xb1F\x14\xc6=t\xc8\xcf\x1fm<\xfb\xfb\x02S\xf0\x83\x88Ϟ\x84\xf7ߘfKK\x84\x8e&f\xbd\xac\x02\xb7\xef\xcfp\xffxȓ\xaf\xf9x5\xb6>\xea\xa6\x00\xb5N\x89:\x9c\x05\xf6'\x85\x9f\xf4<\x9a\xc7-\x1a\t\x91\n\x1a\n\xad\xa3\x96\x0f\xfa>W'M\xd1[\x98,\xb07\xe9\xf1\x11\x15\xb6\x9e\xcf\xe2\xa5A#HL(\xaf?\x9b\xe6?z\x86\x8d\xbeY\\!\x8ce\xf4ŭ¶v\xcb\x0f\xbfe\x10I\x05s^[-tm\x1b\xe7mWO`\xa8\xa6$\xae9\xb8H\xac\x9d\x008fE\x80[\x92>m&.\xbb\x96O\x80A\xe2\x7fw\x18\xe1\xcd)\x83\x14\x91\xb9\x18\x8f\xfepk\xd2c\rq\"\xcd\xf4\xebF\b;}õIo\x89\x1bm\x97\x8e*\xbcn]Ț\xce\x10\xbbP\xb96\xa3\xec{\xdd$͉Z\xd8\xd19\xf3\xa9:\x01\xa8\"\xf2ݬZ\x06\x91\xc6iUjf\xb43\xf7\xef͞!Qd%S\x0fa\xfd\x1c\xd7U\x89礻R\xb9\x93\xa7\n\xbel1nP\xe1\xefM\xd6\x11/\x1d.\xd0\x0eUhh\x8cHx\xd5\xf3\xd9\x15\x8a\x13\x80*A\x88\xddN\xd5j-\rr)F\x8b\x0f\x02\xce7\xb2\xe7\xaf\xe5\x99\xe9\xffr,/n\nP\x19t\xe1\x836\xc7#!tՁ\x1de\xc4\t@\x19\xb0\x16vtY\u07b6)\x9cs\xbel\x15^\xd7n\xb9\xe5\xf5\xd6\xd5\x06r\x94\r'\x00%F5\xceo\xff\xf1\xb7Z\xf6\xf5(v\x0e\xebV\xa0\xa9\x1e~\xf2G\x95\x96\x86\xea:w\xbe\xdc\x14\xef\x03iQ\xbfXU\x1b.+\x8c\x13\x802\xd0\xd4\x00\xd7^\xb3p\x19q\xab\xb0s\x8b\xb2i\x9d\xe6\xce t,\x88@:\xad\x84Aa\xf6?:\xe23\x19\x94h\x9aU\x83\xb37'\x00e\xc0O@}\xe3\xc2ɳ\xaaP_\xa7t5\xd9U\xed\x01\x14\x83\b\xf4\xf7\xc1\xc0\x99\xe4\x82\x1b\x93d\xd2\xe7\xe0\xe1F\x862\xa6\x16m\xb5$8\x01(\x13\xc5mAu\x14\x8a\x01\x8e\x8f\xfb\xdc\xfb\xfd\x0el\x94\x98\xf3ى\x81\x81W\x9a\xb9\xef\xe1&\xc2e\xde\xc2\\\xcb8\x01\xa82<\x94F\xafV\xeb˔\x1f\x11%P\xe1\v/(/\r\xdb\xd9\x0fl\xd5\xf8 \xd7\uf78dx\xac\x17\x8cTW\xdd\xc5J\xe2\x04\xa0\xca0\x02\xa9EV\x05Z\x9d\xc4\xc6\xab6Z͎\xc5j\xbe\xf7y\x98\xb9\x1d\xd8=\xa4\x9aBC\b\xcf\x14\xa2\x00\xcaĄǹ1o\xf5\xba\xbf5vߊ\x96\xfchp\x98\xe1\x01\xc4k\xcf5\xb3\xfe\\@[+\xbd\xa3l)\xf7\xb6\x10\x02\x8c*\x9c~U\x91\x05b\x86\"\xd0w\x16\x06\x86\xdd\xfc\xb7VP\x85PK\x9f\x13:c\n\x10\x18\x13ר\xafrT\xc17\xb0\xbbi\xee\xc2\x11\n\xb4'\x85\xadMR;\xa2V$\x13\"|\xebiC\xfa\x84\x9d۰\rD\xa7\x95\xef|\xd9\xd2?Ys\x03᪦\x1c\xddv\x86\x00\x88\xea\xf2\xd4z+1V\x95}\xdb}\xfeͭM\x88\xce~Ȳ*tw'\xf8\x0f\xefn\xa39\xb1\xf2Rk%W\xf9\xe6\xbeA\x9f\x03Cf\xf6\xe5/\xe2\x0f\xf8Ԩ\xf0/\xcf{X]J\x15_G\xb9)\xcdG\xb5`=\x80\xea\xee!\x9a\xdbUw\xcb\xf5M\xacY\x9fB-s\x96\xa4\x8aB\xb8\xfe\xa6fvo\xf2\xca2\x9f*7\x06\x18\xc4pP\xfd\xb9\x13`\x80!\x15\xfa0\xce\xf8k\x8eE\xec\x8aX\xe8W.2\x83\x1a\\\x05P|\x0fzz\xea\x10\xb3P\xee'4u$X\xbf\xb1\x8e2L\xa7\xcaO\xbe\xc2m\x01u\xa0k\xe1\x93ṳ4C\xd6J\xa8\a`\x04\xaf59\xff{\x14\xbc\x06\x83ߖ\xc0kI\x16tY%\x9e\x06\xf9\v\xa1EX\xaa\x01\xea\x17p\x17|\x94\x94۵_\x06j\xa5\xa3U\xfe\xce\xf2\xd7\xdbә\xa05a\xe6\xbc~\xd2\bWw\xf9$L\xac\x15S\x02 \xc0P\xa4d\x98\xddf\x04\b}CX\\\xb1\xb6\x9a#\x12aT\xe6/J\x1d \xa4k\xd4y\xaa\x05RV1\xac\xec\x9c]\x05\xc2%_e\xda\xf5\x1466X>\xf8\u0590\xfa\xfaكު\x80\x81w\xbd)do\xb7Ū\xce\x14\x803\x16Nz\x82\x11f\x9cw\x9e\xaf\xfd~\xcc\bö\x94\xeeoe\x85e\xe5v\xb7\xda\u008fja-jih\xee\xbf\xe5\xc2Z\xb8rK\xc0\xce+z\xb1q\x1d\xe7K\x10b\x11X\xb3\xb9\x9f\x1b/\x9f\x00\x95i\x02 B\xda*\x0f`\x18H\xf9\xf8\"\xf1\xb2\xa0*\x9e\b\xbd\tã*DJEO?q\xac|\xe2\xb1g\xf1\xa7\x1a\xafF\x04ع! Y\x1fλ\xe4\xad\n\xe2)\xafۜ%e.J\x05\x16\xe0X\b_\xf4\x85k\xeb}6\x8a\x12)\x1c\xb1\xc2\xd3\x11\xf4\xd9\xfc\xf1ͥ\x12\x00',\x8e\xd5A\x1c\x9eZ\xde\xfe\x9eH\x14:kR\x12\xc9\xf8\xbd3\x05 w\xca\xc3\xc9\x00^\v\x85\x94\x89\xcd=c/Զs\xa3\xbfñtt\xda\xff\x97\x8d\"\x8a\x1d\xe6\xd3\xe4/9\x1bPr\xc5\x12T\x95\xf4T\x8e\xb9\xe42͊7\xfeb\x8f\xa3t8V\v\xd5\xd0\xdb\xe7<\x1ct9Fz\x05\xa2\xa2V˜w\xe1p\x94\x93\x92\xaee\xa5#\xc3\xe9^-\xcc3\xb1J\x90u\xa5\xb0\x1c\x8erR2\x01\x10\x897\xed\xf4\x9d\x18C\xc3\x05\xdc\x00\x81\xf4H\xc8\xd9S\x19\xe7\x048\x1ce\xc4_\xfa%\xe6A\x84'\x9e\x18\xe7\x8a0\x89\x98\xb9\xd7\x0fL\x04/<:Ƴ'B\xccB\xf9\xfd\x0e\x87c\xd9(\xa9\x00\x88\b\x0f\x9d\xf5h\xfa\xde(\xd7\x13\xe7\xd9_\xbcN!\x02#\xfd\x01_\xfa\xc2\x00\xbd\x93+:\xf9\xcb\xe1\xa8:J\x1a\x03\x10\x81\xc0*ύ[\xc2y\f{\xc4¡\x91\x88\xe5_\x19u8j\x97\xb2\x17\x04)\xd5\x1f\x18\x12a\xc07SˋS7\x98\xcb2<\x9d\xf0\x18Aj\xa2\x18\x89ñ\x1c\xe4\xcd`\xae\x01O\x85eM\x15\x9e\x8b\x92\v\x80\x880b\xe1\x011L&=\xbc\x19)\xc6З2\x9b>\xbc\x81\xae;:\x99|5\x8dW\xefQ\xbf\xa3>\x9e\x1a8\xe3w\xac6\x14\xd8u\x1a\x02\x0f}n3\x92I\x80\x05MD\xb0\xbd\x17\xf6\x1f\a\xefBM\xe2\x9a\x15\x80\x197,\x90Z\x9f\"\xb51\x97\x98c\x81\xb8\xbc\x80ñ\xca\x100\x16\xae<\x01\xeb\a\xd1\xdeV\x88\ft\x8eºaԏ@/l5\xae}\x01\xc8\x1b\xb9\x12\x1b\xfd\xc5?w8V#Fѵ#\xb0v8\xf7\x83x5L4\x9e\x0f\xe4ͣ\xf6\x05\xc0\xe1p̂\xe42\x8e\xe5\xe2\x1fϠvW\x01\x1c\x8eUAi]Y'\x00\xd3\xf0EI\x88\xe6\xe6H\xf3\xe0V\x15k\x8fj\xfå\xd9\fT\xb2\x86\xc7\xc2\xe2\x04`\x1a\xa1\n\xa1\n\x89v\x7f\xde\"\x1f~\x93\x87\xe7\xf2\v\x1c+\x00'\x00ӱ\xc0\xa4\xa5\xbe\xa7\x1eI̞b\xac6NA\xf6[}g\xff5G\x15E\x86g\x9b\x9f\xcf|\xb1,\xfd\xcb\t\xc0\x14Bʳ\xd4\xd5+\xcd{\x9bi\xdeӄ\x86:\xb3\x8a\xb1U\xbcFC\xd7;;\x91\xa4\xdbc\xe0X$*\xe0[H\x06\xb3g\xec\xa9\xc4\xcbu\xb9\x8c\xbdR\xe2\x04`\x1a*qa\xf2dg\x82\xad\xbf\xb8\x99\xd6k[\x10#\xd8P\xd1HI\xb4\xfbl\xfc\xc0z:nm+\xed\aSE\x03\xd5JA\x80D\xb8Pp\xa7\x8c\xd4\x05\xb0\xfd|.KoZ\x89i\x05\xac@\xd7(\xbaf4\xf7Z\xe9pˀS(\x19k\x98\xb4\x06\xac\xd2te#\x97\xfdA\x0fC\x8f\f3~h\x02\xbfݧ\xed\xc6V\x1a/k@<\x81\xb0Zz\x92cAr6\xe4U[f\xe8\xae\xd3\xe8h\x1d\x1c]\x87ds\xa6(\x8av\x0f\xc15G!\x15\x00\xa9\x926\xc1\t\xc04\x84iyE\x91\x92\xe8H\xd0\xf5\xa3k\xe8\xba}\xda\v\xd5։\x1c\x05S-\x92-\xf9Ƥ\x02\xb8\xe1e\xd8v\x1e=\xdd\x0e\xd6@\xd3$l\xebC\x9b\xd2%\x1f\xfd\xc1\t\xc0\x9cH\xaet\xf9Tva\x19{O\xb5tTG\xe9Q\xcf¦\x81\xf8+\x7f\x14\x85\x82X\x99\xca\xd9/%N\x00\xa6\x13\x81\x8cۊ\xce\xc1\xb3V\xe8ͺ\x8fe\xb5 \x17W\xfdԩ\x17ʂ\v\x02NG\x15\x82\xca\xfa\xf8\"\xc4\xc9H\x8e\x1a\xa36W\x85\x9c\x00\\B\xe9\xa4W\n\x18\xd8\x13\xa2t$\xc2J?\x04\aԤA\x17\x8b\x13\x802!\x1e\xf8;\r\x18f\xafah\xc1\xdf,h\x83\x90\x89\xdc:`U\x90\x8f֙9\x94 ?gO֮`;\x01(\x17\n\xa9\x9b\f\x89\xdd\x06\".\x94/\xd38\xc7\xc0t\b\xf5w\xfahJ\x98\xb0%<\n\xc6Q8\n$#\xe8\x1e\xba\xf0\xef\x19/\x82\xd6g/\xbc^\x83\xba\xed\x04\xa0L\xa8\x82\xd7mh\xf9\xb5$\xf5?\xe2c\x9arǣ%\x85\xc4e\x86\x96_N\x92\xdc\xe7\xe1\xab\xd2\xe6\xd5\ue232\xe2\x10\x85\u05ff\x86v\x8d\xc4\t:\x96\xa9d\x1d5\x1aW\xdfi\x9b\xa8\xd9\xe9\x82\v7\x97\x13U\xfc\xad\x86\xe6_NP\xff\xb2G\xf8\x9a\xe2\xad\x15\xbc\x8d\x06o\xad\\\xc81\xa8\xc1\x91dŢ@\xcb$\xbc\xf1E\xf4\x85Mp\xbe%\xae\xb0S\x9f\x85\x9es\xf1W\r\am\x9d\x00\x94\x1b\v\x92\x10\x12Wz$\xae\xe2B\xb1\xc6\x12\x960sz\xb2D\x14\xb4}\x1c\xb9\xe9%\xc8\xf8S\xb9\xfc:-X\xab5\xfa\x94\x9d\x00\x94\x9b\xb92\n\xa7\xf5\x9fb\a\x94\xe9UѦw\xc3\xfceF\x8d\x10\xca,oXe,\xe5\xd6E%Nӭ\v.\xba\xdeEy\xfc5\x86\x8b\x01\xac\x00N\x1bC(\x82\\\xb4\xba\x90\xef\xf0\x87\xf0H\xc7)'+\x16\vd\U00081e4b^\xd3\xdc\x1e\xa0\xc1bN\xe5\x04\x86ƅ \x98VZ\x1b\x99\xf1\x1f\xc8\xd4A\x9f\xc3#\x1e\x99\xa8\xf6\x9e\xb1\x13\x80\x1aG\x14\x9e2\x1e\xaf\x18\x83\a\xa0\xb9z\xaf\xaax\xaa\xbc*\x86\uf21f\xef\xbf+\x14!\xa3ʣAD\x98s\xc6\xf3\xa6\xae(F\xa0\xdf*\x8fe\vO\xf22\x06^\xed\xf5\xe8\uf34b\xc3̥\x1d\"\n\x91\xe1\xf0KIƃ\x82/_58\x01\xa8q\x8c\xc095\xfc\x89\xd4\xf1\xb8\xe7\x13\xe4<\x81P\x84\x17\xc5\xe3OM\x1d\xaf\x8aW\"\xdb/\xde睾\xe1jΫN\xed\x96)\xf0\x9a\x12_\xf3k\x93\x11\xdf\xcbD\x18\x14\x9f\xb8s\xfb9q\xf8B:ˡ\xd0\x16\xdc\xe1\x058=l\xf8\xd6\xf7\xdb\xd0\xd0GDg\x8a@\xae\xb4\xb61p\xf6d=\xdf|\xa6a\xfe\x1a\x1fU\x8a\x8b\x01T!\xc5n\x02\x13\xe0\xb0x\xfc\xae\xd4s\xb9D\xb4\xa92\x82pX\f\xfdb\n2\xba٘\xd0x\xc4TeF\x894\xcd\x05\x13NXKPd`\xc1\x02\x93Ӧ\xcc3b\x16\x1a\xdf\xfb)k\x894\x16\xb7B1\"\fY\xe5\x0fdz\x1c\xb2\x1e\xd7\xfa>\xf5\xc4#\xff\xbd\x99\x90\x87\xb3\x16U\x8d7y\x15\xf2LEɪ\xf0\xb9\xefձ\xa9\xbb\x83\xb7\xdc:\x80\x97\f\xb1y'\u0080'\xc2\xc0\xd9:\xfe\xf2\x8b\xed<\xd3\xeb\xc7˺\x8bxΕ\xc4\t@\x15Rl'\xca\xcdF\x19U\xe1\x11\xf1Q\xb90\xd2.\xd6\xf8\x15\xf8n\xc6r{Ji3\x82͉\x80jllê|'c\xb1\n^\xa1\x7f@\x84H\x95'\x82\x88\x1fIy\x98\\\x01\x96\xd8eW\x8c\b#Vy:\xe7\xaa\x17\xdbn#\xc2\xf9H\xf9\xf4X\xc8\xe7%\xc2\x13\b\x14Ҫ\x18(\xd8\xf8\xf3O\xd5\b\x9c\x9b\x80\xdf\xfb\x87\x06\x8e\x9eL\xf0\xb6\x9bGY\xb7\xd6\xe2\x19a2\x1dq\xf8p\x1d\x7f\x7f\x7f\x03\xdfy%\x81\x05\x8a\xba|\x95\xe0\x04\xa0\xca\bU\x18\x0e\x17\x93\t(\x88\xc0r\xe5\x10\x1a\xe0\a\xa1\xe5\xeet\xc0\x87\xea\x134\xe7{\xb7\xc0\x88U>7\x19\xf0l\x10a\x8a0S\xc9]\xf7;و\xbd\x99\x88;S\x1e\xfe\x94\b\b\x01\xca?e\x02\x0e\x04\x85\xbbꗴ[\xe2\xc0\\:\x1f\xf9#\x1e\xa9\x17\xfd\x1cD蝄?\xbf?\xc9\x17\x1fkgs\xbbG\xca7\x8cL\x04\x1c\x1b\x10\x86\xb3\xf1s\xafE\xe3\a'\x00e\xa3\xb0\xfe\xa1\x84*\f\x86\xa5\x9a\xb3\x17\xd1^\x11\xac*wO\x84\xbc\x1cXޘ\xf4\xd8\xea\x1bND\x96og\"\x9e\x0eb7\xbd؎/\"\x8cY\xe5\xcfƳ\x1c\r}nIz\xb4\x19\x18P\xe5\xbbو\xaf\xa7\xc3\xdcu\x17\xff\x04d\x99#\x9eF\xc0*\x9c\x1e3\x9c\x1a\xb5\x80E0\x18\x01157ퟁ\x13\x802\x90\x9e\x84\xf3g\x95];.\x9dOO\xa1 F\x18\x1d\x85\xa1\xa1\xc2窥Dr.\xfb\xf7\xb3\x11\x0fg#R\"d\xd1x~\xce\xe2\x8d\xd4\xe4D\xe0\xf3\x93\x01_N\x87\xd4\x1b\x98\xb0\x90Q\x8d\x17\xd8*\x7f\xeb\xb3<\x8b\x9c\aS\x8d\x8d[\x02n\x15\xa0Ĉ\xc0DF\xf8\xe6\x83B6ÜKJ*`Dy\xf29\xe1\xb5\xf3\xd5c\x04\"2\xe5BgTQ\x8d\xff\xbdT\x81\xca\a\xcc2\xaa\fFJ\xb6\x8a\x8d\x7f%c\xb4\xc8\xe4\bG\xf1\x18\x03_{\xc4\xe3\xfe\xef\v\x9e\xd1xI\t⥤\xdc\xe3\xf7=\xe5\xe5\xe3\xc2g\xffI\xc8\x04\xd5g\b\x923\xfa\xe5lW\xfe\x9a\xa6\x04\xd7v\x14\x86\x0f\x04@\xa2\xd2\rYɈ\xc0ؤ\xf0?>\xe3\x91\xceD\xbc\xed\x8d\xd0ҤSY\xa4\x99,<\xf5\xbc\xf0\xbf>\xebq\xf0\x98\x14\x1eUw8\x16In\xf5%p\x02P&\x8c\x81\xb3}\xc2o\x7f\xd2\xe3\x9eo+\xd7_e\xe9\xd9\x06\xe7\xce\xc3\xd3\a\x85G\x9e7\f\x8d\xc4KO5\x1dUr\xd4\x12\x81\x0fL\x00\r\x95n\xc9j\xc0\x18\xc8\x06\xc2#?\x10\x1e\xfd\x81\xe0\xfb\x10E\x10\xa9\xe0\x99\xf8u\x87\xa3\x8c\x8c\x1b`\xb8ҭXM\x88\x80\xe7\xc5\x11\xff\xc8\xc6\vȾW\xbb\xebȎ\x9af\xd8\x00\x03\x95n\xc5j$\x9f<\xe2\f\xdfQ\t4\x0eA\xf5\x1b\xe0D\xa5\x1b\xe3p8\xcaL\x9c\xd7\xf0\xaa\x01\x8ei-V2(\xf6n\x1d\x0e\xc7\x14qR\x13\xc7\rp\x18\xa5\xf6\xaaP\x16\xaaY\xaa\x10\xba\x03\xfd\x1c\x8e\xe9\xf8F\x03\x0f^\x8c\x05\x00F*ݠ\xc2\x114R\xd2\xe7'\x81\xb9\v5\xe4\t\xd3\x11\xe3\xe73\xce\tp8r\xa8B}RG\xea\x85\xc3\x068\x0e\x9c\xadt\xa3\x8a!\xb4\xf0ܳc،\x8d\x83h\xb3\xa5\xd6j\\\xac\xe1\xf4\xb14\x87\x8eg\x8b\xda[\xeep\xacdT\xa1\xb3Ş\xde\xe8\x9b\xe3\x06\xd5s\xc0\x8b\x95nT\xa1Hn\a\xd67\x1fOs\xf0\xb1!<\x8f\xf8X\xb6i\xae\x80\xaa\"F\xb0\x93\x11\xff\xfc/\xfd\xbc6`\xabbs\x8d\xc3Q\r(\xd0\xdd\x15\x1czǩ\xb6\xf3F\x8c\xc9\x02O\xd7Ҟ\x00#©a\xe5\x8f?\xd9ˡdž1\xaax\x9e\xc4[3\r\xf8\xbe\x10\x8e\x85|\xe5\xae\xd3|\xf1\xbeQ\xd4\xe5\x99;\x1cS(B\xb2#x\xfa\xfdO<\x1a\xf89\xc3\x7f\x94\x1a\xcb\b4Fx\xf4H\xc8/~\xe25\xfe\xcd;Ǹ\xe5\xa6&ڛ}\xacU\x8e\x1fKs\xef}\xc3\xfc\xeb\x13\x93\x8c\x87ŕ\x96r8j\x96\x02\xc7pA\xc7\xf0x,\x1cHL\xd5\x038\br\x14\xb8\xb2\xd2\xf7P(B\x9cMwb\xc0\xf2'w\x0f\xf2\xd9\x7f\x1e\xa2)%X\xab\f\x8c+c\xd98\xb5v\xa5\xed\xdfv8fC\x81\xde\x01\x9f(\x10H̯\x04\xaa\xbc\x02\x1c\x040\xaa\x90\xce\xdas\xa0\x0f\xd6\xd24 \x8f1q:]\xff\x84\xf2\xea\x80\xe5\xe4\xb02\x11\n\xc6[\xfa\x9eu\x87\xa3V\x10\x81'\x8e%9{6\x89\x98\xb9W\xc7r9?\xdfk\xb4\xa9\xf3\b\x98\xa3'\x0fP\x9f4\n\xdc\ad*}#\x8b\xbdy#\x821\xf9\xbd\xe5n\xd5ϱ\xba0\x02G\xfb=\uee7f\x05M\xfb\x88Q\xa6'\xf8i\xae\x00\x85\x814p߸\xc9\xd2\xf4\xa6\xa1x\n\x90{ۣī\x01{+}3\x0e\x87\xa38$W\xb7\xf0\xae\xef5\xd0\xded\xb9\xf3\xb6!\x1aZ\xc2)\x11\x10 3\xe1\xf1\xda\xc9\xc4\xf3\xc1\xb8y<\x99\x04\x18\xbc \x00\xbe1g#k\xff\x9f\xaa\xeeu\xae\xb3\xc3Q{\x18\x81\xe1\xac\xf0G_m\xe2\xfb/\xa6\xb8\xfd\xfaqvn\xce\xc6\xf90\xe7\x13|\xf3\x89\x06\x9ez%\xf1՝\x97\xd9\xf3O=\xec\x03\xa7c\x018z\xe2\x00=[\xf6\x01\xfc\v\xf0\xb3@W\xa5o\xc6\xe1p\x14\x8f\x11%\x1d\t\xf7\x1fJ\xf2\xfd\xc3\tZR\xb9\x8aTY\x98\b\xe4L\xa4|\xe5\x95G\r\xaf\x9e>\x10\xbf\x7f\xfa/+<\v\xfckM\x1es\xeap8\x98:\x1f\xc2@\xa0B_Z8?)\xa4#\xc1\x18\xfd\x9ao\xecAo\x9a\xd5O}{\xe4\xc4\x01\x04\xb2\xc0]\xaa\xb5\xb47\xc0\xe1p\xccF\x1c\x1c\xcf\xe7\xc1\xe8\x10p\xb7\x88\x84GO\x1c\x98z\xcflE\xa8\x1e\x04\xbeQ\x83+\x82\x0e\x87c6bc\xfe*\xca#\x17\xbf4C\x00\x8e\xc4ʐ\x06\xfe\x1at\xb0\xd2\xedv8\x1cKG\xe1<\xf07\b\x99#\xd3F\x7f\x98\xfb`\x90\a\x81/\xaeN/`U\u07b4c\xa5\x12w\xe7ϫ\xe5\xd1ٺ\xf6%\x02\x90S\x88\x00\xf8\v\xd0c\x95n\x7fY1\x82\xa6\x8c\xd3\x00NJA\xd1\xc3\xc0'\xc5\x10\x1e9y\xe0\x92\xd7g\xf5\x00\x04E<\xffy\xe0OU\xb5\xf6\xaa\x05-\x16\xa1\x88\xb3\xae\x1d\x8e\xeaFU\xb3\xc0\x9fx\"\x87\xe7\x1a\xd3f\x15\x80WN<\x8bF!\xc0]\xc0\xd7W͐\x18)2\x11\x15\x9eG\xec\xb4\xc2Q\xad\xc4\xf3\xf7\xaf\x00\x7f\x1f\xa9r\xf4\xa2\xb9\x7f\x9e9\x8f\xa2ȥ\x10\x0e\x01\xbf\xad\xca\xea\x99\n\x14\xa3u\xaeԠc\x11\x8c\x8f{\xd8h\xfeS`re\xbb\x99\x1cI\x12-\xa2\x9fi\\\xea\xefw\x81Q\x95\xb9;\xf5\x9c\xad8z\xe2Y\x14\xf0\xc4<\x05\xfc\xbe\xaaNT\xfa\xc1\x95\x1aU%\fs3\x9e\x05\x84@\xd3!v$\xeb\xbc\x00GQ\x88\xc0\xe1\xd3>#\x03\x899O\x8a\x8eߧh(<}$\xc1dX\\'S\xd5Q\u0dcd\xf0\x9c\x05\x8e\xbe\xfa\xec\x9c\xef\x9dW\x86\x8e\x9e8@\xa4\x16\x94\xbb\x81\xbf\xd2Z\xdc/\\0B&\x84#G\xd3`\xe3\xe3\xbag#.7\x06\x83粼v.p\x95\x86\x1cEa\x04^>ox\xe8\xf1\x06\x8cJl\xe8ӭJc\xef\xdb\x188}\xbc\x8e\a\x9eK\xc55\xfc\v\xecg\xaa\x1a\x01\xff[\xe1\x1f\xad±9\\\xff<\xdeB\x17\x1c\x1c>KG[w\x04<\x03\\\x06\xec^\x89\x9b\x85D RȌ\x85\xdcz}#\xf5\xad\t\xd4ꌚ\x02\xaa\xf1\xbf=\xab\xfc\xbf\x7f\xea垇'\xc1\x95\x1bs\x14\x81H\x9c\xa2\xfb\xe2\xa9\x04;\xba\"\xb6n\xcc\xce\x1c\x86\r\xf8\x06\xfa\xce&\xf9\x1fww\xf2\xd8\xf1d\xc1'H\xe5\xc6\xe7\x7f\x00\xfe\xab\xc0\xf8\x91\x05\x8c\x1f\n\x10\x00\x80\xb6\xc6u\x88\x91\t\xe0\t\xe0jD\xb6\xae\xc4>/\bg\a-f,\xe0\xea}\x8d$\xea\xbd\x19\xea,F\xf0Dy\xea\xbb\x03\xfc\xf1g\xfa\x19\x9c\xcc\x15$q8\x8a@D\x19\x9a4<\xfdb\x1d~\xc6\xd0\xd9\x04I\x1fl\xe811\xe2\xf1\xd43\x8d\xfc\xd9\xdfw\xf0\xed\xc3ō\xfe\xc0}(\x1fC\xe8\x15k\x19\x189\xb7p[\n\xbd\xf2\xce\xcd{Qc@u\x0f\xf0\x7f\x11\xae\x96\x158\x01V\x85\x94\xa7\xdcyS=\x1fxO'[^\xdfD\xb2\xc1\xa0\x812ڗ\xe1\xa1\xef\x0e\xf2\x17_\x18\xe6h\x9fu\xc6\xefX\x02\x8aU\xc1C\xd9\xdcf\xd9\xd0\x11\xbb\xfd#\xe3p\xb4\xcfc4\x1b\x1f\x15_\x84\xeb\xff0\xf0\x1f@\x0e+\x96\xa3'\x9e-\xe8\xf7\x8a\xea\xc1=\x9b\xf7\xe5\x7f\xe3z\xe0\xd3\"rE\xa5\x1fc)P\x05\xb5Jw\x8b\xb0gG\x82\x8d\xeb\f\x93cʋ'\x02\x0e\x9f\x89\x98\x8c\x041+Q\xfe\x1c\xe5F5\xfe\xb29O3\xbf\x81\xa7\x98i\xa5\xaa>\x05\xfc\f\"ϊZ^)\xd0\xf8a\x111잍{\x90\xa4\x8fF\xf6\x06\xe0\xafDdEV\x10\xd2\\0\xc6Z\xe2\x15\x01\xb9Pz\xcc\xcd\xf9\x1d\xd5@\\\xe5K\x1f\x03~ND\x0e\xa8\x8d8r\xf2\aE]\xa3\xa0\x18\xc0t\x06G\xcf\xd1ּ\x06c\xfcS\xa0\x8f\x02W\x81lYiF\x11\a^ru\x06\xcd\xccz\x83\x0eG\xa5\xc9\x05\xfc\xee\a>\x8a\xc8\xf3\xa2\xb6h\xe3\x87E\b\x00\xc0\xe0H/m-k\x111g\x81\a\x80\xad\xc0e\xb2\x12\x97\a\x1c\x8e*#\xb7\xd4\xf7E\xe0\x17@\x8e(\x11GN\x14o\xfc\xb0H\x01\x00\x18\x1c9G\xb3\xb7\x0e/%\x83\xc4J\xe4\x03{D$Y\xe9\a\xe4p\xacTTu\x04\xf8cවsGN\x1c`px\xe1h\xff\\,Z\x00\x00\x86'\xcf18|\x96\xce\xd6\xee\tbO\xe0$\xb0\a\xa1݅\xc8\x1c\x8e\xe5C\xe3\f\xa1C\xc0\xaf\xaa\xf2\xd7\b\xe3G\vX\xe7_\x88%\t@\x9e\x81\xe1\xb3t\xb4tG\x99\xc9̳~\xc2\x7f\x00X\x0f\xd2#\xb2<\xd7w8V3\xaa\x9a\x01\xbe\x04\xfc\xbc\x97\xa8\x7f\xc0FY{\xf4d\xe1\x91\xfe\xf9X\xf6a:W]\xb8\x15\xf8i\xe0?!\xb2\xcd\xf9\x02\x0eG\xf1\xe4\x02}/\x01\x7f\x04\xfa\x05\x90\xb1B\xb2\xfb\x8aa\xd9G\xe8\xc1\xe1\xb3t\xb4vgT\xf5q\x11\xb9\x1fH\x00;\x10\xeaܴ\xc0\xe1(\fU\xed\x03>\x05\xfcJ\xa0\xf6[FLv9\\\xfe\x8b)\xa9E漁$p\v\xf0\x11\xe06AZ\x9d\x0e8\x1c\x97\x92;\xbe\xab\x1f\xb8\x17\xf8[E\x1f\x17\b\x8e\x14\x91\xd8S,%7\xc5\x1d\x1b\xf7\"\x9e\x80R\x87p\x13\xf0A\xe0\x1d\x02kݢ\xba\xc31\xe5\xea\x9f\x06\xbe\n܅\ua4c8dE\x86x\xe5\xd5\xe3%\xfd\xdbe\xb5\xc0i\x1e\xc1U\xc0\x8f\x01w\x00\xaf\x17\x91T9\xdb\xe1pT\x1cU\x14&\x81\xe7\x80{\x80{P=\x84\x10\x96rĿ\x98\x8a\f\xc1=[\xf6\xc5iv\xaak\x81\x1b\x81ہ7\x02\xdb\x10R.V\xe0X\x89\xe4F\xfaI\xe0\b\xf0]\xe0k\xc0\xe3\x92f@\x93\xe8\x91S\a\xcaަ\x8a[Zϖ\xbd(x\x82t\x13\x9fL|3\xb0\a\xd8\t\xac\x03\x9a\x11|'\n\x8eZ\"g\xec\x010\x02\x9c\x05^\x06\x0e\x00\x0f\x03\xcfY\xab\xbdb\xb0\x85\xee\xda+\x15UeU;\xb6\xecA5\x12\x11?%\xc8Z`\x1b\xb0\x1bؕ\xfb~\v\xd0\x01\xb4\x00\x8d\xc4+\f\xbe\xcb@vT\x82iF\x1e\x00\xe3\xc4\xc6\xde\a\x9c\x00\x8e\x03\x87\x88\x97\xf1\x8e\xa3ڗNG\xd9d\xd2\xd3c\xafU\xd6\xe8\xa7\xf3\xff\x01\xa1\xe2C>5\xe4̬\x00\x00\x00%tEXtdate:create\x002023-03-05T18:43:33+00:00\xcfnw\xe9\x00\x00\x00%tEXtdate:modify\x002023-03-05T18:43:33+00:00\xbe3\xcfU\x00\x00\x00\x00IEND\xaeB`\x82"), + StaticName: "appicon-256.png", + StaticContent: ResAppicon256PngData, } + +//go:embed icons/coreui/playlist-add-next.svg +var ResPlaylistAddNextSvgData []byte var ResPlaylistAddNextSvg = &fyne.StaticResource{ - StaticName: "playlist-add-next.svg", - StaticContent: []byte( - "\n\n\n\r\n\r\n\r \n\r"), + StaticName: "icons/coreui/playlist-add-next.svg", + StaticContent: ResPlaylistAddNextSvgData, } + +//go:embed icons/freepik/playbutton.png +var ResPlaybuttonPngData []byte var ResPlaybuttonPng = &fyne.StaticResource{ - StaticName: "playbutton.png", - StaticContent: []byte( - "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x80\x00\x00\x00\x80\b\x03\x00\x00\x00\xf4\xe0\x91\xf9\x00\x00\x00\x04gAMA\x00\x00\xb1\x8f\v\xfca\x05\x00\x00\x00 cHRM\x00\x00z&\x00\x00\x80\x84\x00\x00\xfa\x00\x00\x00\x80\xe8\x00\x00u0\x00\x00\xea`\x00\x00:\x98\x00\x00\x17p\x9c\xbaQ<\x00\x00\x01\xcePLTE\x00\x00\x00\"\xd7)!\xd3(#\xe2+!\xd6( \xce'\"\xd9)!\xd5(\"\xd6)\x1b\xae!!\xd2(\"\xd8)\x1b\xb0!\"\xd8)!\xd5(!\xd5(\"\xd7)!\xd6(!\xd6(!\xd6(!\xd6(\"\xd7)!\xd6(\"\xdb)!\xd6(!\xd6(!\xd6(!\xd6(!\xd6(\"\xd7)\"\xd6)\"\xd6)\"\xd7)!\xd6(!\xd6(!\xd6(!\xd6(!\xd6(\"\xd7)!\xd6(!\xd5(!\xd6(\"\xd7)!\xd6(#\xde*!\xd5(!\xd6(!\xd6(!\xd6( \xcd'!\xd3(!\xd6(!\xd6(!\xd2(!\xd5(!\xd6(!\xd6(!\xd6(!\xd6(\"\xd7)!\xd6(!\xd6(\"\xd7)!\xd6(!\xd5(!\xd6(\"\xd6)\"\xd7)\"\xd6)!\xd6(!\xd6(\"\xd6)!\xd6(!\xd5(!\xd6(\"\xd6)!\xd6(!\xd6(!\xd6(\"\xd6)!\xd5(!\xd6(\"\xd6)\"\xd7)\"\xd7)!\xd6(\"\xd7)!\xd6(!\xd5(\"\xd6)!\xd6(!\xd5(\"\xd7)!\xd6(!\xd6(!\xd6(!\xd6(!\xd5(!\xd6(!\xd4(!\xd6(!\xd5(!\xd6(!\xd6(!\xd5(\"\xd7)\"\xd7)!\xd6(!\xd6(\"\xd7)\"\xd7)\"\xd6)!\xd6(!\xd6(\"\xd7)\"\xd6) \xd6'(\xd8/)\xd80\x1f\xd6&>\xdcD\x97\xec\x9b\xc3\xf4\xc5\xc6\xf4Ǐ\xea\x93?\xdcE\xc5\xf4\xc7\xff\xff\xff\xfe\xfe\xfe\xdc\xf8\xddz\xe6~-\xd94\x97\xec\x9a\xfa\xfe\xfa\xba\xf2\xbcQ\xdfW\xec\xfb\xec\x90\xeb\x944\xda:9\xdb?\xe0\xf9\xe1\xfc\xfe\xfc\xcf\xf6\xd0f\xe3k$\xd7+<\xdbB\xe4\xfa\xe5\xf2\xfc\xf2\xa7\xef\xa9D\xddI\xbf\xf3\xc1&\xd7-\x98원\xea\x93(2|%\x00\x00\x00qtRNS\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x04\x141S\x7f\x93\xbe\xcf\xdd\x01\x1cEq\xa6\xcb\xe7\xf8\xfe\v3f\xa9\xd9\xfe\x05'e\xb4\xee\xfd\x01\x11L\xa0\xe4\x01\x16\xc7\xf6\x15o\xd0\xfb\x14\xca\nM\xbf\xfc\x01)\xa1\xf5\ro(\xa4\xfb\x04Q\xd7\x0f\x80\xf0\"\xfc*\xbdCC\xdd\xd6\"\x0e\x03\xfd)\rp\tN\x15\xc9p\xfc\x17\xce\x12Ɵ\n3\xed\xa8\xd8\x03\xa60\x92\x9c\x8e\xa7 \x00\x00\x00\x01bKGD\x7fH\xbfq\xe5\x00\x00\x00\atIME\a\xe7\x01\x13\x01%2\x99\xbf\xbb\v\x00\x00\x04[IDATx\xda\xe5\x9bgC\x13A\x10\x86wÑP\x83\xb4H\rx\x82tA\x9a\"\x1d%H\x93Б\xa2\"Ho\xb7\x89\x82\xf5,\xd8{\x03\xfd\xb7\xe6\x12\x90\x00Iؽ\xdd\xcb|\xf0\xfd\xbe\xf7>\x99\x9d\xdcm\x99A\x88Q8ޚp*1)9%զ\x90=)\xb6Ԕ\xe4\xa4\xc4S\t\xd6x\xcc\xfa<6\xf3\xd3ִ\xf4\x8c̬l{\x0e9\xa6\x1c{vVfFz\x9a\xf5\xb4A\x10\x18瞑\xcf\xe6\xd9\xf3I\b\xe5\xdb\xf3\xce\xcagr\xb1x\x06|\xae\xa0\xb0\xa8\xb8\x84P\xa8\xa4\xb8\xa8\xb0\xe0\x9cP\x04\\Zv\xbe\xbc\xa2\xc4Ec\xaf\xc9URQ~\xbe\xacT\x14\x83\xe9B\xa5\\UMk\xbe\xaf\xea*\xb9\xf2\x82I\x84}DM\xed\xc5K\xac\xf6\x9a.]\xac\xad\x89\xe0E\xc0R\x9d|Y\x97\xbd\x17\xe1\xb2\\'qM\x04\xaeohl\xd2k\xaf\xa9\xa9\xb1\xa1^?\x01nnim\xa3μ\xc0r\xb5\xb5\xb64\xebD\xc0W\xae\x1e\xbc\xec\xf4K\xb1]\xbd\xa2\x87\x00G\xb6;:\xf8\xed5u8\xda#\x99\x11\xf0\xb5\xce.\xce\xe8\xfb\xcdCW\xe75F\x02\xdc\xdd\xd3+\xcc\xdfC\xd0\xdb\xd3\xcdB\x80\xa5\xeb\x8e>q\xf6\x9a\xfa\x1c\xd7\xe9\xff\x90\xd8\xec\xec\x17k\xaf\xa9\xdfi\xa6$\xc0x\xa0K@\xf6\x1f\x95\xd25@\xf7\x91\xc4xpH\xbc\xbd\xa6\xa1A\x1a\x02\xe3\xfc\xe9\b\x8c\xf4\xa7!0\xd6\xffd\x02lq\x0e\x1b\xe9OȰ\xd3\x12\x8a\x00\x8f\xf4\x1b\x90\xff\xfeR\xfaGB\x00H\xa3\x0ec\xed59F\xa5\xa0\xfec=7\x8c\a\xb8\xd13\x16\x84\x00\xe3\xce^\xe3\xfd\t\xe9\xed\f\x92\x88\xd2\xf8\xb0\xc0\xefOp\xb9\x86\xc7\x03\x86@\x9ap\x84\xc5\xdfC\xe0\x98\b@\x80\xa3&\x05\xad?NV\xc7d\xd4\xf1I\xb08m\xe1\xf2'\xc4\xe6\xb4\x1c\x9b\x80\xa9V\x83\xdf\x00\xfeRZ\xa7\x8eLB\xb4\xf9f[\xf8\xfc\ti\xbbi\x8e>\x1c\x80[\x8da\xca@\x9f\\\x8d\xb7\x0e\x85 &V\xe6\xda\x7f\xb0\xabI\x8e\x8d\xf1\x030U\xde\x0e\xaf?!\xb7+\xfd\xb6\x8dX\x9a\xbe\x13n\x80;\xd3~\x8bT\xd3\xccl\xb8\xfd\t\x99\x9d1\x1d\x04@\x0e{\x00ݢ\x8d\x81A\x00\xea6\xed\xc2\xdd(\x80\x9d\xdd\xff\x1d\x00z\n\x80\x93\x90\xe9o\b\xfe\"\x02\x7f\x15\x83\x7f\x8c\xc0?\xc7\xe0\v\x12\xf0%\x19\xf8\xa2\x14|Y\x0e\xbe1\x01ߚ\x81oN\xc1\xb7\xe7\xe0\a\x14\xe0G4\xe0\x87T\xe0\xc7t\xf0\a\x95\xe0G\xb5\xe0\x87\xd5\xcc\xc7\xf5\xbfwv\xfe\b=\xaeg\xbe\xb0\xd8\xdd\x15{a\x01\x7fe\x03~i\x05~m\a\x7fq\t~u\v\x7fy\r~}\x0f_\xc0\x00^\xc2\x01_\xc4\x02_\xc6\x03^\xc8\x04_\xca\x05_\xcc\x06^\xce\a_\xd0\b_\xd2\t_\xd4\n^\xd6\v_\xd8\f_\xda\r_\xdc\x0e_\xde\x0f\xdf\xe0\x00\xdf\xe2\x81\xc0\x9b\\\x10|\x9b\x0f|\xa3\x13\x02o\xf5B\xf0\xcdn\b\xbc\xdd\x0f\xc17<\"\xf0\x96O/\x02lӫw\"`\xdb~}\f\xa0\x8d\xcf>\x04\xd8\xd6o\x1f\x03h\xf3\xfb>\x84\xe0\xf6\xff\xbfN\xd2\xc9+\xf1{\x02!\x00\x00\x00%tEXtdate:create\x002023-01-19T01:37:03+00:00/\x9b0\x17\x00\x00\x00%tEXtdate:modify\x002023-01-19T01:36:39+00:00\x9b\xfb\xbb8\x00\x00\x00\x00IEND\xaeB`\x82"), + StaticName: "icons/freepik/playbutton.png", + StaticContent: ResPlaybuttonPngData, } + +//go:embed icons/majesticons/library.svg +var ResLibrarySvgData []byte var ResLibrarySvg = &fyne.StaticResource{ - StaticName: "library.svg", - StaticContent: []byte( - "\n"), + StaticName: "icons/majesticons/library.svg", + StaticContent: ResLibrarySvgData, } + +//go:embed icons/publicdomain/cast.svg +var ResCastSvgData []byte var ResCastSvg = &fyne.StaticResource{ - StaticName: "cast.svg", - StaticContent: []byte( - "\n\n \n"), + StaticName: "icons/publicdomain/cast.svg", + StaticContent: ResCastSvgData, } + +//go:embed icons/publicdomain/disc.svg +var ResDiscSvgData []byte var ResDiscSvg = &fyne.StaticResource{ - StaticName: "disc.svg", - StaticContent: []byte( - "\r\n\r\n\t\r\n\t\t\r\n\t\r\n\r\n\r\n"), + StaticName: "icons/publicdomain/disc.svg", + StaticContent: ResDiscSvgData, } + +//go:embed icons/publicdomain/headphones.svg +var ResHeadphonesSvgData []byte var ResHeadphonesSvg = &fyne.StaticResource{ - StaticName: "headphones.svg", - StaticContent: []byte( - "\r\n\r\n\r\n\t\r\n\t\t\r\n\t\r\n\r\n\r\n"), + StaticName: "icons/publicdomain/headphones.svg", + StaticContent: ResHeadphonesSvgData, } + +//go:embed icons/publicdomain/heart-filled.svg +var ResHeartFilledSvgData []byte var ResHeartFilledSvg = &fyne.StaticResource{ - StaticName: "heart-filled.svg", - StaticContent: []byte( - ""), + StaticName: "icons/publicdomain/heart-filled.svg", + StaticContent: ResHeartFilledSvgData, } + +//go:embed icons/publicdomain/heart-outline.svg +var ResHeartOutlineSvgData []byte var ResHeartOutlineSvg = &fyne.StaticResource{ - StaticName: "heart-outline.svg", - StaticContent: []byte( - ""), + StaticName: "icons/publicdomain/heart-outline.svg", + StaticContent: ResHeartOutlineSvgData, } + +//go:embed icons/publicdomain/infinity.svg +var ResInfinitySvgData []byte var ResInfinitySvg = &fyne.StaticResource{ - StaticName: "infinity.svg", - StaticContent: []byte( - "\n\n \n"), + StaticName: "icons/publicdomain/infinity.svg", + StaticContent: ResInfinitySvgData, } + +//go:embed icons/publicdomain/musicnotes.svg +var ResMusicnotesSvgData []byte var ResMusicnotesSvg = &fyne.StaticResource{ - StaticName: "musicnotes.svg", - StaticContent: []byte( - "\n"), + StaticName: "icons/publicdomain/musicnotes.svg", + StaticContent: ResMusicnotesSvgData, } + +//go:embed icons/publicdomain/oscilloscope.svg +var ResOscilloscopeSvgData []byte var ResOscilloscopeSvg = &fyne.StaticResource{ - StaticName: "oscilloscope.svg", - StaticContent: []byte( - "\n\r\n\n\r\n\r\n\r \n\r\n"), + StaticName: "icons/publicdomain/oscilloscope.svg", + StaticContent: ResOscilloscopeSvgData, } + +//go:embed icons/publicdomain/people.svg +var ResPeopleSvgData []byte var ResPeopleSvg = &fyne.StaticResource{ - StaticName: "people.svg", - StaticContent: []byte( - "\n\n\n\t\n\t\n\t\n\t\n\t\n\t\n\n\n"), + StaticName: "icons/publicdomain/people.svg", + StaticContent: ResPeopleSvgData, } + +//go:embed icons/publicdomain/playlist.svg +var ResPlaylistSvgData []byte var ResPlaylistSvg = &fyne.StaticResource{ - StaticName: "playlist.svg", - StaticContent: []byte( - "\n"), + StaticName: "icons/publicdomain/playlist.svg", + StaticContent: ResPlaylistSvgData, } + +//go:embed icons/publicdomain/playqueue.svg +var ResPlayqueueSvgData []byte var ResPlayqueueSvg = &fyne.StaticResource{ - StaticName: "playqueue.svg", - StaticContent: []byte( - "\n\n\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r"), + StaticName: "icons/publicdomain/playqueue.svg", + StaticContent: ResPlayqueueSvgData, } + +//go:embed icons/publicdomain/sidebar.svg +var ResSidebarSvgData []byte var ResSidebarSvg = &fyne.StaticResource{ - StaticName: "sidebar.svg", - StaticContent: []byte( - "\r\n\r\n\r\n\r\n"), + StaticName: "icons/publicdomain/sidebar.svg", + StaticContent: ResSidebarSvgData, } + +//go:embed icons/publicdomain/star-outline.svg +var ResStarOutlineSvgData []byte var ResStarOutlineSvg = &fyne.StaticResource{ - StaticName: "star-outline.svg", - StaticContent: []byte( - "\r\n\r\n\r\n"), + StaticName: "icons/publicdomain/star-outline.svg", + StaticContent: ResStarOutlineSvgData, } + +//go:embed icons/publicdomain/star-filled.svg +var ResStarFilledSvgData []byte var ResStarFilledSvg = &fyne.StaticResource{ - StaticName: "star-filled.svg", - StaticContent: []byte( - "\r\n\r\n\r\n"), + StaticName: "icons/publicdomain/star-filled.svg", + StaticContent: ResStarFilledSvgData, } + +//go:embed icons/publicdomain/theatermasks.svg +var ResTheatermasksSvgData []byte var ResTheatermasksSvg = &fyne.StaticResource{ - StaticName: "theatermasks.svg", - StaticContent: []byte( - "\r\n\r\n\t\r\n\t\t\r\n\t\t\r\n\t\r\n\r\n\r\n"), + StaticName: "icons/publicdomain/theatermasks.svg", + StaticContent: ResTheatermasksSvgData, } + +//go:embed icons/publicdomain/grid.svg +var ResGridSvgData []byte var ResGridSvg = &fyne.StaticResource{ - StaticName: "grid.svg", - StaticContent: []byte( - "\r\r\r\n\t\r\n\t\r\n\t\r\n\t\r\n\r\n"), + StaticName: "icons/publicdomain/grid.svg", + StaticContent: ResGridSvgData, } + +//go:embed icons/publicdomain/list.svg +var ResListSvgData []byte var ResListSvg = &fyne.StaticResource{ - StaticName: "list.svg", - StaticContent: []byte( - "\r\r\r\n\t\r\n\t\r\n\t\r\n\r\n"), + StaticName: "icons/publicdomain/list.svg", + StaticContent: ResListSvgData, } + +//go:embed icons/publicdomain/filter.svg +var ResFilterSvgData []byte var ResFilterSvg = &fyne.StaticResource{ - StaticName: "filter.svg", - StaticContent: []byte( - "\r\n\r\n\t\r\n\r\n\r\n"), + StaticName: "icons/publicdomain/filter.svg", + StaticContent: ResFilterSvgData, } + +//go:embed icons/publicdomain/save.svg +var ResSaveSvgData []byte +var ResSaveSvg = &fyne.StaticResource{ + StaticName: "icons/publicdomain/save.svg", + StaticContent: ResSaveSvgData, +} + +//go:embed icons/publicdomain/saveas.svg +var ResSaveasSvgData []byte +var ResSaveasSvg = &fyne.StaticResource{ + StaticName: "icons/publicdomain/saveas.svg", + StaticContent: ResSaveasSvgData, +} + +//go:embed icons/remix_design/broadcast.svg +var ResBroadcastSvgData []byte var ResBroadcastSvg = &fyne.StaticResource{ - StaticName: "broadcast.svg", - StaticContent: []byte( - "\n\n \n"), + StaticName: "icons/remix_design/broadcast.svg", + StaticContent: ResBroadcastSvgData, } + +//go:embed icons/remix_design/repeat.svg +var ResRepeatSvgData []byte var ResRepeatSvg = &fyne.StaticResource{ - StaticName: "repeat.svg", - StaticContent: []byte( - "\n\n \n \n \n \n"), + StaticName: "icons/remix_design/repeat.svg", + StaticContent: ResRepeatSvgData, } + +//go:embed icons/remix_design/repeatone.svg +var ResRepeatoneSvgData []byte var ResRepeatoneSvg = &fyne.StaticResource{ - StaticName: "repeatone.svg", - StaticContent: []byte( - "\n\n \n \n \n \n"), + StaticName: "icons/remix_design/repeatone.svg", + StaticContent: ResRepeatoneSvgData, } + +//go:embed icons/remix_design/shuffle.svg +var ResShuffleSvgData []byte var ResShuffleSvg = &fyne.StaticResource{ - StaticName: "shuffle.svg", - StaticContent: []byte( - "\n\n \n \n \n \n"), + StaticName: "icons/remix_design/shuffle.svg", + StaticContent: ResShuffleSvgData, } + +//go:embed icons/remix_design/share.svg +var ResShareSvgData []byte var ResShareSvg = &fyne.StaticResource{ - StaticName: "share.svg", - StaticContent: []byte( - "\n\n \n \n \n\n"), + StaticName: "icons/remix_design/share.svg", + StaticContent: ResShareSvgData, } + +//go:embed icons/remix_design/updownarrow.svg +var ResUpdownarrowSvgData []byte var ResUpdownarrowSvg = &fyne.StaticResource{ - StaticName: "updownarrow.svg", - StaticContent: []byte( - "\n\n\n \n \n \n \n\n"), + StaticName: "icons/remix_design/updownarrow.svg", + StaticContent: ResUpdownarrowSvgData, } + +//go:embed themes/default.toml +var ResDefaultTomlData []byte var ResDefaultToml = &fyne.StaticResource{ - StaticName: "default.toml", - StaticContent: []byte( - "[SupersonicTheme]\nName = \"Default\"\nVersion = \"0.2\"\nSupportsDark = true\nSupportsLight = true\n\n[DarkColors]\nPageBackground = \"#0F0F0F\"\nListHeader = \"#232323\"\nPageHeader = \"#181d25\"\nBackground = \"#232323\"\nScrollBar = \"#F3F3F3\"\nButton = \"#14141432\"\nForeground = \"#e6e6e6\"\nInputBackground = \"#14141432\"\n\n[LightColors]\nPageBackground = \"#FAFAFA\"\nListHeader = \"#E1DFE1\"\nPageHeader = \"#e1dfe1\"\nBackground = \"#E1DFE1\"\nScrollBar = \"#565656\"\nButton = \"#C8C8C8F0\"\nDisabledButton = \"#CDCDCDF0\"\nForeground = \"#262626\"\nHyperlink = \"#3737FB\""), + StaticName: "themes/default.toml", + StaticContent: ResDefaultTomlData, } + +//go:embed LICENSE +var ResLICENSEData []byte var ResLICENSE = &fyne.StaticResource{ - StaticName: "LICENSE", - StaticContent: []byte( - " GNU GENERAL PUBLIC LICENSE\n Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n Preamble\n\n The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works. By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users. We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors. You can apply it to\nyour programs, too.\n\n When we speak of free software, we are referring to freedom, not\nprice. Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights. Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received. You must make sure that they, too, receive\nor can get the source code. And you must show them these terms so they\nknow their rights.\n\n Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software. For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so. This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software. The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable. Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts. If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary. To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n The precise terms and conditions for copying, distribution and\nmodification follow.\n\n TERMS AND CONDITIONS\n\n 0. Definitions.\n\n \"This License\" refers to version 3 of the GNU General Public License.\n\n \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n \"The Program\" refers to any copyrightable work licensed under this\nLicense. Each licensee is addressed as \"you\". \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy. The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy. Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies. Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License. If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n 1. Source Code.\n\n The \"source code\" for a work means the preferred form of the work\nfor making modifications to it. \"Object code\" means any non-source\nform of a work.\n\n A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form. A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities. However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work. For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n The Corresponding Source for a work in source code form is that\nsame work.\n\n 2. Basic Permissions.\n\n All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met. This License explicitly affirms your unlimited\npermission to run the unmodified Program. The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work. This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force. You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright. Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n Conveying under any other circumstances is permitted solely under\nthe conditions stated below. Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n 3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n 4. Conveying Verbatim Copies.\n\n You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n 5. Conveying Modified Source Versions.\n\n You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n a) The work must carry prominent notices stating that you modified\n it, and giving a relevant date.\n\n b) The work must carry prominent notices stating that it is\n released under this License and any conditions added under section\n 7. This requirement modifies the requirement in section 4 to\n \"keep intact all notices\".\n\n c) You must license the entire work, as a whole, under this\n License to anyone who comes into possession of a copy. This\n License will therefore apply, along with any applicable section 7\n additional terms, to the whole of the work, and all its parts,\n regardless of how they are packaged. This License gives no\n permission to license the work in any other way, but it does not\n invalidate such permission if you have separately received it.\n\n d) If the work has interactive user interfaces, each must display\n Appropriate Legal Notices; however, if the Program has interactive\n interfaces that do not display Appropriate Legal Notices, your\n work need not make them do so.\n\n A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit. Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n 6. Conveying Non-Source Forms.\n\n You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n a) Convey the object code in, or embodied in, a physical product\n (including a physical distribution medium), accompanied by the\n Corresponding Source fixed on a durable physical medium\n customarily used for software interchange.\n\n b) Convey the object code in, or embodied in, a physical product\n (including a physical distribution medium), accompanied by a\n written offer, valid for at least three years and valid for as\n long as you offer spare parts or customer support for that product\n model, to give anyone who possesses the object code either (1) a\n copy of the Corresponding Source for all the software in the\n product that is covered by this License, on a durable physical\n medium customarily used for software interchange, for a price no\n more than your reasonable cost of physically performing this\n conveying of source, or (2) access to copy the\n Corresponding Source from a network server at no charge.\n\n c) Convey individual copies of the object code with a copy of the\n written offer to provide the Corresponding Source. This\n alternative is allowed only occasionally and noncommercially, and\n only if you received the object code with such an offer, in accord\n with subsection 6b.\n\n d) Convey the object code by offering access from a designated\n place (gratis or for a charge), and offer equivalent access to the\n Corresponding Source in the same way through the same place at no\n further charge. You need not require recipients to copy the\n Corresponding Source along with the object code. If the place to\n copy the object code is a network server, the Corresponding Source\n may be on a different server (operated by you or a third party)\n that supports equivalent copying facilities, provided you maintain\n clear directions next to the object code saying where to find the\n Corresponding Source. Regardless of what server hosts the\n Corresponding Source, you remain obligated to ensure that it is\n available for as long as needed to satisfy these requirements.\n\n e) Convey the object code using peer-to-peer transmission, provided\n you inform other peers where the object code and Corresponding\n Source of the work are being offered to the general public at no\n charge under subsection 6d.\n\n A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling. In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage. For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product. A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source. The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information. But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed. Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n 7. Additional Terms.\n\n \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law. If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit. (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.) You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n a) Disclaiming warranty or limiting liability differently from the\n terms of sections 15 and 16 of this License; or\n\n b) Requiring preservation of specified reasonable legal notices or\n author attributions in that material or in the Appropriate Legal\n Notices displayed by works containing it; or\n\n c) Prohibiting misrepresentation of the origin of that material, or\n requiring that modified versions of such material be marked in\n reasonable ways as different from the original version; or\n\n d) Limiting the use for publicity purposes of names of licensors or\n authors of the material; or\n\n e) Declining to grant rights under trademark law for use of some\n trade names, trademarks, or service marks; or\n\n f) Requiring indemnification of licensors and authors of that\n material by anyone who conveys the material (or modified versions of\n it) with contractual assumptions of liability to the recipient, for\n any liability that these contractual assumptions directly impose on\n those licensors and authors.\n\n All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10. If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term. If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n 8. Termination.\n\n You may not propagate or modify a covered work except as expressly\nprovided under this License. Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License. If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n 9. Acceptance Not Required for Having Copies.\n\n You are not required to accept this License in order to receive or\nrun a copy of the Program. Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance. However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work. These actions infringe copyright if you do\nnot accept this License. Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n 10. Automatic Licensing of Downstream Recipients.\n\n Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License. You are not responsible\nfor enforcing compliance by third parties with this License.\n\n An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations. If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License. For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n 11. Patents.\n\n A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based. The\nwork thus licensed is called the contributor's \"contributor version\".\n\n A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version. For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement). To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients. \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License. You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n 12. No Surrender of Others' Freedom.\n\n If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License. If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all. For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n 13. Use with the GNU Affero General Public License.\n\n Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work. The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n 14. Revised Versions of this License.\n\n The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time. Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n Each version is given a distinguishing version number. If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation. If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n Later license versions may give you additional or different\npermissions. However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n 15. Disclaimer of Warranty.\n\n THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n 16. Limitation of Liability.\n\n IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n 17. Interpretation of Sections 15 and 16.\n\n If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n END OF TERMS AND CONDITIONS\n\n How to Apply These Terms to Your New Programs\n\n If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n To do so, attach the following notices to the program. It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n \n Copyright (C) \n\n This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU General Public License for more details.\n\n You should have received a copy of the GNU General Public License\n along with this program. If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n Copyright (C) \n This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n This is free software, and you are welcome to redistribute it\n under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License. Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n The GNU General Public License does not permit incorporating your program\ninto proprietary programs. If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library. If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License. But first, please read\n.\n"), + StaticName: "LICENSE", + StaticContent: ResLICENSEData, } + +//go:embed licenses/BSDLICENSE +var ResBSDLICENSEData []byte var ResBSDLICENSE = &fyne.StaticResource{ - StaticName: "BSDLICENSE", - StaticContent: []byte( - "BSD 3-Clause License\n\nCopyright (C) 2018 Fyne.io developers (see AUTHORS)\nAll rights reserved.\n\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n * Redistributions of source code must retain the above copyright\n notice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above copyright\n notice, this list of conditions and the following disclaimer in the\n documentation and/or other materials provided with the distribution.\n * Neither the name of Fyne.io nor the names of its contributors may be\n used to endorse or promote products derived from this software without\n specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY\nDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\nON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\n"), + StaticName: "licenses/BSDLICENSE", + StaticContent: ResBSDLICENSEData, } + +//go:embed licenses/MITLICENSE +var ResMITLICENSEData []byte var ResMITLICENSE = &fyne.StaticResource{ - StaticName: "MITLICENSE", - StaticContent: []byte( - "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n"), + StaticName: "licenses/MITLICENSE", + StaticContent: ResMITLICENSEData, } diff --git a/res/bundled_gen.sh b/res/bundled_gen.sh index c367529..81758b3 100755 --- a/res/bundled_gen.sh +++ b/res/bundled_gen.sh @@ -22,6 +22,8 @@ fyne bundle -append -prefix Res icons/publicdomain/theatermasks.svg >> bundled.g fyne bundle -append -prefix Res icons/publicdomain/grid.svg >> bundled.go fyne bundle -append -prefix Res icons/publicdomain/list.svg >> bundled.go fyne bundle -append -prefix Res icons/publicdomain/filter.svg >> bundled.go +fyne bundle -append -prefix Res icons/publicdomain/save.svg >> bundled.go +fyne bundle -append -prefix Res icons/publicdomain/saveas.svg >> bundled.go fyne bundle -append -prefix Res icons/remix_design/broadcast.svg >> bundled.go fyne bundle -append -prefix Res icons/remix_design/repeat.svg >> bundled.go fyne bundle -append -prefix Res icons/remix_design/repeatone.svg >> bundled.go @@ -31,6 +33,6 @@ fyne bundle -append -prefix Res icons/remix_design/updownarrow.svg >> bundled.go fyne bundle -append -prefix Res themes/default.toml >> bundled.go -fyne bundle -append -prefix Res ../LICENSE >> bundled.go +fyne bundle -append -prefix Res LICENSE >> bundled.go fyne bundle -append -prefix Res licenses/BSDLICENSE >> bundled.go fyne bundle -append -prefix Res licenses/MITLICENSE >> bundled.go diff --git a/res/icons/publicdomain/save.svg b/res/icons/publicdomain/save.svg new file mode 100644 index 0000000..8150355 --- /dev/null +++ b/res/icons/publicdomain/save.svg @@ -0,0 +1,35 @@ + + + + Clarity Icon + This is shape (source) for Clarity vector icon theme for gtk + + + + Clarity Icon + This is shape (source) for Clarity vector icon theme for gtk + + + Jakub Jankiewicz + + + + + Jakub Jankiewicz + + + 2010 + image/svg+xml + + + + + + + \ No newline at end of file diff --git a/res/icons/publicdomain/saveas.svg b/res/icons/publicdomain/saveas.svg new file mode 100644 index 0000000..87027ba --- /dev/null +++ b/res/icons/publicdomain/saveas.svg @@ -0,0 +1,35 @@ + + + + Save-As Icon + This is shape (source) for Clarity vector icon theme for gtk + + + + Save-As Icon + This is shape (source) for Clarity vector icon theme for gtk + + + Jakub Jankiewicz + + + + + Jakub Jankiewicz + + + 2010 + image/svg+xml + + + + + + + \ No newline at end of file diff --git a/ui/dialogs/graphicequalizer.go b/ui/dialogs/graphicequalizer.go index a13962d..8e3102f 100644 --- a/ui/dialogs/graphicequalizer.go +++ b/ui/dialogs/graphicequalizer.go @@ -21,13 +21,13 @@ import ( type GraphicEqualizer struct { widget.BaseWidget - OnChanged func(band int, gain float64) - OnPreampChanged func(gain float64) - OnLoadAutoEQProfile func() - OnManualAdjustment func() // Called when user manually changes a slider - OnPresetSelected func(presetName string) // Called when user selects a preset - OnPresetDeleted func(presetName string) // Called when user deletes a preset - OnEQTypeChanged func(eqType string) // Called when EQ type is changed + OnChanged func(band int, gain float64) + OnPreampChanged func(gain float64) + OnLoadAutoEQProfile func() + OnManualAdjustment func() // Called when user manually changes a slider + OnPresetSelected func(presetName string) // Called when user selects a preset + OnPresetDeleted func(presetName string) // Called when user deletes a preset + OnEQTypeChanged func(eqType string) // Called when EQ type is changed bandSliders []*eqSlider preampSlider *eqSlider @@ -41,11 +41,11 @@ type GraphicEqualizer struct { eqPresets []backend.EQPreset presetManager *backend.EQPresetManager parentWindow fyne.Window - isApplyingPreset bool // Flag to prevent clearing profile during preset application - currentEQType string // Current EQ type ("ISO10Band" or "ISO15Band") + isApplyingPreset bool // Flag to prevent clearing profile during preset application + currentEQType string // Current EQ type ("ISO10Band" or "ISO15Band") isDirty bool // true when sliders modified since last preset load/save loadedPreset *backend.EQPreset // currently loaded preset (nil if none) - saveBtn *widget.Button // reference for enable/disable control + saveBtn *ttwidget.Button // reference for enable/disable control } func NewGraphicEqualizer(preamp float64, bandFreqs []string, bandGains []float64, eqType string, presetMgr *backend.EQPresetManager, parentWindow fyne.Window, activePresetName string) *GraphicEqualizer { @@ -129,20 +129,23 @@ func (g *GraphicEqualizer) buildSliders(preamp float64, bands []string, bandGain }) // Save button (overwrites current loaded preset) - g.saveBtn = widget.NewButton(lang.L("Save"), func() { + g.saveBtn = ttwidget.NewButtonWithIcon("", myTheme.SaveIcon, func() { g.saveCurrentPreset() }) g.saveBtn.Disable() // starts disabled + g.saveBtn.SetToolTip(lang.L("Save")) // Save As button (always enabled, opens name-entry dialog) - saveAsBtn := widget.NewButton(lang.L("Save As"), func() { + saveAsBtn := ttwidget.NewButtonWithIcon("", myTheme.SaveAsIcon, func() { g.showSaveAsDialog() }) + saveAsBtn.SetToolTip(lang.L("Save As")) // Delete button - deleteBtn := widget.NewButton(lang.L("Delete"), func() { + deleteBtn := ttwidget.NewButtonWithIcon("", theme.DeleteIcon(), func() { g.showDeletePresetDialog() }) + deleteBtn.SetToolTip(lang.L("Delete")) // AutoEQ button g.autoEQBtn = widget.NewButton(lang.L("AutoEQ"), func() { @@ -166,12 +169,12 @@ func (g *GraphicEqualizer) buildSliders(preamp float64, bands []string, bandGain g.eqTypeSelect, widget.NewLabel(lang.L("EQ Preset:")), g.presetSelect, - g.autoEQBtn, layout.NewSpacer(), g.saveBtn, saveAsBtn, deleteBtn, resetBtn, + g.autoEQBtn, ), // Second row: Profile label (shown only when AutoEQ profile is active) g.profileLabel, diff --git a/ui/theme/theme.go b/ui/theme/theme.go index 9f88961..9b22de8 100644 --- a/ui/theme/theme.go +++ b/ui/theme/theme.go @@ -69,6 +69,8 @@ var ( SortIcon fyne.Resource = theme.NewThemedResource(res.ResUpdownarrowSvg) VisualizationIcon fyne.Resource = theme.NewThemedResource(res.ResOscilloscopeSvg) LibraryIcon fyne.Resource = theme.NewThemedResource(res.ResLibrarySvg) + SaveIcon fyne.Resource = theme.NewThemedResource(res.ResSaveSvg) + SaveAsIcon fyne.Resource = theme.NewThemedResource(res.ResSaveasSvg) ) type AppearanceMode string From 6c84910553d68314985e68bbaa63dfa3c40845b1 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Sun, 8 Feb 2026 17:15:38 -0800 Subject: [PATCH 23/25] renaming --- ...utoeq_interpolate.go => eq_interpolate.go} | 20 +++++++++---------- ...rpolate_test.go => eq_interpolate_test.go} | 12 +++++------ ui/dialogs/settingsdialog.go | 20 +++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) rename backend/{autoeq_interpolate.go => eq_interpolate.go} (88%) rename backend/{autoeq_interpolate_test.go => eq_interpolate_test.go} (94%) diff --git a/backend/autoeq_interpolate.go b/backend/eq_interpolate.go similarity index 88% rename from backend/autoeq_interpolate.go rename to backend/eq_interpolate.go index 81dde07..3e98c47 100644 --- a/backend/autoeq_interpolate.go +++ b/backend/eq_interpolate.go @@ -8,15 +8,15 @@ var autoEQFreqs = []float64{31.25, 62.5, 125, 250, 500, 1000, 2000, 4000, 8000, // Supersonic uses 15 bands at these frequencies (in Hz) var supersonicFreqs = []float64{25, 40, 63, 100, 160, 250, 400, 630, 1000, 1600, 2500, 4000, 6300, 10000, 16000} -// InterpolateAutoEQTo15Band converts a 10-band AutoEQ profile to Supersonic's 15-band ISO equalizer. +// InterpolateEQ10To15Band converts a 10-band EQ profile to Supersonic's 15-band ISO equalizer. // Uses logarithmic frequency positioning with linear dB interpolation. // // Parameters: -// - autoEQGains: Array of 10 gain values (dB) from AutoEQ at 31, 62, 125, 250, 500, 1k, 2k, 4k, 8k, 16k Hz +// - eq10Gains: Array of 10 gain values (dB) from 10-band EQ at 31, 62, 125, 250, 500, 1k, 2k, 4k, 8k, 16k Hz // // Returns: // - Array of 15 gain values (dB) for Supersonic at 25, 40, 63, 100, 160, 250, 400, 630, 1k, 1.6k, 2.5k, 4k, 6.3k, 10k, 16k Hz -func InterpolateAutoEQTo15Band(autoEQGains [10]float64) [15]float64 { +func InterpolateEQ10To15Band(eq10Gains [10]float64) [15]float64 { var result [15]float64 for i, targetFreq := range supersonicFreqs { @@ -25,21 +25,21 @@ func InterpolateAutoEQTo15Band(autoEQGains [10]float64) [15]float64 { if lowerIdx == upperIdx { // Exact match - use the AutoEQ gain directly - result[i] = autoEQGains[lowerIdx] + result[i] = eq10Gains[lowerIdx] } else if lowerIdx == -1 { // Target frequency is below the lowest AutoEQ band (25 Hz < 31.25 Hz) // Extrapolate using the first two AutoEQ bands - result[i] = extrapolateBelow(targetFreq, autoEQGains) + result[i] = extrapolateBelow(targetFreq, eq10Gains) } else if upperIdx == -1 { // Target frequency is above the highest AutoEQ band (should not happen with our ranges) // Use the highest AutoEQ gain - result[i] = autoEQGains[len(autoEQGains)-1] + result[i] = eq10Gains[len(eq10Gains)-1] } else { // Interpolate between two AutoEQ bands fLow := autoEQFreqs[lowerIdx] fHigh := autoEQFreqs[upperIdx] - gLow := autoEQGains[lowerIdx] - gHigh := autoEQGains[upperIdx] + gLow := eq10Gains[lowerIdx] + gHigh := eq10Gains[upperIdx] // Calculate logarithmic position between the two bands // t = log(targetFreq/fLow) / log(fHigh/fLow) @@ -107,9 +107,9 @@ func extrapolateBelow(targetFreq float64, autoEQGains [10]float64) float64 { return g1 + slope*math.Log(targetFreq/f1) } -// Interpolate15BandTo10Band converts a 15-band ISO equalizer to 10-band format. +// InterpolateEQ15BandTo10Band converts a 15-band ISO equalizer to 10-band format. // Uses logarithmic frequency positioning with linear dB interpolation. -func Interpolate15BandTo10Band(gains15Band [15]float64) [10]float64 { +func InterpolateEQ15BandTo10Band(gains15Band [15]float64) [10]float64 { var result [10]float64 for i, targetFreq := range autoEQFreqs { diff --git a/backend/autoeq_interpolate_test.go b/backend/eq_interpolate_test.go similarity index 94% rename from backend/autoeq_interpolate_test.go rename to backend/eq_interpolate_test.go index 1eeb7e7..7a73b89 100644 --- a/backend/autoeq_interpolate_test.go +++ b/backend/eq_interpolate_test.go @@ -8,7 +8,7 @@ import ( func TestInterpolateAutoEQTo15Band_FlatProfile(t *testing.T) { // Test with a flat profile (all zeros) flatProfile := [10]float64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0} - result := InterpolateAutoEQTo15Band(flatProfile) + result := InterpolateEQ10To15Band(flatProfile) for i, gain := range result { if math.Abs(gain) > 0.001 { @@ -24,7 +24,7 @@ func TestInterpolateAutoEQTo15Band_ExactMatches(t *testing.T) { // Exact matches: 250 (idx 5→3), 1k (idx 5→8), 4k (idx 7→11), 16k (idx 9→14) testProfile := [10]float64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10} - result := InterpolateAutoEQTo15Band(testProfile) + result := InterpolateEQ10To15Band(testProfile) tests := []struct { supersonicIdx int @@ -51,7 +51,7 @@ func TestInterpolateAutoEQTo15Band_Interpolation(t *testing.T) { testProfile := [10]float64{0, 0, 0, 0, 0, 10, 0, 0, 0, 0} // Only 1000 Hz (index 5) has gain of 10 dB - result := InterpolateAutoEQTo15Band(testProfile) + result := InterpolateEQ10To15Band(testProfile) // Check that 1000 Hz (index 8) has the exact value if math.Abs(result[8]-10) > 0.001 { @@ -75,7 +75,7 @@ func TestInterpolateAutoEQTo15Band_Extrapolation(t *testing.T) { testProfile := [10]float64{5, 10, 0, 0, 0, 0, 0, 0, 0, 0} // 31.25 Hz = 5 dB, 62.5 Hz = 10 dB - result := InterpolateAutoEQTo15Band(testProfile) + result := InterpolateEQ10To15Band(testProfile) // 25 Hz should be extrapolated below 31.25 Hz // Since the slope is positive (5 to 10), 25 Hz should be < 5 dB @@ -94,7 +94,7 @@ func TestInterpolateAutoEQTo15Band_RealProfile(t *testing.T) { // Approximating a V-shaped response testProfile := [10]float64{6, 5, 3, 1, 0, 0, 1, 3, 5, 6} - result := InterpolateAutoEQTo15Band(testProfile) + result := InterpolateEQ10To15Band(testProfile) // Verify output is reasonable if len(result) != 15 { @@ -115,7 +115,7 @@ func TestInterpolateAutoEQTo15Band_MonotonicPreservation(t *testing.T) { // If AutoEQ gains are monotonically increasing, interpolated values should also increase monotonicProfile := [10]float64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9} - result := InterpolateAutoEQTo15Band(monotonicProfile) + result := InterpolateEQ10To15Band(monotonicProfile) // Check general increasing trend (allowing for some extrapolation variance at edges) for i := 2; i < len(result)-1; i++ { diff --git a/ui/dialogs/settingsdialog.go b/ui/dialogs/settingsdialog.go index bf99bb9..2d30438 100644 --- a/ui/dialogs/settingsdialog.go +++ b/ui/dialogs/settingsdialog.go @@ -42,14 +42,14 @@ type SettingsDialog struct { OnPageNeedsRefresh func() OnClearCaches func() - config *backend.Config - audioDevices []mpv.AudioDevice - themeFiles map[string]string // filename -> displayName - promptText *widget.RichText - eqPresetManager *backend.EQPresetManager - autoEQManager *backend.AutoEQManager - imageManager util.ImageFetcher - window fyne.Window + config *backend.Config + audioDevices []mpv.AudioDevice + themeFiles map[string]string // filename -> displayName + promptText *widget.RichText + eqPresetManager *backend.EQPresetManager + autoEQManager *backend.AutoEQManager + imageManager util.ImageFetcher + window fyne.Window clientDecidesScrobble bool @@ -534,7 +534,7 @@ func (s *SettingsDialog) createEqualizerTab(eqBands []string) *container.TabItem // Use interpolation to downsample var bands15 [15]float64 copy(bands15[:], currentBands) - bands10 := backend.Interpolate15BandTo10Band(bands15) + bands10 := backend.InterpolateEQ15BandTo10Band(bands15) newBands = bands10[:] } else { // Already 10-band or invalid size, just copy what we can @@ -548,7 +548,7 @@ func (s *SettingsDialog) createEqualizerTab(eqBands []string) *container.TabItem // Use interpolation to upsample var bands10 [10]float64 copy(bands10[:], currentBands) - bands15 := backend.InterpolateAutoEQTo15Band(bands10) + bands15 := backend.InterpolateEQ10To15Band(bands10) newBands = bands15[:] } else { // Already 15-band or invalid size, just copy what we can From 52f96e1ce85c509e3dc8af0e621349f6033ac53f Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Sun, 8 Feb 2026 17:38:27 -0800 Subject: [PATCH 24/25] use error toast to inform user --- ui/controller/controller.go | 3 +- ui/dialogs/autoeqbrowser.go | 63 +++++++++++++----------------------- ui/dialogs/settingsdialog.go | 10 +++++- 3 files changed, 33 insertions(+), 43 deletions(-) diff --git a/ui/controller/controller.go b/ui/controller/controller.go index 0c73893..ed80bb3 100644 --- a/ui/controller/controller.go +++ b/ui/controller/controller.go @@ -330,7 +330,8 @@ func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func(), themeFiles map c.App.EQPresetManager, c.MainWindow, c.App.AutoEQManager, - c.App.ImageManager) + c.App.ImageManager, + c.ToastProvider) dlg.OnReplayGainSettingsChanged = func() { c.App.PlaybackManager.SetReplayGainOptions(c.App.Config.ReplayGain) } diff --git a/ui/dialogs/autoeqbrowser.go b/ui/dialogs/autoeqbrowser.go index d5ae1d1..a023622 100644 --- a/ui/dialogs/autoeqbrowser.go +++ b/ui/dialogs/autoeqbrowser.go @@ -20,13 +20,15 @@ import ( type AutoEQBrowser struct { SearchDialog *SearchDialog manager *backend.AutoEQManager + toastProvider ToastProvider allProfileResults []*mediaprovider.SearchResult OnProfileSelected func(*backend.AutoEQProfile) } -func NewAutoEQBrowser(manager *backend.AutoEQManager, im util.ImageFetcher) *AutoEQBrowser { +func NewAutoEQBrowser(manager *backend.AutoEQManager, im util.ImageFetcher, toastProvider ToastProvider) *AutoEQBrowser { ab := &AutoEQBrowser{ - manager: manager, + manager: manager, + toastProvider: toastProvider, } sd := NewSearchDialog( im, @@ -43,7 +45,6 @@ func (ab *AutoEQBrowser) fetchAllProfiles() error { ctx := context.Background() profiles, err := ab.manager.FetchIndex(ctx) if err != nil { - log.Printf("Error fetching AutoEQ index: %v", err) // Show empty results on error ab.allProfileResults = []*mediaprovider.SearchResult{} return fmt.Errorf("failed to fetch AutoEQ index: %w", err) @@ -83,14 +84,10 @@ func (ab *AutoEQBrowser) onSearched(query string) []*mediaprovider.SearchResult if ab.allProfileResults == nil { if err := ab.fetchAllProfiles(); err != nil { log.Printf("Failed to load AutoEQ profiles: %v", err) - // Return a single error result - return []*mediaprovider.SearchResult{ - { - Name: lang.L("Error loading AutoEQ profiles"), - ArtistName: lang.L("Check network connection and try again"), - Type: mediaprovider.ContentTypePlaylist, - }, - } + fyne.Do(func() { + ab.toastProvider.ShowErrorToast(lang.L("Error loading AutoEQ profiles")) + }) + return []*mediaprovider.SearchResult{} } } @@ -114,18 +111,20 @@ func (ab *AutoEQBrowser) SetOnDismiss(onDismiss func()) { func (ab *AutoEQBrowser) SetOnProfileSelected(callback func(*backend.AutoEQProfile)) { ab.OnProfileSelected = callback ab.SearchDialog.OnNavigateTo = func(_ mediaprovider.ContentType, profilePath string) { - // Fetch the full profile data - ctx := context.Background() - profile, err := ab.manager.FetchProfile(ctx, profilePath) - if err != nil { - log.Printf("Error fetching AutoEQ profile: %v", err) - // TODO: Show error dialog to user - return - } - - if ab.OnProfileSelected != nil { - ab.OnProfileSelected(profile) - } + go func() { + // Fetch the full profile data + profile, err := ab.manager.FetchProfile(context.Background(), profilePath) + fyne.Do(func() { + if err != nil { + log.Printf("Error loading AutoEQ profile: %v", err) + ab.toastProvider.ShowErrorToast(lang.L("Error loading AutoEQ profile")) + } else { + if ab.OnProfileSelected != nil { + ab.OnProfileSelected(profile) + } + } + }) + }() } } @@ -148,21 +147,3 @@ func (ab *AutoEQBrowser) Hide() { func (ab *AutoEQBrowser) Refresh() { ab.SearchDialog.Refresh() } - -// ShowErrorDialog displays an error message to the user -func ShowAutoEQError(window fyne.Window, err error) { - title := lang.L("Error") - message := lang.L("Failed to load profile") - - if err == backend.ErrProfileNotFound { - message = lang.L("Profile not found") - } else if strings.Contains(err.Error(), "context deadline exceeded") || - strings.Contains(err.Error(), "connection") { - message = lang.L("Network error. Check connection.") - } - - // Use a simple dialog (would need to import "fyne.io/fyne/v2/dialog") - // For now just log it - log.Printf("AutoEQ Error: %s - %v", message, err) - fmt.Printf("%s: %s\n", title, message) -} diff --git a/ui/dialogs/settingsdialog.go b/ui/dialogs/settingsdialog.go index 2d30438..fe7bfa5 100644 --- a/ui/dialogs/settingsdialog.go +++ b/ui/dialogs/settingsdialog.go @@ -50,12 +50,18 @@ type SettingsDialog struct { autoEQManager *backend.AutoEQManager imageManager util.ImageFetcher window fyne.Window + toastProvider ToastProvider clientDecidesScrobble bool content fyne.CanvasObject } +type ToastProvider interface { + ShowSuccessToast(message string) + ShowErrorToast(message string) +} + // TODO: having this depend on the mpv package for the AudioDevice type is kinda gross. Refactor. func NewSettingsDialog( config *backend.Config, @@ -71,6 +77,7 @@ func NewSettingsDialog( window fyne.Window, autoEQManager *backend.AutoEQManager, imageManager util.ImageFetcher, + toastProvider ToastProvider, ) *SettingsDialog { s := &SettingsDialog{ config: config, @@ -81,6 +88,7 @@ func NewSettingsDialog( autoEQManager: autoEQManager, imageManager: imageManager, window: window, + toastProvider: toastProvider, } s.ExtendBaseWidget(s) @@ -587,7 +595,7 @@ func (s *SettingsDialog) openAutoEQBrowser(geq *GraphicEqualizer, debouncer func return } - browser := NewAutoEQBrowser(s.autoEQManager, s.imageManager) + browser := NewAutoEQBrowser(s.autoEQManager, s.imageManager, s.toastProvider) // Show in a modal popup dialog var popup *widget.PopUp From f2440d9d156442c941eeac64fea582e38d04f501 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Sun, 8 Feb 2026 17:46:20 -0800 Subject: [PATCH 25/25] some log cleanup --- backend/autoeq.go | 11 +++++------ ui/dialogs/autoeqbrowser.go | 2 -- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/backend/autoeq.go b/backend/autoeq.go index b0e04c6..76a0bb2 100644 --- a/backend/autoeq.go +++ b/backend/autoeq.go @@ -24,10 +24,10 @@ import ( ) const ( - autoEQIndexURL = "https://raw.githubusercontent.com/jaakkopasanen/AutoEq/master/results/INDEX.md" - autoEQBaseURL = "https://raw.githubusercontent.com/jaakkopasanen/AutoEq/master/results/" - indexCacheTTL = 7 * 24 * time.Hour // 7 days - profileCacheTTL = 30 * 24 * time.Hour // 30 days + autoEQIndexURL = "https://raw.githubusercontent.com/jaakkopasanen/AutoEq/master/results/INDEX.md" + autoEQBaseURL = "https://raw.githubusercontent.com/jaakkopasanen/AutoEq/master/results/" + indexCacheTTL = 7 * 24 * time.Hour // 7 days + profileCacheTTL = 30 * 24 * time.Hour // 30 days maxMemoryCacheSize = 20 // LRU cache size ) @@ -114,6 +114,7 @@ func (m *AutoEQManager) FetchIndex(ctx context.Context) ([]AutoEQProfileMetadata if err != nil { return nil, err } + log.Printf("Successfully fetched %d AutoEQ profiles", len(profiles)) // Cache in memory and disk m.indexCacheMutex.Lock() @@ -359,7 +360,6 @@ func (m *AutoEQManager) fetchProfileFromNetwork(ctx context.Context, path string // The file is named "{HeadphoneName} FixedBandEQ.txt" encodedFileName := url.PathEscape(headphoneName + " FixedBandEQ.txt") profileURL := autoEQBaseURL + encodedPath + "/" + encodedFileName - log.Printf("Fetching profile from: %s", profileURL) ctx, cancel := context.WithTimeout(ctx, m.timeout) defer cancel() @@ -375,7 +375,6 @@ func (m *AutoEQManager) fetchProfileFromNetwork(ctx context.Context, path string } defer resp.Body.Close() - log.Printf("Profile fetch response: %d", resp.StatusCode) if resp.StatusCode == http.StatusNotFound { return nil, ErrProfileNotFound } diff --git a/ui/dialogs/autoeqbrowser.go b/ui/dialogs/autoeqbrowser.go index a023622..bc828c8 100644 --- a/ui/dialogs/autoeqbrowser.go +++ b/ui/dialogs/autoeqbrowser.go @@ -50,8 +50,6 @@ func (ab *AutoEQBrowser) fetchAllProfiles() error { return fmt.Errorf("failed to fetch AutoEQ index: %w", err) } - log.Printf("Successfully fetched %d AutoEQ profiles", len(profiles)) - // Convert to SearchResult format for display ab.allProfileResults = sharedutil.MapSlice(profiles, ab.profileToSearchResult) return nil