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

audiodecoder: Fix compile with ENABLE_FFMPEGDEC

Browse Source
This commit is contained in:
M. Liebmann
2013-12-22 01:41:11 +01:00
parent aacc4189a4
commit 944dac5a67
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/driver/audiometadata.cpp
View File

@@ -55,7 +55,10 @@ CAudioMetaData::CAudioMetaData( const CAudioMetaData& src )
: type( src.type ), type_info( src.type_info ), : type( src.type ), type_info( src.type_info ),
filesize( src.filesize ), bitrate( src.bitrate ), filesize( src.filesize ), bitrate( src.bitrate ),
avg_bitrate( src.avg_bitrate ), samplerate( src.samplerate ), avg_bitrate( src.avg_bitrate ), samplerate( src.samplerate ),
layer( src.layer ), mode( src.mode ), total_time( src.total_time ), #ifndef ENABLE_FFMPEGDEC
layer( src.layer ), mode( src.mode ),
#endif
total_time( src.total_time ),
audio_start_pos( src.audio_start_pos ), vbr( src.vbr ), audio_start_pos( src.audio_start_pos ), vbr( src.vbr ),
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 ),
@@ -78,8 +81,10 @@ void CAudioMetaData::operator=( const CAudioMetaData& src )
bitrate = src.bitrate; bitrate = src.bitrate;
avg_bitrate = src.avg_bitrate; avg_bitrate = src.avg_bitrate;
samplerate = src.samplerate; samplerate = src.samplerate;
#ifndef ENABLE_FFMPEGDEC
layer = src.layer; layer = src.layer;
mode = src.mode; mode = src.mode;
#endif
total_time = src.total_time; total_time = src.total_time;
audio_start_pos = src.audio_start_pos; audio_start_pos = src.audio_start_pos;
vbr = src.vbr; vbr = src.vbr;

9
src/driver/audiometadata.h
View File

@@ -36,8 +36,15 @@
#ifndef __AUDIO_METADATA__ #ifndef __AUDIO_METADATA__
#define __AUDIO_METADATA__ #define __AUDIO_METADATA__
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string> #include <string>
#ifndef ENABLE_FFMPEGDEC
#include <mad.h> #include <mad.h>
#endif
class CAudioMetaData class CAudioMetaData
{ {
@@ -69,8 +76,10 @@ public:
unsigned int bitrate; /* overall bitrate, vbr file: current bitrate */ unsigned int bitrate; /* overall bitrate, vbr file: current bitrate */
unsigned int avg_bitrate; /* average bitrate in case of vbr file */ unsigned int avg_bitrate; /* average bitrate in case of vbr file */
unsigned int samplerate; unsigned int samplerate;
#ifndef ENABLE_FFMPEGDEC
enum mad_layer layer; enum mad_layer layer;
enum mad_mode mode; enum mad_mode mode;
#endif
time_t total_time; time_t total_time;
long audio_start_pos; /* position of first audio frame */ long audio_start_pos; /* position of first audio frame */
bool vbr; bool vbr;