[xiph-commits] r8705 - trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags
ozone at motherfish-iii.xiph.org
ozone at motherfish-iii.xiph.org
Sun Jan 9 15:27:43 PST 2005
Author: ozone
Date: 2005-01-09 15:27:43 -0800 (Sun, 09 Jan 2005)
New Revision: 8705
Modified:
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTime.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/config.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.h
Log:
oggdsf:
* Portability fixes for libCMMLTags
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -34,13 +34,13 @@
#include "stdafx.h"
-#include ".\c_anchortag.h"
+#include "C_AnchorTag.h"
//Constructors
C_AnchorTag::C_AnchorTag(void)
{
//Set the tag type
- mTagType = C_CMMLTag::eTagType::ANCHOR;
+ mTagType = C_CMMLTag::ANCHOR;
mCls = L"";
mHref = L"";
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -33,11 +33,11 @@
*/
#include "stdafx.h"
-#include ".\c_basetag.h"
+#include "libCMMLTags/C_BaseTag.h"
C_BaseTag::C_BaseTag(void)
{
- mTagType = C_CMMLTag::eTagType::BASE;
+ mTagType = C_CMMLTag::BASE;
mHref = L"";
}
@@ -81,4 +81,4 @@
void C_BaseTag::privateClone(C_CMMLTag* outTag) {
C_CMMLTag::privateClone(outTag);
((C_BaseTag*)outTag)->mHref = mHref;
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -33,13 +33,16 @@
*/
#pragma once
+
//STL Include Files
#include <string>
-using namespace std;
//Local Include Files
+#include <libCMMLTags/config.h>
#include <libCMMLTags/C_CMMLTag.h>
+using namespace std;
+
class LIBCMMLTAGS_API C_BaseTag
//Derived Classes
: public C_CMMLTag
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_cmmldoc.h"
+#include <libCMMLTags/C_CMMLDoc.h>
C_CMMLDoc::C_CMMLDoc(void)
{
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLError.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_cmmlerror.h"
+#include <libCMMLTags/C_CMMLError.h>
C_CMMLError::C_CMMLError(unsigned long inLine, unsigned long inCol, unsigned long inErrorCode)
{
@@ -55,4 +55,4 @@
}
unsigned long C_CMMLError::errorCode() {
return mErrorCode;
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_cmmlpreamble.h"
+#include <libCMMLTags/C_CMMLPreamble.h>
C_CMMLPreamble::C_CMMLPreamble(void)
{
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -37,6 +37,8 @@
#include <string>
using namespace std;
+#include <libCMMLTags/config.h>
+
class LIBCMMLTAGS_API C_CMMLPreamble
{
public:
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_cmmlroottag.h"
+#include <libCMMLTags/C_CMMLRootTag.h>
C_CMMLRootTag::C_CMMLRootTag(void)
{
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_cmmltag.h"
+#include <libCMMLTags/C_CMMLTag.h>
C_CMMLTag::C_CMMLTag(void)
{
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -35,6 +35,9 @@
//STL Include Files
#include <string>
+
+#include <libCMMLTags/config.h>
+
using namespace std;
//DESCRIPTION:
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTime.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTime.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTime.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -1,5 +1,5 @@
#include "stdafx.h"
-#include ".\c_cmmltime.h"
+#include <libCMMLTags/C_CMMLTime.h>
C_CMMLTime::C_CMMLTime(void)
{
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,12 +32,12 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_cliptag.h"
+#include <libCMMLTags/C_ClipTag.h>
//TO DO ::: track element
C_ClipTag::C_ClipTag(void)
{
- mTagType = C_CMMLTag::eTagType::CLIP;
+ mTagType = C_CMMLTag::CLIP;
mMetaList = new C_MetaTagList;
mAnchor = NULL;
@@ -184,4 +184,4 @@
retStr += mMetaList->toString();
retStr += L"</clip>\n\n";
return retStr;
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,11 +32,11 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_desctag.h"
+#include <libCMMLTags/C_DescTag.h>
C_DescTag::C_DescTag(void)
{
- mTagType = C_CMMLTag::eTagType::DESC;
+ mTagType = C_CMMLTag::DESC;
}
C_DescTag::~C_DescTag(void)
@@ -71,4 +71,4 @@
privateClone(retTag);
return retTag;
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -38,6 +38,7 @@
using namespace std;
//Local Include Files
+#include <libCMMLTags/config.h>
#include <libCMMLTags/C_TextFieldTag.h>
class LIBCMMLTAGS_API C_DescTag
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,11 +32,11 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_headtag.h"
+#include <libCMMLTags/C_HeadTag.h>
C_HeadTag::C_HeadTag(void)
{
- mTagType = C_CMMLTag::eTagType::HEAD;
+ mTagType = C_CMMLTag::HEAD;
mMetaList = new C_MetaTagList;
mTitle = new C_TitleTag;
mBase = NULL;
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_humreadcmmltag.h"
+#include <libCMMLTags/C_HumReadCMMLTag.h>
C_HumReadCMMLTag::C_HumReadCMMLTag(void)
{
@@ -78,4 +78,4 @@
}
return retStr;
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,11 +32,11 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_imagetag.h"
+#include <libCMMLTags/C_ImageTag.h>
C_ImageTag::C_ImageTag(void)
{
- mTagType = C_CMMLTag::eTagType::IMAGE;
+ mTagType = C_CMMLTag::IMAGE;
}
C_ImageTag::~C_ImageTag(void)
@@ -95,4 +95,4 @@
return retStr;
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -38,7 +38,8 @@
using namespace std;
//Local Include Files
-#include "c_humreadcmmltag.h"
+#include <libCMMLTags/config.h>
+#include <libCMMLTags/C_HumReadCMMLTag.h>
class LIBCMMLTAGS_API C_ImageTag :
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,11 +32,11 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_importtag.h"
+#include <libCMMLTags/C_ImportTag.h>
C_ImportTag::C_ImportTag(void)
{
- mTagType = C_CMMLTag::eTagType::IMPORT;
+ mTagType = C_CMMLTag::IMPORT;
mStart = L"0";
mParamList = new C_ParamTagList;
}
@@ -160,4 +160,4 @@
}
-
\ No newline at end of file
+
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTagList.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_importtaglist.h"
+#include <libCMMLTags/C_ImportTagList.h>
C_ImportTagList::C_ImportTagList(void)
{
@@ -72,4 +72,4 @@
privateClone(retList);
return retList;
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_int64.h"
+#include <libCMMLTags/C_Int64.h>
C_Int64::C_Int64(void)
{
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_Int64.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -34,6 +34,8 @@
#pragma once
+#include <libCMMLTags/config.h>
+
class LIBCMMLTAGS_API C_Int64
{
public:
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_mappedtag.h"
+#include <libCMMLTags/C_MappedTag.h>
C_MappedTag::C_MappedTag(void)
{
@@ -67,4 +67,4 @@
C_MappedTag* locTag = reinterpret_cast<C_MappedTag*>(outTag);
locTag->setName(mName);
locTag->setContent(mContent);
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTag.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -38,6 +38,7 @@
using namespace std;
//Local Include Files
+#include <libCMMLTags/config.h>
#include <libCMMLTags/C_HumReadCMMLTag.h>
class LIBCMMLTAGS_API C_MappedTag
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MappedTagList.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_mappedtaglist.h"
+#include <libCMMLTags/C_MappedTagList.h>
C_MappedTagList::C_MappedTagList(void)
{
@@ -103,4 +103,4 @@
outTagList->addTag(mTagList[i]->mappedClone());
}
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,11 +32,11 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_metatag.h"
+#include <libCMMLTags/C_MetaTag.h>
C_MetaTag::C_MetaTag(void)
{
- mTagType = C_CMMLTag::eTagType::META;
+ mTagType = C_CMMLTag::META;
}
C_MetaTag::~C_MetaTag(void)
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -35,13 +35,14 @@
//STL Include Files
#include <string>
-using namespace std;
//Local Include Files
+#include <libCMMLTags/config.h>
#include <libCMMLTags/C_MappedTag.h>
+using namespace std;
+
class LIBCMMLTAGS_API C_MetaTag
- //Derived Classes
: public C_MappedTag
{
public:
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTagList.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_metataglist.h"
+#include <libCMMLTags/C_MetaTagList.h>
C_MetaTagList::C_MetaTagList(void)
{
@@ -93,4 +93,4 @@
void C_MetaTagList::privateClone(C_MappedTagList* outTagList) {
C_MappedTagList::privateClone(outTagList);
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_paramtag.h"
+#include <libCMMLTags/C_ParamTag.h>
C_ParamTag::C_ParamTag(void)
{
@@ -71,4 +71,4 @@
}
C_CMMLTag* C_ParamTag::genericClone() {
return clone();
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -38,7 +38,8 @@
using namespace std;
//Local Include Files
-#include "c_mappedtag.h"
+#include <libCMMLTags/config.h>
+#include <libCMMLTags/C_MappedTag.h>
class LIBCMMLTAGS_API C_ParamTag
//Derived Classes
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTagList.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_paramtaglist.h"
+#include <libCMMLTags/C_ParamTagList.h>
C_ParamTagList::C_ParamTagList(void)
{
@@ -61,4 +61,4 @@
C_ParamTagList* retList = new C_ParamTagList;
privateClone(retList);
return retList;
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,11 +32,11 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_streamtag.h"
+#include <libCMMLTags/C_StreamTag.h>
C_StreamTag::C_StreamTag(void)
{
- mTagType = C_CMMLTag::eTagType::STREAM;
+ mTagType = C_CMMLTag::STREAM;
mImportList = new C_ImportTagList;
mTimebase = L"0";
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_taglist.h"
+#include <libCMMLTags/C_TagList.h>
C_TagList::C_TagList(void)
{
@@ -81,4 +81,4 @@
outTagList->addTag(mTagList[i]->genericClone());
}
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TagList.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -39,6 +39,7 @@
using namespace std;
//Local Include Files
+#include <libCMMLTags/config.h>
#include <libCMMLTags/C_CMMLTag.h>
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TextFieldTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,7 +32,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_textfieldtag.h"
+#include <libCMMLTags/C_TextFieldTag.h>
C_TextFieldTag::C_TextFieldTag(void)
{
@@ -55,4 +55,4 @@
void C_TextFieldTag::privateClone(C_CMMLTag* outTag) {
C_HumReadCMMLTag::privateClone(outTag);
((C_TextFieldTag*)outTag)->setText(mText);
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,11 +32,11 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "stdafx.h"
-#include ".\c_titletag.h"
+#include <libCMMLTags/C_TitleTag.h>
C_TitleTag::C_TitleTag(void)
{
- mTagType = C_CMMLTag::eTagType::TITLE;
+ mTagType = C_CMMLTag::TITLE;
}
C_TitleTag::~C_TitleTag(void)
@@ -68,4 +68,4 @@
}
C_CMMLTag* C_TitleTag::genericClone() {
return clone();
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -38,6 +38,7 @@
using namespace std;
//Local Include Files
+#include <libCMMLTags/config.h>
#include <libCMMLTags/C_TextFieldTag.h>
class LIBCMMLTAGS_API C_TitleTag
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/config.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/config.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/config.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -39,8 +39,16 @@
// LIBCMMLTAGS_API functions as being imported from a DLL, whereas this DLL sees symbols
// defined with this macro as being exported.
-#ifdef LIBCMMLTAGS_EXPORTS
-#define LIBCMMLTAGS_API __declspec(dllexport)
+#pragma once
+
+
+#ifdef WIN32
+# ifdef LIBCMMLTAGS_EXPORTS
+# define LIBCMMLTAGS_API __declspec(dllexport)
+# else
+# define LIBCMMLTAGS_API __declspec(dllimport)
+# endif
#else
-#define LIBCMMLTAGS_API __declspec(dllimport)
-#endif
\ No newline at end of file
+# define LIBCMMLTAGS_API
+#endif
+
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -32,20 +32,21 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// The following ifdef block is the standard way of creating macros which make exporting
-// from a DLL simpler. All files within this DLL are compiled with the LIBCMMLTAGS_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see
-// LIBCMMLTAGS_API functions as being imported from a DLL, whereas this DLL sees symbols
-// defined with this macro as being exported.
-#ifdef LIBCMMLTAGS_EXPORTS
-#define LIBCMMLTAGS_API __declspec(dllexport)
+#pragma once
+
+
+#ifdef WIN32
+# ifdef LIBCMMLTAGS_EXPORTS
+# define LIBCMMLTAGS_API __declspec(dllexport)
+# else
+# define LIBCMMLTAGS_API __declspec(dllimport)
+# endif
#else
-#define LIBCMMLTAGS_API __declspec(dllimport)
+# define LIBCMMLTAGS_API
#endif
-#include "config.h"
+#include <libCMMLTags/config.h>
// These classes are exported from the cpp_lib_cmml.dll
#include <libCMMLTags/C_AnchorTag.h>
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.h 2005-01-09 23:10:32 UTC (rev 8704)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/stdafx.h 2005-01-09 23:27:43 UTC (rev 8705)
@@ -43,7 +43,10 @@
#pragma warning(disable:4251)
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files:
-#include <windows.h>
-#include "config.h"
+#ifdef WIN32
+# include <windows.h>
+#endif
+#include <libCMMLTags/config.h>
+
// TODO: reference additional headers your program requires here
More information about the commits
mailing list