[xiph-commits] r7310 -

illiminable at dactyl.lonelymoon.com illiminable
Sat Jul 24 02:59:57 PDT 2004 

trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET
Message-ID: <20040724095957.9F1079AAAB at dactyl.lonelymoon.com>

Author: illiminable
Date: Sat Jul 24 02:59:57 2004
New Revision: 7310

Added:
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.cpp
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNSingleVorbisComment.cpp
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNSingleVorbisComment.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.cpp
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.cpp
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h
Removed:
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/FileComments.cpp
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/FileComments.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/SingleVorbisComment.cpp
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/SingleVorbisComment.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/StreamCommentInfo.cpp
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/StreamCommentInfo.h
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/VorbisComments.cpp
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/VorbisComments.h
Modified:
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj
Log:
* Removed the classes with the same name... .NET doesn't seem to know how namespaces are supposed to work. Gets confused if you pass an object pointer of a native type to a constructor of a managed type of the same name, but in a different explicitly stated namespace.

Added: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.cpp	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.cpp	2004-07-24 09:59:55 UTC (rev 7310)
@@ -0,0 +1,51 @@
+#include "StdAfx.h"
+#include ".\DNFileComments.h"
+#using <mscorlib.dll>
+
+
+namespace illiminable {
+	namespace Ogg {
+		namespace libVorbisCommentDotNET {
+
+DNFileComments::DNFileComments(void)
+{
+	mNativeClass = new ::FileComments;
+}
+
+DNFileComments::~DNFileComments(void)
+{
+	delete mNativeClass;
+}
+
+
+
+bool DNFileComments::loadFile(String* inFileName) {
+	char* locCS = Wrappers::netStrToCStr(inFileName);
+	bool locRet = mNativeClass->loadFile(locCS);
+	Wrappers::releaseCStr(locCS);
+	return locRet;
+}
+String* DNFileComments::fileName() {
+	return Wrappers::CStrToNetStr(mNativeClass->fileName().c_str());
+}
+
+bool DNFileComments::writeOutAll() {
+	return mNativeClass->writeOutAll();
+}
+bool DNFileComments::writeOutStream(Int64 inIndex) {
+	return mNativeClass->writeOutStream(inIndex);
+}
+
+//bool DNFileComments::addStreamComment(DNStreamCommentInfo* inStreamComment) {
+//
+//}
+DNStreamCommentInfo* DNFileComments::getStreamComment(Int64 inIndex) {
+	return new illiminable::Ogg::libVorbisCommentDotNET::DNStreamCommentInfo(mNativeClass->getStreamComment(inIndex));
+}
+
+Int64 DNFileComments::streamCount() {
+	return mNativeClass->streamCount();
+}
+
+
+		}}}
\ No newline at end of file

Added: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.h	2004-07-24 09:59:55 UTC (rev 7310)
@@ -0,0 +1,68 @@
+#pragma once
+#pragma unmanaged
+#include "dllstuff.h"
+#include "libVorbisComment/FileComments.h"
+
+#pragma managed
+using namespace System;
+using namespace illiminable::libiWrapper;
+namespace illiminable {
+	namespace Ogg {
+		namespace libVorbisCommentDotNET {
+
+
+//class LIBVORBISCOMMENT_API FileComments
+//	:	public IOggCallback
+//{
+//public:
+//	FileComments(void);
+//	~FileComments(void);
+//
+//
+//
+//	bool loadFile(string inFileName);
+//	string fileName();
+//
+//	bool writeOutAll();
+//	bool writeOutStream(unsigned long inIndex);
+//
+//	bool addStreamComment(StreamCommentInfo* inStreamComment);
+//	StreamCommentInfo* getStreamComment(unsigned long inIndex);
+//
+//	unsigned long streamCount();
+//
+//	//IOggCallback implementation
+//	virtual bool acceptOggPage(OggPage* inOggPage);
+//protected:
+//	vector<StreamCommentInfo*> mStreams;
+//	string mFileName;
+//	unsigned long mMinorStreamCount;
+//	__int64 mBytePos;
+//};
+
+
+
+
+public __gc class DNFileComments
+{
+public:
+	DNFileComments(void);
+	~DNFileComments(void);
+
+
+	bool loadFile(String* inFileName);
+	String* fileName();
+
+	bool writeOutAll();
+	bool writeOutStream(Int64 inIndex);
+
+	bool addStreamComment(DNStreamCommentInfo* inStreamComment);
+	DNStreamCommentInfo* getStreamComment(Int64 inIndex);
+
+	Int64 streamCount();
+
+protected:
+	::FileComments* mNativeClass;
+};
+
+		}}}
\ No newline at end of file

Added: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNSingleVorbisComment.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNSingleVorbisComment.cpp	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNSingleVorbisComment.cpp	2004-07-24 09:59:55 UTC (rev 7310)
@@ -0,0 +1,58 @@
+#include "StdAfx.h"
+#include ".\DNsinglevorbiscomment.h"
+#using <mscorlib.dll>
+
+namespace illiminable {
+	namespace Ogg {
+		namespace libVorbisCommentDotNET {
+DNSingleVorbisComment::DNSingleVorbisComment(void)
+	:	mNativeClass(NULL)
+{
+	mNativeClass = new ::SingleVorbisComment;
+}
+
+DNSingleVorbisComment::DNSingleVorbisComment(::SingleVorbisComment* inNativeClass) {
+	mNativeClass = inNativeClass;
+}
+DNSingleVorbisComment::~DNSingleVorbisComment(void)
+{
+	delete mNativeClass;
+}
+
+
+
+String* DNSingleVorbisComment::key() {
+	return Wrappers::CStrToNetStr(mNativeClass->key().c_str());
+}
+bool DNSingleVorbisComment::setKey(String* inKey) {
+	char* locCS = Wrappers::netStrToCStr(inKey);
+	mNativeClass->setKey(locCS);
+	Wrappers::releaseCStr(locCS);
+	return true;
+}
+
+String* DNSingleVorbisComment::value() {
+	return Wrappers::CStrToNetStr(mNativeClass->value().c_str());
+}
+bool DNSingleVorbisComment::setValue(String* inValue) {
+	char* locCS = Wrappers::netStrToCStr(inValue);
+	mNativeClass->setValue(locCS);
+	Wrappers::releaseCStr(locCS);
+	return true;
+}
+
+String* DNSingleVorbisComment::toString() {
+	return Wrappers::CStrToNetStr(mNativeClass->toString().c_str());
+}
+
+Int64 DNSingleVorbisComment::length() {
+	Int64 locLength = mNativeClass->length();
+	return locLength;
+}
+
+
+
+
+
+
+}}}
\ No newline at end of file

Added: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNSingleVorbisComment.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNSingleVorbisComment.h	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNSingleVorbisComment.h	2004-07-24 09:59:55 UTC (rev 7310)
@@ -0,0 +1,65 @@
+#pragma once
+
+#pragma unmanaged
+//The directory is necessary to avoid recursive inclusion. native and DN class have same names.
+#include "libVorbisComment/SingleVorbisComment.h"
+
+#pragma managed
+
+using namespace illiminable::libiWrapper;
+using namespace System;
+
+namespace illiminable {
+	namespace Ogg {
+		namespace libVorbisCommentDotNET {
+
+//NATIVE CLASS
+//class LIBVORBISCOMMENT_API SingleVorbisComment
+//{
+//public:
+//	SingleVorbisComment(void);
+//	~SingleVorbisComment(void);
+//
+//	string key();
+//	bool setKey(string inKey);
+//
+//	string value();
+//	bool setValue(string inValue);
+//
+//	string toString();
+//
+//	unsigned long length();
+//
+//	bool parseComment(string inCommentString);
+//
+//protected:
+//	string mKey;
+//	string mValue;
+//};
+
+
+public __gc class DNSingleVorbisComment
+{
+public:
+	DNSingleVorbisComment(void);
+	DNSingleVorbisComment(::SingleVorbisComment* inNativeClass);
+	~DNSingleVorbisComment(void);
+
+	String* key();
+	bool setKey(String* inKey);
+
+	String* value();
+	bool setValue(String* inValue);
+
+	String* toString();
+
+	Int64 length();
+
+protected:
+
+	::SingleVorbisComment* mNativeClass;
+	//bool parseComment(String inCommentString);
+};
+
+
+		}}}
\ No newline at end of file

Added: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.cpp	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.cpp	2004-07-24 09:59:55 UTC (rev 7310)
@@ -0,0 +1,73 @@
+#include "StdAfx.h"
+#include ".\DNStreamCommentInfo.h"
+#using <mscorlib.dll>
+
+
+
+namespace illiminable {
+	namespace Ogg {
+		namespace libVorbisCommentDotNET {
+
+DNStreamCommentInfo::DNStreamCommentInfo(void)
+{
+	mNativeClass = new ::StreamCommentInfo;
+}
+
+DNStreamCommentInfo::DNStreamCommentInfo(::StreamCommentInfo* inNativeClass) {
+	mNativeClass = inNativeClass;
+}
+
+DNStreamCommentInfo::~DNStreamCommentInfo(void)
+{
+	delete mNativeClass;
+}
+
+
+
+
+DNVorbisComments* DNStreamCommentInfo::comments() {
+
+	return new illiminable::Ogg::libVorbisCommentDotNET::DNVorbisComments((::VorbisComments*)mNativeClass->comments());
+}
+	//void setComments(VorbisComments* inComments);
+
+Int64 DNStreamCommentInfo::pageStart() {
+	Int64 locNum = mNativeClass->pageStart();
+	return locNum;
+}
+void DNStreamCommentInfo::setPageStart(Int64 inPageStart) {
+	mNativeClass->setPageStart(inPageStart);
+}
+
+Int32 DNStreamCommentInfo::codecID() {
+	Int32 locNum = mNativeClass->codecID();
+	return locNum;
+}
+void DNStreamCommentInfo::setCodecID(Int32 inCodecID) {
+	mNativeClass->setCodecID(inCodecID);
+}
+
+bool DNStreamCommentInfo::isDirty() {
+	return mNativeClass->isDirty();
+}
+void DNStreamCommentInfo::setIsDirty(bool inIsDirty) {
+	mNativeClass->setIsDirty(inIsDirty);
+}
+
+Int64 DNStreamCommentInfo::majorStreamNo() {
+	Int64 locNum = mNativeClass->majorStreamNo();
+	return locNum;
+}
+void DNStreamCommentInfo::setMajorStreamNo(Int64 inMajorStreamNo) {
+	mNativeClass->setMajorStreamNo(inMajorStreamNo);
+}
+
+Int64 DNStreamCommentInfo::minorStreamNo() {
+	Int64 locNum = mNativeClass->minorStreamNo();
+	return locNum;
+}
+void DNStreamCommentInfo::setMinorStreamNo(Int64 inMinorStreamNo) {
+	mNativeClass->setMinorStreamNo(inMinorStreamNo);
+}
+
+		}}}
\ No newline at end of file

Added: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNStreamCommentInfo.h	2004-07-24 09:59:55 UTC (rev 7310)
@@ -0,0 +1,99 @@
+#pragma once
+
+#pragma unmanaged
+#include "dllstuff.h"
+#include "libVorbisComment/VorbisComments.h"
+#include "libVorbisComment/StreamCommentInfo.h"
+
+#pragma managed
+using namespace System;
+using namespace illiminable::libiWrapper;
+namespace illiminable {
+	namespace Ogg {
+		namespace libVorbisCommentDotNET {
+
+//NATIVE CLASS
+//class LIBVORBISCOMMENT_API StreamCommentInfo
+//{
+//public:
+//	StreamCommentInfo(void);
+//	~StreamCommentInfo(void);
+//
+//	enum eCodecIDs {
+//		NO_CODEC = 0,
+//		VORBIS = 1,
+//		THEORA = 2
+//
+//	};
+//	VorbisComments* comments();
+//	void setComments(VorbisComments* inComments);
+//
+//	__int64 pageStart();
+//	void setPageStart(__int64 inPageStart);
+//
+//	unsigned short codecID();
+//	void setCodecID(unsigned short inCodecID);
+//
+//	bool isDirty();
+//	void setIsDirty(bool inIsDirty);
+//
+//	unsigned long majorStreamNo();
+//	void setMajorStreamNo(unsigned long inMajorStreamNo);
+//
+//	unsigned long minorStreamNo();
+//	void setMinorStreamNo(unsigned long inMinorStreamNo);
+//
+//protected:
+//	VorbisComments* mComments;
+//	__int64 mPageStart;
+//	unsigned short mCodecID;
+//
+//	bool mIsDirty;
+//
+//	unsigned long mMajorStreamNo;
+//	unsigned long mMinorStreamNo;
+//};
+
+
+
+
+
+
+public __gc class DNStreamCommentInfo
+{
+public:
+	DNStreamCommentInfo(void);
+	DNStreamCommentInfo(::StreamCommentInfo* inNativeClass);
+	~DNStreamCommentInfo(void);
+
+
+
+	/*const Int32	NO_CODEC = 0;
+	const Int32 VORBIS = 1;
+	const Int32 THEORA = 2;*/
+
+	DNVorbisComments* comments();
+	//void setComments(VorbisComments* inComments);
+
+	Int64 pageStart();
+	void setPageStart(Int64 inPageStart);
+
+	Int32 codecID();
+	void setCodecID(Int32 inCodecID);
+
+	bool isDirty();
+	void setIsDirty(bool inIsDirty);
+
+	Int64 majorStreamNo();
+	void setMajorStreamNo(Int64 inMajorStreamNo);
+
+	Int64 minorStreamNo();
+	void setMinorStreamNo(Int64 inMinorStreamNo);
+
+protected:
+	::StreamCommentInfo* mNativeClass;
+};
+
+
+
+		}}}
\ No newline at end of file

Added: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.cpp	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.cpp	2004-07-24 09:59:55 UTC (rev 7310)
@@ -0,0 +1,72 @@
+#include "StdAfx.h"
+#include ".\DNVorbisComments.h"
+#using <mscorlib.dll>
+
+
+namespace illiminable {
+	namespace Ogg {
+		namespace libVorbisCommentDotNET {
+DNVorbisComments::DNVorbisComments(void)
+	:	mNativeClass(NULL)
+{
+	mNativeClass = new ::VorbisComments;
+}
+
+DNVorbisComments::DNVorbisComments(::VorbisComments* inNativeClass) {
+	mNativeClass = inNativeClass;
+}
+
+DNVorbisComments::~DNVorbisComments(void)
+{
+	delete mNativeClass;
+}
+
+
+
+String* DNVorbisComments::vendorString() {
+	return Wrappers::CStrToNetStr(mNativeClass->vendorString().c_str());
+}
+bool DNVorbisComments::setVendorString(String* inVendorString) {
+	char* locCS = Wrappers::netStrToCStr(inVendorString);
+	mNativeClass->setVendorString(locCS);
+	Wrappers::releaseCStr(locCS);
+	return true;
+}
+
+Int64 DNVorbisComments::numUserComments() {
+	Int64 locNum = mNativeClass->numUserComments();
+	return locNum;
+}
+DNSingleVorbisComment* DNVorbisComments::getUserComment(Int64 inIndex) {
+	unsigned long locIndex = inIndex;
+
+	//FIX::: Need to clone this... or bad things will happen when garbage colelcted.
+	return new illiminable::Ogg::libVorbisCommentDotNET::DNSingleVorbisComment((::SingleVorbisComment*)mNativeClass->getUserComment(locIndex));
+}
+
+	//vector<SingleVorbisComment> getCommentsByKey(String* inKey);
+
+//bool DNVorbisComments::addComment(SingleVorbisComment* inComment) {
+//
+//}
+bool DNVorbisComments::addComment(String* inKey, String* inValue) {
+	char* locCS1 = Wrappers::netStrToCStr(inKey);
+	char* locCS2 = Wrappers::netStrToCStr(inValue);
+	mNativeClass->addComment(locCS1, locCS2);
+	Wrappers::releaseCStr(locCS1);
+	Wrappers::releaseCStr(locCS2);
+	return true;
+}
+
+	//bool parseOggPacket(OggPacket* inPacket, unsigned long inStartOffset);
+	//OggPacket* toOggPacket();
+String* DNVorbisComments::toString() {
+	return Wrappers::CStrToNetStr(mNativeClass->toString().c_str());
+}
+
+Int64 DNVorbisComments::size() {
+	Int64 locNum = mNativeClass->size();
+	return locNum;
+}
+
+		}}}
\ No newline at end of file

Added: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNVorbisComments.h	2004-07-24 09:59:55 UTC (rev 7310)
@@ -0,0 +1,76 @@
+#pragma once
+#pragma unmanaged
+#include "dllstuff.h"
+#include "libVorbisComment/VorbisComments.h"
+
+#pragma managed
+using namespace System;
+using namespace illiminable::libiWrapper;
+namespace illiminable {
+	namespace Ogg {
+		namespace libVorbisCommentDotNET {
+
+//NATIVE CLASS
+//class LIBVORBISCOMMENT_API VorbisComments
+//{
+//public:
+//	VorbisComments(void);
+//	~VorbisComments(void);
+//
+//	string vendorString();
+//	bool setVendorString(string inVendorString);
+//
+//	unsigned long numUserComments();
+//	SingleVorbisComment getUserComment(unsigned long inIndex);
+//
+//	vector<SingleVorbisComment> getCommentsByKey(string inKey);
+//
+//	bool addComment(SingleVorbisComment inComment);
+//	bool addComment(string inKey, string inValue);
+//
+//	bool parseOggPacket(OggPacket* inPacket, unsigned long inStartOffset);
+//	OggPacket* toOggPacket();
+//	string toString();
+//
+//	unsigned long size();
+//protected:
+//	string mVendorString;
+//	vector<SingleVorbisComment> mCommentList;
+//};
+
+
+
+
+public __gc class DNVorbisComments
+{
+public:
+	DNVorbisComments(void);
+	DNVorbisComments(::VorbisComments* inNativeClass);
+	~DNVorbisComments(void);
+
+	String* vendorString();
+	bool setVendorString(String* inVendorString);
+
+	Int64 numUserComments();
+	DNSingleVorbisComment* getUserComment(Int64 inIndex);
+
+	//vector<SingleVorbisComment> getCommentsByKey(String* inKey);
+
+	bool addComment(SingleVorbisComment* inComment);
+	bool addComment(String* inKey, String* inValue);
+
+	//bool parseOggPacket(OggPacket* inPacket, unsigned long inStartOffset);
+	//OggPacket* toOggPacket();
+	String* toString();
+
+	Int64 size();
+
+protected:
+	::VorbisComments* mNativeClass;
+
+private:
+
+};
+
+
+		}}}
\ No newline at end of file

Deleted: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/FileComments.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/FileComments.cpp	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/FileComments.cpp	2004-07-24 09:59:55 UTC (rev 7310)
@@ -1,51 +0,0 @@
-#include "StdAfx.h"
-#include ".\FileComments.h"
-#using <mscorlib.dll>
-
-
-namespace illiminable {
-	namespace Ogg {
-		namespace libVorbisCommentDotNET {
-
-FileComments::FileComments(void)
-{
-	mNativeClass = new ::FileComments;
-}
-
-FileComments::~FileComments(void)
-{
-	delete mNativeClass;
-}
-
-
-
-bool FileComments::loadFile(String* inFileName) {
-	char* locCS = Wrappers::netStrToCStr(inFileName);
-	bool locRet = mNativeClass->loadFile(locCS);
-	Wrappers::releaseCStr(locCS);
-	return locRet;
-}
-String* FileComments::fileName() {
-	return Wrappers::CStrToNetStr(mNativeClass->fileName().c_str());
-}
-
-bool FileComments::writeOutAll() {
-	return mNativeClass->writeOutAll();
-}
-bool FileComments::writeOutStream(Int64 inIndex) {
-	return mNativeClass->writeOutStream(inIndex);
-}
-
-//bool FileComments::addStreamComment(StreamCommentInfo* inStreamComment) {
-//
-//}
-StreamCommentInfo* FileComments::getStreamComment(Int64 inIndex) {
-	return new illiminable::Ogg::libVorbisCommentDotNET::StreamCommentInfo(mNativeClass->getStreamComment(inIndex));
-}
-
-Int64 FileComments::streamCount() {
-	return mNativeClass->streamCount();
-}
-
-
-		}}}
\ No newline at end of file

Deleted: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/FileComments.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/FileComments.h	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/FileComments.h	2004-07-24 09:59:55 UTC (rev 7310)
@@ -1,68 +0,0 @@
-#pragma once
-#pragma unmanaged
-#include "dllstuff.h"
-#include "libVorbisComment/FileComments.h"
-
-#pragma managed
-using namespace System;
-using namespace illiminable::libiWrapper;
-namespace illiminable {
-	namespace Ogg {
-		namespace libVorbisCommentDotNET {
-
-
-//class LIBVORBISCOMMENT_API FileComments
-//	:	public IOggCallback
-//{
-//public:
-//	FileComments(void);
-//	~FileComments(void);
-//
-//
-//
-//	bool loadFile(string inFileName);
-//	string fileName();
-//
-//	bool writeOutAll();
-//	bool writeOutStream(unsigned long inIndex);
-//
-//	bool addStreamComment(StreamCommentInfo* inStreamComment);
-//	StreamCommentInfo* getStreamComment(unsigned long inIndex);
-//
-//	unsigned long streamCount();
-//
-//	//IOggCallback implementation
-//	virtual bool acceptOggPage(OggPage* inOggPage);
-//protected:
-//	vector<StreamCommentInfo*> mStreams;
-//	string mFileName;
-//	unsigned long mMinorStreamCount;
-//	__int64 mBytePos;
-//};
-
-
-
-
-public __gc class FileComments
-{
-public:
-	FileComments(void);
-	~FileComments(void);
-
-
-	bool loadFile(String* inFileName);
-	String* fileName();
-
-	bool writeOutAll();
-	bool writeOutStream(Int64 inIndex);
-
-	bool addStreamComment(StreamCommentInfo* inStreamComment);
-	StreamCommentInfo* getStreamComment(Int64 inIndex);
-
-	Int64 streamCount();
-
-protected:
-	::FileComments* mNativeClass;
-};
-
-		}}}
\ No newline at end of file

Deleted: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/SingleVorbisComment.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/SingleVorbisComment.cpp	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/SingleVorbisComment.cpp	2004-07-24 09:59:55 UTC (rev 7310)
@@ -1,58 +0,0 @@
-#include "StdAfx.h"
-#include ".\singlevorbiscomment.h"
-#using <mscorlib.dll>
-
-namespace illiminable {
-	namespace Ogg {
-		namespace libVorbisCommentDotNET {
-SingleVorbisComment::SingleVorbisComment(void)
-	:	mNativeClass(NULL)
-{
-	mNativeClass = new ::SingleVorbisComment;
-}
-
-SingleVorbisComment::SingleVorbisComment(::SingleVorbisComment* inNativeClass) {
-	mNativeClass = inNativeClass;
-}
-SingleVorbisComment::~SingleVorbisComment(void)
-{
-	delete mNativeClass;
-}
-
-
-
-String* SingleVorbisComment::key() {
-	return Wrappers::CStrToNetStr(mNativeClass->key().c_str());
-}
-bool SingleVorbisComment::setKey(String* inKey) {
-	char* locCS = Wrappers::netStrToCStr(inKey);
-	mNativeClass->setKey(locCS);
-	Wrappers::releaseCStr(locCS);
-	return true;
-}
-
-String* SingleVorbisComment::value() {
-	return Wrappers::CStrToNetStr(mNativeClass->value().c_str());
-}
-bool SingleVorbisComment::setValue(String* inValue) {
-	char* locCS = Wrappers::netStrToCStr(inValue);
-	mNativeClass->setValue(locCS);
-	Wrappers::releaseCStr(locCS);
-	return true;
-}
-
-String* SingleVorbisComment::toString() {
-	return Wrappers::CStrToNetStr(mNativeClass->toString().c_str());
-}
-
-Int64 SingleVorbisComment::length() {
-	Int64 locLength = mNativeClass->length();
-	return locLength;
-}
-
-
-
-
-
-
-}}}
\ No newline at end of file

Deleted: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/SingleVorbisComment.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/SingleVorbisComment.h	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/SingleVorbisComment.h	2004-07-24 09:59:55 UTC (rev 7310)
@@ -1,65 +0,0 @@
-#pragma once
-
-#pragma unmanaged
-//The directory is necessary to avoid recursive inclusion. native and DN class have same names.
-#include "libVorbisComment/SingleVorbisComment.h"
-
-#pragma managed
-
-using namespace illiminable::libiWrapper;
-using namespace System;
-
-namespace illiminable {
-	namespace Ogg {
-		namespace libVorbisCommentDotNET {
-
-//NATIVE CLASS
-//class LIBVORBISCOMMENT_API SingleVorbisComment
-//{
-//public:
-//	SingleVorbisComment(void);
-//	~SingleVorbisComment(void);
-//
-//	string key();
-//	bool setKey(string inKey);
-//
-//	string value();
-//	bool setValue(string inValue);
-//
-//	string toString();
-//
-//	unsigned long length();
-//
-//	bool parseComment(string inCommentString);
-//
-//protected:
-//	string mKey;
-//	string mValue;
-//};
-
-
-public __gc class SingleVorbisComment
-{
-public:
-	SingleVorbisComment(void);
-	SingleVorbisComment(::SingleVorbisComment* inNativeClass);
-	~SingleVorbisComment(void);
-
-	String* key();
-	bool setKey(String* inKey);
-
-	String* value();
-	bool setValue(String* inValue);
-
-	String* toString();
-
-	Int64 length();
-
-protected:
-
-	::SingleVorbisComment* mNativeClass;
-	//bool parseComment(String inCommentString);
-};
-
-
-		}}}
\ No newline at end of file

Deleted: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/StreamCommentInfo.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/StreamCommentInfo.cpp	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/StreamCommentInfo.cpp	2004-07-24 09:59:55 UTC (rev 7310)
@@ -1,73 +0,0 @@
-#include "StdAfx.h"
-#include ".\StreamCommentInfo.h"
-#using <mscorlib.dll>
-
-
-
-namespace illiminable {
-	namespace Ogg {
-		namespace libVorbisCommentDotNET {
-
-StreamCommentInfo::StreamCommentInfo(void)
-{
-	mNativeClass = new ::StreamCommentInfo;
-}
-
-StreamCommentInfo::StreamCommentInfo(::StreamCommentInfo* inNativeClass) {
-	mNativeClass = inNativeClass;
-}
-
-StreamCommentInfo::~StreamCommentInfo(void)
-{
-	delete mNativeClass;
-}
-
-
-
-
-VorbisComments* StreamCommentInfo::comments() {
-
-	return new illiminable::Ogg::libVorbisCommentDotNET::VorbisComments((::VorbisComments*)mNativeClass->comments());
-}
-	//void setComments(VorbisComments* inComments);
-
-Int64 StreamCommentInfo::pageStart() {
-	Int64 locNum = mNativeClass->pageStart();
-	return locNum;
-}
-void StreamCommentInfo::setPageStart(Int64 inPageStart) {
-	mNativeClass->setPageStart(inPageStart);
-}
-
-Int32 StreamCommentInfo::codecID() {
-	Int32 locNum = mNativeClass->codecID();
-	return locNum;
-}
-void StreamCommentInfo::setCodecID(Int32 inCodecID) {
-	mNativeClass->setCodecID(inCodecID);
-}
-
-bool StreamCommentInfo::isDirty() {
-	return mNativeClass->isDirty();
-}
-void StreamCommentInfo::setIsDirty(bool inIsDirty) {
-	mNativeClass->setIsDirty(inIsDirty);
-}
-
-Int64 StreamCommentInfo::majorStreamNo() {
-	Int64 locNum = mNativeClass->majorStreamNo();
-	return locNum;
-}
-void StreamCommentInfo::setMajorStreamNo(Int64 inMajorStreamNo) {
-	mNativeClass->setMajorStreamNo(inMajorStreamNo);
-}
-
-Int64 StreamCommentInfo::minorStreamNo() {
-	Int64 locNum = mNativeClass->minorStreamNo();
-	return locNum;
-}
-void StreamCommentInfo::setMinorStreamNo(Int64 inMinorStreamNo) {
-	mNativeClass->setMinorStreamNo(inMinorStreamNo);
-}
-
-		}}}
\ No newline at end of file

Deleted: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/StreamCommentInfo.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/StreamCommentInfo.h	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/StreamCommentInfo.h	2004-07-24 09:59:55 UTC (rev 7310)
@@ -1,99 +0,0 @@
-#pragma once
-
-#pragma unmanaged
-#include "dllstuff.h"
-#include "libVorbisComment/VorbisComments.h"
-#include "libVorbisComment/StreamCommentInfo.h"
-
-#pragma managed
-using namespace System;
-using namespace illiminable::libiWrapper;
-namespace illiminable {
-	namespace Ogg {
-		namespace libVorbisCommentDotNET {
-
-//NATIVE CLASS
-//class LIBVORBISCOMMENT_API StreamCommentInfo
-//{
-//public:
-//	StreamCommentInfo(void);
-//	~StreamCommentInfo(void);
-//
-//	enum eCodecIDs {
-//		NO_CODEC = 0,
-//		VORBIS = 1,
-//		THEORA = 2
-//
-//	};
-//	VorbisComments* comments();
-//	void setComments(VorbisComments* inComments);
-//
-//	__int64 pageStart();
-//	void setPageStart(__int64 inPageStart);
-//
-//	unsigned short codecID();
-//	void setCodecID(unsigned short inCodecID);
-//
-//	bool isDirty();
-//	void setIsDirty(bool inIsDirty);
-//
-//	unsigned long majorStreamNo();
-//	void setMajorStreamNo(unsigned long inMajorStreamNo);
-//
-//	unsigned long minorStreamNo();
-//	void setMinorStreamNo(unsigned long inMinorStreamNo);
-//
-//protected:
-//	VorbisComments* mComments;
-//	__int64 mPageStart;
-//	unsigned short mCodecID;
-//
-//	bool mIsDirty;
-//
-//	unsigned long mMajorStreamNo;
-//	unsigned long mMinorStreamNo;
-//};
-
-
-
-
-
-
-public __gc class StreamCommentInfo
-{
-public:
-	StreamCommentInfo(void);
-	StreamCommentInfo(::StreamCommentInfo* inNativeClass);
-	~StreamCommentInfo(void);
-
-
-
-	/*const Int32	NO_CODEC = 0;
-	const Int32 VORBIS = 1;
-	const Int32 THEORA = 2;*/
-
-	VorbisComments* comments();
-	//void setComments(VorbisComments* inComments);
-
-	Int64 pageStart();
-	void setPageStart(Int64 inPageStart);
-
-	Int32 codecID();
-	void setCodecID(Int32 inCodecID);
-
-	bool isDirty();
-	void setIsDirty(bool inIsDirty);
-
-	Int64 majorStreamNo();
-	void setMajorStreamNo(Int64 inMajorStreamNo);
-
-	Int64 minorStreamNo();
-	void setMinorStreamNo(Int64 inMinorStreamNo);
-
-protected:
-	::StreamCommentInfo* mNativeClass;
-};
-
-
-
-		}}}
\ No newline at end of file

Deleted: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/VorbisComments.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/VorbisComments.cpp	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/VorbisComments.cpp	2004-07-24 09:59:55 UTC (rev 7310)
@@ -1,72 +0,0 @@
-#include "StdAfx.h"
-#include ".\vorbiscomments.h"
-#using <mscorlib.dll>
-
-
-namespace illiminable {
-	namespace Ogg {
-		namespace libVorbisCommentDotNET {
-VorbisComments::VorbisComments(void)
-	:	mNativeClass(NULL)
-{
-	mNativeClass = new ::VorbisComments;
-}
-
-VorbisComments::VorbisComments(::VorbisComments* inNativeClass) {
-	mNativeClass = inNativeClass;
-}
-
-VorbisComments::~VorbisComments(void)
-{
-	delete mNativeClass;
-}
-
-
-
-String* VorbisComments::vendorString() {
-	return Wrappers::CStrToNetStr(mNativeClass->vendorString().c_str());
-}
-bool VorbisComments::setVendorString(String* inVendorString) {
-	char* locCS = Wrappers::netStrToCStr(inVendorString);
-	mNativeClass->setVendorString(locCS);
-	Wrappers::releaseCStr(locCS);
-	return true;
-}
-
-Int64 VorbisComments::numUserComments() {
-	Int64 locNum = mNativeClass->numUserComments();
-	return locNum;
-}
-SingleVorbisComment* VorbisComments::getUserComment(Int64 inIndex) {
-	unsigned long locIndex = inIndex;
-
-	//FIX::: Need to clone this... or bad things will happen when garbage colelcted.
-	return new illiminable::Ogg::libVorbisCommentDotNET::SingleVorbisComment((::SingleVorbisComment*)mNativeClass->getUserComment(locIndex));
-}
-
-	//vector<SingleVorbisComment> getCommentsByKey(String* inKey);
-
-//bool VorbisComments::addComment(SingleVorbisComment* inComment) {
-//
-//}
-bool VorbisComments::addComment(String* inKey, String* inValue) {
-	char* locCS1 = Wrappers::netStrToCStr(inKey);
-	char* locCS2 = Wrappers::netStrToCStr(inValue);
-	mNativeClass->addComment(locCS1, locCS2);
-	Wrappers::releaseCStr(locCS1);
-	Wrappers::releaseCStr(locCS2);
-	return true;
-}
-
-	//bool parseOggPacket(OggPacket* inPacket, unsigned long inStartOffset);
-	//OggPacket* toOggPacket();
-String* VorbisComments::toString() {
-	return Wrappers::CStrToNetStr(mNativeClass->toString().c_str());
-}
-
-Int64 VorbisComments::size() {
-	Int64 locNum = mNativeClass->size();
-	return locNum;
-}
-
-		}}}
\ No newline at end of file

Deleted: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/VorbisComments.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/VorbisComments.h	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/VorbisComments.h	2004-07-24 09:59:55 UTC (rev 7310)
@@ -1,76 +0,0 @@
-#pragma once
-#pragma unmanaged
-#include "dllstuff.h"
-#include "libVorbisComment/VorbisComments.h"
-
-#pragma managed
-using namespace System;
-using namespace illiminable::libiWrapper;
-namespace illiminable {
-	namespace Ogg {
-		namespace libVorbisCommentDotNET {
-
-//NATIVE CLASS
-//class LIBVORBISCOMMENT_API VorbisComments
-//{
-//public:
-//	VorbisComments(void);
-//	~VorbisComments(void);
-//
-//	string vendorString();
-//	bool setVendorString(string inVendorString);
-//
-//	unsigned long numUserComments();
-//	SingleVorbisComment getUserComment(unsigned long inIndex);
-//
-//	vector<SingleVorbisComment> getCommentsByKey(string inKey);
-//
-//	bool addComment(SingleVorbisComment inComment);
-//	bool addComment(string inKey, string inValue);
-//
-//	bool parseOggPacket(OggPacket* inPacket, unsigned long inStartOffset);
-//	OggPacket* toOggPacket();
-//	string toString();
-//
-//	unsigned long size();
-//protected:
-//	string mVendorString;
-//	vector<SingleVorbisComment> mCommentList;
-//};
-
-
-
-
-public __gc class VorbisComments
-{
-public:
-	VorbisComments(void);
-	VorbisComments(::VorbisComments* inNativeClass);
-	~VorbisComments(void);
-
-	String* vendorString();
-	bool setVendorString(String* inVendorString);
-
-	Int64 numUserComments();
-	SingleVorbisComment* getUserComment(Int64 inIndex);
-
-	//vector<SingleVorbisComment> getCommentsByKey(String* inKey);
-
-	bool addComment(SingleVorbisComment* inComment);
-	bool addComment(String* inKey, String* inValue);
-
-	//bool parseOggPacket(OggPacket* inPacket, unsigned long inStartOffset);
-	//OggPacket* toOggPacket();
-	String* toString();
-
-	Int64 size();
-
-protected:
-	::VorbisComments* mNativeClass;
-
-private:
-	VorbisComments(const VorbisComments&);
-};
-
-
-		}}}
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj	2004-07-24 09:39:53 UTC (rev 7309)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/libVorbisCommentDotNET.vcproj	2004-07-24 09:59:55 UTC (rev 7310)
@@ -127,15 +127,21 @@
RelativePath=".\AssemblyInfo.cpp">
</File>
<File
-				RelativePath=".\FileComments.cpp">
+				RelativePath=".\DNFileComments.cpp">
</File>
<File
-				RelativePath=".\libVorbisCommentDotNET.cpp">
+				RelativePath=".\DNSingleVorbisComment.cpp">
</File>
<File
-				RelativePath=".\SingleVorbisComment.cpp">
+				RelativePath=".\DNStreamCommentInfo.cpp">
</File>
<File
+				RelativePath=".\DNVorbisComments.cpp">
+			</File>
+			<File
+				RelativePath=".\libVorbisCommentDotNET.cpp">
+			</File>
+			<File
RelativePath=".\Stdafx.cpp">
<FileConfiguration
Name="Debug|Win32">
@@ -150,37 +156,31 @@
UsePrecompiledHeader="1"/>
</FileConfiguration>
</File>
-			<File
-				RelativePath=".\StreamCommentInfo.cpp">
-			</File>
-			<File
-				RelativePath=".\VorbisComments.cpp">
-			</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
-				RelativePath=".\FileComments.h">
+				RelativePath=".\DNFileComments.h">
</File>
<File
-				RelativePath=".\libVorbisCommentDotNET.h">
+				RelativePath=".\DNSingleVorbisComment.h">
</File>
<File
-				RelativePath=".\resource.h">
+				RelativePath=".\DNStreamCommentInfo.h">
</File>
<File
-				RelativePath=".\SingleVorbisComment.h">
+				RelativePath=".\DNVorbisComments.h">
</File>
<File
-				RelativePath=".\Stdafx.h">
+				RelativePath=".\libVorbisCommentDotNET.h">
</File>
<File
-				RelativePath=".\StreamCommentInfo.h">
+				RelativePath=".\resource.h">
</File>
<File
-				RelativePath=".\VorbisComments.h">
+				RelativePath=".\Stdafx.h">
</File>
</Filter>
<Filter

More information about the commits mailing list