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

audiometadata: add logo to metadata

Browse Source 
# Conflicts:
#	src/driver/audiometadata.cpp
#	src/driver/audiometadata.h

cherry-picked from 9c58e2fc21

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: b66ea2f9cc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)

Origin message was:
------------------
- audiometadata: add logo to metadata

# Conflicts:
#	src/driver/audiometadata.cpp
#	src/driver/audiometadata.h

cherry-picked from 9c58e2fc21

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-28 19:53:38 +02:00
committed by Thilo Graf
parent a82d0e9e58
commit dc545ddf1d
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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),
logo( src.logo ), url( src.url ),
cover_temporary( false ), cover_temporary( false ),
changed( src.changed ) changed( src.changed )
{ {
@@ -97,9 +98,10 @@ void CAudioMetaData::operator=( const CAudioMetaData& src )
genre = src.genre; genre = src.genre;
track = src.track; track = src.track;
cover = src.cover; cover = src.cover;
logo = src.logo;
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 +127,8 @@ 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();
logo.clear();
url.clear();
cover_temporary=false; cover_temporary=false;
changed=false; changed=false;
} }

2
src/driver/audiometadata.h
View File

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