[xiph-commits] r8490 - in trunk/oggdsf/src/lib: codecs/flac/libs/libflac/include/FLAC core/directshow/libDirectshowAbstracts

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-19 03:01:55 -0800 (Sun, 19 Dec 2004)
New Revision: 8490

Removed:
   trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.in
Modified:
   trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.cpp
   trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp
Log:
* Removed the obsolete ordinals.h.in from previous version of flac.
* Squashed about 6 warnings in AbsTransFilter signed/unsigned.

Deleted: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.in	2004-12-19 10:45:10 UTC (rev 8489)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.in	2004-12-19 11:01:55 UTC (rev 8490)
@@ -1,58 +0,0 @@
-/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003  Josh Coalson
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
- */
-
-#ifndef FLAC__ORDINALS_H
-#define FLAC__ORDINALS_H
-
-#ifdef true
-#undef true
-#endif
-#ifdef false
-#undef false
-#endif
-#ifndef __cplusplus
-#define true 1
-#define false 0
-#endif
-
-typedef int FLAC__bool;
-
-typedef signed char FLAC__int8;
-typedef unsigned char FLAC__uint8;
-
-#if defined _MSC_VER
-typedef __int16 FLAC__int16;
-typedef __int32 FLAC__int32;
-typedef __int64 FLAC__int64;
-typedef unsigned __int16 FLAC__uint16;
-typedef unsigned __int32 FLAC__uint32;
-typedef unsigned __int64 FLAC__uint64;
-#else
-typedef @FLaC__SIZE16@ FLAC__int16;
-typedef @FLaC__SIZE32@ FLAC__int32;
-typedef @FLaC__SIZE64@ FLAC__int64;
-typedef @FLaC__USIZE16@ FLAC__uint16;
-typedef @FLaC__USIZE32@ FLAC__uint32;
-typedef @FLaC__USIZE64@ FLAC__uint64;
-#endif
-
-typedef FLAC__uint8 FLAC__byte;
-typedef float FLAC__real;
-
-#endif

Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.cpp	2004-12-19 10:45:10 UTC (rev 8489)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.cpp	2004-12-19 11:01:55 UTC (rev 8490)
@@ -78,7 +78,7 @@
 {
 
 	delete mStreamLock;
-	for (int i = 0; i < mAcceptableMediaTypes.size(); i++) {
+	for (size_t i = 0; i < mAcceptableMediaTypes.size(); i++) {
 		delete mAcceptableMediaTypes[i];
 	}
 
@@ -127,7 +127,7 @@
 HRESULT AbstractTransformInputPin::CheckMediaType(const CMediaType *inMediaType) 
 {
 	//TO DO::: Neaten this up.
-	for (int i = 0; i < mAcceptableMediaTypes.size(); i++) {
+	for (size_t i = 0; i < mAcceptableMediaTypes.size(); i++) {
 		if	(		(inMediaType->majortype == mAcceptableMediaTypes[i]->majortype) 
 				&&	(inMediaType->subtype == mAcceptableMediaTypes[i]->subtype) 
 				&&	(inMediaType->formattype == mAcceptableMediaTypes[i]->formattype)
@@ -172,7 +172,7 @@
 	//TODO::: Check for NULL Pointer.
 	if (inPosition < 0) {
 		return E_INVALIDARG;
-	} else 	if (inPosition < mAcceptableMediaTypes.size()) {
+	} else 	if (((size_t)inPosition) < mAcceptableMediaTypes.size()) {
 		outMediaType->SetType(&(mAcceptableMediaTypes[inPosition]->majortype));
 		outMediaType->SetSubtype(&(mAcceptableMediaTypes[inPosition]->subtype));
 		//Don't set the format data here... its up to the connecting output pin

Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp	2004-12-19 10:45:10 UTC (rev 8489)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp	2004-12-19 11:01:55 UTC (rev 8490)
@@ -55,7 +55,7 @@
 	delete mDataQueue;
 	mDataQueue = NULL;
 
-	for (int i = 0; i < mAcceptableMediaTypes.size(); i++) {
+	for (size_t i = 0; i < mAcceptableMediaTypes.size(); i++) {
 		delete mAcceptableMediaTypes[i];
 	}
 }
@@ -123,7 +123,7 @@
 }
 HRESULT AbstractTransformOutputPin::CheckMediaType(const CMediaType *inMediaType) 
 {
-	for (int i = 0;  i < mAcceptableMediaTypes.size(); i++) {
+	for (size_t i = 0;  i < mAcceptableMediaTypes.size(); i++) {
 		if	(		(inMediaType->majortype == mAcceptableMediaTypes[i]->majortype) 
 				&& 	(inMediaType->subtype == mAcceptableMediaTypes[i]->subtype) 
 				&&	(inMediaType->formattype == mAcceptableMediaTypes[i]->formattype)
@@ -159,7 +159,7 @@
 		return E_INVALIDARG;
 	}
 
-	if (inPosition < mAcceptableMediaTypes.size()) {
+	if (((size_t)inPosition) < mAcceptableMediaTypes.size()) {
 		FillMediaType(outMediaType, inPosition);
 		CreateAndFillFormatBuffer(outMediaType, inPosition);
 		return S_OK;