mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

audioplayer: allow logos for internet radio stations ...

Browse Source 
Syntax in radio-stations.xml or radio-favorites.xml:

<station
 url="http://url/to/the/station"
 name="Name of the station"
 logo="http://url/to/the/logo"
/>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9c115bec03
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-27 (Tue, 27 Jun 2017)

Origin message was:
------------------
- audioplayer: allow logos for internet radio stations ...

Syntax in radio-stations.xml or radio-favorites.xml:

<station
    url="http://url/to/the/station"
    name="Name of the station"
    logo="http://url/to/the/logo"
/>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-27 23:45:57 +02:00
parent 937977f913
commit 9c58e2fc21
2 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/gui/audioplayer.cpp
View File

@@ -61,6 +61,7 @@ extern CPictureViewer * g_PicViewer;
#include <gui/infoclock.h> #include <gui/infoclock.h>
#include <system/settings.h> #include <system/settings.h>
#include <system/helpers.h> #include <system/helpers.h>
#include <system/httptool.h>
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <algorithm> #include <algorithm>
@@ -1021,19 +1022,23 @@ bool CAudioPlayerGui::shufflePlaylist(void)
return(result); return(result);
} }
void CAudioPlayerGui::addUrl2Playlist(const char *url, const char *name, const time_t bitrate) void CAudioPlayerGui::addUrl2Playlist(const char *url, const char *name, const char *logo, const time_t bitrate)
{ {
CAudiofileExt mp3(url, CFile::STREAM_AUDIO); CAudiofileExt mp3(url, CFile::STREAM_AUDIO);
//printf("[addUrl2Playlist], name = %s, url = %s\n", name, url); //printf("[addUrl2Playlist], name = %s, url = %s\n", name, url);
if (name != NULL) if (name != NULL)
{
mp3.MetaData.title = name; mp3.MetaData.title = name;
}
else else
{ {
std::string tmp = mp3.Filename.substr(mp3.Filename.rfind('/')+1); std::string filename = mp3.Filename.substr(mp3.Filename.rfind('/') + 1);
mp3.MetaData.title = tmp; mp3.MetaData.title = filename;
} }
if (logo != NULL)
mp3.MetaData.logo = logo;
else
mp3.MetaData.logo.clear();
if (bitrate) if (bitrate)
mp3.MetaData.total_time = bitrate; mp3.MetaData.total_time = bitrate;
else else
@@ -1045,7 +1050,7 @@ void CAudioPlayerGui::addUrl2Playlist(const char *url, const char *name, const t
addToPlaylist(mp3); addToPlaylist(mp3);
} }
void CAudioPlayerGui::processPlaylistUrl(const char *url, const char *name, const time_t tim) void CAudioPlayerGui::processPlaylistUrl(const char *url, const char *name, const char *logo, const time_t tim)
{ {
CURL *curl_handle; CURL *curl_handle;
struct MemoryStruct chunk; struct MemoryStruct chunk;
@@ -1120,7 +1125,7 @@ void CAudioPlayerGui::processPlaylistUrl(const char *url, const char *name, cons
tmp = strchr(line, '\n'); tmp = strchr(line, '\n');
if (tmp != NULL) if (tmp != NULL)
*tmp = '\0'; *tmp = '\0';
addUrl2Playlist(ptr, name, tim); addUrl2Playlist(ptr, name, logo, tim);
} }
} }
} }
@@ -1177,7 +1182,7 @@ void CAudioPlayerGui::readDir_ic(void)
{ {
xmlDocPtr answer_parser = parseXml(answer.c_str()); xmlDocPtr answer_parser = parseXml(answer.c_str());
scanBox->hide(); scanBox->hide();
scanXmlData(answer_parser, "listen_url", "server_name", "bitrate", true); scanXmlData(answer_parser, "listen_url", "server_name", NULL, "bitrate", true);
} }
else else
scanBox->hide(); scanBox->hide();
@@ -1188,10 +1193,10 @@ void CAudioPlayerGui::readDir_ic(void)
void CAudioPlayerGui::scanXmlFile(std::string filename) void CAudioPlayerGui::scanXmlFile(std::string filename)
{ {
xmlDocPtr answer_parser = parseXmlFile(filename.c_str()); xmlDocPtr answer_parser = parseXmlFile(filename.c_str());
scanXmlData(answer_parser, "url", "name"); scanXmlData(answer_parser, "url", "name", "logo");
} }
void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *urltag, const char *nametag, const char *bitratetag, bool usechild) void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *urltag, const char *nametag, const char *logotag, const char *bitratetag, bool usechild)
{ {
#define IC_typetag "server_type" #define IC_typetag "server_type"
@@ -1224,8 +1229,9 @@ void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *urltag, c
while (element && msg != CRCInput::RC_home) while (element && msg != CRCInput::RC_home)
{ {
const char *ptr = NULL; const char *ptr = NULL;
const char *name = NULL;
const char *url = NULL; const char *url = NULL;
const char *name = NULL;
const char *logo = NULL;
time_t bitrate = 0; time_t bitrate = 0;
bool skip = true; bool skip = true;
listPos++; listPos++;
@@ -1243,10 +1249,12 @@ void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *urltag, c
xmlNodePtr child = xmlChildrenNode(element); xmlNodePtr child = xmlChildrenNode(element);
while (child) while (child)
{ {
if (strcmp(xmlGetName(child), nametag) == 0) if (strcmp(xmlGetName(child), urltag) == 0)
name = xmlGetData(child);
else if (strcmp(xmlGetName(child), urltag) == 0)
url = xmlGetData(child); url = xmlGetData(child);
else if (strcmp(xmlGetName(child), nametag) == 0)
name = xmlGetData(child);
else if (strcmp(xmlGetName(child), logotag) == 0)
logo = xmlGetData(child);
else if (strcmp(xmlGetName(child), IC_typetag) == 0) else if (strcmp(xmlGetName(child), IC_typetag) == 0)
type = xmlGetData(child); type = xmlGetData(child);
else if (bitratetag && strcmp(xmlGetName(child), bitratetag) == 0) else if (bitratetag && strcmp(xmlGetName(child), bitratetag) == 0)
@@ -1269,6 +1277,7 @@ void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *urltag, c
{ {
url = xmlGetAttribute(element, urltag); url = xmlGetAttribute(element, urltag);
name = xmlGetAttribute(element, nametag); name = xmlGetAttribute(element, nametag);
logo = xmlGetAttribute(element, logotag);
if (bitratetag) if (bitratetag)
{ {
ptr = xmlGetAttribute(element, bitratetag); ptr = xmlGetAttribute(element, bitratetag);
@@ -1283,13 +1292,12 @@ void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *urltag, c
progress.showStatusMessageUTF(url); progress.showStatusMessageUTF(url);
//printf("Processing %s, %s\n", url, name); //printf("Processing %s, %s\n", url, name);
if (strstr(url, ".m3u") || strstr(url, ".pls")) if (strstr(url, ".m3u") || strstr(url, ".pls"))
processPlaylistUrl(url, name); processPlaylistUrl(url, name, logo);
else else
addUrl2Playlist(url, name, bitrate); addUrl2Playlist(url, name, logo, bitrate);
} }
element = xmlNextNode(element); element = xmlNextNode(element);
g_RCInput->getMsg(&msg, &data, 0); g_RCInput->getMsg(&msg, &data, 0);
} }
progress.hide(); progress.hide();
} }
@@ -1402,7 +1410,7 @@ bool CAudioPlayerGui::openFilebrowser(void)
if (strstr(url, ".m3u") || strstr(url, ".pls")) if (strstr(url, ".m3u") || strstr(url, ".pls"))
processPlaylistUrl(url); processPlaylistUrl(url);
else else
addUrl2Playlist(url, name, duration); addUrl2Playlist(url, name, NULL, duration);
} }
else if ((url = strstr(cLine, "icy://")) != NULL) else if ((url = strstr(cLine, "icy://")) != NULL)
{ {
@@ -1545,7 +1553,7 @@ bool CAudioPlayerGui::openSCbrowser(void)
#endif // LCD_UPDATE #endif // LCD_UPDATE
} }
//printf("processPlaylistUrl(%s, %s)\n", files->Url.c_str(), files->Name.c_str()); //printf("processPlaylistUrl(%s, %s)\n", files->Url.c_str(), files->Name.c_str());
processPlaylistUrl(files->Url.c_str(), files->Name.c_str(), files->Time); processPlaylistUrl(files->Url.c_str(), files->Name.c_str(), NULL, files->Time);
g_RCInput->getMsg(&msg, &data, 0); g_RCInput->getMsg(&msg, &data, 0);
} }
if (m_select_title_by_name) if (m_select_title_by_name)
@@ -1719,12 +1727,54 @@ void CAudioPlayerGui::paintCover()
{ {
const CAudioMetaData meta = CAudioPlayer::getInstance()->getMetaData(); const CAudioMetaData meta = CAudioPlayer::getInstance()->getMetaData();
// try folder.jpg first
std::string cover = m_curr_audiofile.Filename.substr(0, m_curr_audiofile.Filename.rfind('/')) + "/folder.jpg"; std::string cover = m_curr_audiofile.Filename.substr(0, m_curr_audiofile.Filename.rfind('/')) + "/folder.jpg";
bool stationlogo = false;
// try cover from tag
if (!meta.cover.empty()) if (!meta.cover.empty())
cover = meta.cover; cover = meta.cover;
// try station logo
else if (!meta.logo.empty())
{
std::size_t found_url = meta.logo.find("://");
if (found_url != std::string::npos)
{
mkdir(COVERDIR, 0755);
std::string filename(meta.logo);
const size_t last_slash_idx = filename.find_last_of("/");
if (last_slash_idx != std::string::npos)
filename.erase(0, last_slash_idx + 1);
std::string fullname(COVERDIR);
fullname += "/" + filename;
CHTTPTool httptool;
if (httptool.downloadFile(meta.logo, fullname.c_str()))
{
cover = fullname;
stationlogo = true;
}
else
cover.clear();
}
}
if (access(cover.c_str(), F_OK) == 0) if (access(cover.c_str(), F_OK) == 0)
{
g_PicViewer->DisplayImage(cover, m_x + OFFSET_INNER_MID, m_y + OFFSET_INNER_SMALL, m_title_height - 2*OFFSET_INNER_SMALL, m_title_height - 2*OFFSET_INNER_SMALL, m_frameBuffer->TM_NONE); g_PicViewer->DisplayImage(cover, m_x + OFFSET_INNER_MID, m_y + OFFSET_INNER_SMALL, m_title_height - 2*OFFSET_INNER_SMALL, m_title_height - 2*OFFSET_INNER_SMALL, m_frameBuffer->TM_NONE);
/*
Some guys use this covers for the screensaver.
So we need to keep this station-logo until the
stream is stopped.
Until this is coded we delete the station-logo
immediately.
*/
if (stationlogo)
unlink(cover.c_str());
}
} }
void CAudioPlayerGui::paintTitleBox() void CAudioPlayerGui::paintTitleBox()

6
src/gui/audioplayer.h
View File

@@ -161,12 +161,12 @@ class CAudioPlayerGui : public CMenuTarget
/** /**
* Adds an url (shoutcast, ...) to the to the audioplayer playlist * Adds an url (shoutcast, ...) to the to the audioplayer playlist
*/ */
void addUrl2Playlist(const char *url, const char *name = NULL, const time_t bitrate = 0); void addUrl2Playlist(const char *url, const char *name = NULL, const char *logo = NULL, const time_t bitrate = 0);
/** /**
* Adds a url which points to an .m3u format (playlist, ...) to the audioplayer playlist * Adds a url which points to an .m3u format (playlist, ...) to the audioplayer playlist
*/ */
void processPlaylistUrl(const char *url, const char *name = NULL, const time_t bitrate = 0); void processPlaylistUrl(const char *url, const char *name = NULL, const char *logo = NULL, const time_t bitrate = 0);
/** /**
* Loads a given XML file of internet audiostreams or playlists and processes them * Loads a given XML file of internet audiostreams or playlists and processes them
@@ -176,7 +176,7 @@ class CAudioPlayerGui : public CMenuTarget
/** /**
* Processes a loaded XML file/data of internet audiostreams or playlists * Processes a loaded XML file/data of internet audiostreams or playlists
*/ */
void scanXmlData(xmlDocPtr answer_parser, const char *urltag, const char *nametag, const char *bitratetag = NULL, bool usechild = false); void scanXmlData(xmlDocPtr answer_parser, const char *urltag, const char *nametag, const char *logotag = NULL, const char *bitratetag = NULL, bool usechild = false);
/** /**
* Reads the icecast directory (XML file) and calls scanXmlData * Reads the icecast directory (XML file) and calls scanXmlData