mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- audioplayer: remove bool screen_saver from updateMetaData() ...

Browse Source 
... using member m_screensaver instead of this
This commit is contained in:
svenhoefer
2014-12-29 21:33:23 +01:00
parent dec7d42ffe
commit f023ff1651
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/audioplayer.cpp
View File

@@ -343,7 +343,7 @@ int CAudioPlayerGui::show()
while (loop) while (loop)
{ {
updateMetaData(m_screensaver); updateMetaData();
updateTimes(); updateTimes();
@@ -2026,7 +2026,7 @@ int CAudioPlayerGui::getNext()
return ret; return ret;
} }
void CAudioPlayerGui::updateMetaData(bool screen_saver) void CAudioPlayerGui::updateMetaData()
{ {
bool updateMeta = false; bool updateMeta = false;
bool updateLcd = false; bool updateLcd = false;
@@ -2056,13 +2056,13 @@ void CAudioPlayerGui::updateMetaData(bool screen_saver)
info << " / " << meta.samplerate/1000 << "." << (meta.samplerate/100)%10 <<"kHz"; info << " / " << meta.samplerate/1000 << "." << (meta.samplerate/100)%10 <<"kHz";
m_metainfo = meta.type_info + info.str(); m_metainfo = meta.type_info + info.str();
updateMeta = !screen_saver; updateMeta = !m_screensaver;
if (!meta.artist.empty() && meta.artist != m_curr_audiofile.MetaData.artist) if (!meta.artist.empty() && meta.artist != m_curr_audiofile.MetaData.artist)
{ {
m_curr_audiofile.MetaData.artist = meta.artist; m_curr_audiofile.MetaData.artist = meta.artist;
if ( !screen_saver) if (!m_screensaver)
updateScreen = true; updateScreen = true;
updateLcd = true; updateLcd = true;
} }
@@ -2071,7 +2071,7 @@ void CAudioPlayerGui::updateMetaData(bool screen_saver)
{ {
m_curr_audiofile.MetaData.title = meta.title; m_curr_audiofile.MetaData.title = meta.title;
if ( !screen_saver) if (!m_screensaver)
updateScreen = true; updateScreen = true;
updateLcd = true; updateLcd = true;
} }

2
src/gui/audioplayer.h
View File

@@ -163,7 +163,7 @@ class CAudioPlayerGui : public CMenuTarget
void rev(unsigned int seconds=0); void rev(unsigned int seconds=0);
int getNext(); int getNext();
void GetMetaData(CAudiofileExt &File); void GetMetaData(CAudiofileExt &File);
void updateMetaData(bool screen_saver = false); void updateMetaData();
void updateTimes(const bool force = false); void updateTimes(const bool force = false);
void showMetaData(); void showMetaData();
void screensaver(bool on); void screensaver(bool on);