astyle formatting cleanup to make the sourcecode more accessible

switch used: astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren
http://astyle.sourceforge.net/

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

1 files changed, 57 insertions, 37 deletions

diff --git a/src/filters/reader/CDDAReader/CDDAReader.h b/src/filters/reader/CDDAReader/CDDAReader.h
index d3ac17c0a..15019e76d 100644
--- a/src/filters/reader/CDDAReader/CDDAReader.h
+++ b/src/filters/reader/CDDAReader/CDDAReader.h
@@ -1,4 +1,4 @@
-/* 

+/*

  *	Copyright (C) 2003-2006 Gabest

  *	http://www.gabest.org

  *

@@ -6,15 +6,15 @@
  *  it under the terms of the GNU General Public License as published by

  *  the Free Software Foundation; either version 2, or (at your option)

  *  any later version.

- *   

+ *

  *  This Program is distributed in the hope that it will be useful,

  *  but WITHOUT ANY WARRANTY; without even the implied warranty of

  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

  *  GNU General Public License for more details.

- *   

+ *

  *  You should have received a copy of the GNU General Public License

  *  along with GNU Make; see the file COPYING.  If not, write to

- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 

+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.

  *  http://www.gnu.org/copyleft/gpl.html

  *

  */

@@ -28,77 +28,97 @@
 #include "../asyncreader/asyncio.h"

 #include "../asyncreader/asyncrdr.h"

 

-typedef struct {UINT chunkID; long chunkSize;} ChunkHeader;

+typedef struct

+{

+    UINT chunkID;

+    long chunkSize;

+} ChunkHeader;

 

-#define RIFFID 'FFIR' 

-#define WAVEID 'EVAW' 

-typedef struct {ChunkHeader hdr; UINT WAVE;} RIFFChunk;

+#define RIFFID 'FFIR'

+#define WAVEID 'EVAW'

+typedef struct

+{

+    ChunkHeader hdr;

+    UINT WAVE;

+} RIFFChunk;

 

-#define FormatID ' tmf' 

-typedef struct {ChunkHeader hdr; PCMWAVEFORMAT pcm;} FormatChunk;

+#define FormatID ' tmf'

+typedef struct

+{

+    ChunkHeader hdr;

+    PCMWAVEFORMAT pcm;

+} FormatChunk;

 

 #define DataID 'atad'

-typedef struct {ChunkHeader hdr;} DataChunk;

+typedef struct

+{

+    ChunkHeader hdr;

+} DataChunk;

 

-typedef struct {RIFFChunk riff; FormatChunk frm; DataChunk data;} WAVEChunck;

+typedef struct

+{

+    RIFFChunk riff;

+    FormatChunk frm;

+    DataChunk data;

+} WAVEChunck;

 

 class CCDDAStream : public CAsyncStream

 {

 private:

     CCritSec m_csLock;

 

-	LONGLONG m_llPosition, m_llLength;

+    LONGLONG m_llPosition, m_llLength;

 

-	HANDLE m_hDrive;

-	CDROM_TOC m_TOC;

-	UINT m_nFirstSector, m_nStartSector, m_nStopSector;

+    HANDLE m_hDrive;

+    CDROM_TOC m_TOC;

+    UINT m_nFirstSector, m_nStartSector, m_nStopSector;

 

-	WAVEChunck m_header;

+    WAVEChunck m_header;

 

 public:

-	CCDDAStream();

-	virtual ~CCDDAStream();

+    CCDDAStream();

+    virtual ~CCDDAStream();

 

-	CString m_discTitle, m_trackTitle;

-	CString m_discArtist, m_trackArtist;

+    CString m_discTitle, m_trackTitle;

+    CString m_discArtist, m_trackArtist;

 

-	bool Load(const WCHAR* fnw);

+    bool Load(const WCHAR* fnw);

 

-	// overrides

+    // overrides

     HRESULT SetPointer(LONGLONG llPos);

     HRESULT Read(PBYTE pbBuffer, DWORD dwBytesToRead, BOOL bAlign, LPDWORD pdwBytesRead);

     LONGLONG Size(LONGLONG* pSizeAvailable);

     DWORD Alignment();

     void Lock();

-	void Unlock();

+    void Unlock();

 };

 

 [uuid("54A35221-2C8D-4a31-A5DF-6D809847E393")]

-class CCDDAReader 

-	: public CAsyncReader

-	, public IFileSourceFilter

-	, public IAMMediaContent

+class CCDDAReader

+    : public CAsyncReader

+    , public IFileSourceFilter

+    , public IAMMediaContent

 {

     CCDDAStream m_stream;

-	CStringW m_fn;

+    CStringW m_fn;

 

 public:

     CCDDAReader(IUnknown* pUnk, HRESULT* phr);

-	~CCDDAReader();

+    ~CCDDAReader();

 

-	DECLARE_IUNKNOWN;

+    DECLARE_IUNKNOWN;

     STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

 

-	// IFileSourceFilter

+    // IFileSourceFilter

 

-	STDMETHODIMP Load(LPCOLESTR pszFileName, const AM_MEDIA_TYPE* pmt);

-	STDMETHODIMP GetCurFile(LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt);

+    STDMETHODIMP Load(LPCOLESTR pszFileName, const AM_MEDIA_TYPE* pmt);

+    STDMETHODIMP GetCurFile(LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt);

 

-	// IAMMediaContent

+    // IAMMediaContent

 

     STDMETHODIMP GetTypeInfoCount(UINT* pctinfo);

-	STDMETHODIMP GetTypeInfo(UINT itinfo, LCID lcid, ITypeInfo** pptinfo);

-	STDMETHODIMP GetIDsOfNames(REFIID riid, OLECHAR** rgszNames, UINT cNames, LCID lcid, DISPID* rgdispid);

+    STDMETHODIMP GetTypeInfo(UINT itinfo, LCID lcid, ITypeInfo** pptinfo);

+    STDMETHODIMP GetIDsOfNames(REFIID riid, OLECHAR** rgszNames, UINT cNames, LCID lcid, DISPID* rgdispid);

     STDMETHODIMP Invoke(DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pdispparams, VARIANT* pvarResult, EXCEPINFO* pexcepinfo, UINT* puArgErr);

 

     STDMETHODIMP get_AuthorName(BSTR* pbstrAuthorName);