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

audioplayer: outsource for title data source handling into own methods

Browse Source 
Prepared to allow external access to an audio player instance.
This commit is contained in:
Thilo Graf
2021-11-13 18:56:46 +01:00
parent 26646c6ae8
commit 007b89b205
2 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/gui/audioplayer.cpp
View File

@@ -27,7 +27,7 @@
#include <config.h> #include <config.h>
#endif #endif
#include <gui/audioplayer.h> #include "gui/audioplayer.h"
#include <global.h> #include <global.h>
#include <neutrino.h> #include <neutrino.h>
@@ -1873,6 +1873,42 @@ void CAudioPlayerGui::paintCover()
cover_object.paint(); cover_object.paint();
} }
} }
void CAudioPlayerGui::getCurrentCaption(std::string* text)
{
if (m_inetmode)
{
*text = m_curr_audiofile.MetaData.album;
}
else
{
char sNr[20];
sprintf(sNr, ": %2d", m_current + 1);
*text = g_Locale->getText(LOCALE_AUDIOPLAYER_PLAYING);
*text += sNr ;
}
}
void CAudioPlayerGui::getCurrentTitleArtist(std::string* text)
{
GetMetaData(m_curr_audiofile);
if (m_curr_audiofile.MetaData.title.empty())
*text = m_curr_audiofile.MetaData.artist;
else if (m_curr_audiofile.MetaData.artist.empty())
*text = m_curr_audiofile.MetaData.title;
else if (g_settings.audioplayer_display == TITLE_ARTIST)
{
*text = m_curr_audiofile.MetaData.title;
*text += " - ";
*text += m_curr_audiofile.MetaData.artist;
}
else //if (g_settings.audioplayer_display == ARTIST_TITLE)
{
*text = m_curr_audiofile.MetaData.artist;
*text += " - ";
*text += m_curr_audiofile.MetaData.title;
}
}
void CAudioPlayerGui::paintTitleBox() void CAudioPlayerGui::paintTitleBox()
{ {
@@ -1901,17 +1937,7 @@ void CAudioPlayerGui::paintTitleBox()
// first line (Track number) // first line (Track number)
std::string tmp; std::string tmp;
if (m_inetmode) getCurrentCaption(&tmp);
{
tmp = m_curr_audiofile.MetaData.album;
}
else
{
char sNr[20];
sprintf(sNr, ": %2d", m_current + 1);
tmp = g_Locale->getText(LOCALE_AUDIOPLAYER_PLAYING);
tmp += sNr ;
}
int w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(tmp); int w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(tmp);
int xstart = (m_width - w)/2; int xstart = (m_width - w)/2;
@@ -1920,24 +1946,8 @@ void CAudioPlayerGui::paintTitleBox()
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x + xstart, m_y + OFFSET_INNER_SMALL + 1*m_item_height, m_width - OFFSET_INNER_MID - xstart, tmp, COL_MENUHEAD_TEXT); //caption "current track" g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x + xstart, m_y + OFFSET_INNER_SMALL + 1*m_item_height, m_width - OFFSET_INNER_MID - xstart, tmp, COL_MENUHEAD_TEXT); //caption "current track"
// second line (Artist/Title...) // second line (Artist/Title...)
GetMetaData(m_curr_audiofile); getCurrentTitleArtist(&tmp);
if (m_curr_audiofile.MetaData.title.empty())
tmp = m_curr_audiofile.MetaData.artist;
else if (m_curr_audiofile.MetaData.artist.empty())
tmp = m_curr_audiofile.MetaData.title;
else if (g_settings.audioplayer_display == TITLE_ARTIST)
{
tmp = m_curr_audiofile.MetaData.title;
tmp += " - ";
tmp += m_curr_audiofile.MetaData.artist;
}
else //if (g_settings.audioplayer_display == ARTIST_TITLE)
{
tmp = m_curr_audiofile.MetaData.artist;
tmp += " - ";
tmp += m_curr_audiofile.MetaData.title;
}
w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(tmp); w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(tmp);
xstart = (m_width - w)/2; xstart = (m_width - w)/2;
if (xstart < OFFSET_INNER_MID + m_cover_width) if (xstart < OFFSET_INNER_MID + m_cover_width)

3
src/gui/audioplayer.h
View File

@@ -168,6 +168,9 @@ class CAudioPlayerGui : public CMenuTarget
void showMetaData(); void showMetaData();
bool getNumericInput(neutrino_msg_t& msg, int& val); bool getNumericInput(neutrino_msg_t& msg, int& val);
void getCurrentCaption(std::string* text);
void getCurrentTitleArtist(std::string* text);
void addToPlaylist(CAudiofileExt &file); void addToPlaylist(CAudiofileExt &file);
void removeFromPlaylist(long pos); void removeFromPlaylist(long pos);