Author: robux4
Date: 2005-03-16 21:30:28 +0300 (Wed, 16 Mar 2005)
New Revision: 1094
Modified:
trunk/libebml/src/StdIOCallback.cpp
trunk/libmatroska/matroska/KaxContexts.h
trunk/mkxuncat/mkxuncat.cpp
trunk/mkxuncat/mkxuncat.vcproj
Log:
misc compilation fixes
Modified: trunk/libebml/src/StdIOCallback.cpp
===================================================================
--- trunk/libebml/src/StdIOCallback.cpp 2005-03-16 13:11:04 UTC (rev 1093)
+++ trunk/libebml/src/StdIOCallback.cpp 2005-03-16 18:30:28 UTC (rev 1094)
@@ -159,7 +159,7 @@
assert(File!=0);
uint32 Result = fwrite(Buffer,1,Size,File);
mCurrentPosition += Result;
- return result;
+ return Result;
}
uint64 StdIOCallback::getFilePointer()
Modified: trunk/libmatroska/matroska/KaxContexts.h
===================================================================
--- trunk/libmatroska/matroska/KaxContexts.h 2005-03-16 13:11:04 UTC (rev 1093)
+++ trunk/libmatroska/matroska/KaxContexts.h 2005-03-16 18:30:28 UTC (rev 1094)
@@ -1,86 +1,87 @@
-/****************************************************************************
-** libmatroska : parse Matroska files, see http://www.matroska.org/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2004 Steve Lhomme. All rights reserved.
-**
-** This file is part of libmatroska.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 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
-** Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser 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
-**
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
-** Contact [email protected] if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-/*!
- \file
- \version \$Id: KaxContexts.h,v 1.6 2004/04/14 23:26:17 robux4 Exp $
- \author Steve Lhomme <robux4 @ users.sf.net>
-*/
-#ifndef LIBMATROSKA_CONTEXTS_H
-#define LIBMATROSKA_CONTEXTS_H
-
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlElement.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxSegment_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxAttachments_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxAttached_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxFileDescription_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxFileName_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxMimeType_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxFileData_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxChapters_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCluster_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTags_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTag_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxBlockGroup_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxReferencePriority_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxReferenceBlock_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxReferenceVirtual_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCues_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxInfo_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxSeekHead_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTracks_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackEntry_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackNumber_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackType_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackFlagEnabled_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackFlagDefault_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackFlagLacing_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackName_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackLanguage_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecID_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecPrivate_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecName_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecSettings_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecInfoURL_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecDownloadURL_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecDecodeAll_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackOverlay_Context;
-
-extern const EbmlSemanticContext & MATROSKA_DLL_API GetKaxGlobal_Context();
-extern const EbmlSemanticContext & MATROSKA_DLL_API GetKaxTagsGlobal_Context();
-
-END_LIBMATROSKA_NAMESPACE
-
-#endif // LIBMATROSKA_CONTEXTS_H
+/****************************************************************************
+** libmatroska : parse Matroska files, see http://www.matroska.org/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2004 Steve Lhomme. All rights reserved.
+**
+** This file is part of libmatroska.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 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
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** Contact [email protected] if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+ \file
+ \version \$Id: KaxContexts.h,v 1.6 2004/04/14 23:26:17 robux4 Exp $
+ \author Steve Lhomme <robux4 @ users.sf.net>
+*/
+#ifndef LIBMATROSKA_CONTEXTS_H
+#define LIBMATROSKA_CONTEXTS_H
+
+#include "matroska/KaxTypes.h"
+#include "ebml/EbmlElement.h"
+
+using namespace LIBEBML_NAMESPACE;
+
+START_LIBMATROSKA_NAMESPACE
+
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxMatroska_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxSegment_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxAttachments_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxAttached_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxFileDescription_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxFileName_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxMimeType_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxFileData_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxChapters_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxCluster_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTags_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTag_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxBlockGroup_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxReferencePriority_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxReferenceBlock_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxReferenceVirtual_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxCues_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxInfo_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxSeekHead_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTracks_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackEntry_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackNumber_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackType_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackFlagEnabled_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackFlagDefault_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackFlagLacing_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackName_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackLanguage_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecID_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecPrivate_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecName_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecSettings_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecInfoURL_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecDownloadURL_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecDecodeAll_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackOverlay_Context;
+
+extern const EbmlSemanticContext & MATROSKA_DLL_API GetKaxGlobal_Context();
+extern const EbmlSemanticContext & MATROSKA_DLL_API GetKaxTagsGlobal_Context();
+
+END_LIBMATROSKA_NAMESPACE
+
+#endif // LIBMATROSKA_CONTEXTS_H
Modified: trunk/mkxuncat/mkxuncat.cpp
===================================================================
--- trunk/mkxuncat/mkxuncat.cpp 2005-03-16 13:11:04 UTC (rev 1093)
+++ trunk/mkxuncat/mkxuncat.cpp 2005-03-16 18:30:28 UTC (rev 1094)
@@ -39,6 +39,7 @@
#include <ebml/EbmlStream.h>
#include <ebml/EbmlHead.h>
#include <ebml/EbmlContexts.h>
+#include <matroska/KaxContexts.h>
#include <matroska/KaxSegment.h>
using namespace LIBEBML_NAMESPACE;
@@ -54,7 +55,7 @@
int main(int argc, const char *argv[])
{
- fprintf( stdout, "mkxuncat v0.1.0 (c) Steve Lhomme - GPL\n" );
+ fprintf( stdout, "mkxuncat v0.1.1 (c) Steve Lhomme - GPL\n" );
if ( argc != 2 )
{
Modified: trunk/mkxuncat/mkxuncat.vcproj
===================================================================
--- trunk/mkxuncat/mkxuncat.vcproj 2005-03-16 13:11:04 UTC (rev 1093)
+++ trunk/mkxuncat/mkxuncat.vcproj 2005-03-16 18:30:28 UTC (rev 1094)
@@ -119,9 +119,6 @@
<File
RelativePath=".\mkxuncat.cpp">
</File>
- <File
- RelativePath="..\libebml\src\platform\win32\WinIOCallback.cpp">
- </File>
</Filter>
<Filter
Name="Header Files"
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.