mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 08:21:12 +02:00
- 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:
@@ -38,6 +38,7 @@
|
|||||||
#include <driver/audioplay.h>
|
#include <driver/audioplay.h>
|
||||||
#include <driver/audiometadata.h>
|
#include <driver/audiometadata.h>
|
||||||
#include <driver/display.h>
|
#include <driver/display.h>
|
||||||
|
#include <system/httptool.h>
|
||||||
|
|
||||||
#include <daemonc/remotecontrol.h>
|
#include <daemonc/remotecontrol.h>
|
||||||
|
|
||||||
@@ -1754,6 +1755,7 @@ void CAudioPlayerGui::paintCover()
|
|||||||
{
|
{
|
||||||
const CAudioMetaData meta = CAudioPlayer::getInstance()->getMetaData();
|
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_cover = m_curr_audiofile.Filename.substr(0, m_curr_audiofile.Filename.rfind('/')) + "/folder.jpg";
|
||||||
m_stationlogo = false;
|
m_stationlogo = false;
|
||||||
|
|
||||||
@@ -2007,6 +2009,12 @@ void CAudioPlayerGui::stop()
|
|||||||
if (CAudioPlayer::getInstance()->getState() != CBaseDec::STOP)
|
if (CAudioPlayer::getInstance()->getState() != CBaseDec::STOP)
|
||||||
CAudioPlayer::getInstance()->stop();
|
CAudioPlayer::getInstance()->stop();
|
||||||
|
|
||||||
|
if (m_stationlogo)
|
||||||
|
{
|
||||||
|
unlink(m_cover.c_str());
|
||||||
|
m_stationlogo = false;
|
||||||
|
}
|
||||||
|
|
||||||
cleanupCovers();
|
cleanupCovers();
|
||||||
|
|
||||||
if (m_streamripper_active)
|
if (m_streamripper_active)
|
||||||
|
Reference in New Issue
Block a user