[Drdivx-commits] SF.net SVN: drdivx: [405] DrDivX/trunk/mp3gain
Brought to you by:
harikrishnan_v,
seabass089
From: <ro...@us...> - 2006-08-21 19:09:47
|
Revision: 405 Author: robux4 Date: 2006-08-21 12:08:56 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/drdivx/?rev=405&view=rev Log Message: ----------- more cleaning from gcc warnings Modified Paths: -------------- DrDivX/trunk/drdivx2/src/analyzer/AnalyzerBundleImpl.cpp DrDivX/trunk/drdivx2/src/analyzer/AnalyzerImpl.cpp DrDivX/trunk/drdivx2/src/analyzer/PortableAnalyzerImpl.cpp DrDivX/trunk/drdivx2/src/analyzer/PropertyArbiterImpl.cpp DrDivX/trunk/drdivx2/src/analyzer/TrustRegistry.cpp DrDivX/trunk/drdivx2/src/analyzer/VtsIfoAnalyzerImpl.cpp DrDivX/trunk/drdivx2/src/cli/main.cpp DrDivX/trunk/drdivx2/src/detector/ContainerFormatDetectorImpl.cpp DrDivX/trunk/drdivx2/src/detector/FormatSupportRegistry.cpp DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp DrDivX/trunk/drdivx2/src/encoder/PortableTrackEncoder.cpp DrDivX/trunk/drdivx2/src/encoder/SubtitleTrackEncoder.cpp DrDivX/trunk/drdivx2/src/encoder/VideoTrackEncoder.cpp DrDivX/trunk/drdivx2/src/job/JobImpl.cpp DrDivX/trunk/drdivx2/src/media/ContainerBundleImpl.cpp DrDivX/trunk/drdivx2/src/media/FileContainerImpl.cpp DrDivX/trunk/drdivx2/src/media/MovieImpl.cpp DrDivX/trunk/drdivx2/src/media/TrackImpl.cpp DrDivX/trunk/drdivx2/src/profile/ContainerCheckerImpl.cpp DrDivX/trunk/drdivx2/src/profile/ContainerNormalizerImpl.cpp DrDivX/trunk/drdivx2/src/profile/ProfileBundleBuilderImpl.cpp DrDivX/trunk/drdivx2/src/profile/ProfileBundleImpl.cpp DrDivX/trunk/drdivx2/src/profile/ProfileBundleNormalizerImpl.cpp DrDivX/trunk/drdivx2/src/profile/ProfileImpl.cpp DrDivX/trunk/drdivx2/src/profile/QualityProfileBundleBuilder.cpp DrDivX/trunk/drdivx2/src/property/MetaPropertyBundleImpl.cpp DrDivX/trunk/drdivx2/src/util/LogManager.cpp DrDivX/trunk/drffmpeg/import/include/baseclasses/streams.h DrDivX/trunk/drffmpeg/import/include/baseclasses/wxutil.h DrDivX/trunk/mp3gain/apetag.c DrDivX/trunk/mp3gain/export/include/rg_error.h DrDivX/trunk/mp3gain/gain_analysis.c Modified: DrDivX/trunk/drdivx2/src/analyzer/AnalyzerBundleImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/analyzer/AnalyzerBundleImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/analyzer/AnalyzerBundleImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #include "JobImplEvents.h" #include "DrError.h" Modified: DrDivX/trunk/drdivx2/src/analyzer/AnalyzerImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/analyzer/AnalyzerImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/analyzer/AnalyzerImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #include <string> #include <vector> Modified: DrDivX/trunk/drdivx2/src/analyzer/PortableAnalyzerImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/analyzer/PortableAnalyzerImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/analyzer/PortableAnalyzerImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #ifdef _WIN32 #include <windows.h> @@ -882,7 +881,7 @@ err = vidTrack->SetProperty(p1); assert(err == noErr); - uint32_t rate, scale; + uint32_t rate = 0, scale = 1; p1 = NULL; err = CreateProperty(VIDEO_TRACK_FRAME_SCALE_PROP, &p1); Modified: DrDivX/trunk/drdivx2/src/analyzer/PropertyArbiterImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/analyzer/PropertyArbiterImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/analyzer/PropertyArbiterImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning (disable:4786) #include "DrError.h" #include "Serializable.h" Modified: DrDivX/trunk/drdivx2/src/analyzer/TrustRegistry.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/analyzer/TrustRegistry.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/analyzer/TrustRegistry.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) + #ifdef HAVE_CONFIG_H #include <config.h> #endif Modified: DrDivX/trunk/drdivx2/src/analyzer/VtsIfoAnalyzerImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/analyzer/VtsIfoAnalyzerImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/analyzer/VtsIfoAnalyzerImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #include "DrError.h" #include "Serializable.h" Modified: DrDivX/trunk/drdivx2/src/cli/main.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/cli/main.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/cli/main.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -20,9 +20,6 @@ /* Note: define CLI_MODE to use this file for a standalone app */ -#ifdef _MSC_VER -#pragma warning(disable:4786) -#endif #ifdef HAVE_CONFIG_H #include <config.h> #endif Modified: DrDivX/trunk/drdivx2/src/detector/ContainerFormatDetectorImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/detector/ContainerFormatDetectorImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/detector/ContainerFormatDetectorImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #include <drffmpeg/avformat.h> Modified: DrDivX/trunk/drdivx2/src/detector/FormatSupportRegistry.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/detector/FormatSupportRegistry.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/detector/FormatSupportRegistry.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #include "DrError.h" #include "Serializable.h" Modified: DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/encoder/AudioTrackEncoder.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,17 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <drffmpeg/avcodec.h> -#include <drffmpeg/avformat.h> - -#include <mp3gain/mp3gain.h> - #include "JobImplEvents.h" #include "StringUtility.h" #include "DrError.h" @@ -46,6 +40,11 @@ #include "PropertyHelper.h" #include "Mp3Encoder.h" +#include <drffmpeg/avcodec.h> +#include <drffmpeg/avformat.h> + +#include <mp3gain/mp3gain.h> + int opt_input_file(const char *); int opt_output_file(const char *); Modified: DrDivX/trunk/drdivx2/src/encoder/PortableTrackEncoder.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/encoder/PortableTrackEncoder.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/encoder/PortableTrackEncoder.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -994,10 +994,13 @@ AVFormatContext *oc, *os; int64_t total_size; AVCodecContext *enc; - int frame_number, vid, i; +#if 0 // disabled because unavailable with our encoder + int frame_number; + static int qp_histogram[52]; +#endif + int vid, i; double bitrate, ti1, pts; static int64_t last_time = -1; - static int qp_histogram[52]; if (!is_last_report) { int64_t cur_time; Modified: DrDivX/trunk/drdivx2/src/encoder/SubtitleTrackEncoder.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/encoder/SubtitleTrackEncoder.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/encoder/SubtitleTrackEncoder.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,15 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <drffmpeg/avcodec.h> -#include <drffmpeg/avformat.h> - #include "DrError.h" #include "Serializable.h" #include "Deserializable.h" @@ -41,6 +37,9 @@ #include "SubtitleTrackEncoder.h" #include "PropertyHelper.h" +#include <drffmpeg/avcodec.h> +#include <drffmpeg/avformat.h> + using namespace std; //#define USE_FFMPEG Modified: DrDivX/trunk/drdivx2/src/encoder/VideoTrackEncoder.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/encoder/VideoTrackEncoder.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/encoder/VideoTrackEncoder.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,15 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <drffmpeg/avcodec.h> -#include <drffmpeg/avformat.h> - #include "DrError.h" #include "Serializable.h" #include "Deserializable.h" @@ -45,6 +41,9 @@ #include "DivXEncoder.h" #include "VideoProcessing.h" +#include <drffmpeg/avcodec.h> +#include <drffmpeg/avformat.h> + using namespace std; int opt_input_file(const char *); Modified: DrDivX/trunk/drdivx2/src/job/JobImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/job/JobImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/job/JobImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -22,7 +22,6 @@ #include <config.h> #endif -#pragma warning(disable:4786) #include <cmath> #define INCLUDE_METADATA @@ -207,6 +206,7 @@ IProfileBundleBuilder *profileBundleBuilder = NULL; IPropertyBundle *hintPropBundle = NULL; IProperty *prop = NULL; + IMovie *movie = NULL; ErrorCode err; notifier.UpdateStage(Analysis); @@ -220,7 +220,6 @@ goto clean_exit; } - IMovie *movie = NULL; inputContainer->GetMovie(&movie); if (movie == NULL) { Modified: DrDivX/trunk/drdivx2/src/media/ContainerBundleImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/media/ContainerBundleImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/media/ContainerBundleImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #ifdef HAVE_CONFIG_H #include <config.h> #endif Modified: DrDivX/trunk/drdivx2/src/media/FileContainerImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/media/FileContainerImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/media/FileContainerImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #include <sys/types.h> #include <sys/stat.h> Modified: DrDivX/trunk/drdivx2/src/media/MovieImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/media/MovieImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/media/MovieImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning (disable:4786) #include <string> #include <vector> #include <cassert> Modified: DrDivX/trunk/drdivx2/src/media/TrackImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/media/TrackImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/media/TrackImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -18,8 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning (disable:4786) - #include "DrError.h" #include "Serializable.h" #include "Deserializable.h" Modified: DrDivX/trunk/drdivx2/src/profile/ContainerCheckerImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/profile/ContainerCheckerImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/profile/ContainerCheckerImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #include "DrError.h" #include "Serializable.h" Modified: DrDivX/trunk/drdivx2/src/profile/ContainerNormalizerImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/profile/ContainerNormalizerImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/profile/ContainerNormalizerImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #include "DrError.h" #include "Serializable.h" Modified: DrDivX/trunk/drdivx2/src/profile/ProfileBundleBuilderImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/profile/ProfileBundleBuilderImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/profile/ProfileBundleBuilderImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -118,6 +118,7 @@ case HighDefinitionCertification: certProfile = HighDefinitionCertificationProfile; break; + default: assert(0); break; }; outVidFrameRateDecimation = 0; @@ -250,6 +251,7 @@ case HighDefinitionCertification: certProfile = HighDefinitionCertificationProfile; break; + default: assert(0); break; }; // Check bitrate @@ -406,6 +408,7 @@ case HighDefinitionCertification: certProfile = HighDefinitionCertificationProfile; break; + default: assert(0); break; }; ProfilePropertyHelper::SetUInt32PropertyValue(profile, VIDEO_ENC_CERTIFICATION_PROP, certification); Modified: DrDivX/trunk/drdivx2/src/profile/ProfileBundleImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/profile/ProfileBundleImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/profile/ProfileBundleImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -371,6 +371,7 @@ case CustomProfileBundle: xmlNewProp(profileBundleNode, TYPE_TAG, CUSTOM_TAG); break; + default: assert(0); break; }; switch (certification) @@ -387,6 +388,7 @@ case HandheldCertification: xmlNewProp(profileBundleNode, CERTIFICATION_TAG, HAND_HELD_TAG); break; + default: assert(0); break; }; std::vector<IProfile *>::const_iterator iter(profiles.begin()), iterEnd(profiles.end()); Modified: DrDivX/trunk/drdivx2/src/profile/ProfileBundleNormalizerImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/profile/ProfileBundleNormalizerImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/profile/ProfileBundleNormalizerImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -85,6 +85,7 @@ case HighDefinitionCertification: certProfile = HighDefinitionCertificationProfile; break; + default: assert(0); break; }; uint32_t fps = inVidFrameRate / (inVidFrameScale * outVidFrameRateDecimation); Modified: DrDivX/trunk/drdivx2/src/profile/ProfileImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/profile/ProfileImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/profile/ProfileImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #include "DrError.h" #include "Serializable.h" Modified: DrDivX/trunk/drdivx2/src/profile/QualityProfileBundleBuilder.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/profile/QualityProfileBundleBuilder.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/profile/QualityProfileBundleBuilder.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -213,6 +213,7 @@ resizeFilter = Lanczos4; #endif break; + default: break; }; uint32_t inVidFrameRate = 0; Modified: DrDivX/trunk/drdivx2/src/property/MetaPropertyBundleImpl.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/property/MetaPropertyBundleImpl.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/property/MetaPropertyBundleImpl.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma warning(disable:4786) #ifdef HAVE_CONFIG_H #include <config.h> Modified: DrDivX/trunk/drdivx2/src/util/LogManager.cpp =================================================================== --- DrDivX/trunk/drdivx2/src/util/LogManager.cpp 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drdivx2/src/util/LogManager.cpp 2006-08-21 19:08:56 UTC (rev 405) @@ -107,7 +107,7 @@ struct tm *m = localtime(&t); if (with_header) { - sprintf(buf, "%02.2d-%02.2d-%04.4d %02.2d:%02.2d:%02.2d ", m->tm_mday, m->tm_mon + 1, m->tm_year + 1900, m->tm_hour, m->tm_min, m->tm_sec); + sprintf(buf, "%2.2d-%2.2d-%4.4d %2.2d:%2.2d:%2.2d ", m->tm_mday, m->tm_mon + 1, m->tm_year + 1900, m->tm_hour, m->tm_min, m->tm_sec); strcat(buf, prefix[level]); fwrite(buf, strlen(buf), 1, file); } Modified: DrDivX/trunk/drffmpeg/import/include/baseclasses/streams.h =================================================================== --- DrDivX/trunk/drffmpeg/import/include/baseclasses/streams.h 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drffmpeg/import/include/baseclasses/streams.h 2006-08-21 19:08:56 UTC (rev 405) @@ -43,9 +43,11 @@ #include <olectl.h> #include <ddraw.h> +#ifdef _MSC_VER // Disable warning message for C4201 - use of nameless struct/union // Otherwise, strmif.h will generate warnings for Win32 debug builds -#pragma warning( disable : 4201 ) +#pragma warning( disable : 4201 ) +#endif #include <mmsystem.h> @@ -130,7 +132,10 @@ /////////////////////////////////////////////////////////////////////////// +#ifdef _MSC_VER #pragma warning(disable:4201) // warning C4201: nonstandard extension used : nameless struct/union +#endif + #include <strmif.h> // Generated IDL header file for streams interfaces #include <reftime.h> // Helper class for REFERENCE_TIME management Modified: DrDivX/trunk/drffmpeg/import/include/baseclasses/wxutil.h =================================================================== --- DrDivX/trunk/drffmpeg/import/include/baseclasses/wxutil.h 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/drffmpeg/import/include/baseclasses/wxutil.h 2006-08-21 19:08:56 UTC (rev 405) @@ -11,8 +11,10 @@ #ifndef __WXUTIL__ #define __WXUTIL__ +#ifdef _MSC_VER // eliminate spurious "statement has no effect" warnings. #pragma warning(disable: 4705) +#endif // wrapper for whatever critical section we have class CCritSec { Modified: DrDivX/trunk/mp3gain/apetag.c =================================================================== --- DrDivX/trunk/mp3gain/apetag.c 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/mp3gain/apetag.c 2006-08-21 19:08:56 UTC (rev 405) @@ -303,7 +303,7 @@ return 1; } -int truncate_file (char *filename, long truncLength) { +int truncate_file (const char *filename, long truncLength) { #ifdef WIN32 Modified: DrDivX/trunk/mp3gain/export/include/rg_error.h =================================================================== --- DrDivX/trunk/mp3gain/export/include/rg_error.h 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/mp3gain/export/include/rg_error.h 2006-08-21 19:08:56 UTC (rev 405) @@ -56,9 +56,15 @@ #include <stdio.h> +#if !defined(MMSYSERR_NOERROR) #define MMSYSERR_NOERROR 0 +#endif +#if !defined(MMSYSERR_ERROR) #define MMSYSERR_ERROR 1 +#endif +#if !defined(WAVERR_BADFORMAT) #define WAVERR_BADFORMAT 32 +#endif typedef unsigned int MMRESULT; Modified: DrDivX/trunk/mp3gain/gain_analysis.c =================================================================== --- DrDivX/trunk/mp3gain/gain_analysis.c 2006-08-21 16:13:39 UTC (rev 404) +++ DrDivX/trunk/mp3gain/gain_analysis.c 2006-08-21 19:08:56 UTC (rev 405) @@ -138,11 +138,9 @@ // for each filter: // [0] 48 kHz, [1] 44.1 kHz, [2] 32 kHz, [3] 24 kHz, [4] 22050 Hz, [5] 16 kHz, [6] 12 kHz, [7] is 11025 Hz, [8] 8 kHz -#ifdef WIN32 -#ifndef __GNUC__ +#ifdef _MSC_VER #pragma warning ( disable : 4305 ) #endif -#endif static const Float_t ABYule[9][2*YULE_ORDER + 1] = { {0.03857599435200, -3.84664617118067, -0.02160367184185, 7.81501653005538, -0.00123395316851,-11.34170355132042, -0.00009291677959, 13.05504219327545, -0.01655260341619,-12.28759895145294, 0.02161526843274, 9.48293806319790, -0.02074045215285, -5.87257861775999, 0.00594298065125, 2.75465861874613, 0.00306428023191, -0.86984376593551, 0.00012025322027, 0.13919314567432, 0.00288463683916 }, @@ -169,11 +167,9 @@ }; -#ifdef WIN32 -#ifndef __GNUC__ +#ifdef _MSC_VER #pragma warning ( default : 4305 ) #endif -#endif // When calling these filter procedures, make sure that ip[-order] and op[-order] point to real data! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |