Commit Graph

8 Commits

Author SHA1 Message Date
vanhofen
dc545ddf1d 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>


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
2017-06-28 20:35:19 +02:00
Jacek Jendrzej
bac423a519 src/driver/audiometadata.cpp init cover_temporary
Origin commit data
------------------
Branch: ni/coolstream
Commit: 582051b9a1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-10 (Fri, 10 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-10 20:33:28 +01:00
Michael Liebmann
b9b4cb6dea audiodecoder: Fix compile with ENABLE_FFMPEGDEC
Origin commit data
------------------
Branch: ni/coolstream
Commit: 944dac5a67
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-22 (Sun, 22 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-23 08:45:18 +01:00
[CST] Focus
6aa17d2ae9 driver/audiodec: get back old audio decoders code, use configure option ENABLE_FFMPEGDEC
to switch between old code and ffmpegdec


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cb07d75d9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-15 (Sun, 15 Dec 2013)



------------------
This commit was generated by Migit
2013-12-15 14:46:45 +04:00
[CST] Focus
a9344c2cec driver/audiodec/ffmpegdec.cpp, driver/audiometadata.cpp: fix compile
Origin commit data
------------------
Branch: ni/coolstream
Commit: 38ca5c4f38
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-02 (Mon, 02 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-15 14:40:54 +04:00
martii
7f0c91d25d driver/audiodec,audiometadata: cover file handling fixed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 579ca91889
Author: martii <m4rtii@gmx.de>
Date: 2013-11-12 (Tue, 12 Nov 2013)


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

------------------
This commit was generated by Migit
2013-12-15 14:40:54 +04:00
vanhofen
8fee7926c9 audioplayer: show cover from id3-tag or folder.jpg in header
if exist a file called folder.jpg in same dir as the audiofile
 or a audiocover is defined in id3-tag it will be displayed in header.

 cover in tag is preferred.

 ported from mohusch. original patch by tangocash. thx!


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe07423ad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)

Origin message was:
------------------
- audioplayer: show cover from id3-tag or folder.jpg in header

 if exist a file called folder.jpg in same dir as the audiofile
 or a audiocover is defined in id3-tag it will be displayed in header.

 cover in tag is preferred.

 ported from mohusch. original patch by tangocash. thx!


------------------
This commit was generated by Migit
2013-11-09 18:34:09 +01:00
mrcolor
bcecfb6585 our current experimental Neutrino branch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)



------------------
This commit was generated by Migit
2009-12-08 11:05:11 +00:00