Skip to content

Commit

Permalink
Add random song button
Browse files Browse the repository at this point in the history
- Change window size
  • Loading branch information
ManHinnn0509 committed Jan 7, 2022
1 parent 5729bc8 commit 9fc4c2f
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 7 deletions.
2 changes: 1 addition & 1 deletion config.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
MP3_FOLDER_PATH = getenv('MP3_FOLDER_PATH')

TITLE = 'MP3 Player by ManHinnn0509'
WINDOW_SIZE = "600x300"
WINDOW_SIZE = "600x350"

# Allow resize or not
RESIZE_H = False
Expand Down
32 changes: 26 additions & 6 deletions controlmenu.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import random

import tkinter as tk
from tkinter import *

Expand All @@ -7,11 +9,13 @@

class ControlMenu:

PAUSE_TEXT = 'Pause ⏸'
RESUME_TEXT = 'Resume ▶️'
PAUSE_TEXT = "Pause ⏸"
RESUME_TEXT = "Resume ▶️"

LOOP_ENABLED_TEXT = "Loop 🔁\n(Enabled)"
LOOP_DISABLED_TEXT = "Loop 🔁\n(Disabled)"

LOOP_ENABLED_TEXT = 'Loop 🔁\n(Enabled)'
LOOP_DISABLED_TEXT = 'Loop 🔁\n(Disabled)'
RANDOM_TEXT = "Random"

def __init__(self, mp3Player: MP3Player) -> None:
self.mp3Player = mp3Player
Expand Down Expand Up @@ -60,6 +64,14 @@ def __init__(self, mp3Player: MP3Player) -> None:
self.loopButton = loopButton
self.loopButton.grid(row=4, column=0)

randomButton = Button(
menuFrame, text=self.RANDOM_TEXT,
width=self.buttonWidth, height=self.buttonHeight,
command=self.__playRandomSong
)
self.randomButton = randomButton
self.randomButton.grid(row=5, column=0)

# Volume slider
volumeSlider = Scale(
self.menuFrame,
Expand All @@ -73,7 +85,7 @@ def __init__(self, mp3Player: MP3Player) -> None:
volumeSlider.set(int(self.mp3Player.volume * 100))

self.volumeSlider = volumeSlider
self.volumeSlider.grid(row=5, column=0)
self.volumeSlider.grid(row=6, column=0)

# Pack the frame
self.menuFrame.pack(fill=tk.Y, side='right')
Expand Down Expand Up @@ -128,4 +140,12 @@ def __changeVolume(self, event):
self.mp3Player.volume = volume

# CHANGE VOLUME CODE HERE
self.mp3Player.mixer.music.set_volume(volume)
self.mp3Player.mixer.music.set_volume(volume)

def __playRandomSong(self):
# 0 <= i < len(songList)
i = int(random.randrange(0, len(self.mp3Player.songs)))

self.mp3Player.songIndex = i
self.mp3Player.playSong()

0 comments on commit 9fc4c2f

Please sign in to comment.