diff options
56 files changed, 314 insertions, 251 deletions
diff --git a/src/Subtitles/VobSubFileRipper.cpp b/src/Subtitles/VobSubFileRipper.cpp index 946484618..b5ef49f23 100644 --- a/src/Subtitles/VobSubFileRipper.cpp +++ b/src/Subtitles/VobSubFileRipper.cpp @@ -22,7 +22,7 @@ #include "stdafx.h"
#include "vobsubfileripper.h"
#include "../decss/VobDec.h"
-#include "../subtitles/CCDecoder.h"
+#include "../Subtitles/CCDecoder.h"
//
// CVobSubFileRipper
diff --git a/src/apps/VSRip/VSRip.cpp b/src/apps/VSRip/VSRip.cpp index 04ee79a9a..6f3314e98 100644 --- a/src/apps/VSRip/VSRip.cpp +++ b/src/apps/VSRip/VSRip.cpp @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
diff --git a/src/apps/VSRip/VSRip.h b/src/apps/VSRip/VSRip.h index 53ecf76b7..903d89ed5 100644 --- a/src/apps/VSRip/VSRip.h +++ b/src/apps/VSRip/VSRip.h @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
diff --git a/src/apps/VSRip/VSRip.rc b/src/apps/VSRip/VSRip.rc index 9dcb93339..186509847 100644 --- a/src/apps/VSRip/VSRip.rc +++ b/src/apps/VSRip/VSRip.rc @@ -111,12 +111,12 @@ BEGIN BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "Comments", "Visit http://gabest.org/ for updates"
- VALUE "CompanyName", "Gabest"
+ VALUE "Comments", "VobSub Subtitle Ripper Wizard"
+ VALUE "CompanyName", "MPC-HC Team"
VALUE "FileDescription", "VobSub Subtitle Ripper Wizard"
VALUE "FileVersion", "1, 0, 0, 7"
VALUE "InternalName", "VSRip.exe"
- VALUE "LegalCopyright", "2003-2004 (C) Gabest. All rights reserved."
+ VALUE "LegalCopyright", "2003-2010 (C) see: http://mpc-hc.svn.sourceforge.net/viewvc/mpc-hc/trunk/src/apps/mplayerc/AUTHORS?revision=HEAD"
VALUE "OriginalFilename", "VSRip.exe"
VALUE "ProductName", "VSRip"
VALUE "ProductVersion", "1, 0, 0, 7"
diff --git a/src/apps/VSRip/VSRipDlg.cpp b/src/apps/VSRip/VSRipDlg.cpp index 283e1c3c9..f0dc1ec0b 100644 --- a/src/apps/VSRip/VSRipDlg.cpp +++ b/src/apps/VSRip/VSRipDlg.cpp @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
diff --git a/src/apps/VSRip/VSRipDlg.h b/src/apps/VSRip/VSRipDlg.h index 82941324f..b50a42dec 100644 --- a/src/apps/VSRip/VSRipDlg.h +++ b/src/apps/VSRip/VSRipDlg.h @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
diff --git a/src/apps/VSRip/VSRipFileDlg.cpp b/src/apps/VSRip/VSRipFileDlg.cpp index a4a9cfc29..7f4ad626e 100644 --- a/src/apps/VSRip/VSRipFileDlg.cpp +++ b/src/apps/VSRip/VSRipFileDlg.cpp @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
diff --git a/src/apps/VSRip/VSRipFileDlg.h b/src/apps/VSRip/VSRipFileDlg.h index c12d94c4b..8c5108c1b 100644 --- a/src/apps/VSRip/VSRipFileDlg.h +++ b/src/apps/VSRip/VSRipFileDlg.h @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
diff --git a/src/apps/VSRip/VSRipIndexingDlg.cpp b/src/apps/VSRip/VSRipIndexingDlg.cpp index be26aa367..db0793489 100644 --- a/src/apps/VSRip/VSRipIndexingDlg.cpp +++ b/src/apps/VSRip/VSRipIndexingDlg.cpp @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
diff --git a/src/apps/VSRip/VSRipIndexingDlg.h b/src/apps/VSRip/VSRipIndexingDlg.h index f0de696f6..135139322 100644 --- a/src/apps/VSRip/VSRipIndexingDlg.h +++ b/src/apps/VSRip/VSRipIndexingDlg.h @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
diff --git a/src/apps/VSRip/VSRipPGCDlg.cpp b/src/apps/VSRip/VSRipPGCDlg.cpp index 63641a9fd..bd1889c93 100644 --- a/src/apps/VSRip/VSRipPGCDlg.cpp +++ b/src/apps/VSRip/VSRipPGCDlg.cpp @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
@@ -24,7 +25,7 @@ #include <atlcoll.h>
#include "VSRip.h"
#include "VSRipPGCDlg.h"
-#include "../../subtitles/VobSubFile.h"
+#include "../../Subtitles/VobSubFile.h"
// CVSRipPGCDlg dialog
diff --git a/src/apps/VSRip/VSRipPGCDlg.h b/src/apps/VSRip/VSRipPGCDlg.h index a8fa6e7d2..2b993f81a 100644 --- a/src/apps/VSRip/VSRipPGCDlg.h +++ b/src/apps/VSRip/VSRipPGCDlg.h @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
diff --git a/src/apps/VSRip/VSRipPage.cpp b/src/apps/VSRip/VSRipPage.cpp index 6973443b2..a81e2bb94 100644 --- a/src/apps/VSRip/VSRipPage.cpp +++ b/src/apps/VSRip/VSRipPage.cpp @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
@@ -57,4 +58,3 @@ void CVSRipPage::OnShowWindow(BOOL bShow, UINT nStatus) m_pVSFRipper->SetCallBack(bShow ? (IVSFRipperCallback*)this : NULL);
}
-
diff --git a/src/apps/VSRip/VSRipPage.h b/src/apps/VSRip/VSRipPage.h index c6f7eee9f..ace06838e 100644 --- a/src/apps/VSRip/VSRipPage.h +++ b/src/apps/VSRip/VSRipPage.h @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
@@ -23,7 +24,7 @@ #pragma once
#include <afxtempl.h>
-#include "../../subtitles/VobSubFileRipper.h"
+#include "../../Subtitles/VobSubFileRipper.h"
// CVSRipPage dialog
diff --git a/src/apps/VSRip/stdafx.cpp b/src/apps/VSRip/stdafx.cpp index 7f94ff126..28c902615 100644 --- a/src/apps/VSRip/stdafx.cpp +++ b/src/apps/VSRip/stdafx.cpp @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
diff --git a/src/apps/VSRip/stdafx.h b/src/apps/VSRip/stdafx.h index cd41f2954..aad729f56 100644 --- a/src/apps/VSRip/stdafx.h +++ b/src/apps/VSRip/stdafx.h @@ -2,6 +2,7 @@ * $Id$
*
* (C) 2003-2005 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This file is part of vsrip.
*
diff --git a/src/apps/mplayerc/TextPassThruFilter.cpp b/src/apps/mplayerc/TextPassThruFilter.cpp index 3cf763a8d..807f41521 100644 --- a/src/apps/mplayerc/TextPassThruFilter.cpp +++ b/src/apps/mplayerc/TextPassThruFilter.cpp @@ -29,7 +29,7 @@ #include "TextPassThruFilter.h"
#include <moreuuids.h>
#include "../../DSUtil/DSUtil.h"
-#include "../../subtitles/SubtitleInputPin.h"
+#include "../../Subtitles/SubtitleInputPin.h"
//
// CTextPassThruInputPin
diff --git a/src/apps/mplayerc/WebClientSocket.cpp b/src/apps/mplayerc/WebClientSocket.cpp index 2c7c71f8b..3a609ccc6 100644 --- a/src/apps/mplayerc/WebClientSocket.cpp +++ b/src/apps/mplayerc/WebClientSocket.cpp @@ -26,7 +26,7 @@ #include "mplayerc.h"
#include "resource.h"
#include "MainFrm.h"
-#include "../../subtitles/TextFile.h"
+#include "../../Subtitles/TextFile.h"
#include "WebServer.h"
#include "WebClientSocket.h"
diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp index 8ebead5f5..90a8e1e7c 100644 --- a/src/apps/mplayerc/mplayerc.cpp +++ b/src/apps/mplayerc/mplayerc.cpp @@ -717,8 +717,8 @@ BOOL WINAPI Mine_DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID l return ret;
}
-#include "../../subtitles/SSF.h"
-#include "../../subtitles/RTS.h"
+#include "../../Subtitles/SSF.h"
+#include "../../Subtitles/RTS.h"
#include "../../SubPic/MemSubPic.h"
class ssftest
@@ -742,7 +742,7 @@ public: CCritSec csLock;
/*
CRenderedTextSubtitle s(&csLock);
- s.Open(_T("../../subtitles/libssf/demo/demo.ssa"), 1);
+ s.Open(_T("../../Subtitles/libssf/demo/demo.ssa"), 1);
for(int i = 2*60*1000+2000; i < 2*60*1000+17000; i += 10)
{
@@ -755,7 +755,7 @@ public: try
{
ssf::CRenderer s(&csLock);
- s.Open(_T("../../subtitles/libssf/demo/demo.ssf"));
+ s.Open(_T("../../Subtitles/libssf/demo/demo.ssf"));
for(int i = 2*60*1000+2000; i < 2*60*1000+17000; i += 40)
// for(int i = 2*60*1000+2000; i < 2*60*1000+17000; i += 1000)
diff --git a/src/filters/FilterApp.cpp b/src/filters/FilterApp.cpp index 30cc0da63..872c8fb3d 100644 --- a/src/filters/FilterApp.cpp +++ b/src/filters/FilterApp.cpp @@ -1,20 +1,20 @@ -/*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+/*
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* 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
*
*/
@@ -30,13 +30,13 @@ CFilterApp::CFilterApp() BOOL CFilterApp::InitInstance()
{
- if(!__super::InitInstance())
+ if(!__super::InitInstance())
return FALSE;
-
+
SetRegistryKey(_T("Gabest"));
-
+
DllEntryPoint(AfxGetInstanceHandle(), DLL_PROCESS_ATTACH, 0);
-
+
return TRUE;
}
diff --git a/src/filters/FilterApp.h b/src/filters/FilterApp.h index 0c95ee723..72e6a645c 100644 --- a/src/filters/FilterApp.h +++ b/src/filters/FilterApp.h @@ -1,20 +1,20 @@ -/*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+/*
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* 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/Filters.h b/src/filters/Filters.h index dcae28923..beeb3ec9f 100644 --- a/src/filters/Filters.h +++ b/src/filters/Filters.h @@ -1,20 +1,23 @@ -// Copyright (C) 2003-2006 Gabest.
-// http://www.gabest.org
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, 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 this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA, or visit
-// http://www.gnu.org/copyleft/gpl.html
+/*
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
#pragma once
@@ -42,7 +45,6 @@ #include "./parser/MatroskaSplitter/MatroskaSplitter.h"
#include "./parser/RealMediaSplitter/RealMediaSplitter.h"
#include "./parser/AviSplitter/AviSplitter.h"
-//#include "./parser/RadGtSplitter/RadGtSplitter.h"
#include "./parser/RoQSplitter/RoQSplitter.h"
#include "./parser/OggSplitter/OggSplitter.h"
#include "./parser/NutSplitter/NutSplitter.h"
diff --git a/src/filters/InternalPropertyPage.cpp b/src/filters/InternalPropertyPage.cpp index 3f2dad87f..b65214031 100644 --- a/src/filters/InternalPropertyPage.cpp +++ b/src/filters/InternalPropertyPage.cpp @@ -1,20 +1,20 @@ -/*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+/*
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* 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
*
*/
@@ -114,7 +114,10 @@ CInternalPropertyPage::~CInternalPropertyPage() {
if(m_pWnd)
{
- if(m_pWnd->m_hWnd) {ASSERT(0); m_pWnd->DestroyWindow();}
+ if(m_pWnd->m_hWnd) {
+ ASSERT(0);
+ m_pWnd->DestroyWindow();
+ }
delete m_pWnd;
m_pWnd = NULL;
}
@@ -124,14 +127,14 @@ STDMETHODIMP CInternalPropertyPage::NonDelegatingQueryInterface(REFIID riid, voi {
return
QI2(IPropertyPage)
- __super::NonDelegatingQueryInterface(riid, ppv);
+ __super::NonDelegatingQueryInterface(riid, ppv);
}
// IPropertyPage
STDMETHODIMP CInternalPropertyPage::SetPageSite(IPropertyPageSite* pPageSite)
{
- CAutoLock cAutoLock(this);
+ CAutoLock cAutoLock(this);
if(pPageSite && m_pPageSite || !pPageSite && !m_pPageSite)
return E_UNEXPECTED;
@@ -145,12 +148,12 @@ STDMETHODIMP CInternalPropertyPage::Activate(HWND hwndParent, LPCRECT pRect, BOO {
AFX_MANAGE_STATE(AfxGetStaticModuleState());
- CAutoLock cAutoLock(this);
+ CAutoLock cAutoLock(this);
- CheckPointer(pRect, E_POINTER);
+ CheckPointer(pRect, E_POINTER);
if(!m_pWnd || m_pWnd->m_hWnd || m_pUnks.IsEmpty())
- return E_UNEXPECTED;
+ return E_UNEXPECTED;
if(!m_pWnd->Create(m_pPageSite, pRect, CWnd::FromHandle(hwndParent)))
return E_OUTOFMEMORY;
@@ -171,9 +174,9 @@ STDMETHODIMP CInternalPropertyPage::Deactivate() {
AFX_MANAGE_STATE(AfxGetStaticModuleState());
- CAutoLock cAutoLock(this);
+ CAutoLock cAutoLock(this);
- if(!m_pWnd || !m_pWnd->m_hWnd)
+ if(!m_pWnd || !m_pWnd->m_hWnd)
return E_UNEXPECTED;
m_pWnd->OnDeactivate();
@@ -181,32 +184,32 @@ STDMETHODIMP CInternalPropertyPage::Deactivate() m_pWnd->ModifyStyleEx(WS_EX_CONTROLPARENT, 0);
m_pWnd->DestroyWindow();
- return S_OK;
+ return S_OK;
}
STDMETHODIMP CInternalPropertyPage::GetPageInfo(PROPPAGEINFO* pPageInfo)
{
- CAutoLock cAutoLock(this);
+ CAutoLock cAutoLock(this);
CheckPointer(pPageInfo, E_POINTER);
- LPOLESTR pszTitle;
- HRESULT hr = AMGetWideString(CStringW(GetWindowTitle()), &pszTitle);
- if(FAILED(hr)) return hr;
+ LPOLESTR pszTitle;
+ HRESULT hr = AMGetWideString(CStringW(GetWindowTitle()), &pszTitle);
+ if(FAILED(hr)) return hr;
- pPageInfo->cb = sizeof(PROPPAGEINFO);
- pPageInfo->pszTitle = pszTitle;
- pPageInfo->pszDocString = NULL;
- pPageInfo->pszHelpFile = NULL;
- pPageInfo->dwHelpContext = 0;
- pPageInfo->size = GetWindowSize();
+ pPageInfo->cb = sizeof(PROPPAGEINFO);
+ pPageInfo->pszTitle = pszTitle;
+ pPageInfo->pszDocString = NULL;
+ pPageInfo->pszHelpFile = NULL;
+ pPageInfo->dwHelpContext = 0;
+ pPageInfo->size = GetWindowSize();
- return S_OK;
+ return S_OK;
}
STDMETHODIMP CInternalPropertyPage::SetObjects(ULONG cObjects, LPUNKNOWN* ppUnk)
{
- CAutoLock cAutoLock(this);
+ CAutoLock cAutoLock(this);
if(cObjects && m_pWnd || !cObjects && !m_pWnd)
return E_UNEXPECTED;
@@ -241,18 +244,18 @@ STDMETHODIMP CInternalPropertyPage::SetObjects(ULONG cObjects, LPUNKNOWN* ppUnk) m_pWnd = NULL;
}
- return S_OK;
+ return S_OK;
}
STDMETHODIMP CInternalPropertyPage::Show(UINT nCmdShow)
{
AFX_MANAGE_STATE(AfxGetStaticModuleState());
- CAutoLock cAutoLock(this);
+ CAutoLock cAutoLock(this);
if(!m_pWnd) return E_UNEXPECTED;
- if((nCmdShow != SW_SHOW) && (nCmdShow != SW_SHOWNORMAL) && (nCmdShow != SW_HIDE))
+ if((nCmdShow != SW_SHOW) && (nCmdShow != SW_SHOWNORMAL) && (nCmdShow != SW_HIDE))
return E_INVALIDARG;
m_pWnd->ShowWindow(nCmdShow);
@@ -265,9 +268,9 @@ STDMETHODIMP CInternalPropertyPage::Move(LPCRECT pRect) {
AFX_MANAGE_STATE(AfxGetStaticModuleState());
- CAutoLock cAutoLock(this);
+ CAutoLock cAutoLock(this);
- CheckPointer(pRect, E_POINTER);
+ CheckPointer(pRect, E_POINTER);
if(!m_pWnd) return E_UNEXPECTED;
@@ -278,7 +281,7 @@ STDMETHODIMP CInternalPropertyPage::Move(LPCRECT pRect) STDMETHODIMP CInternalPropertyPage::IsPageDirty()
{
- CAutoLock cAutoLock(this);
+ CAutoLock cAutoLock(this);
return m_pWnd && m_pWnd->GetDirty() ? S_OK : S_FALSE;
}
@@ -287,12 +290,12 @@ STDMETHODIMP CInternalPropertyPage::Apply() {
AFX_MANAGE_STATE(AfxGetStaticModuleState());
- CAutoLock cAutoLock(this);
+ CAutoLock cAutoLock(this);
- if(!m_pWnd || m_pUnks.IsEmpty() || !m_pPageSite)
+ if(!m_pWnd || m_pUnks.IsEmpty() || !m_pPageSite)
return E_UNEXPECTED;
- if(m_pWnd->GetDirty() && m_pWnd->OnApply())
+ if(m_pWnd->GetDirty() && m_pWnd->OnApply())
m_pWnd->SetDirty(false);
return S_OK;
@@ -300,14 +303,14 @@ STDMETHODIMP CInternalPropertyPage::Apply() STDMETHODIMP CInternalPropertyPage::Help(LPCWSTR lpszHelpDir)
{
- CAutoLock cAutoLock(this);
+ CAutoLock cAutoLock(this);
return E_NOTIMPL;
}
STDMETHODIMP CInternalPropertyPage::TranslateAccelerator(LPMSG lpMsg)
{
- CAutoLock cAutoLock(this);
+ CAutoLock cAutoLock(this);
return E_NOTIMPL;
}
diff --git a/src/filters/InternalPropertyPage.h b/src/filters/InternalPropertyPage.h index af3292539..17c636ca8 100644 --- a/src/filters/InternalPropertyPage.h +++ b/src/filters/InternalPropertyPage.h @@ -1,20 +1,20 @@ -/*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+/*
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* 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
*
*/
@@ -24,7 +24,8 @@ #include <atlcoll.h>
interface __declspec(uuid("03481710-D73E-4674-839F-03EDE2D60ED8"))
-ISpecifyPropertyPages2 : public ISpecifyPropertyPages
+ISpecifyPropertyPages2 :
+public ISpecifyPropertyPages
{
STDMETHOD (CreatePage) (const GUID& guid, IPropertyPage** ppPage) = 0;
};
@@ -43,16 +44,27 @@ protected: public:
CInternalPropertyPageWnd();
- void SetDirty(bool fDirty = true) {m_fDirty = fDirty; if(fDirty && m_pPageSite) m_pPageSite->OnStatusChange(PROPPAGESTATUS_DIRTY);}
- bool GetDirty() {return m_fDirty;}
+ void SetDirty(bool fDirty = true) {
+ m_fDirty = fDirty;
+ if(fDirty && m_pPageSite) m_pPageSite->OnStatusChange(PROPPAGESTATUS_DIRTY);
+ }
+ bool GetDirty() {
+ return m_fDirty;
+ }
virtual BOOL Create(IPropertyPageSite* pPageSite, LPCRECT pRect, CWnd* pParentWnd);
- virtual bool OnConnect(const CInterfaceList<IUnknown, &IID_IUnknown>& pUnks) {return true;}
+ virtual bool OnConnect(const CInterfaceList<IUnknown, &IID_IUnknown>& pUnks) {
+ return true;
+ }
virtual void OnDisconnect() {}
- virtual bool OnActivate() {return true;}
+ virtual bool OnActivate() {
+ return true;
+ }
virtual void OnDeactivate() {}
- virtual bool OnApply() {return true;}
+ virtual bool OnApply() {
+ return true;
+ }
DECLARE_MESSAGE_MAP()
};
@@ -75,22 +87,22 @@ public: CInternalPropertyPage(LPUNKNOWN lpunk, HRESULT* phr);
virtual ~CInternalPropertyPage();
- DECLARE_IUNKNOWN;
- STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
+ DECLARE_IUNKNOWN;
+ STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
// IPropertyPage
- STDMETHODIMP SetPageSite(IPropertyPageSite* pPageSite);
- STDMETHODIMP Activate(HWND hwndParent, LPCRECT pRect, BOOL fModal);
- STDMETHODIMP Deactivate();
- STDMETHODIMP GetPageInfo(PROPPAGEINFO* pPageInfo);
- STDMETHODIMP SetObjects(ULONG cObjects, LPUNKNOWN* ppUnk);
- STDMETHODIMP Show(UINT nCmdShow);
- STDMETHODIMP Move(LPCRECT prect);
- STDMETHODIMP IsPageDirty();
- STDMETHODIMP Apply();
- STDMETHODIMP Help(LPCWSTR lpszHelpDir);
- STDMETHODIMP TranslateAccelerator(LPMSG lpMsg);
+ STDMETHODIMP SetPageSite(IPropertyPageSite* pPageSite);
+ STDMETHODIMP Activate(HWND hwndParent, LPCRECT pRect, BOOL fModal);
+ STDMETHODIMP Deactivate();
+ STDMETHODIMP GetPageInfo(PROPPAGEINFO* pPageInfo);
+ STDMETHODIMP SetObjects(ULONG cObjects, LPUNKNOWN* ppUnk);
+ STDMETHODIMP Show(UINT nCmdShow);
+ STDMETHODIMP Move(LPCRECT prect);
+ STDMETHODIMP IsPageDirty();
+ STDMETHODIMP Apply();
+ STDMETHODIMP Help(LPCWSTR lpszHelpDir);
+ STDMETHODIMP TranslateAccelerator(LPMSG lpMsg);
};
template<class WndClass>
@@ -113,7 +125,7 @@ class CInternalPropertyPageTempl : public CInternalPropertyPage public:
CInternalPropertyPageTempl(LPUNKNOWN lpunk, HRESULT* phr)
- : CInternalPropertyPage(lpunk, phr)
+ : CInternalPropertyPage(lpunk, phr)
{
}
};
diff --git a/src/filters/PinInfoWnd.cpp b/src/filters/PinInfoWnd.cpp index e2d6208b6..8219154eb 100644 --- a/src/filters/PinInfoWnd.cpp +++ b/src/filters/PinInfoWnd.cpp @@ -1,20 +1,20 @@ -/*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+/*
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* 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
*
*/
@@ -39,7 +39,7 @@ bool CPinInfoWnd::OnConnect(const CInterfaceList<IUnknown, &IID_IUnknown>& pUnks POSITION pos = pUnks.GetHeadPosition();
while(pos && !(m_pBF = pUnks.GetNext(pos)));
-
+
if(!m_pBF) return false;
return true;
@@ -159,10 +159,10 @@ void CPinInfoWnd::OnCbnSelchangeCombo1() CComPtr<IPin> pPinTo;
if(SUCCEEDED(pPin->ConnectedTo(&pPinTo)) && pPinTo)
{
- str.Format(_T("- Connected to:\n\nCLSID: %s\nFilter: %s\nPin: %s\n\n"),
- CString(CStringFromGUID(GetCLSID(pPinTo))),
- CString(GetFilterName(GetFilterFromPin(pPinTo))),
- CString(GetPinName(pPinTo)));
+ str.Format(_T("- Connected to:\n\nCLSID: %s\nFilter: %s\nPin: %s\n\n"),
+ CString(CStringFromGUID(GetCLSID(pPinTo))),
+ CString(GetFilterName(GetFilterFromPin(pPinTo))),
+ CString(GetPinName(pPinTo)));
AddLine(str);
diff --git a/src/filters/PinInfoWnd.h b/src/filters/PinInfoWnd.h index b9768b8f4..74d052ea4 100644 --- a/src/filters/PinInfoWnd.h +++ b/src/filters/PinInfoWnd.h @@ -1,20 +1,20 @@ -/*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+/*
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* 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
*
*/
@@ -25,11 +25,11 @@ #include <afxcmn.h>
class __declspec(uuid("A1EB391C-6089-4A87-9988-BE50872317D4"))
-CPinInfoWnd : public CInternalPropertyPageWnd
+ CPinInfoWnd : public CInternalPropertyPageWnd
{
CComQIPtr<IBaseFilter> m_pBF;
- enum
+ enum
{
IDC_PP_COMBO1 = 10000,
IDC_PP_EDIT1,
@@ -43,15 +43,19 @@ CPinInfoWnd : public CInternalPropertyPageWnd public:
CPinInfoWnd();
-
+
bool OnConnect(const CInterfaceList<IUnknown, &IID_IUnknown>& pUnks);
void OnDisconnect();
bool OnActivate();
void OnDeactivate();
bool OnApply();
- static LPCTSTR GetWindowTitle() {return _T("Pin Info");}
- static CSize GetWindowSize() {return CSize(500, 300);}
+ static LPCTSTR GetWindowTitle() {
+ return _T("Pin Info");
+ }
+ static CSize GetWindowSize() {
+ return CSize(500, 300);
+ }
DECLARE_MESSAGE_MAP()
diff --git a/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.h b/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.h index 616943d3e..c6b26ede4 100644 --- a/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.h +++ b/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.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
*
*/
@@ -24,7 +24,7 @@ #include "BitStream.h"
#include "BaseMuxerInputPin.h"
#include "BaseMuxerRelatedPin.h"
-#include "../../../subtitles/libssf/SubtitleFile.h"
+#include "../../../Subtitles/libssf/SubtitleFile.h"
class CBaseMuxerOutputPin : public CBaseOutputPin
{
@@ -38,19 +38,22 @@ public: HRESULT BreakConnect();
- HRESULT DecideBufferSize(IMemAllocator* pAlloc, ALLOCATOR_PROPERTIES* pProperties);
+ HRESULT DecideBufferSize(IMemAllocator* pAlloc, ALLOCATOR_PROPERTIES* pProperties);
- HRESULT CheckMediaType(const CMediaType* pmt);
- HRESULT GetMediaType(int iPosition, CMediaType* pmt);
+ HRESULT CheckMediaType(const CMediaType* pmt);
+ HRESULT GetMediaType(int iPosition, CMediaType* pmt);
- HRESULT DeliverEndOfStream();
+ HRESULT DeliverEndOfStream();
STDMETHODIMP Notify(IBaseFilter* pSender, Quality q);
};
class CBaseMuxerRawOutputPin : public CBaseMuxerOutputPin, public CBaseMuxerRelatedPin
{
- struct idx_t {REFERENCE_TIME rt; __int64 fp;};
+ struct idx_t {
+ REFERENCE_TIME rt;
+ __int64 fp;
+ };
CAtlList<idx_t> m_idx;
ssf::SubtitleFile m_ssf;
@@ -60,7 +63,7 @@ public: virtual ~CBaseMuxerRawOutputPin() {}
DECLARE_IUNKNOWN;
- STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
+ STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
virtual void MuxHeader(const CMediaType& mt);
virtual void MuxPacket(const CMediaType& mt, const MuxerPacket* pPacket);
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp index 7217f58be..8ac4852f9 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp @@ -28,7 +28,7 @@ #include "../../../DSUtil/DSUtil.h"
#include "../../../DSUtil/MediaTypes.h"
#include "RealMediaSplitter.h"
-#include "../../../subtitles/SubtitleInputPin.h"
+#include "../../../Subtitles/SubtitleInputPin.h"
//
diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.h b/src/filters/parser/SSFSplitter/SSFSplitter.h index a0bf9f5a8..ab03ca8fc 100644 --- a/src/filters/parser/SSFSplitter/SSFSplitter.h +++ b/src/filters/parser/SSFSplitter/SSFSplitter.h @@ -22,7 +22,7 @@ #pragma once
#include "../BaseSplitter/BaseSplitter.h"
-#include "../../../subtitles/libssf/SubtitleFile.h"
+#include "../../../Subtitles/libssf/SubtitleFile.h"
class __declspec(uuid("95C3F9F6-1E05-4C34-8122-504476EACB51"))
CSSFSplitterFilter : public CBaseSplitterFilter
diff --git a/src/filters/source/SubtitleSource/SubtitleSource.h b/src/filters/source/SubtitleSource/SubtitleSource.h index c46cbe83a..b76143ff4 100644 --- a/src/filters/source/SubtitleSource/SubtitleSource.h +++ b/src/filters/source/SubtitleSource/SubtitleSource.h @@ -22,7 +22,7 @@ #pragma once
#include <atlbase.h>
-#include "../../../subtitles/RTS.h"
+#include "../../../Subtitles/RTS.h"
class CSubtitleSource
: public CSource
diff --git a/src/filters/stdafx.cpp b/src/filters/stdafx.cpp index fd94566f5..0fe5ee915 100644 --- a/src/filters/stdafx.cpp +++ b/src/filters/stdafx.cpp @@ -1,29 +1,22 @@ -/*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+/*
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* 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
*
*/
-// stdafx.cpp : source file that includes just the standard includes
-// misc.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/filters/stdafx.h b/src/filters/stdafx.h index b5b447c08..e641fa6c6 100644 --- a/src/filters/stdafx.h +++ b/src/filters/stdafx.h @@ -1,29 +1,24 @@ -/*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+/*
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* 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
*
*/
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
#pragma once
#include "../DSUtil/SharedInclude.h"
diff --git a/src/filters/transform/VSFilter/DirectVobSub.cpp b/src/filters/transform/VSFilter/DirectVobSub.cpp index 45b9778b6..59d3a8ec1 100644 --- a/src/filters/transform/VSFilter/DirectVobSub.cpp +++ b/src/filters/transform/VSFilter/DirectVobSub.cpp @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/filters/transform/VSFilter/DirectVobSub.h b/src/filters/transform/VSFilter/DirectVobSub.h index 01af0b887..7f6edcba4 100644 --- a/src/filters/transform/VSFilter/DirectVobSub.h +++ b/src/filters/transform/VSFilter/DirectVobSub.h @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp index 50de106a9..1d0726364 100644 --- a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp +++ b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/filters/transform/VSFilter/DirectVobSubFilter.h b/src/filters/transform/VSFilter/DirectVobSubFilter.h index d26b1c968..6552d5f17 100644 --- a/src/filters/transform/VSFilter/DirectVobSubFilter.h +++ b/src/filters/transform/VSFilter/DirectVobSubFilter.h @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -24,9 +26,9 @@ #include <atlsync.h>
#include "DirectVobSub.h"
#include "../BaseVideoFilter/BaseVideoFilter.h"
-#include "../../../subtitles/VobSubFile.h"
-#include "../../../subtitles/RTS.h"
-#include "../../../subtitles/SSF.h"
+#include "../../../Subtitles/VobSubFile.h"
+#include "../../../Subtitles/RTS.h"
+#include "../../../Subtitles/SSF.h"
typedef struct
{
diff --git a/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp b/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp index b00574049..a9340c688 100644 --- a/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp +++ b/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/filters/transform/VSFilter/DirectVobSubPropPage.h b/src/filters/transform/VSFilter/DirectVobSubPropPage.h index e33caf607..9b514c525 100644 --- a/src/filters/transform/VSFilter/DirectVobSubPropPage.h +++ b/src/filters/transform/VSFilter/DirectVobSubPropPage.h @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/filters/transform/VSFilter/IDirectVobSub.h b/src/filters/transform/VSFilter/IDirectVobSub.h index 1bf84bb93..b917f87c3 100644 --- a/src/filters/transform/VSFilter/IDirectVobSub.h +++ b/src/filters/transform/VSFilter/IDirectVobSub.h @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,7 +23,7 @@ #pragma once
-#include "../../../subtitles/STS.h"
+#include "../../../Subtitles/STS.h"
#ifdef __cplusplus
extern "C" {
diff --git a/src/filters/transform/VSFilter/Scale2x.cpp b/src/filters/transform/VSFilter/Scale2x.cpp index 62c1a4a55..71cf01f24 100644 --- a/src/filters/transform/VSFilter/Scale2x.cpp +++ b/src/filters/transform/VSFilter/Scale2x.cpp @@ -1,26 +1,31 @@ -// Copyright 2003-2006 Gabest
-// http://www.gabest.org
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, 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 this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA, or visit
-// http://www.gnu.org/copyleft/gpl.html
+/*
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
#include "stdafx.h"
#include <moreuuids.h>
// For CPUID usage
-#include "..\..\..\DSUtil\vd.h"
+#include "../../../DSUtil/vd.h"
#include "AvgLines.h"
#include <emmintrin.h>
diff --git a/src/filters/transform/VSFilter/Scale2x.h b/src/filters/transform/VSFilter/Scale2x.h index d0ce4fced..bd38fd84b 100644 --- a/src/filters/transform/VSFilter/Scale2x.h +++ b/src/filters/transform/VSFilter/Scale2x.h @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,4 +23,4 @@ #pragma once
-extern void Scale2x(const GUID& subtype, BYTE* d, int dpitch, BYTE* s, int spitch, int w, int h);
\ No newline at end of file +extern void Scale2x(const GUID& subtype, BYTE* d, int dpitch, BYTE* s, int spitch, int w, int h);
diff --git a/src/filters/transform/VSFilter/StyleEditorDialog.cpp b/src/filters/transform/VSFilter/StyleEditorDialog.cpp index 02170c870..b31fa4b9c 100644 --- a/src/filters/transform/VSFilter/StyleEditorDialog.cpp +++ b/src/filters/transform/VSFilter/StyleEditorDialog.cpp @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/filters/transform/VSFilter/StyleEditorDialog.h b/src/filters/transform/VSFilter/StyleEditorDialog.h index ec7818cea..b0760539d 100644 --- a/src/filters/transform/VSFilter/StyleEditorDialog.h +++ b/src/filters/transform/VSFilter/StyleEditorDialog.h @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,7 +25,7 @@ #include "resource.h"
#include "afxwin.h"
#include "afxcmn.h"
-#include "../../../subtitles/STS.h"
+#include "../../../Subtitles/STS.h"
// CColorStatic dialog
diff --git a/src/filters/transform/VSFilter/Systray.cpp b/src/filters/transform/VSFilter/Systray.cpp index 32f0defef..63a4aa0fa 100644 --- a/src/filters/transform/VSFilter/Systray.cpp +++ b/src/filters/transform/VSFilter/Systray.cpp @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/filters/transform/VSFilter/Systray.h b/src/filters/transform/VSFilter/Systray.h index 6d4ac3b76..02013e55b 100644 --- a/src/filters/transform/VSFilter/Systray.h +++ b/src/filters/transform/VSFilter/Systray.h @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/filters/transform/VSFilter/TextInputPin.cpp b/src/filters/transform/VSFilter/TextInputPin.cpp index df2bd911b..f32995241 100644 --- a/src/filters/transform/VSFilter/TextInputPin.cpp +++ b/src/filters/transform/VSFilter/TextInputPin.cpp @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/filters/transform/VSFilter/TextInputPin.h b/src/filters/transform/VSFilter/TextInputPin.h index 87d99c674..57b50b2a1 100644 --- a/src/filters/transform/VSFilter/TextInputPin.h +++ b/src/filters/transform/VSFilter/TextInputPin.h @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,7 +23,7 @@ #pragma once
-#include "../../../subtitles/SubtitleInputPin.h"
+#include "../../../Subtitles/SubtitleInputPin.h"
class CDirectVobSubFilter;
@@ -37,4 +39,3 @@ protected: public:
CTextInputPin(CDirectVobSubFilter* pFilter, CCritSec* pLock, CCritSec* pSubLock, HRESULT* phr);
};
-
diff --git a/src/filters/transform/VSFilter/VSFilter.cpp b/src/filters/transform/VSFilter/VSFilter.cpp index 787b8abc6..12ae93e67 100644 --- a/src/filters/transform/VSFilter/VSFilter.cpp +++ b/src/filters/transform/VSFilter/VSFilter.cpp @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/filters/transform/VSFilter/VSFilter.h b/src/filters/transform/VSFilter/VSFilter.h index e490d5cd1..6b7af5ffa 100644 --- a/src/filters/transform/VSFilter/VSFilter.h +++ b/src/filters/transform/VSFilter/VSFilter.h @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/filters/transform/VSFilter/csri.h b/src/filters/transform/VSFilter/csri.h index 3d55c3a19..83ee828fa 100644 --- a/src/filters/transform/VSFilter/csri.h +++ b/src/filters/transform/VSFilter/csri.h @@ -29,7 +29,7 @@ ****************************************************************************/
/** \file csri.h - main CSRI (common subtitle renderer interface) include.
- * $Id: csri.h 45 2007-06-20 01:00:40Z equinox $ */
+ * $Id$ */
#ifndef _CSRI_H
/** \cond */
diff --git a/src/filters/transform/VSFilter/csriapi.cpp b/src/filters/transform/VSFilter/csriapi.cpp index 8824cab4d..2381476d3 100644 --- a/src/filters/transform/VSFilter/csriapi.cpp +++ b/src/filters/transform/VSFilter/csriapi.cpp @@ -23,9 +23,9 @@ #include <afxdlgs.h>
#include <atlpath.h>
#include "resource.h"
-#include "../../../subtitles/VobSubFile.h"
-#include "../../../subtitles/RTS.h"
-#include "../../../subtitles/SSF.h"
+#include "../../../Subtitles/VobSubFile.h"
+#include "../../../Subtitles/RTS.h"
+#include "../../../Subtitles/SSF.h"
#include "../../../SubPic/MemSubPic.h"
#define CSRIAPI extern "C" __declspec(dllexport)
diff --git a/src/filters/transform/VSFilter/plugins.cpp b/src/filters/transform/VSFilter/plugins.cpp index 1abc38255..9f7146b1f 100644 --- a/src/filters/transform/VSFilter/plugins.cpp +++ b/src/filters/transform/VSFilter/plugins.cpp @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,9 +25,9 @@ #include <afxdlgs.h>
#include <atlpath.h>
#include "resource.h"
-#include "../../../subtitles/VobSubFile.h"
-#include "../../../subtitles/RTS.h"
-#include "../../../subtitles/SSF.h"
+#include "../../../Subtitles/VobSubFile.h"
+#include "../../../Subtitles/RTS.h"
+#include "../../../Subtitles/SSF.h"
#include "../../../SubPic/MemSubPic.h"
#include "../../../SubPic/SubPicQueueImpl.h"
#include "vfr.h"
diff --git a/src/filters/transform/VSFilter/stdafx.cpp b/src/filters/transform/VSFilter/stdafx.cpp index 774edf250..887298ca4 100644 --- a/src/filters/transform/VSFilter/stdafx.cpp +++ b/src/filters/transform/VSFilter/stdafx.cpp @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,8 +21,4 @@ *
*/
-// stdafx.cpp : source file that includes just the standard includes
-// stdafx.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
#include "stdafx.h"
diff --git a/src/filters/transform/VSFilter/stdafx.h b/src/filters/transform/VSFilter/stdafx.h index 5afee91f2..ca6dba445 100644 --- a/src/filters/transform/VSFilter/stdafx.h +++ b/src/filters/transform/VSFilter/stdafx.h @@ -1,6 +1,8 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
+ * $Id$
+ *
+ * (C) 2003-2006 Gabest
+ * (C) 2006-2010 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,9 +21,6 @@ *
*/
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently,
-// but are changed infrequently
#if !defined(AFX_STDAFX_H__E8AD1C3F_323D_4812_A1DE_AA2419CE2AF3__INCLUDED_)
#define AFX_STDAFX_H__E8AD1C3F_323D_4812_A1DE_AA2419CE2AF3__INCLUDED_
@@ -35,7 +34,7 @@ #define _ATL_APARTMENT_THREADED
#undef WINVER
-#define WINVER 0x0501 // <= Force WINVER 0x0501 with Visual Studio 2008 (fix compilation error)
+#define WINVER 0x0501
#include "../../../DSUtil/SharedInclude.h"
diff --git a/src/filters/transform/VSFilter/vfr.cpp b/src/filters/transform/VSFilter/vfr.cpp index 667351eb9..bb56a6126 100644 --- a/src/filters/transform/VSFilter/vfr.cpp +++ b/src/filters/transform/VSFilter/vfr.cpp @@ -1,6 +1,8 @@ /*
* VFR translation functions for OverLua
*
+ * $Id$
+ *
* (C) 2003-2006 Gabest
* (C) 2006-2010 see AUTHORS
*
@@ -178,4 +180,3 @@ VFRTranslator *GetVFRTranslator(const char *vfrfile) fclose(f);
return res;
}
-
diff --git a/src/filters/transform/VSFilter/vfr.h b/src/filters/transform/VSFilter/vfr.h index 61cb52546..a4aafffd4 100644 --- a/src/filters/transform/VSFilter/vfr.h +++ b/src/filters/transform/VSFilter/vfr.h @@ -1,6 +1,8 @@ /*
* VFR translation functions for OverLua
*
+ * $Id$
+ *
* (C) 2003-2006 Gabest
* (C) 2006-2010 see AUTHORS
*
|