- audioplayer: don't remove station-logo immediately; ...

this allows the usage of station-logo as screensaver

Signed-off-by: Thilo Graf <dbt@novatux.de>

# Conflicts:
#	src/gui/audioplayer.cpp
This commit is contained in:
svenhoefer
2018-05-25 10:27:49 +02:00
committed by Thilo Graf
parent b616b6731d
commit 1ed07af6a5

View File

@@ -38,6 +38,7 @@
#include <driver/audioplay.h>
#include <driver/audiometadata.h>
#include <driver/display.h>
#include <system/httptool.h>
#include <daemonc/remotecontrol.h>
@@ -1754,6 +1755,7 @@ void CAudioPlayerGui::paintCover()
{
const CAudioMetaData meta = CAudioPlayer::getInstance()->getMetaData();
// try folder.jpg first
m_cover = m_curr_audiofile.Filename.substr(0, m_curr_audiofile.Filename.rfind('/')) + "/folder.jpg";
m_stationlogo = false;
@@ -2007,6 +2009,12 @@ void CAudioPlayerGui::stop()
if (CAudioPlayer::getInstance()->getState() != CBaseDec::STOP)
CAudioPlayer::getInstance()->stop();
if (m_stationlogo)
{
unlink(m_cover.c_str());
m_stationlogo = false;
}
cleanupCovers();
if (m_streamripper_active)