Filters: applied astyle formatting, updated copyright notice

VSFilter, VSRip: updated copyright notice
Renamed remaining "subtitles" instances to "Subtitles"

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

24 files changed, 118 insertions, 80 deletions

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

  *