remove duplicate defines and remove trailing ";"

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5408 10f7b99b-c216-0410-bff0-8a66a9350fd8

11 files changed, 80 insertions, 89 deletions

diff --git a/src/DSUtil/DSUtil.h b/src/DSUtil/DSUtil.h
index f7caf057b..a19bcf994 100644
--- a/src/DSUtil/DSUtil.h
+++ b/src/DSUtil/DSUtil.h
@@ -243,6 +243,11 @@ public:
     if (_fs == State_Running && _pMS)                                                                       \

         _pMC->Run();

 

+#define CallQueue(call)                  \

+    if (!m_pOutputQueue) return NOERROR; \

+    m_pOutputQueue->##call;              \

+    return NOERROR;

+

 #define QI(i)  (riid == __uuidof(i)) ? GetInterface((i*)this, ppv) :

 #define QI2(i) (riid == IID_##i) ? GetInterface((i*)this, ppv) :

 

diff --git a/src/Subtitles/VobSubFile.cpp b/src/Subtitles/VobSubFile.cpp
index e8c04d1a2..8e55130b1 100644
--- a/src/Subtitles/VobSubFile.cpp
+++ b/src/Subtitles/VobSubFile.cpp
@@ -877,12 +877,6 @@ bool CVobSubFile::ReadRar(CString fn)
     return true;

 }

 

-#define ReadBEdw(var)             \

-    f.Read(&((BYTE*)&var)[3], 1); \

-    f.Read(&((BYTE*)&var)[2], 1); \

-    f.Read(&((BYTE*)&var)[1], 1); \

-    f.Read(&((BYTE*)&var)[0], 1);

-

 bool CVobSubFile::ReadIfo(CString fn)

 {

     CFile f;

@@ -895,12 +889,12 @@ bool CVobSubFile::ReadIfo(CString fn)
     f.Seek(0xc0 + 0x0c, SEEK_SET);

 

     DWORD pos;

-    ReadBEdw(pos);

+    ReadBEdw(pos)

 

     f.Seek(pos * 0x800 + 0x0c, CFile::begin);

 

     DWORD offset;

-    ReadBEdw(offset);

+    ReadBEdw(offset)

 

     /* Subpic palette */

 

diff --git a/src/Subtitles/VobSubFile.h b/src/Subtitles/VobSubFile.h
index ef16df5f4..277f9bb92 100644
--- a/src/Subtitles/VobSubFile.h
+++ b/src/Subtitles/VobSubFile.h
@@ -29,6 +29,19 @@
 

 #define VOBSUBIDXVER 7

 

+#define ReadBEb(var)              \

+    f.Read(&((BYTE*)&var)[0], 1);

+

+#define ReadBEw(var)              \

+    f.Read(&((BYTE*)&var)[1], 1); \

+    f.Read(&((BYTE*)&var)[0], 1);

+

+#define ReadBEdw(var)             \

+    f.Read(&((BYTE*)&var)[3], 1); \

+    f.Read(&((BYTE*)&var)[2], 1); \

+    f.Read(&((BYTE*)&var)[1], 1); \

+    f.Read(&((BYTE*)&var)[0], 1);

+

 extern CString FindLangFromId(WORD id);

 

 class CVobSubSettings

diff --git a/src/Subtitles/VobSubFileRipper.cpp b/src/Subtitles/VobSubFileRipper.cpp
index 859f6e27d..211c30e35 100644
--- a/src/Subtitles/VobSubFileRipper.cpp
+++ b/src/Subtitles/VobSubFileRipper.cpp
@@ -22,6 +22,7 @@
  */

 

 #include "stdafx.h"

+#include "VobSubFile.h"

 #include "VobSubFileRipper.h"

 #include "../DeCSS/VobDec.h"

 #include "CCDecoder.h"

@@ -106,19 +107,6 @@ void CVobSubFileRipper::Finished(bool fSucceeded)
     m_pCallback->OnFinished(fSucceeded);

 }

 

-#define ReadBEb(var)              \

-    f.Read(&((BYTE*)&var)[0], 1);

-

-#define ReadBEw(var)              \

-    f.Read(&((BYTE*)&var)[1], 1); \

-    f.Read(&((BYTE*)&var)[0], 1);

-

-#define ReadBEdw(var)             \

-    f.Read(&((BYTE*)&var)[3], 1); \

-    f.Read(&((BYTE*)&var)[2], 1); \

-    f.Read(&((BYTE*)&var)[1], 1); \

-    f.Read(&((BYTE*)&var)[0], 1);

-

 bool CVobSubFileRipper::LoadIfo(CString fn)

 {

     CString str;

@@ -153,11 +141,11 @@ bool CVobSubFileRipper::LoadIfo(CString fn)
     memset(ids, 0, sizeof(ids));

 

     int len = 0;

-    ReadBEw(len);

+    ReadBEw(len)

 

     for (ptrdiff_t i = 0; i < len; i++) {

         f.Seek(2, CFile::current); // 01 00 ?

-        ReadBEw(ids[i]);

+        ReadBEw(ids[i])

         if (ids[i] == 0) {

             ids[i] = '--';

         }

@@ -187,12 +175,12 @@ bool CVobSubFileRipper::LoadIfo(CString fn)
 

         DWORD pgcpos;

         f.Seek(0xc0 + 0x0c, CFile::begin);

-        ReadBEdw(pgcpos);

+        ReadBEdw(pgcpos)

         pgcpos *= 0x800;

 

         WORD nPGC;

         f.Seek(pgcpos, CFile::begin);

-        ReadBEw(nPGC);

+        ReadBEw(nPGC)

 

         m_rd.pgcs.RemoveAll();

         m_rd.pgcs.SetCount(nPGC);

@@ -201,13 +189,13 @@ bool CVobSubFileRipper::LoadIfo(CString fn)
             PGC& pgc = m_rd.pgcs[i];

 

             f.Seek(pgcpos + 8 + i * 8 + 4, CFile::begin);

-            ReadBEdw(offset);

+            ReadBEdw(offset)

             offset += pgcpos;

 

             BYTE nProgs, nCells;

             f.Seek(offset + 2, CFile::begin);

-            ReadBEb(nProgs);

-            ReadBEb(nCells);

+            ReadBEb(nProgs)

+            ReadBEb(nCells)

 

             //

 

@@ -262,11 +250,11 @@ bool CVobSubFileRipper::LoadIfo(CString fn)
 

             WORD progoff, celladdroff, vobcelloff;

             f.Seek(offset + 0xe6, CFile::begin);

-            ReadBEw(progoff);

+            ReadBEw(progoff)

             f.Seek(offset + 0xe8, CFile::begin);

-            ReadBEw(celladdroff);

+            ReadBEw(celladdroff)

             f.Seek(offset + 0xea, CFile::begin);

-            ReadBEw(vobcelloff);

+            ReadBEw(vobcelloff)

 

             //

 

@@ -284,8 +272,8 @@ bool CVobSubFileRipper::LoadIfo(CString fn)
 

             f.Seek(offset + vobcelloff, CFile::begin);

             for (size_t j = 0; j < nCells; j++) {

-                ReadBEw(pgc.angles[0][j].vob);

-                ReadBEw(pgc.angles[0][j].cell);

+                ReadBEw(pgc.angles[0][j].vob)

+                ReadBEw(pgc.angles[0][j].cell)

             }

 

             //

@@ -299,7 +287,7 @@ bool CVobSubFileRipper::LoadIfo(CString fn)
             f.Seek(offset + celladdroff, CFile::begin);

             for (size_t j = 0; j < nCells; j++) {

                 BYTE b;

-                ReadBEb(b);

+                ReadBEb(b)

                 switch (b >> 6) {

                     case 0:

                         iAngle = 0;

@@ -318,10 +306,10 @@ bool CVobSubFileRipper::LoadIfo(CString fn)
                 pgc.nAngles = max(pgc.nAngles, iAngle);

 

                 f.Seek(3, CFile::current);

-                ReadBEdw(pgc.angles[0][j].tTime);

-                ReadBEdw(pgc.angles[0][j].start);

+                ReadBEdw(pgc.angles[0][j].tTime)

+                ReadBEdw(pgc.angles[0][j].start)

                 f.Seek(8, CFile::current);

-                ReadBEdw(pgc.angles[0][j].end);

+                ReadBEdw(pgc.angles[0][j].end)

 

                 float fps;

                 switch ((pgc.angles[0][j].tTime >> 6) & 0x3) {

diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
index 656a0f753..6eef4d081 100644
--- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
+++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
@@ -932,20 +932,20 @@ HRESULT CRealMediaSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p)
     var = (var << 8) | (*pIn++); \

     var = (var << 8) | (*pIn++);

 

-                GetWORD(packetlen);

+                GetWORD(packetlen)

                 if (packetlen & 0x8000) {

                     m_segments.fMerged = true;

                 }

                 if ((packetlen & 0x4000) == 0) {

-                    GetWORD(packetlen);

+                    GetWORD(packetlen)

                     packetlen &= 0x3fffffff;

                 } else {

                     packetlen &= 0x3fff;

                 }

 

-                GetWORD(packetoffset);

+                GetWORD(packetoffset)

                 if ((packetoffset & 0x4000) == 0) {

-                    GetWORD(packetoffset);

+                    GetWORD(packetoffset)

                     packetoffset &= 0x3fffffff;

                 } else {

                     packetoffset &= 0x3fff;

@@ -1539,17 +1539,17 @@ void CRMFile::GetDimensions()
     var = (var << 8) | (*p++); \

     var = (var << 8) | (*p++);

 

-                    GetWORD(packetlen);

+                    GetWORD(packetlen)

                     if ((packetlen & 0x4000) == 0) {

-                        GetWORD(packetlen);

+                        GetWORD(packetlen)

                         packetlen &= 0x3fffffff;

                     } else {

                         packetlen &= 0x3fff;

                     }

 

-                    GetWORD(packetoffset);

+                    GetWORD(packetoffset)

                     if ((packetoffset & 0x4000) == 0) {

-                        GetWORD(packetoffset);

+                        GetWORD(packetoffset)

                         packetoffset &= 0x3fffffff;

                     } else {

                         packetoffset &= 0x3fff;

diff --git a/src/filters/transform/BufferFilter/BufferFilter.cpp b/src/filters/transform/BufferFilter/BufferFilter.cpp
index c087d26ed..20e3dd2af 100644
--- a/src/filters/transform/BufferFilter/BufferFilter.cpp
+++ b/src/filters/transform/BufferFilter/BufferFilter.cpp
@@ -351,27 +351,22 @@ HRESULT CBufferFilterOutputPin::Deliver(IMediaSample* pMediaSample)
     return m_pOutputQueue->Receive(pMediaSample);

 }

 

-#define CallQueue(call)                  \

-    if (!m_pOutputQueue) return NOERROR; \

-    m_pOutputQueue->##call;              \

-    return NOERROR;

-

 HRESULT CBufferFilterOutputPin::DeliverEndOfStream()

 {

-    CallQueue(EOS());

+    CallQueue(EOS())

 }

 

 HRESULT CBufferFilterOutputPin::DeliverBeginFlush()

 {

-    CallQueue(BeginFlush());

+    CallQueue(BeginFlush())

 }

 

 HRESULT CBufferFilterOutputPin::DeliverEndFlush()

 {

-    CallQueue(EndFlush());

+    CallQueue(EndFlush())

 }

 

 HRESULT CBufferFilterOutputPin::DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)

 {

-    CallQueue(NewSegment(tStart, tStop, dRate));

+    CallQueue(NewSegment(tStart, tStop, dRate))

 }

diff --git a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
index 638173c46..09e0ed461 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
+++ b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
@@ -33,13 +33,14 @@
 #include "FfmpegContext.h"

 

 #define MAX_RETRY_ON_PENDING    50

-#define DO_DXVA_PENDING_LOOP(x) nTry = 0;                                             \

-                                while (FAILED(hr = x) && nTry < MAX_RETRY_ON_PENDING) \

-                                {                                                     \

-                                    if (hr != E_PENDING) break;                       \

-                                    Sleep(3);                                         \

-                                    nTry++;                                           \

-                                }

+#define DO_DXVA_PENDING_LOOP(x)                           \

+    nTry = 0;                                             \

+    while (FAILED(hr = x) && nTry < MAX_RETRY_ON_PENDING) \

+    {                                                     \

+        if (hr != E_PENDING) break;                       \

+        Sleep(3);                                         \

+        nTry++;                                           \

+    }

 

 CDXVADecoder::CDXVADecoder(CMPCVideoDecFilter* pFilter, IAMVideoAccelerator*  pAMVideoAccelerator, DXVAMode nMode, int nPicEntryNumber)

 {

@@ -400,7 +401,7 @@ HRESULT CDXVADecoder::FindFreeDXVA1Buffer(DWORD dwTypeIndex, DWORD& dwBufferInde
     int nTry = 0;

 

     dwBufferIndex = 0; //(dwBufferIndex + 1) % m_ComBufferInfo[DXVA_PICTURE_DECODE_BUFFER].dwNumCompBuffers;

-    DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->QueryRenderStatus((DWORD) - 1, dwBufferIndex, 0));

+    DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->QueryRenderStatus((DWORD) - 1, dwBufferIndex, 0))

 

     return hr;

 }

@@ -421,7 +422,7 @@ HRESULT CDXVADecoder::BeginFrame(int nSurfaceIndex, IMediaSample* pSampleToDeliv
                 BeginFrameInfo.dwSizeOutputData = 0;

                 BeginFrameInfo.pOutputData = NULL;

 

-                DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->BeginFrame(&BeginFrameInfo));

+                DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->BeginFrame(&BeginFrameInfo))

 

                 ASSERT(SUCCEEDED(hr));

                 if (SUCCEEDED(hr)) {

@@ -436,7 +437,7 @@ HRESULT CDXVADecoder::BeginFrame(int nSurfaceIndex, IMediaSample* pSampleToDeliv
                 if (pSampleService) {

                     hr = pSampleService->GetService(MR_BUFFER_SERVICE, __uuidof(IDirect3DSurface9), (void**) &pDecoderRenderTarget);

                     if (SUCCEEDED(hr)) {

-                        DO_DXVA_PENDING_LOOP(m_pDirectXVideoDec->BeginFrame(pDecoderRenderTarget, NULL));

+                        DO_DXVA_PENDING_LOOP(m_pDirectXVideoDec->BeginFrame(pDecoderRenderTarget, NULL))

                     }

                 }

             }

diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp
index 356031d2e..e0d5b4131 100644
--- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp
+++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp
@@ -2189,7 +2189,7 @@ HRESULT CMpaDecFilter::DeliverFFmpeg(enum CodecID nCodecId, BYTE* p, int buffsiz
     }

     //

     else {

-        COPY_TO_BUFFER(p, buffsize);

+        COPY_TO_BUFFER(p, buffsize)

         pDataBuff = m_pFFBuffer;

     }

 

diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
index bad4f4bd9..cbc68add6 100644
--- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
+++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
@@ -1555,29 +1555,24 @@ HRESULT CMpeg2DecOutputPin::Deliver(IMediaSample* pMediaSample)
     return m_pOutputQueue->Receive(pMediaSample);

 }

 

-#define CallQueue(call)                  \

-    if (!m_pOutputQueue) return NOERROR; \

-    m_pOutputQueue->##call;              \

-    return NOERROR;

-

 HRESULT CMpeg2DecOutputPin::DeliverEndOfStream()

 {

-    CallQueue(EOS());

+    CallQueue(EOS())

 }

 

 HRESULT CMpeg2DecOutputPin::DeliverBeginFlush()

 {

-    CallQueue(BeginFlush());

+    CallQueue(BeginFlush())

 }

 

 HRESULT CMpeg2DecOutputPin::DeliverEndFlush()

 {

-    CallQueue(EndFlush());

+    CallQueue(EndFlush())

 }

 

 HRESULT CMpeg2DecOutputPin::DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)

 {

-    CallQueue(NewSegment(tStart, tStop, dRate));

+    CallQueue(NewSegment(tStart, tStop, dRate))

 }

 

 

@@ -1968,7 +1963,7 @@ bool CSubpicInputPin::dvdspu::Parse()
 

     int i, next = datasize;

 

-#define GetWORD (p[i]<<8)|p[i+1]; i += 2

+#define GetWORD (p[i] << 8) | p[i+1]; i += 2

 

     do {

         i = next;

diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp
index b6802a5c5..69417494e 100644
--- a/src/mpc-hc/MainFrm.cpp
+++ b/src/mpc-hc/MainFrm.cpp
@@ -14040,7 +14040,7 @@ bool CMainFrame::BuildGraphVideoAudio(int fVPreview, bool fVCapture, int fAPrevi
         return false;

     }

 

-    SaveMediaState;

+    SaveMediaState

 

     HRESULT hr;

 

@@ -14173,7 +14173,7 @@ bool CMainFrame::BuildGraphVideoAudio(int fVPreview, bool fVCapture, int fAPrevi
     OpenSetupStatsBar();

     OpenSetupStatusBar();

 

-    RestoreMediaState;

+    RestoreMediaState

 

     return true;

 }

diff --git a/src/mpc-hc/Mpeg2SectionData.cpp b/src/mpc-hc/Mpeg2SectionData.cpp
index ab02e975b..da5193eca 100644
--- a/src/mpc-hc/Mpeg2SectionData.cpp
+++ b/src/mpc-hc/Mpeg2SectionData.cpp
@@ -31,11 +31,11 @@
 #define BeginEnumDescriptors(gb, nType, nLength)                       \

     {                                                                  \

         BYTE DescBuffer[256];                                          \

-        int  nLimit = ((int)gb.BitRead(12)) + gb.GetPos();             \

+        int nLimit = ((int)gb.BitRead(12)) + gb.GetPos();              \

         while (gb.GetPos() < nLimit)                                   \

         {                                                              \

             MPEG2_DESCRIPTOR nType = (MPEG2_DESCRIPTOR)gb.BitRead(8);  \

-            WORD             nLength = (WORD)gb.BitRead(8);

+            WORD nLength = (WORD)gb.BitRead(8);

 

 #define SkipDescriptor(gb, nType, nLength)                             \

     gb.ReadBuffer(DescBuffer, nLength);                                \

@@ -238,7 +238,7 @@ HRESULT CMpeg2DataParser::ParseSDT(ULONG ulFreq)
                     TRACE("%15S %d\n", Channel.GetName(), Channel.GetSID());

                     break;

                 default :

-                    SkipDescriptor(gb, nType, nLength);                     // descriptor()

+                    SkipDescriptor(gb, nType, nLength)                      // descriptor()

                     break;

             }

         }

@@ -306,8 +306,8 @@ HRESULT CMpeg2DataParser::ParsePMT(CDVBChannel& Channel)
     gb.BitRead(3);                                              // reserved

     Channel.SetPCR((ULONG)gb.BitRead(13));                      // PCR_PID

     gb.BitRead(4);                                              // reserved

-    BeginEnumDescriptors(gb, nType, nLength) {              // for (i=0;i<N;i++) {

-        SkipDescriptor(gb, nType, nLength);                     //      descriptor()

+    BeginEnumDescriptors(gb, nType, nLength) {                  // for (i=0;i<N;i++) {

+        SkipDescriptor(gb, nType, nLength)                      // descriptor()

     }

     EndEnumDescriptors

 

@@ -331,11 +331,11 @@ HRESULT CMpeg2DataParser::ParsePMT(CDVBChannel& Channel)
                     break;

                 case DT_AC3_AUDIO :

                     pes_stream_type = AUDIO_STREAM_AC3;

-                    SkipDescriptor(gb, nType, nLength);

+                    SkipDescriptor(gb, nType, nLength)

                     break;

                 case DT_EXTENDED_AC3_AUDIO :

                     pes_stream_type = AUDIO_STREAM_AC3_PLUS;

-                    SkipDescriptor(gb, nType, nLength);

+                    SkipDescriptor(gb, nType, nLength)

                     break;

                 case DT_SUBTITLING : {

                     gb.ReadBuffer(DescBuffer, nLength);

@@ -344,7 +344,7 @@ HRESULT CMpeg2DataParser::ParsePMT(CDVBChannel& Channel)
                 }

                 break;

                 default :

-                    SkipDescriptor(gb, nType, nLength);

+                    SkipDescriptor(gb, nType, nLength)

                     break;

             }

         }

@@ -500,7 +500,7 @@ HRESULT CMpeg2DataParser::ParseEIT(ULONG ulSID, PresentFollowing& NowNext)
                         }

                         break;

                     default:

-                        SkipDescriptor(gb, nType, nLength);

+                        SkipDescriptor(gb, nType, nLength)

                         break;

                 }

             }

@@ -541,8 +541,8 @@ HRESULT CMpeg2DataParser::ParseNIT()
     CheckNoLog(ParseSIHeader(gb, SI_NIT, wSectionLength, wTSID));

 

     gb.BitRead(4);                                              // reserved_future_use

-    BeginEnumDescriptors(gb, nType, nLength) {              // for (i=0;i<N;i++) {

-        SkipDescriptor(gb, nType, nLength);                     //      descriptor()

+    BeginEnumDescriptors(gb, nType, nLength) {                  // for (i=0;i<N;i++) {

+        SkipDescriptor(gb, nType, nLength)                      // descriptor()

     }

     EndEnumDescriptors

 

@@ -568,7 +568,7 @@ HRESULT CMpeg2DataParser::ParseNIT()
                     }

                     break;

                 default :

-                    SkipDescriptor(gb, nType, nLength);

+                    SkipDescriptor(gb, nType, nLength)

                     break;

             }

         }