[xiph-commits] r8323 - in trunk/oggdsf/src/lib:
codecs/cmml/libCMMLTagsDotNET core/directshow/dsfSubtitleVMR9
helper/libiWrapper
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Tue Nov 30 22:52:09 PST 2004
Author: illiminable
Date: 2004-11-30 22:52:08 -0800 (Tue, 30 Nov 2004)
New Revision: 8323
Modified:
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.cpp
trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h
trunk/oggdsf/src/lib/helper/libiWrapper/Wrappers.cpp
trunk/oggdsf/src/lib/helper/libiWrapper/Wrappers.h
trunk/oggdsf/src/lib/helper/libiWrapper/libiWrapper.vcproj
Log:
* Widify cmml.
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/AnchorTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -60,29 +60,29 @@
//Accessors
String* AnchorTag::cls() {
- return Wrappers::CStrToNetStr( getMe()->cls().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->cls().c_str() );
}
String* AnchorTag::href() {
- return Wrappers::CStrToNetStr( getMe()->href().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->href().c_str() );
}
//Mutators
void AnchorTag::setCls(String* inCls) {
- char* tc = Wrappers::netStrToCStr( inCls );
+ wchar_t* tc = Wrappers::netStrToWStr( inCls );
getMe()->setCls( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void AnchorTag::setHref(String* inHref) {
- char* tc = Wrappers::netStrToCStr( inHref );
+ wchar_t* tc = Wrappers::netStrToWStr( inHref );
getMe()->setHref( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
//Other
String* AnchorTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str() );
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/BaseTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -57,19 +57,19 @@
//Accessors
String* BaseTag::href() {
- return Wrappers::CStrToNetStr( getMe()->href().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->href().c_str() );
}
//Mutators
void BaseTag::setHref(String* inHref) {
- char* tc = Wrappers::netStrToCStr( inHref );
+ wchar_t* tc = Wrappers::netStrToWStr( inHref );
getMe()->setHref( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
//Other
String* BaseTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str() );
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLPreamble.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -49,35 +49,35 @@
//Accessors
String* CMMLPreamble::xmlVersion() {
- return Wrappers::CStrToNetStr( mBaseClass->xmlVersion().c_str() );
+ return Wrappers::WStrToNetStr( mBaseClass->xmlVersion().c_str() );
}
String* CMMLPreamble::xmlEncoding() {
- return Wrappers::CStrToNetStr( mBaseClass->xmlEncoding().c_str() );
+ return Wrappers::WStrToNetStr( mBaseClass->xmlEncoding().c_str() );
}
String* CMMLPreamble::xmlStandAlone() {
- return Wrappers::CStrToNetStr( mBaseClass->xmlStandAlone().c_str() );
+ return Wrappers::WStrToNetStr( mBaseClass->xmlStandAlone().c_str() );
}
//Mutators
void CMMLPreamble::setXmlVersion(String* inVersion) {
- char* tc = Wrappers::netStrToCStr( inVersion );
+ wchar_t* tc = Wrappers::netStrToWStr( inVersion );
mBaseClass->setXmlVersion( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void CMMLPreamble::setXmlEncoding(String* inEncoding) {
- char* tc = Wrappers::netStrToCStr( inEncoding );
+ wchar_t* tc = Wrappers::netStrToWStr( inEncoding );
mBaseClass->setXmlEncoding( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void CMMLPreamble::setXmlStandAlone(String* inStandAlone) {
- char* tc = Wrappers::netStrToCStr( inStandAlone );
+ wchar_t* tc = Wrappers::netStrToWStr( inStandAlone );
mBaseClass->setXmlStandAlone( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
//Others
String* CMMLPreamble::toString() {
- return Wrappers::CStrToNetStr( mBaseClass->toString().c_str() );
+ return Wrappers::WStrToNetStr( mBaseClass->toString().c_str() );
}
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLRootTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -75,7 +75,7 @@
//Other
String* CMMLRootTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str());
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str());
}
C_CMMLRootTag* CMMLRootTag::getMe() {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/CMMLTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -50,14 +50,14 @@
}
//Accessors
String* CMMLTag::id() {
- return Wrappers::CStrToNetStr( mBaseClass->id().c_str() );
+ return Wrappers::WStrToNetStr( mBaseClass->id().c_str() );
}
//Mutators
void CMMLTag::setId(String* inId) {
- char* tc = Wrappers::netStrToCStr( inId );
+ wchar_t* tc = Wrappers::netStrToWStr( inId );
mBaseClass->setId( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -57,7 +57,7 @@
//Accessors
String* ClipTag::track() {
- return Wrappers::CStrToNetStr( getMe()->track().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->track().c_str() );
}
MetaTagList* ClipTag::metaList() {
return new MetaTagList(getMe()->metaList()->clone());
@@ -73,20 +73,20 @@
}
String* ClipTag::start() {
- return Wrappers::CStrToNetStr( getMe()->start().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->start().c_str() );
}
String* ClipTag::end() {
- return Wrappers::CStrToNetStr( getMe()->end().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->end().c_str() );
}
//Mutators
void ClipTag::setTrack(String* inTrack) {
- char* tc = Wrappers::netStrToCStr( inTrack );
+ wchar_t* tc = Wrappers::netStrToWStr( inTrack );
getMe()->setTrack( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void ClipTag::setAnchor(AnchorTag* inAnchor) {
getMe()->setAnchor(inAnchor->getMe()->clone());
@@ -99,20 +99,20 @@
}
void ClipTag::setStart(String* inStart) {
- char* tc = Wrappers::netStrToCStr( inStart );
+ wchar_t* tc = Wrappers::netStrToWStr( inStart );
getMe()->setStart( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void ClipTag::setEnd(String* inEnd) {
- char* tc = Wrappers::netStrToCStr( inEnd );
+ wchar_t* tc = Wrappers::netStrToWStr( inEnd );
getMe()->setEnd( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
//Others
String* ClipTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str() );
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTagList.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -54,7 +54,7 @@
String* ClipTagList::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str());
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str());
}
void ClipTagList::addTag(ClipTag* inTag) {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/DescTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -56,7 +56,7 @@
return (C_DescTag*)mBaseClass;
}
String* DescTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str() );
}
}
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HeadTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -56,7 +56,7 @@
}
String* HeadTag::profile() {
- return Wrappers::CStrToNetStr( getMe()->profile().c_str());
+ return Wrappers::WStrToNetStr( getMe()->profile().c_str());
}
TitleTag* HeadTag::title() {
return new TitleTag(getMe()->title()->clone());
@@ -76,9 +76,9 @@
//Mutators
void HeadTag::setProfile(String* inProfile) {
- char* tc = Wrappers::netStrToCStr( inProfile );
+ wchar_t* tc = Wrappers::netStrToWStr( inProfile );
getMe()->setProfile( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void HeadTag::setTitle(TitleTag* inTitle){
@@ -91,7 +91,7 @@
//Other
String* HeadTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str());
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str());
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/HumReadCMMLTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -52,22 +52,22 @@
}
//Accessors
String* HumReadCMMLTag::lang() {
- return Wrappers::CStrToNetStr( getMe()->lang().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->lang().c_str() );
}
String* HumReadCMMLTag::dirn() {
- return Wrappers::CStrToNetStr( getMe()->dirn().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->dirn().c_str() );
}
//Mutators
void HumReadCMMLTag::setLang(String* inLang) {
- char* tc = Wrappers::netStrToCStr( inLang );
+ wchar_t* tc = Wrappers::netStrToWStr( inLang );
getMe()->setLang( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void HumReadCMMLTag::setDirn(String* inDirn) {
- char* tc = Wrappers::netStrToCStr( inDirn );
+ wchar_t* tc = Wrappers::netStrToWStr( inDirn );
getMe()->setDirn( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImageTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -54,27 +54,27 @@
//Accessors
String* ImageTag::src() {
- return Wrappers::CStrToNetStr( getMe()->src().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->src().c_str() );
}
String* ImageTag::alt() {
- return Wrappers::CStrToNetStr( getMe()->alt().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->alt().c_str() );
}
//Mutators
void ImageTag::setSrc(String* inSrc) {
- char* tc = Wrappers::netStrToCStr( inSrc );
+ wchar_t* tc = Wrappers::netStrToWStr( inSrc );
getMe()->setSrc( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void ImageTag::setAlt(String* inAlt) {
- char* tc = Wrappers::netStrToCStr( inAlt );
+ wchar_t* tc = Wrappers::netStrToWStr( inAlt );
getMe()->setAlt( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
//Other
String* ImageTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str() );
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -56,22 +56,22 @@
//Accessors
String* ImportTag::granuleRate() {
- return Wrappers::CStrToNetStr( getMe()->granuleRate().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->granuleRate().c_str() );
}
String* ImportTag::contentType() {
- return Wrappers::CStrToNetStr( getMe()->contentType().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->contentType().c_str() );
}
String* ImportTag::src() {
- return Wrappers::CStrToNetStr( getMe()->src().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->src().c_str() );
}
String* ImportTag::start() {
- return Wrappers::CStrToNetStr( getMe()->start().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->start().c_str() );
}
String* ImportTag::end() {
- return Wrappers::CStrToNetStr( getMe()->end().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->end().c_str() );
}
String* ImportTag::title() {
- return Wrappers::CStrToNetStr( getMe()->title().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->title().c_str() );
}
ParamTagList* ImportTag::paramList() {
return new ParamTagList(getMe()->paramList()->clone());
@@ -80,34 +80,34 @@
//Mutators
void ImportTag::setGranuleRate(String* inGranuleRate) {
- char* tc = Wrappers::netStrToCStr( inGranuleRate );
+ wchar_t* tc = Wrappers::netStrToWStr( inGranuleRate );
getMe()->setGranuleRate( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void ImportTag::setContentType(String* inContentType) {
- char* tc = Wrappers::netStrToCStr( inContentType );
+ wchar_t* tc = Wrappers::netStrToWStr( inContentType );
getMe()->setContentType( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void ImportTag::setSrc(String* inSrc) {
- char* tc = Wrappers::netStrToCStr( inSrc );
+ wchar_t* tc = Wrappers::netStrToWStr( inSrc );
getMe()->setSrc( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void ImportTag::setStart(String* inStart) {
- char* tc = Wrappers::netStrToCStr( inStart );
+ wchar_t* tc = Wrappers::netStrToWStr( inStart );
getMe()->setStart( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void ImportTag::setEnd(String* inEnd) {
- char* tc = Wrappers::netStrToCStr( inEnd );
+ wchar_t* tc = Wrappers::netStrToWStr( inEnd );
getMe()->setEnd( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void ImportTag::setTitle(String* inTitle) {
- char* tc = Wrappers::netStrToCStr( inTitle );
+ wchar_t* tc = Wrappers::netStrToWStr( inTitle );
getMe()->setTitle( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void ImportTag::setParamList(ParamTagList* inParamList) {
getMe()->setParamList(inParamList->getMe()->clone());
@@ -115,7 +115,7 @@
//Other
String* ImportTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str() );
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ImportTagList.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -53,7 +53,7 @@
String* ImportTagList::toString() {
- return Wrappers::CStrToNetStr (getMe()->toString().c_str() );
+ return Wrappers::WStrToNetStr (getMe()->toString().c_str() );
}
void ImportTagList::addTag(ImportTag* inTag) {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -56,24 +56,24 @@
}
//Accessors
String* MappedTag::name() {
- return Wrappers::CStrToNetStr( getMe()->name().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->name().c_str() );
}
String* MappedTag::content() {
- return Wrappers::CStrToNetStr( getMe()->content().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->content().c_str() );
}
//Mutators
void MappedTag::setName(String* inName) {
- char* tc = Wrappers::netStrToCStr( inName );
+ wchar_t* tc = Wrappers::netStrToWStr( inName );
getMe()->setName( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void MappedTag::setContent(String* inContent) {
- char* tc = Wrappers::netStrToCStr( inContent );
+ wchar_t* tc = Wrappers::netStrToWStr( inContent );
getMe()->setContent( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MappedTagList.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -51,9 +51,9 @@
}
String* MappedTagList::getContent(String* inName) {
- char* tc = Wrappers::netStrToCStr( inName );
- String* ts = Wrappers::CStrToNetStr( mBaseClass->getContent(tc).c_str() );
- Wrappers::releaseCStr( tc );
+ wchar_t* tc = Wrappers::netStrToWStr( inName );
+ String* ts = Wrappers::WStrToNetStr( mBaseClass->getContent(tc).c_str() );
+ Wrappers::releaseWStr( tc );
return ts;
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -58,19 +58,19 @@
//Accessors
String* MetaTag::scheme() {
- return Wrappers::CStrToNetStr( getMe()->scheme().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->scheme().c_str() );
}
//Mutators
void MetaTag::setScheme(String* inScheme) {
- char* tc = Wrappers::netStrToCStr( inScheme );
+ wchar_t* tc = Wrappers::netStrToWStr( inScheme );
getMe()->setScheme( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
//Other
String* MetaTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str() );
}
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -58,13 +58,13 @@
}
void MetaTagList::addTag(String* inName, String* inContent) {
- char* tc1 = Wrappers::netStrToCStr( inName );
- char* tc2 = Wrappers::netStrToCStr( inContent );
+ wchar_t* tc1 = Wrappers::netStrToWStr( inName );
+ wchar_t* tc2 = Wrappers::netStrToWStr( inContent );
getMe()->addTag(tc1, tc2);
- Wrappers::releaseCStr( tc2 );
- Wrappers::releaseCStr( tc1 );
+ Wrappers::releaseWStr( tc2 );
+ Wrappers::releaseWStr( tc1 );
}
//void removeTag ???
unsigned long MetaTagList::numTags() {
@@ -76,23 +76,23 @@
return new MetaTag(getMe()->getTag(inTagNo));
}
MetaTag* MetaTagList::getTag(String* inName) {
- char* tc = Wrappers::netStrToCStr( inName );
+ wchar_t* tc = Wrappers::netStrToWStr( inName );
MetaTag* retVal = new MetaTag(getMe()->getTag(tc));
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
return retVal;
}
String* MetaTagList::getContent(String* inName) {
- char* tc = Wrappers::netStrToCStr( inName );
- String* ts = Wrappers::CStrToNetStr(getMe()->getContent(tc).c_str());
- Wrappers::releaseCStr( tc );
+ wchar_t* tc = Wrappers::netStrToWStr( inName );
+ String* ts = Wrappers::WStrToNetStr(getMe()->getContent(tc).c_str());
+ Wrappers::releaseWStr( tc );
return ts;
}
String* MetaTagList::toString() {
- return Wrappers::CStrToNetStr(getMe()->toString().c_str());
+ return Wrappers::WStrToNetStr(getMe()->toString().c_str());
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -56,7 +56,7 @@
}
String* ParamTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str() );
}
}
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ParamTagList.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -64,7 +64,7 @@
//Other
String* ParamTagList::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str() );
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/StreamTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -56,10 +56,10 @@
//Accessors
String* StreamTag::timebase() {
- return Wrappers::CStrToNetStr( getMe()->timebase().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->timebase().c_str() );
}
String* StreamTag::utc() {
- return Wrappers::CStrToNetStr( getMe()->utc().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->utc().c_str() );
}
ImportTagList* StreamTag::importList() {
return new ImportTagList( getMe()->importList()->clone());
@@ -68,15 +68,15 @@
//Mutators
void StreamTag::setTimebase(String* inTimebase) {
- char* tc = Wrappers::netStrToCStr( inTimebase );
+ wchar_t* tc = Wrappers::netStrToWStr( inTimebase );
getMe()->setTimebase( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void StreamTag::setUtc(String* inUtc) {
- char* tc = Wrappers::netStrToCStr( inUtc );
+ wchar_t* tc = Wrappers::netStrToWStr( inUtc );
getMe()->setUtc( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
void StreamTag::setImportList(ImportTagList* inTagList) {
getMe()->setImportList(inTagList->getMe()->clone());
@@ -84,7 +84,7 @@
//Other
String* StreamTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str());
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str());
}
C_StreamTag* StreamTag::getMe() {
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TextFieldTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -51,14 +51,14 @@
//Accessors
String* TextFieldTag::text() {
- return Wrappers::CStrToNetStr( getMe()->text().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->text().c_str() );
}
//Mutators
void TextFieldTag::setText(String* inText) {
- char* tc = Wrappers::netStrToCStr( inText );
+ wchar_t* tc = Wrappers::netStrToWStr( inText );
getMe()->setText( tc );
- Wrappers::releaseCStr( tc );
+ Wrappers::releaseWStr( tc );
}
}
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/TitleTag.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -54,7 +54,7 @@
delete mBaseClass;
}
String* TitleTag::toString() {
- return Wrappers::CStrToNetStr( getMe()->toString().c_str() );
+ return Wrappers::WStrToNetStr( getMe()->toString().c_str() );
}
C_TitleTag* TitleTag::getMe() {
Modified: trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -164,19 +164,19 @@
}*/
if (inMediaSample->GetActualDataLength() > 0) {
- char* locStr = NULL;
+ wchar_t* locStr = NULL;
BYTE* locBuff = NULL;
inMediaSample->GetPointer(&locBuff);
- locStr = new char[inMediaSample->GetActualDataLength()];
+ locStr = new wchar_t[inMediaSample->GetActualDataLength() / sizeof(wchar_t)];
memcpy((void*)locStr, (const void*) locBuff, inMediaSample->GetActualDataLength());
- string x = locStr;
+ wstring x = locStr;
//debugLog<<"DoRenderSample : Subtile = "<<x<<endl;
SetSubtitle(x);
//debugLog<<"DoRenderSample : SetSubtitle Returns"<<endl<<endl;
delete locStr;
} else {
//debugLog<<"DoRenderSample : Clearing Subtitle..."<<endl;
- SetSubtitle("");
+ SetSubtitle(L"");
}
@@ -188,7 +188,7 @@
-HRESULT SubtitleVMR9Filter::SetSubtitle(string inSubtitle) {
+HRESULT SubtitleVMR9Filter::SetSubtitle(wstring inSubtitle) {
// LONG cx, cy;
// HRESULT locHR;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h 2004-12-01 06:52:08 UTC (rev 8323)
@@ -82,7 +82,7 @@
void SetColorRef(VMR9AlphaBitmap& bmpInfo);
HRESULT mHR;
//SubtitleVMR9OutputPin* mOutputPin;
- virtual HRESULT SetSubtitle(string inSubtitle);
+ virtual HRESULT SetSubtitle(wstring inSubtitle);
IVideoWindow* mVideoWindow;
IVMRMixerBitmap9* mBitmapMixer;
IVMRWindowlessControl9* mWindowLess;
Modified: trunk/oggdsf/src/lib/helper/libiWrapper/Wrappers.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libiWrapper/Wrappers.cpp 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/helper/libiWrapper/Wrappers.cpp 2004-12-01 06:52:08 UTC (rev 8323)
@@ -57,12 +57,27 @@
void Wrappers::releaseCStr(char* inCStr) {
Marshal::FreeHGlobal((int)inCStr);
}
+
+ wchar_t* Wrappers::netStrToWStr(String* inNetString) {
+ wchar_t* locWStr = (wchar_t*)Marshal::StringToHGlobalUni(inNetString).ToPointer();
+ return locWStr;
+ }
+
+ void Wrappers::releaseWStr(wchar_t* inWStr) {
+ Marshal::FreeHGlobal((int)inWStr);
+ }
String* Wrappers::CStrToNetStr(const char* inCStr) {
String* retStr;
retStr = Marshal::PtrToStringAnsi((char*)inCStr);
return retStr;
}
+ String* Wrappers::WStrToNetStr(const wchar_t* inWStr) {
+ String* retStr;
+ retStr = Marshal::PtrToStringUni((wchar_t*)inWStr);
+ return retStr;
+ }
+
}
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/helper/libiWrapper/Wrappers.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libiWrapper/Wrappers.h 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/helper/libiWrapper/Wrappers.h 2004-12-01 06:52:08 UTC (rev 8323)
@@ -51,6 +51,9 @@
static void releaseCStr(char* inCStr);
static String* CStrToNetStr(const char* inCStr);
+ static String* WStrToNetStr(const wchar_t* inWStr);
+ static wchar_t* netStrToWStr(String* inNetString);
+ static void releaseWStr(wchar_t* inWStr);
};
}
Modified: trunk/oggdsf/src/lib/helper/libiWrapper/libiWrapper.vcproj
===================================================================
--- trunk/oggdsf/src/lib/helper/libiWrapper/libiWrapper.vcproj 2004-12-01 06:35:51 UTC (rev 8322)
+++ trunk/oggdsf/src/lib/helper/libiWrapper/libiWrapper.vcproj 2004-12-01 06:52:08 UTC (rev 8323)
@@ -24,6 +24,7 @@
MinimalRebuild="FALSE"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="TRUE"
UsePrecompiledHeader="3"
WarningLevel="3"
DebugInformationFormat="3"
@@ -76,6 +77,7 @@
PreprocessorDefinitions="WIN32;NDEBUG"
MinimalRebuild="FALSE"
RuntimeLibrary="2"
+ TreatWChar_tAsBuiltInType="TRUE"
UsePrecompiledHeader="3"
WarningLevel="3"
CallingConvention="2"/>
@@ -130,6 +132,7 @@
MinimalRebuild="FALSE"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="2"
+ TreatWChar_tAsBuiltInType="TRUE"
UsePrecompiledHeader="3"
WarningLevel="3"
CallingConvention="2"/>
@@ -184,6 +187,7 @@
MinimalRebuild="FALSE"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="1"
+ TreatWChar_tAsBuiltInType="TRUE"
UsePrecompiledHeader="3"
WarningLevel="3"
CallingConvention="2"/>
More information about the commits
mailing list