revert r1783

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

5 files changed, 333 insertions, 398 deletions

diff --git a/src/filters/reader/CDDAReader/CDDAReader.cpp b/src/filters/reader/CDDAReader/CDDAReader.cpp
index 3f83ec737..193451274 100644
--- a/src/filters/reader/CDDAReader/CDDAReader.cpp
+++ b/src/filters/reader/CDDAReader/CDDAReader.cpp
@@ -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

  *

  */

@@ -31,55 +31,55 @@
 

 const AMOVIESETUP_MEDIATYPE sudPinTypesOut[] =

 {

-    {&MEDIATYPE_Stream,	&MEDIASUBTYPE_WAVE},

+	{&MEDIATYPE_Stream,	&MEDIASUBTYPE_WAVE},

 };

 

 const AMOVIESETUP_PIN sudOpPin[] =

 {

-    {L"Output", FALSE, TRUE, FALSE, FALSE, &CLSID_NULL, NULL, countof(sudPinTypesOut), sudPinTypesOut},

+	{L"Output", FALSE, TRUE, FALSE, FALSE, &CLSID_NULL, NULL, countof(sudPinTypesOut), sudPinTypesOut},

 };

 

 const AMOVIESETUP_FILTER sudFilter[] =

 {

-    {&__uuidof(CCDDAReader), L"MPC - CDDA Reader", MERIT_NORMAL, countof(sudOpPin), sudOpPin, CLSID_LegacyAmFilterCategory}

+	{&__uuidof(CCDDAReader), L"MPC - CDDA Reader", MERIT_NORMAL, countof(sudOpPin), sudOpPin, CLSID_LegacyAmFilterCategory}

 };

 

 CFactoryTemplate g_Templates[] =

 {

-    {sudFilter[0].strName, sudFilter[0].clsID, CreateInstance<CCDDAReader>, NULL, &sudFilter[0]}

+	{sudFilter[0].strName, sudFilter[0].clsID, CreateInstance<CCDDAReader>, NULL, &sudFilter[0]}

 };

 

 int g_cTemplates = countof(g_Templates);

 

 STDAPI DllRegisterServer()

 {

-    if(GetVersion() & 0x80000000)

-    {

-        ::MessageBox(NULL, _T("Sorry, this will only run on Windows NT based operating system."), _T("CDDA Reader"), MB_OK);

-        return E_NOTIMPL;

-    }

+	if(GetVersion()&0x80000000)

+	{

+		::MessageBox(NULL, _T("Sorry, this will only run on Windows NT based operating system."), _T("CDDA Reader"), MB_OK);

+		return E_NOTIMPL;

+	}

 

-    SetRegKeyValue(

-        _T("Media Type\\{e436eb83-524f-11ce-9f53-0020af0ba770}"), _T("{54A35221-2C8D-4a31-A5DF-6D809847E393}"),

-        _T("0"), _T("0,4,,52494646,8,4,,43444441")); // "RIFFxxxxCDDA"

+	SetRegKeyValue(

+		_T("Media Type\\{e436eb83-524f-11ce-9f53-0020af0ba770}"), _T("{54A35221-2C8D-4a31-A5DF-6D809847E393}"), 

+		_T("0"), _T("0,4,,52494646,8,4,,43444441")); // "RIFFxxxxCDDA"

 

-    SetRegKeyValue(

-        _T("Media Type\\{e436eb83-524f-11ce-9f53-0020af0ba770}"), _T("{54A35221-2C8D-4a31-A5DF-6D809847E393}"),

-        _T("Source Filter"), _T("{54A35221-2C8D-4a31-A5DF-6D809847E393}"));

+	SetRegKeyValue(

+		_T("Media Type\\{e436eb83-524f-11ce-9f53-0020af0ba770}"), _T("{54A35221-2C8D-4a31-A5DF-6D809847E393}"), 

+		_T("Source Filter"), _T("{54A35221-2C8D-4a31-A5DF-6D809847E393}"));

 

-    SetRegKeyValue(

-        _T("Media Type\\Extensions"), _T(".cda"),

-        _T("Source Filter"), _T("{54A35221-2C8D-4a31-A5DF-6D809847E393}"));

+	SetRegKeyValue(

+		_T("Media Type\\Extensions"), _T(".cda"), 

+		_T("Source Filter"), _T("{54A35221-2C8D-4a31-A5DF-6D809847E393}"));

 

-    return AMovieDllRegisterServer2(TRUE);

+	return AMovieDllRegisterServer2(TRUE);

 }

 

 STDAPI DllUnregisterServer()

 {

-    DeleteRegKey(_T("Media Type\\{e436eb83-524f-11ce-9f53-0020af0ba770}"), _T("{54A35221-2C8D-4a31-A5DF-6D809847E393}"));

-    DeleteRegKey(_T("Media Type\\Extensions"), _T(".cda"));

+	DeleteRegKey(_T("Media Type\\{e436eb83-524f-11ce-9f53-0020af0ba770}"), _T("{54A35221-2C8D-4a31-A5DF-6D809847E393}"));

+	DeleteRegKey(_T("Media Type\\Extensions"), _T(".cda"));

 

-    return AMovieDllRegisterServer2(FALSE);

+	return AMovieDllRegisterServer2(FALSE);

 }

 

 #include "../../FilterApp.h"

@@ -93,15 +93,15 @@ CFilterApp theApp;
 //

 

 CCDDAReader::CCDDAReader(IUnknown* pUnk, HRESULT* phr)

-    : CAsyncReader(NAME("CCDDAReader"), pUnk, &m_stream, phr, __uuidof(this))

+	: CAsyncReader(NAME("CCDDAReader"), pUnk, &m_stream, phr, __uuidof(this))

 {

-    if(phr) *phr = S_OK;

+	if(phr) *phr = S_OK;

 

-    if(GetVersion() & 0x80000000)

-    {

-        if(phr) *phr = E_NOTIMPL;

-        return;

-    }

+	if(GetVersion()&0x80000000)

+	{

+		if(phr) *phr = E_NOTIMPL;

+		return;

+	}

 }

 

 CCDDAReader::~CCDDAReader()

@@ -112,355 +112,310 @@ STDMETHODIMP CCDDAReader::NonDelegatingQueryInterface(REFIID riid, void** ppv)
 {

     CheckPointer(ppv, E_POINTER);

 

-    return

-        QI(IFileSourceFilter)

-        QI2(IAMMediaContent)

-        __super::NonDelegatingQueryInterface(riid, ppv);

+	return 

+		QI(IFileSourceFilter)

+		QI2(IAMMediaContent)

+		__super::NonDelegatingQueryInterface(riid, ppv);

 }

 

 // IFileSourceFilter

 

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

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

 {

-    if(!m_stream.Load(pszFileName))

-        return E_FAIL;

+	if(!m_stream.Load(pszFileName))

+		return E_FAIL;

 

-    m_fn = pszFileName;

+	m_fn = pszFileName;

 

-    CMediaType mt;

-    mt.majortype = MEDIATYPE_Stream;

-    mt.subtype = MEDIASUBTYPE_WAVE;

-    m_mt = mt;

+	CMediaType mt;

+	mt.majortype = MEDIATYPE_Stream;

+	mt.subtype = MEDIASUBTYPE_WAVE;

+	m_mt = mt;

 

-    return S_OK;

+	return S_OK;

 }

 

 STDMETHODIMP CCDDAReader::GetCurFile(LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt)

 {

-    CheckPointer(ppszFileName, E_POINTER);

+	CheckPointer(ppszFileName, E_POINTER);

+	

+	if(!(*ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength()+1)*sizeof(WCHAR))))

+		return E_OUTOFMEMORY;

 

-    if(!(*ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength() + 1) * sizeof(WCHAR))))

-        return E_OUTOFMEMORY;

+	wcscpy(*ppszFileName, m_fn);

 

-    wcscpy(*ppszFileName, m_fn);

-

-    return S_OK;

+	return S_OK;

 }

 

 // IAMMediaContent

 

-STDMETHODIMP CCDDAReader::GetTypeInfoCount(UINT* pctinfo)

-{

-    return E_NOTIMPL;

-}

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

-{

-    return E_NOTIMPL;

-}

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

-{

-    return E_NOTIMPL;

-}

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

-{

-    return E_NOTIMPL;

-}

+STDMETHODIMP CCDDAReader::GetTypeInfoCount(UINT* pctinfo) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::GetTypeInfo(UINT itinfo, LCID lcid, ITypeInfo** pptinfo) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::GetIDsOfNames(REFIID riid, OLECHAR** rgszNames, UINT cNames, LCID lcid, DISPID* rgdispid) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::Invoke(DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pdispparams, VARIANT* pvarResult, EXCEPINFO* pexcepinfo, UINT* puArgErr) {return E_NOTIMPL;}

 

 STDMETHODIMP CCDDAReader::get_AuthorName(BSTR* pbstrAuthorName)

 {

-    CheckPointer(pbstrAuthorName, E_POINTER);

-    CString str = m_stream.m_trackArtist;

-    if(str.IsEmpty()) str = m_stream.m_discArtist;

-    *pbstrAuthorName = str.AllocSysString();

-    return S_OK;

+	CheckPointer(pbstrAuthorName, E_POINTER);

+	CString str = m_stream.m_trackArtist;

+	if(str.IsEmpty()) str = m_stream.m_discArtist;

+	*pbstrAuthorName = str.AllocSysString();

+	return S_OK;

 }

 

 STDMETHODIMP CCDDAReader::get_Title(BSTR* pbstrTitle)

 {

-    CheckPointer(pbstrTitle, E_POINTER);

-    CString str = m_stream.m_trackTitle;

-    if(str.IsEmpty()) str = m_stream.m_discTitle;

-    *pbstrTitle = str.AllocSysString();

-    return S_OK;

-}

-

-STDMETHODIMP CCDDAReader::get_Rating(BSTR* pbstrRating)

-{

-    return E_NOTIMPL;

-}

-STDMETHODIMP CCDDAReader::get_Description(BSTR* pbstrDescription)

-{

-    return E_NOTIMPL;

-}

-STDMETHODIMP CCDDAReader::get_Copyright(BSTR* pbstrCopyright)

-{

-    return E_NOTIMPL;

-}

-STDMETHODIMP CCDDAReader::get_BaseURL(BSTR* pbstrBaseURL)

-{

-    return E_NOTIMPL;

-}

-STDMETHODIMP CCDDAReader::get_LogoURL(BSTR* pbstrLogoURL)

-{

-    return E_NOTIMPL;

-}

-STDMETHODIMP CCDDAReader::get_LogoIconURL(BSTR* pbstrLogoURL)

-{

-    return E_NOTIMPL;

-}

-STDMETHODIMP CCDDAReader::get_WatermarkURL(BSTR* pbstrWatermarkURL)

-{

-    return E_NOTIMPL;

-}

-STDMETHODIMP CCDDAReader::get_MoreInfoURL(BSTR* pbstrMoreInfoURL)

-{

-    return E_NOTIMPL;

-}

-STDMETHODIMP CCDDAReader::get_MoreInfoBannerImage(BSTR* pbstrMoreInfoBannerImage)

-{

-    return E_NOTIMPL;

-}

-STDMETHODIMP CCDDAReader::get_MoreInfoBannerURL(BSTR* pbstrMoreInfoBannerURL)

-{

-    return E_NOTIMPL;

-}

-STDMETHODIMP CCDDAReader::get_MoreInfoText(BSTR* pbstrMoreInfoText)

-{

-    return E_NOTIMPL;

-}

+	CheckPointer(pbstrTitle, E_POINTER);

+	CString str = m_stream.m_trackTitle;

+	if(str.IsEmpty()) str = m_stream.m_discTitle;

+	*pbstrTitle = str.AllocSysString();

+	return S_OK;

+}

+

+STDMETHODIMP CCDDAReader::get_Rating(BSTR* pbstrRating) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::get_Description(BSTR* pbstrDescription) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::get_Copyright(BSTR* pbstrCopyright) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::get_BaseURL(BSTR* pbstrBaseURL) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::get_LogoURL(BSTR* pbstrLogoURL) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::get_LogoIconURL(BSTR* pbstrLogoURL) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::get_WatermarkURL(BSTR* pbstrWatermarkURL) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::get_MoreInfoURL(BSTR* pbstrMoreInfoURL) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::get_MoreInfoBannerImage(BSTR* pbstrMoreInfoBannerImage) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::get_MoreInfoBannerURL(BSTR* pbstrMoreInfoBannerURL) {return E_NOTIMPL;}

+STDMETHODIMP CCDDAReader::get_MoreInfoText(BSTR* pbstrMoreInfoText) {return E_NOTIMPL;}

 

 // CCDDAStream

 

 CCDDAStream::CCDDAStream()

 {

-    m_hDrive = INVALID_HANDLE_VALUE;

-

-    m_llPosition = m_llLength = 0;

-

-    memset(&m_TOC, 0, sizeof(m_TOC));

-    m_nStartSector = m_nStopSector = 0;

-

-    memset(&m_header, 0, sizeof(m_header));

-    m_header.riff.hdr.chunkID = RIFFID;

-    m_header.riff.WAVE = WAVEID;

-    m_header.frm.hdr.chunkID = FormatID;

-    m_header.frm.hdr.chunkSize = sizeof(m_header.frm.pcm);

-    m_header.frm.pcm.wf.wFormatTag = WAVE_FORMAT_PCM;

-    m_header.frm.pcm.wf.nSamplesPerSec = 44100;

-    m_header.frm.pcm.wf.nChannels = 2;

-    m_header.frm.pcm.wBitsPerSample = 16;

-    m_header.frm.pcm.wf.nBlockAlign = m_header.frm.pcm.wf.nChannels * m_header.frm.pcm.wBitsPerSample / 8;

-    m_header.frm.pcm.wf.nAvgBytesPerSec = m_header.frm.pcm.wf.nSamplesPerSec * m_header.frm.pcm.wf.nBlockAlign;

-    m_header.data.hdr.chunkID = DataID;

+	m_hDrive = INVALID_HANDLE_VALUE;

+

+	m_llPosition = m_llLength = 0;

+

+	memset(&m_TOC, 0, sizeof(m_TOC));

+	m_nStartSector = m_nStopSector = 0;

+

+	memset(&m_header, 0, sizeof(m_header));

+	m_header.riff.hdr.chunkID = RIFFID;

+	m_header.riff.WAVE = WAVEID;

+	m_header.frm.hdr.chunkID = FormatID;

+	m_header.frm.hdr.chunkSize = sizeof(m_header.frm.pcm);

+	m_header.frm.pcm.wf.wFormatTag = WAVE_FORMAT_PCM;

+	m_header.frm.pcm.wf.nSamplesPerSec = 44100;

+	m_header.frm.pcm.wf.nChannels = 2;

+	m_header.frm.pcm.wBitsPerSample = 16;

+	m_header.frm.pcm.wf.nBlockAlign = m_header.frm.pcm.wf.nChannels * m_header.frm.pcm.wBitsPerSample / 8;

+	m_header.frm.pcm.wf.nAvgBytesPerSec = m_header.frm.pcm.wf.nSamplesPerSec * m_header.frm.pcm.wf.nBlockAlign;

+	m_header.data.hdr.chunkID = DataID;

 }

 

 CCDDAStream::~CCDDAStream()

 {

-    if(m_hDrive != INVALID_HANDLE_VALUE)

-    {

-        CloseHandle(m_hDrive);

-        m_hDrive = INVALID_HANDLE_VALUE;

-    }

+	if(m_hDrive != INVALID_HANDLE_VALUE)

+	{

+		CloseHandle(m_hDrive);

+		m_hDrive = INVALID_HANDLE_VALUE;

+	}

 }

 

 bool CCDDAStream::Load(const WCHAR* fnw)

 {

-    CString path(fnw);

-

-    int iDriveLetter = path.Find(_T(":\\")) - 1;

-    int iTrackIndex = CString(path).MakeLower().Find(_T(".cda")) - 1;

-    if(iDriveLetter < 0 || iTrackIndex <= iDriveLetter)

-        return(false);

-

-    CString drive = CString(_T("\\\\.\\")) + path[iDriveLetter] + _T(":");

-    while(iTrackIndex > 0 && _istdigit(path[iTrackIndex-1])) iTrackIndex--;

-    if(1 != _stscanf(path.Mid(iTrackIndex), _T("%d"), &iTrackIndex))

-        return(false);

-

-    if(m_hDrive != INVALID_HANDLE_VALUE)

-    {

-        CloseHandle(m_hDrive);

-        m_hDrive = INVALID_HANDLE_VALUE;

-    }

-

-    m_hDrive = CreateFile(drive, GENERIC_READ, FILE_SHARE_READ, NULL,

-                          OPEN_EXISTING, FILE_ATTRIBUTE_READONLY | FILE_FLAG_SEQUENTIAL_SCAN, (HANDLE)NULL);

-    if(m_hDrive == INVALID_HANDLE_VALUE)

-    {

-        return(false);

-    }

-

-    DWORD BytesReturned;

-    if(!DeviceIoControl(m_hDrive, IOCTL_CDROM_READ_TOC, NULL, 0, &m_TOC, sizeof(m_TOC), &BytesReturned, 0)

-       || !(m_TOC.FirstTrack <= iTrackIndex && iTrackIndex <= m_TOC.LastTrack))

-    {

-        CloseHandle(m_hDrive);

-        m_hDrive = INVALID_HANDLE_VALUE;

-        return(false);

-    }

-

-    // MMC-3 Draft Revision 10g: Table 222 – Q Sub-channel control field

-    m_TOC.TrackData[iTrackIndex-1].Control &= 5;

-    if(!(m_TOC.TrackData[iTrackIndex-1].Control == 0 || m_TOC.TrackData[iTrackIndex-1].Control == 1))

-    {

-        CloseHandle(m_hDrive);

-        m_hDrive = INVALID_HANDLE_VALUE;

-        return(false);

-    }

-

-    if(m_TOC.TrackData[iTrackIndex-1].Control & 8)

-        m_header.frm.pcm.wf.nChannels = 4;

-

-    m_nStartSector = MSF2UINT(m_TOC.TrackData[iTrackIndex-1].Address) - 150;//MSF2UINT(m_TOC.TrackData[0].Address);

-    m_nStopSector = MSF2UINT(m_TOC.TrackData[iTrackIndex].Address) - 150;//MSF2UINT(m_TOC.TrackData[0].Address);

-

-    m_llLength = (m_nStopSector - m_nStartSector) * RAW_SECTOR_SIZE;

-

-    m_header.riff.hdr.chunkSize = (long)(m_llLength + sizeof(m_header) - 8);

-    m_header.data.hdr.chunkSize = (long)(m_llLength);

-

-    do

-    {

-        CDROM_READ_TOC_EX TOCEx;

-        memset(&TOCEx, 0, sizeof(TOCEx));

-        TOCEx.Format = CDROM_READ_TOC_EX_FORMAT_CDTEXT;

-        TOCEx.SessionTrack = iTrackIndex;

-        WORD size = 0;

-        ASSERT(MINIMUM_CDROM_READ_TOC_EX_SIZE == sizeof(size));

-        if(!DeviceIoControl(m_hDrive, IOCTL_CDROM_READ_TOC_EX, &TOCEx, sizeof(TOCEx), &size, sizeof(size), &BytesReturned, 0))

-            break;

-

-        size = ((size >> 8) | (size << 8)) + sizeof(size);

-

-        CAutoVectorPtr<BYTE> pCDTextData;

-        pCDTextData.Allocate(size);

-        memset(pCDTextData, 0, size);

-

-        if(!DeviceIoControl(m_hDrive, IOCTL_CDROM_READ_TOC_EX, &TOCEx, sizeof(TOCEx), pCDTextData, size, &BytesReturned, 0))

-            break;

-

-        size = (WORD)(BytesReturned - sizeof(CDROM_TOC_CD_TEXT_DATA));

-        CDROM_TOC_CD_TEXT_DATA_BLOCK* pDesc = ((CDROM_TOC_CD_TEXT_DATA*)(BYTE*)pCDTextData)->Descriptors;

-

-        CStringArray str[16];

-        for(int i = 0; i < 16; i++) str[i].SetSize(1 + m_TOC.LastTrack);

-        CString last;

-

-        for(int i = 0; size >= sizeof(CDROM_TOC_CD_TEXT_DATA_BLOCK); i++, size -= sizeof(CDROM_TOC_CD_TEXT_DATA_BLOCK), pDesc++)

-        {

-            if(pDesc->TrackNumber > m_TOC.LastTrack)

-                continue;

-

-            const int lenU = countof(pDesc->Text);

-            const int lenW = countof(pDesc->WText);

-

-            CString text = !pDesc->Unicode

-                           ? CString(CStringA((CHAR*)pDesc->Text, lenU))

-                           : CString(CStringW((WCHAR*)pDesc->WText, lenW));

-

-            int tlen = text.GetLength();

-            CString tmp = (tlen < 12 - 1)

-                          ? (!pDesc->Unicode

-                             ? CString(CStringA((CHAR*)pDesc->Text + tlen + 1, lenU - (tlen + 1)))

-                             : CString(CStringW((WCHAR*)pDesc->WText + tlen + 1, lenW - (tlen + 1))))

-                              : _T("");

-

-            if((pDesc->PackType -= 0x80) >= 0x10)

-                continue;

-

-            if(pDesc->CharacterPosition == 0)

-            {

-                str[pDesc->PackType][pDesc->TrackNumber] = text;

-            }

-            else if(pDesc->CharacterPosition <= 0xf)

-            {

-                if(pDesc->CharacterPosition < 0xf && last.GetLength() > 0)

-                {

-                    str[pDesc->PackType][pDesc->TrackNumber] = last + text;

-                }

-                else

-                {

-                    str[pDesc->PackType][pDesc->TrackNumber] += text;

-                }

-            }

-

-            last = tmp;

-        }

-

-        m_discTitle = str[0][0];

-        m_trackTitle = str[0][iTrackIndex];

-        m_discArtist = str[1][0];

-        m_trackArtist = str[1][iTrackIndex];

-    }

-    while(0);

-

-

-    return(true);

+	CString path(fnw);

+

+	int iDriveLetter = path.Find(_T(":\\"))-1;

+	int iTrackIndex = CString(path).MakeLower().Find(_T(".cda"))-1;

+	if(iDriveLetter < 0 || iTrackIndex <= iDriveLetter)

+		return(false);

+

+	CString drive = CString(_T("\\\\.\\")) + path[iDriveLetter] + _T(":");

+	while(iTrackIndex > 0 && _istdigit(path[iTrackIndex-1])) iTrackIndex--;

+	if(1 != _stscanf(path.Mid(iTrackIndex), _T("%d"), &iTrackIndex))

+		return(false);

+

+	if(m_hDrive != INVALID_HANDLE_VALUE)

+	{

+		CloseHandle(m_hDrive);

+		m_hDrive = INVALID_HANDLE_VALUE;

+	}

+

+	m_hDrive = CreateFile(drive, GENERIC_READ, FILE_SHARE_READ, NULL, 

+		OPEN_EXISTING, FILE_ATTRIBUTE_READONLY|FILE_FLAG_SEQUENTIAL_SCAN, (HANDLE)NULL);

+	if(m_hDrive == INVALID_HANDLE_VALUE)

+	{

+		return(false);

+	}

+

+	DWORD BytesReturned;

+	if(!DeviceIoControl(m_hDrive, IOCTL_CDROM_READ_TOC, NULL, 0, &m_TOC, sizeof(m_TOC), &BytesReturned, 0)

+	|| !(m_TOC.FirstTrack <= iTrackIndex && iTrackIndex <= m_TOC.LastTrack))

+	{

+		CloseHandle(m_hDrive);

+		m_hDrive = INVALID_HANDLE_VALUE;

+		return(false);

+	}

+

+	// MMC-3 Draft Revision 10g: Table 222 – Q Sub-channel control field

+	m_TOC.TrackData[iTrackIndex-1].Control &= 5;

+	if(!(m_TOC.TrackData[iTrackIndex-1].Control == 0 || m_TOC.TrackData[iTrackIndex-1].Control == 1))

+	{

+		CloseHandle(m_hDrive);

+		m_hDrive = INVALID_HANDLE_VALUE;

+		return(false);

+	}

+

+	if(m_TOC.TrackData[iTrackIndex-1].Control&8) 

+		m_header.frm.pcm.wf.nChannels = 4;

+

+	m_nStartSector = MSF2UINT(m_TOC.TrackData[iTrackIndex-1].Address) - 150;//MSF2UINT(m_TOC.TrackData[0].Address);

+	m_nStopSector = MSF2UINT(m_TOC.TrackData[iTrackIndex].Address) - 150;//MSF2UINT(m_TOC.TrackData[0].Address);

+

+	m_llLength = (m_nStopSector-m_nStartSector)*RAW_SECTOR_SIZE;

+

+	m_header.riff.hdr.chunkSize = (long)(m_llLength + sizeof(m_header) - 8);

+	m_header.data.hdr.chunkSize = (long)(m_llLength);

+

+	do

+	{

+		CDROM_READ_TOC_EX TOCEx;

+		memset(&TOCEx, 0, sizeof(TOCEx));

+		TOCEx.Format = CDROM_READ_TOC_EX_FORMAT_CDTEXT;

+		TOCEx.SessionTrack = iTrackIndex;

+		WORD size = 0;

+		ASSERT(MINIMUM_CDROM_READ_TOC_EX_SIZE == sizeof(size));

+		if(!DeviceIoControl(m_hDrive, IOCTL_CDROM_READ_TOC_EX, &TOCEx, sizeof(TOCEx), &size, sizeof(size), &BytesReturned, 0))

+			break;

+

+		size = ((size>>8)|(size<<8)) + sizeof(size);

+

+		CAutoVectorPtr<BYTE> pCDTextData;

+		pCDTextData.Allocate(size);

+		memset(pCDTextData, 0, size);

+

+		if(!DeviceIoControl(m_hDrive, IOCTL_CDROM_READ_TOC_EX, &TOCEx, sizeof(TOCEx), pCDTextData, size, &BytesReturned, 0))

+			break;

+

+		size = (WORD)(BytesReturned - sizeof(CDROM_TOC_CD_TEXT_DATA));

+		CDROM_TOC_CD_TEXT_DATA_BLOCK* pDesc = ((CDROM_TOC_CD_TEXT_DATA*)(BYTE*)pCDTextData)->Descriptors;

+

+		CStringArray str[16];

+		for(int i = 0; i < 16; i++) str[i].SetSize(1+m_TOC.LastTrack);

+		CString last;

+

+		for(int i = 0; size >= sizeof(CDROM_TOC_CD_TEXT_DATA_BLOCK); i++, size -= sizeof(CDROM_TOC_CD_TEXT_DATA_BLOCK), pDesc++)

+		{

+			if(pDesc->TrackNumber > m_TOC.LastTrack)

+				continue;

+

+			const int lenU = countof(pDesc->Text);

+			const int lenW = countof(pDesc->WText);

+

+			CString text = !pDesc->Unicode 

+				? CString(CStringA((CHAR*)pDesc->Text, lenU))

+				: CString(CStringW((WCHAR*)pDesc->WText, lenW));

+

+			int tlen = text.GetLength();

+			CString tmp = (tlen < 12-1)

+				? (!pDesc->Unicode 

+					? CString(CStringA((CHAR*)pDesc->Text+tlen+1, lenU-(tlen+1)))

+					: CString(CStringW((WCHAR*)pDesc->WText+tlen+1, lenW-(tlen+1))))

+				: _T("");

+

+			if((pDesc->PackType -= 0x80) >= 0x10) 

+				continue;

+

+			if(pDesc->CharacterPosition == 0) 

+			{

+				str[pDesc->PackType][pDesc->TrackNumber] = text;

+			}

+			else if(pDesc->CharacterPosition <= 0xf)

+			{

+				if(pDesc->CharacterPosition < 0xf && last.GetLength() > 0)

+				{

+					str[pDesc->PackType][pDesc->TrackNumber] = last + text;

+				}

+				else

+				{

+					str[pDesc->PackType][pDesc->TrackNumber] += text;

+				}

+			}

+

+			last = tmp;

+		}

+

+		m_discTitle = str[0][0];

+		m_trackTitle = str[0][iTrackIndex];

+		m_discArtist = str[1][0];

+		m_trackArtist = str[1][iTrackIndex];

+	}

+	while(0);

+	

+

+	return(true);

 }

 

 HRESULT CCDDAStream::SetPointer(LONGLONG llPos)

 {

-    if(llPos < 0 || llPos > m_llLength) return S_FALSE;

-    m_llPosition = llPos;

-    return S_OK;

+	if(llPos < 0 || llPos > m_llLength) return S_FALSE;

+	m_llPosition = llPos;

+	return S_OK;

 }

 

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

 {

-    CAutoLock lck(&m_csLock);

-

-    BYTE buff[RAW_SECTOR_SIZE];

-

-    PBYTE pbBufferOrg = pbBuffer;

-    LONGLONG pos = m_llPosition;

-    size_t len = (size_t)dwBytesToRead;

-

-    if(pos < sizeof(m_header) && len > 0)

-    {

-        size_t l = (size_t)min(len, sizeof(m_header) - pos);

-        memcpy(pbBuffer, &((BYTE*)&m_header)[pos], l);

-        pbBuffer += l;

-        pos += l;

-        len -= l;

-    }

-

-    pos -= sizeof(m_header);

-

-    while(pos >= 0 && pos < m_llLength && len > 0)

-    {

-        RAW_READ_INFO rawreadinfo;

-        rawreadinfo.SectorCount = 1;

-        rawreadinfo.TrackMode = CDDA;

-

-        UINT sector = m_nStartSector + int(pos / RAW_SECTOR_SIZE);

-        __int64 offset = pos % RAW_SECTOR_SIZE;

-

-        rawreadinfo.DiskOffset.QuadPart = sector * 2048;

-        DWORD BytesReturned = 0;

-        BOOL b = DeviceIoControl(

-                     m_hDrive, IOCTL_CDROM_RAW_READ,

-                     &rawreadinfo, sizeof(rawreadinfo),

-                     buff, RAW_SECTOR_SIZE,

-                     &BytesReturned, 0);

-

-        size_t l = (size_t)min(min(len, RAW_SECTOR_SIZE - offset), m_llLength - pos);

-        memcpy(pbBuffer, &buff[offset], l);

-

-        pbBuffer += l;

-        pos += l;

-        len -= l;

-    }

-

-    if(pdwBytesRead) *pdwBytesRead = pbBuffer - pbBufferOrg;

-    m_llPosition += pbBuffer - pbBufferOrg;

-

-    return S_OK;

+	CAutoLock lck(&m_csLock);

+

+	BYTE buff[RAW_SECTOR_SIZE];

+

+	PBYTE pbBufferOrg = pbBuffer;

+	LONGLONG pos = m_llPosition;

+	size_t len = (size_t)dwBytesToRead;

+

+	if(pos < sizeof(m_header) && len > 0)

+	{

+		size_t l = (size_t)min(len, sizeof(m_header) - pos);

+		memcpy(pbBuffer, &((BYTE*)&m_header)[pos], l);

+		pbBuffer += l;

+		pos += l;

+		len -= l;

+	}

+

+	pos -= sizeof(m_header);

+

+	while(pos >= 0 && pos < m_llLength && len > 0)

+	{

+		RAW_READ_INFO rawreadinfo;

+		rawreadinfo.SectorCount = 1;

+		rawreadinfo.TrackMode = CDDA;

+

+		UINT sector = m_nStartSector + int(pos/RAW_SECTOR_SIZE);

+		__int64 offset = pos%RAW_SECTOR_SIZE;

+

+		rawreadinfo.DiskOffset.QuadPart = sector*2048;

+		DWORD BytesReturned = 0;

+		BOOL b = DeviceIoControl(

+					m_hDrive, IOCTL_CDROM_RAW_READ,

+					&rawreadinfo, sizeof(rawreadinfo),

+					buff, RAW_SECTOR_SIZE,

+					&BytesReturned, 0);

+

+		size_t l = (size_t)min(min(len, RAW_SECTOR_SIZE - offset), m_llLength - pos);

+		memcpy(pbBuffer, &buff[offset], l);

+

+		pbBuffer += l;

+		pos += l;

+		len -= l;

+	}

+

+	if(pdwBytesRead) *pdwBytesRead = pbBuffer - pbBufferOrg;

+	m_llPosition += pbBuffer - pbBufferOrg;

+

+	return S_OK;

 }

 

 LONGLONG CCDDAStream::Size(LONGLONG* pSizeAvailable)

 {

-    LONGLONG size = sizeof(m_header) + m_llLength;

-    if(pSizeAvailable) *pSizeAvailable = size;

+	LONGLONG size = sizeof(m_header) + m_llLength;

+	if(pSizeAvailable) *pSizeAvailable = size;

     return size;

 }

 

diff --git a/src/filters/reader/CDDAReader/CDDAReader.h b/src/filters/reader/CDDAReader/CDDAReader.h
index 15019e76d..d3ac17c0a 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,97 +28,77 @@
 #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);

diff --git a/src/filters/reader/CDDAReader/resource.h b/src/filters/reader/CDDAReader/resource.h
index 0bc7c47f7..0d07f7b10 100644
--- a/src/filters/reader/CDDAReader/resource.h
+++ b/src/filters/reader/CDDAReader/resource.h
@@ -3,7 +3,7 @@
 // Used by cddareader.rc

 

 // Next default values for new objects

-//

+// 

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        101

diff --git a/src/filters/reader/CDDAReader/stdafx.cpp b/src/filters/reader/CDDAReader/stdafx.cpp
index c330f87bd..d431dab84 100644
--- a/src/filters/reader/CDDAReader/stdafx.cpp
+++ b/src/filters/reader/CDDAReader/stdafx.cpp
@@ -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

  *

  */

diff --git a/src/filters/reader/CDDAReader/stdafx.h b/src/filters/reader/CDDAReader/stdafx.h
index a9f666228..c35359c38 100644
--- a/src/filters/reader/CDDAReader/stdafx.h
+++ b/src/filters/reader/CDDAReader/stdafx.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

  *

  */