Merge remote-tracking branch 'origin/audio_loop'

This commit is contained in:
Marco
2019-07-31 23:16:14 +02:00
3 changed files with 140 additions and 86 deletions

View File

@@ -19,8 +19,7 @@ from PyQt5.QtGui import QPixmap
from PyQt5 import uic
from PyQt5.QtCore import (QFileInfo,
Qt,
pyqtSlot,
QRect,)
pyqtSlot,)
from audio_player import AudioPlayer
from weatherdata import SpaceWeatherData, ForecastData
@@ -495,6 +494,7 @@ class Artemis(QMainWindow, Ui_MainWindow):
self.pause,
self.stop,
self.volume,
self.loop,
self.audio_progress,
self.active_color,
self.inactive_color