mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

driver/audiodec: metadata fix

Browse Source
This commit is contained in:
martii
2013-10-20 12:29:40 +02:00
committed by [CST] Focus
parent d5ea074457
commit 5a7b190790
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/driver/audiodec/basedec.cpp
View File

@@ -147,6 +147,9 @@ void CBaseDec::ClearMetaData()
bool CBaseDec::GetMetaDataBase(CAudiofile* const in, const bool nice) bool CBaseDec::GetMetaDataBase(CAudiofile* const in, const bool nice)
{ {
if (in->FileType == CFile::STREAM_AUDIO)
return true;
if (LookupMetaData(in)) if (LookupMetaData(in))
return true; return true;

5
src/driver/audiodec/ffmpegdec.cpp
View File

@@ -431,14 +431,17 @@ bool CFfmpegDec::SetMetaData(FILE *_in, CFile::FileType ft, CAudioMetaData* m)
total_time = 8 * m->filesize / bitrate; total_time = 8 * m->filesize / bitrate;
meta_data_valid = true; meta_data_valid = true;
m->changed = true;
} }
if (!is_stream) {
m->title = title; m->title = title;
m->artist = artist; m->artist = artist;
m->date = date; m->date = date;
m->album = album; m->album = album;
m->genre = genre; m->genre = genre;
m->type_info = type_info;
m->total_time = total_time; m->total_time = total_time;
}
m->type_info = type_info;
m->bitrate = bitrate; m->bitrate = bitrate;
m->samplerate = samplerate; m->samplerate = samplerate;

23
src/driver/audioplay.cpp
View File

@@ -42,6 +42,7 @@
#include <neutrino.h> #include <neutrino.h>
#include <driver/audioplay.h> #include <driver/audioplay.h>
#include <driver/netfile.h> #include <driver/netfile.h>
#include <eitd/edvbstring.h> // UTF8
void CAudioPlayer::stop() void CAudioPlayer::stop()
{ {
@@ -169,24 +170,30 @@ void CAudioPlayer::sc_callback(void *arg)
{ {
bool changed=false; bool changed=false;
CSTATE *stat = (CSTATE*)arg; CSTATE *stat = (CSTATE*)arg;
if(m_Audiofile.MetaData.artist != stat->artist)
const std::string artist = convertLatin1UTF8(stat->artist);
const std::string title = convertLatin1UTF8(stat->title);
const std::string station = convertLatin1UTF8(stat->station);
const std::string genre = convertLatin1UTF8(stat->genre);
if(m_Audiofile.MetaData.artist != artist)
{ {
m_Audiofile.MetaData.artist = stat->artist; m_Audiofile.MetaData.artist = artist;
changed=true; changed=true;
} }
if (m_Audiofile.MetaData.title != stat->title) if (m_Audiofile.MetaData.title != title)
{ {
m_Audiofile.MetaData.title = stat->title; m_Audiofile.MetaData.title = title;
changed=true; changed=true;
} }
if (m_Audiofile.MetaData.sc_station != stat->station) if (m_Audiofile.MetaData.sc_station != station)
{ {
m_Audiofile.MetaData.sc_station = stat->station; m_Audiofile.MetaData.sc_station = station;
changed=true; changed=true;
} }
if (m_Audiofile.MetaData.genre != stat->genre) if (m_Audiofile.MetaData.genre != genre)
{ {
m_Audiofile.MetaData.genre = stat->genre; m_Audiofile.MetaData.genre = genre;
changed=true; changed=true;
} }
if(changed) if(changed)