Commit 52fd3e67 authored by Thorfin89's avatar Thorfin89

Optimisation du code.

parent c0cf63a3
......@@ -49,9 +49,20 @@ class Radio(Pupitre):
config_file.close()
self.player.audio_set_volume(volume_init)
def info_r(self):
self.lbl_info_radio.config(text = "Info sur le flux en cours")
def radio_forward(self): # passe à la radio suivante
self.num_radio_selected += 1
if self.num_radio_selected == self.nb_radios:
self.num_radio_selected = 0
self.radio_selected(self.num_radio_selected)
def radio_back(self): # passe à la radio précédente
self.num_radio_selected -= 1
if self.num_radio_selected == -1:
self.num_radio_selected = self.nb_radios - 1
self.radio_selected(self.num_radio_selected)
def info_r(self):
self.lbl_info_radio.config(text="Info sur le flux en cours")
app = Radio() # instancie l'application
......
......@@ -18,15 +18,13 @@ with open("./data/radios.csv", 'r', encoding='utf-8-sig') as radios_file:
radios_list = csv.DictReader(radios_file)
radios_list = [dict(ligne) for ligne in radios_list]
# calcul du nombre de radios contenues dans le fichier CSV
nb_radios = len(radios_list)
# classes ---------------------------------
class Pupitre:
def __init__(self):
self.nb_radios = len(radios_list)
self.root = tk.Tk() # fenêtre principale
self.root.title("Web Radio Pi")
self.root.geometry("800x480")
......@@ -141,18 +139,6 @@ class Pupitre:
self.lbl_info_radio.config(text=radios_list[num_radio]['Nom'], font=('Helvatical bold', 20))
self.num_radio_selected = num_radio
def radio_back(self): # passe à la radio précédente
self.num_radio_selected -= 1
if self.num_radio_selected == -1:
self.num_radio_selected = nb_radios - 1
self.radio_selected(self.num_radio_selected)
def radio_forward(self): # passe à la radio suivante
self.num_radio_selected += 1
if self.num_radio_selected == nb_radios:
self.num_radio_selected = 0
self.radio_selected(self.num_radio_selected)
def switch_sound(self): # bascule on/off du son
global mute
if not mute:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment