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

audioplayer: add url to metadata

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: eaabd0ca48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

Origin message was:
------------------
- audioplayer: add url to metadata

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-18 23:00:12 +02:00
parent 7e214a917c
commit a37ea12a57
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/audiometadata.cpp
View File

@@ -64,6 +64,7 @@ CAudioMetaData::CAudioMetaData( const CAudioMetaData& src )
hasInfoOrXingTag( src.hasInfoOrXingTag ), artist( src.artist ), hasInfoOrXingTag( src.hasInfoOrXingTag ), artist( src.artist ),
title( src.title ), album( src.album ), sc_station( src.sc_station ), title( src.title ), album( src.album ), sc_station( src.sc_station ),
date( src.date ), genre( src.genre ), track( src.track ),cover(src.cover), date( src.date ), genre( src.genre ), track( src.track ),cover(src.cover),
url( src.url ),
cover_temporary( false ), cover_temporary( false ),
changed( src.changed ) changed( src.changed )
{ {
@@ -97,9 +98,9 @@ void CAudioMetaData::operator=( const CAudioMetaData& src )
genre = src.genre; genre = src.genre;
track = src.track; track = src.track;
cover = src.cover; cover = src.cover;
url = src.url;
sc_station = src.sc_station; sc_station = src.sc_station;
changed = src.changed; changed = src.changed;
changed = src.changed;
cover_temporary = false; cover_temporary = false;
} }
@@ -125,6 +126,7 @@ void CAudioMetaData::clear()
if (cover_temporary && !cover.empty()) if (cover_temporary && !cover.empty())
unlink(cover.c_str()); unlink(cover.c_str());
cover.clear(); cover.clear();
url.clear();
cover_temporary=false; cover_temporary=false;
changed=false; changed=false;
} }

1
src/driver/audiometadata.h
View File

@@ -96,6 +96,7 @@ public:
std::string genre; std::string genre;
std::string track; std::string track;
std::string cover; std::string cover;
std::string url;
bool cover_temporary; bool cover_temporary;
bool changed; bool changed;
}; };

3
src/gui/audioplayer.cpp
View File

@@ -1024,7 +1024,6 @@ bool CAudioPlayerGui::shufflePlaylist(void)
void CAudioPlayerGui::addUrl2Playlist(const char *url, const char *name, const time_t bitrate) void CAudioPlayerGui::addUrl2Playlist(const char *url, const char *name, const time_t bitrate)
{ {
CAudiofileExt mp3(url, CFile::STREAM_AUDIO); CAudiofileExt mp3(url, CFile::STREAM_AUDIO);
//tmp = tmp.substr(0,tmp.length()-4); //remove .url
//printf("[addUrl2Playlist], name = %s, url = %s\n", name, url); //printf("[addUrl2Playlist], name = %s, url = %s\n", name, url);
if (name != NULL) if (name != NULL)
{ {
@@ -1040,6 +1039,8 @@ void CAudioPlayerGui::addUrl2Playlist(const char *url, const char *name, const t
else else
mp3.MetaData.total_time = 0; mp3.MetaData.total_time = 0;
mp3.MetaData.url = url;
if (url[0] != '#') if (url[0] != '#')
addToPlaylist(mp3); addToPlaylist(mp3);
} }