diff --git a/src/driver/audiometadata.cpp b/src/driver/audiometadata.cpp index 7dbe1bd08..3a47d33d8 100644 --- a/src/driver/audiometadata.cpp +++ b/src/driver/audiometadata.cpp @@ -64,6 +64,7 @@ CAudioMetaData::CAudioMetaData( const CAudioMetaData& src ) hasInfoOrXingTag( src.hasInfoOrXingTag ), artist( src.artist ), title( src.title ), album( src.album ), sc_station( src.sc_station ), date( src.date ), genre( src.genre ), track( src.track ),cover(src.cover), + url( src.url ), cover_temporary( false ), changed( src.changed ) { @@ -97,9 +98,9 @@ void CAudioMetaData::operator=( const CAudioMetaData& src ) genre = src.genre; track = src.track; cover = src.cover; + url = src.url; sc_station = src.sc_station; changed = src.changed; - changed = src.changed; cover_temporary = false; } @@ -125,6 +126,7 @@ void CAudioMetaData::clear() if (cover_temporary && !cover.empty()) unlink(cover.c_str()); cover.clear(); + url.clear(); cover_temporary=false; changed=false; } diff --git a/src/driver/audiometadata.h b/src/driver/audiometadata.h index 3f25fd79e..be43d5304 100644 --- a/src/driver/audiometadata.h +++ b/src/driver/audiometadata.h @@ -96,6 +96,7 @@ public: std::string genre; std::string track; std::string cover; + std::string url; bool cover_temporary; bool changed; }; diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 03b4a0a9c..e64129ccf 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1024,7 +1024,6 @@ bool CAudioPlayerGui::shufflePlaylist(void) void CAudioPlayerGui::addUrl2Playlist(const char *url, const char *name, const time_t bitrate) { CAudiofileExt mp3(url, CFile::STREAM_AUDIO); - //tmp = tmp.substr(0,tmp.length()-4); //remove .url //printf("[addUrl2Playlist], name = %s, url = %s\n", name, url); if (name != NULL) { @@ -1040,6 +1039,8 @@ void CAudioPlayerGui::addUrl2Playlist(const char *url, const char *name, const t else mp3.MetaData.total_time = 0; + mp3.MetaData.url = url; + if (url[0] != '#') addToPlaylist(mp3); }