diff options
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | dxr3audiodecoder.c | 4 | ||||
| -rw-r--r-- | dxr3multichannelaudio.c | 2 | ||||
| -rw-r--r-- | dxr3tools.h | 2 | ||||
| -rw-r--r-- | dxr3vdrincludes.h | 1 |
5 files changed, 6 insertions, 7 deletions
@@ -251,8 +251,8 @@ NOTE: I havent found time to include all of the languages, will be done in pre2 - extended cDxr3MemcpyBench::Rdtsc(uint32_t config_flags): support for non-x86 archs, support for cpu's, which dont support rdtsc timing (Christian Gmeiner) -- using now std::string instead of namespace std - (bug #1044069, Christian Gmeiner) +- use std:: instead of namespace std + (bug #1044069, Christian Gmeiner, Ville Skyttä) - removed extra log commands in dxr3outputthread.c (Christian Gmeiner) - fixed #includes: moved #include "dxr3osd.h" from dxr3interface.h to dxr3interface.c, removed not needed #includes (Christian Gmeiner) diff --git a/dxr3audiodecoder.c b/dxr3audiodecoder.c index 25ccd31..e341e2a 100644 --- a/dxr3audiodecoder.c +++ b/dxr3audiodecoder.c @@ -110,7 +110,7 @@ void cDxr3AudioDecoder::Decode(const uint8_t* buf, int length, uint32_t pts, cDx if ((buf[i+2] & 0xFC) != (lastHeader[2] & 0xFC)) { cLog::Instance() << "cDxr3AudioDecoder::Decode Found different audio header -> init\n"; - cLog::Instance() << "cDxr3AduioDecoder::Decode Old header 0x" << hex << *((uint32_t*) lastHeader) << " new header 0x" << *((uint32_t*) (buf+i))<< dec << "\n"; + cLog::Instance() << "cDxr3AudioDecoder::Decode Old header 0x" << std::hex << *((uint32_t*) lastHeader) << " new header 0x" << *((uint32_t*) (buf+i)) << std::dec << "\n"; Init(); lastHeader[0] = buf[i]; @@ -255,7 +255,7 @@ void cDxr3AudioDecoder::DecodeAc3Dts(const uint8_t* pPes, const uint8_t* buf, in for (int i = 0; i < pFrame->Count() - pesHeaderLength - LPCM_HEADER_LENGTH; i += 2) { - swap(pData[i], pData[i + 1]); + std::swap(pData[i], pData[i + 1]); } aBuf.Push(pFrame->Data() + pesHeaderLength + LPCM_HEADER_LENGTH, pFrame->Count() - pesHeaderLength - 7, tempPes.GetPts()); diff --git a/dxr3multichannelaudio.c b/dxr3multichannelaudio.c index 7a301ac..1f1471d 100644 --- a/dxr3multichannelaudio.c +++ b/dxr3multichannelaudio.c @@ -176,7 +176,7 @@ void cAudioEncapsulator::PutData(const uchar *data, int len) if(!muteData) { if(!frameData) DEBUG("PutData() without frame\n"); while (frameData && len > 0) { - int l = std::min(len,frameCount); + int l = std::min(len,frameCount); if(data) { memcpy(frameData,data,l); data += l; diff --git a/dxr3tools.h b/dxr3tools.h index dd96ebb..1cb1575 100644 --- a/dxr3tools.h +++ b/dxr3tools.h @@ -92,7 +92,7 @@ namespace Tools // ================================== //! write a string via vdr to OSD - inline void WriteInfoToOsd(string x) + inline void WriteInfoToOsd(std::string x) { #if VDRVERSNUM <= 10306 Interface->Info(x.c_str()); diff --git a/dxr3vdrincludes.h b/dxr3vdrincludes.h index 02f2211..c3d8e17 100644 --- a/dxr3vdrincludes.h +++ b/dxr3vdrincludes.h @@ -26,7 +26,6 @@ #include <string> #include <algorithm> #include <vector> -using namespace std; #ifndef __STL_CONFIG_H #define __STL_CONFIG_H |