From 02954cd40bf36082a63b56eb5211bd27f5f0b4c4 Mon Sep 17 00:00:00 2001
From: Tom Kirchner <git@halffull.org>
Date: Tue, 31 Dec 2024 17:02:40 -0800
Subject: [PATCH 1/2] Expose more properties to Lua for UI

---
 src/tangara/lua/property.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/tangara/lua/property.cpp b/src/tangara/lua/property.cpp
index 847bbe15..3302172f 100644
--- a/src/tangara/lua/property.cpp
+++ b/src/tangara/lua/property.cpp
@@ -265,6 +265,22 @@ static void pushTrack(lua_State* L, const audio::TrackInfo& track) {
   lua_pushliteral(L, "encoding");
   lua_pushstring(L, codecs::StreamTypeToString(track.encoding).c_str());
   lua_settable(L, -3);
+
+  lua_pushliteral(L, "uri");
+  lua_pushstring(L, track.uri.c_str());
+  lua_settable(L, -3);
+
+  lua_pushliteral(L, "sample_rate");
+  lua_pushinteger(L, track.format.sample_rate);
+  lua_settable(L, -3);
+
+  lua_pushliteral(L, "num_channels");
+  lua_pushinteger(L, track.format.num_channels);
+  lua_settable(L, -3);
+
+  lua_pushliteral(L, "bits_per_sample");
+  lua_pushinteger(L, track.format.bits_per_sample);
+  lua_settable(L, -3);
 }
 
 static void pushDevice(lua_State* L,

From 0975c2cdbdaf252eb6765b32d4c880911abfcc9f Mon Sep 17 00:00:00 2001
From: Tom Kirchner <git@halffull.org>
Date: Tue, 31 Dec 2024 17:04:16 -0800
Subject: [PATCH 2/2] Add track info screen

---
 lua/images.lua     |   1 +
 lua/img/info.png   | Bin 0 -> 3560 bytes
 lua/playing.lua    |  11 +++++-
 lua/track_info.lua |  85 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 lua/img/info.png
 create mode 100644 lua/track_info.lua

diff --git a/lua/images.lua b/lua/images.lua
index d7939305..5acfa8fe 100644
--- a/lua/images.lua
+++ b/lua/images.lua
@@ -23,6 +23,7 @@ local img = {
   usb = lvgl.ImgData("//lua/img/usb.png"),
   listened = lvgl.ImgData("//lua/img/listened.png"),
   unlistened = lvgl.ImgData("//lua/img/unlistened.png"),
+  info = lvgl.ImgData("//lua/img/info.png"),
 }
 
 return img
diff --git a/lua/img/info.png b/lua/img/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a14815e57bd203e60cb805f092f1952dc039027
GIT binary patch
literal 3560
zcmeHK3s6&65Z#x5LZbYFkO_vL5<XgmAc&O6M<6n4i6EkNKtMs9u_6W0QG?N<GFB>n
zP}+h({TGl{id7^czha#NRt(B02q=`wKol`R$m@MzTkBA2J7ZgC+|0hWdv|m0J^MEI
z=IwcJp)ZHUV*vn1;^!?z_X&hDXy_{Nn^up;d8?L6R!bzdz(8Z8aVBVi0vPfL1#HwN
z9P9;~gpq-a!bwQU$R=_LT-pmZ_qk2vVWd%<WMq?`+XvamLBbgM;Ei|-=+5_%_@If1
z$<YOG0xw|DXmlEtL8sH1Oa_Z>$YJZ~uub$0CK{UZ1d~m9e7>30bZavUdrLlF=xk#@
zW2Q(X5?IfE*TunYx}(T}0Ku3{CR>MX%;6Y2nDfmY{<h#(K#xJJiHunQNe?6IVR!`y
z&^oEuh>TJph>|H(8lAyp>7axnT|kv0lPF{=l|n($ttbu@J*vL>Ob?ntz)HGBtf9m9
z{n-pl&%!dUw7%EMF?@rZ$ugQ`Y{Hu|)mms{D{`9U>@wTc%X^-Wub*W8;=rIK!AnDy
zMMSPz9TmMMCho)dgpG-tHt*Q^QSz?cds5O496WS5{m9XboZK&tpE!By^qH@|K40`r
z@r7?MUM;Vvtg8O5=Gu)PZ#LXgHr~E-zqPIX!NZQupSo0!pY%QLf2JN7BzO@#f0a>Y
zFY(etyhs!ZnL;OcVWf=&aXkvvd?robBY?g#*1*DHJHya(e|BLR)6!Ae%MIU9&oZ(S
z-JhZ&sEsgtHDdCA#Oya>zw^2SY%+!(9$62>FrZBl9wYsq^zvefn%bHd<x|)&?J373
z>~itGR;RQzUetItRuLIRzo|T=Y|>J2NZWM3V2HX5htA{2CISx0v8r9el=I>t9Gr3B
z<!Vi;s|0=ebvX2Bnl&+{Svg7WVQ+p~U_&XEc-E)BpveDYFP~`py!H$GBQm6w0sgv<
z#wJ&uav#L^<FF5h_RPd|ZCP;Wpv~D<76@}v##Os+97wVnw_fG2JWtjqRaS5j%yuzC
zS*tBuq8PM^CLha55yBWs&QdjN4%F)7&}jQJ4)dJ0c!YkS?$Js*_Q)P_<8jEzC^h@*
zE-P*BwMH-;S);8Ip-dY=F+eEEibveF2<32+D@&M@#1iHUT8D=p9_=j-DLHp3^G280
zGP2GuBL2E+M>2n}+_!D6X(d-h*H~|xfkSq|`#6;CZPo+{dOuf}Ym+a>;XregsRFV7
z;aAKm*O)0vZfcD>mFdso?%tJj^ki&e?`zDQ>rj0l2{d*WM#xQ&Rm&bPa`VR_>}<iX
zVS|dgRnevxu+E%<!?_@(HYG+aM~f#2jH5%cD_ID|i9iV*HY_4gS{5M`9)VJzO<4w=
z#KW|!)y~49##|}uZpLB0Wx?DpWrpf?wUzhym+E@jGv_SN`}7_St5OCVTj@3U#(+9J
zWl)BG6lFN{=_|!O8nGrORUIXu<51_1YNY7JL3IWO<gb+0>CTkZnAa(~+tB1z#N;}O
z>uRsM^Uv2kvdZ*dzG7%{0`-TEsM%&%LuyRpe^8*YI=(}*5eKU$6^ee=MI7oEgz5%2
zY3C4oNo(j3b%m_+M8WPcTl^1gUr?-J5-{bV{j4Gc<39rP(v~zq{wKTYzuP8nt1wmt
zh_Sc5@OrCoW{p^|B`7!gmg|brtXz@N5>->x4KJJUQ`sIapRijtvtTekWnhPvHwPWl
z9O9U+Xx1d8s-t_1Wp&P8XhSlPsqVnwwl_5C84jjsgLYHBGc3<n^eqmq;C5vcS2uIl
zx;piz$DZu`p4we<__1jHHDkNeQlCgm7x(0n{P7Qm@eYpH6cgjO1;usO(cfQ6l*a-O
zfWlNA%}Ofru{f!(Cw9BWUWOdA2tVlpfX!3U%g|1MK{S-q2@pR6peqc(^$5VE^`Bh~
za6<uFxWBJAx+59zx<q`Nx!x}%4q&<^p;+Q^aRM4Nk$8Iq3Tq?6j72SC!<Mut9=6c5
b!Q~XdA<Kz)QBw%<P6v{C3%&C_!{omJw!zuR

literal 0
HcmV?d00001

diff --git a/lua/playing.lua b/lua/playing.lua
index 86ecf20c..84e31962 100644
--- a/lua/playing.lua
+++ b/lua/playing.lua
@@ -6,6 +6,7 @@ local playback = require("playback")
 local queue = require("queue")
 local screen = require("screen")
 local theme = require("theme")
+local track_info = require("track_info")
 
 local img = require("images")
 
@@ -176,7 +177,7 @@ return screen:new {
       },
       w = lvgl.PCT(100),
       h = lvgl.SIZE_CONTENT,
-      pad_column = 8,
+      pad_column = 6,
       pad_all = 2,
     }
 
@@ -230,6 +231,14 @@ return screen:new {
     theme.set_subject(shuffle_btn, icon_enabled_class)
     local shuffle_desc = widgets.Description(shuffle_btn)
 
+    local info_btn = controls:Button {}
+    info_btn:onClicked(function()
+      backstack.push(track_info:new())
+    end)
+    local info_img = info_btn:Image { src = img.info }
+    theme.set_subject(info_btn, icon_enabled_class)
+    local info_desc = widgets.Description(info_btn, "Track info")
+
     controls:Object({ flex_grow = 1, h = 1 }) -- spacer
 
 
diff --git a/lua/track_info.lua b/lua/track_info.lua
new file mode 100644
index 00000000..4018f246
--- /dev/null
+++ b/lua/track_info.lua
@@ -0,0 +1,85 @@
+local backstack = require("backstack")
+local font = require("font")
+local lvgl = require("lvgl")
+local playback = require("playback")
+local screen = require("screen")
+local widgets = require("widgets")
+
+return screen:new {
+  create_ui = function(self)
+    self.root = lvgl.Object(nil, {
+      flex = {
+        flex_direction = "column",
+        flex_wrap = "wrap",
+        justify_content = "center",
+        align_items = "center",
+        align_content = "center",
+      },
+      w = lvgl.HOR_RES(),
+      h = lvgl.VER_RES(),
+    })
+    self.root:center()
+
+    self.status_bar = widgets.StatusBar(self, {
+      back_cb = backstack.pop,
+      transparent_bg = true,
+    })
+
+    local info = lvgl.List(self.root, {
+      w = lvgl.PCT(100),
+      h = lvgl.PCT(100),
+      flex_grow = 1,
+    })
+
+    -- Use buttons so we can scroll through the list, and labels so we can
+    -- change the text as the track changes.
+    local label = function(text)
+      local b = info:add_btn(nil, "")
+      local ret = b:Label {
+        w = lvgl.PCT(100),
+        h = lvgl.SIZE_CONTENT,
+        text = text,
+        text_font = font.fusion_10,
+        text_align = 1, -- left
+      }
+      return ret
+    end
+
+    local album_artist = label("Loading...")
+    local genre = label("")
+    local disc = label("")
+    local tracknum = label("")
+    local encoding = label("")
+    local sample_rate = label("")
+    local num_channels = label("")
+    local bits_per_sample = label("")
+    local path = label("")
+
+    self.bindings = self.bindings + {
+      playback.track:bind(function(track)
+        if not track then
+          return
+        end
+
+        -- Genres are stored in a table of (genre, bool) pairs
+        local function genres(tbl)
+          local all = {}
+          for item,_ in pairs(tbl) do
+            table.insert(all, item)
+          end
+          return table.concat(all, ", ")
+        end
+
+        album_artist:set { text = "Album artist: " .. (track.album_artist or "") }
+        genre:set { text = "Genre: " .. (track.genre and genres(track.genre) or "") }
+        disc:set { text = "Disc: " .. (track.disc or "") }
+        tracknum:set { text = "Track: " .. (track.track or "") }
+        encoding:set { text = "Encoding: " .. (track.encoding or "") }
+        sample_rate:set { text = "Sample rate: " .. (track.sample_rate or "") }
+        num_channels:set { text = "Channels: " .. (track.num_channels or "") }
+        bits_per_sample:set { text = "Bits per sample: " .. (track.bits_per_sample or "") }
+        path:set { text = "Path: " .. (track.uri or "") }
+      end),
+    }
+  end,
+}