micke/cast
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases 3 Packages Wiki Activity Actions

Better controlls

Browse source
This commit is contained in:
Micke Nordin 2022-07-10 18:31:17 +02:00
parent 5a161c7e82
commit 03edf98b86
2 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scripts/cast
View file

@ -86,6 +86,7 @@ class Cast(wx.Frame):
self.m_chromecasts, self.m_browser = pychromecast.get_chromecasts() self.m_chromecasts, self.m_browser = pychromecast.get_chromecasts()
def get_player_controls(self, channel_index: int, uri: str) -> wx.BoxSizer: def get_player_controls(self, channel_index: int, uri: str) -> wx.BoxSizer:
outer_sizer = wx.BoxSizer(wx.VERTICAL)
inner_sizer = wx.BoxSizer(wx.HORIZONTAL) inner_sizer = wx.BoxSizer(wx.HORIZONTAL)
play_button = wx.Button(self.m_panel, play_button = wx.Button(self.m_panel,
-1, -1,
@ -104,8 +105,8 @@ class Cast(wx.Frame):
if self.m_mode == 'normal': if self.m_mode == 'normal':
back_button = wx.Button(self.m_panel, back_button = wx.Button(self.m_panel,
-1, -1,
"Back", "Go Back",
size=(WIDTH / 4, BTN_HEIGHT)) size=(WIDTH, BTN_HEIGHT))
back_button.Bind( back_button.Bind(
wx.EVT_BUTTON, wx.EVT_BUTTON,
lambda event, cindex=channel_index: self.show_video_list( lambda event, cindex=channel_index: self.show_video_list(
@ -115,12 +116,12 @@ class Cast(wx.Frame):
back_button = wx.Button(self.m_panel, back_button = wx.Button(self.m_panel,
-1, -1,
label="Close", label="Close",
size=(WIDTH / 4, BTN_HEIGHT)) size=(WIDTH, BTN_HEIGHT))
back_button.Bind(wx.EVT_BUTTON, lambda event: self.Destroy()) back_button.Bind(wx.EVT_BUTTON, lambda event: self.Destroy())
outer_sizer.Add(back_button, FLAGS)
inner_sizer.Add(play_button, FLAGS) inner_sizer.Add(play_button, FLAGS)
inner_sizer.Add(pause_button, FLAGS) inner_sizer.Add(pause_button, FLAGS)
inner_sizer.Add(stop_button, FLAGS) inner_sizer.Add(stop_button, FLAGS)
inner_sizer.Add(back_button, FLAGS)
if self.has_usable_chromecasts(): if self.has_usable_chromecasts():
btm = make_bitmap_from_file( btm = make_bitmap_from_file(
@ -151,10 +152,12 @@ class Cast(wx.Frame):
play_button.Bind(wx.EVT_BUTTON, self.play) play_button.Bind(wx.EVT_BUTTON, self.play)
pause_button.Bind(wx.EVT_BUTTON, self.pause) pause_button.Bind(wx.EVT_BUTTON, self.pause)
stop_button.Bind(wx.EVT_BUTTON, self.stop) stop_button.Bind(wx.EVT_BUTTON, self.stop)
outer_sizer.Add(inner_sizer, FLAGS)
inner_sizer.Fit(self) inner_sizer.Fit(self)
inner_sizer.Layout() outer_sizer.Fit(self)
outer_sizer.Layout()
return inner_sizer return outer_sizer
def get_providers(self) -> list[ChannelProvider]: def get_providers(self) -> list[ChannelProvider]:
@ -185,7 +188,8 @@ class Cast(wx.Frame):
channels = list() channels = list()
for id in chandict[provider]["channels"]: for id in chandict[provider]["channels"]:
channels.append(SVT.SVT(id)) channels.append(SVT.SVT(id))
svt = ChannelProvider(chandict[provider]["displayname"], channels=channels) svt = ChannelProvider(chandict[provider]["displayname"],
channels=channels)
providers.append(svt) providers.append(svt)
return providers return providers
@ -202,15 +206,13 @@ class Cast(wx.Frame):
break break
return result return result
def show_channel_list(self, _, provider_index) -> None: def show_channel_list(self, _, provider_index) -> None:
self.m_selected_provider_index = provider_index self.m_selected_provider_index = provider_index
self.m_selected_provider = self.m_providers[provider_index] self.m_selected_provider = self.m_providers[provider_index]
self.m_sizer.Clear(delete_windows=True) self.m_sizer.Clear(delete_windows=True)
self.m_sizer = wx.BoxSizer(wx.VERTICAL) self.m_sizer = wx.BoxSizer(wx.VERTICAL)
if len(self.m_providers) > 1: if len(self.m_providers) > 1:
back_callback = lambda event: self.show_provider_list( back_callback = lambda event: self.show_provider_list(event)
event)
self.add_back_button(back_callback) self.add_back_button(back_callback)
else: else:
closebtn = wx.Button(self.m_panel, closebtn = wx.Button(self.m_panel,
@ -387,7 +389,7 @@ class Cast(wx.Frame):
self.m_sizer.Add(cancel_btn) self.m_sizer.Add(cancel_btn)
for cast in self.m_chromecasts: for cast in self.m_chromecasts:
if cast.cast_type == 'audio': if cast.cast_type == 'audio':
continue continue
friendly_name = "Unknown Chromecast" friendly_name = "Unknown Chromecast"
try: try:
@ -395,9 +397,9 @@ class Cast(wx.Frame):
except AttributeError: except AttributeError:
friendly_name = cast.cast_info.friendly_name friendly_name = cast.cast_info.friendly_name
btn = wx.Button(self.m_panel, btn = wx.Button(self.m_panel,
id=-1, id=-1,
label=friendly_name, label=friendly_name,
size=(WIDTH, BTN_HEIGHT)) size=(WIDTH, BTN_HEIGHT))
btn.Bind( btn.Bind(
wx.EVT_BUTTON, wx.EVT_BUTTON,
lambda event, chromecast=cast, muri=uri, cindex=channel_index: lambda event, chromecast=cast, muri=uri, cindex=channel_index:

15
src/Utils/__init__.py
View file

@ -109,7 +109,9 @@ def get_all_svt_channels() -> dict:
make_bitmap_from_url( make_bitmap_from_url(
get_svt_thumb_from_id_changed( get_svt_thumb_from_id_changed(
item["running"]["image"]['id'], item["running"]["image"]['id'],
item["running"]["image"]['changed'])), item["running"]["image"]['changed'],
SCREEN_WIDTH),
wx.Size(width=SCREEN_WIDTH, height=480)),
"name": "name":
item["name"] item["name"]
} }
@ -379,6 +381,17 @@ def resolve_svt_channel(svt_id: str, path: str = '/usr/share/cast') -> dict:
make_bitmap_from_file('{}/assets/SVT.png'.format(path)) make_bitmap_from_file('{}/assets/SVT.png'.format(path))
} }
for category in get_all_svt_categories():
channels[category['id']] = {
"name":
category["name"],
"thumbnail":
make_bitmap_from_url(
get_svt_thumb_from_id_changed(
category['image']['id'], category['image']['changed']))
}
CHAN_CACHE = channels
return channels[svt_id] return channels[svt_id]