[xiph-commits] r8585 - in trunk/oggdsf: build/oggcodecs
src/lib/helper/libTemporalURI src/tests/testTemporal
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Sun Jan 2 21:00:45 PST 2005
Author: illiminable
Date: 2005-01-02 21:00:45 -0800 (Sun, 02 Jan 2005)
New Revision: 8585
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/helper/libTemporalURI/C_TimeStamp.cpp
trunk/oggdsf/src/lib/helper/libTemporalURI/C_TimeStamp.h
trunk/oggdsf/src/lib/helper/libTemporalURI/libTemporalURI.cpp
trunk/oggdsf/src/lib/helper/libTemporalURI/libTemporalURI.h
trunk/oggdsf/src/tests/testTemporal/testTemporal.cpp
trunk/oggdsf/src/tests/testTemporal/testTemporal.vcproj
Log:
* Update the distrib project to include the new test.
* Fixed a link error
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2005-01-03 04:47:51 UTC (rev 8584)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2005-01-03 05:00:45 UTC (rev 8585)
@@ -118,6 +118,12 @@
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
@@ -364,6 +370,12 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
@@ -627,6 +639,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_A0E68123D9D541DFA9691752981C903A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1113,7 +1131,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{D65F0073-A820-4085-B997-A061171595A7}"
- "PackageCode" = "8:{1ECA1112-659A-4550-A850-14171273E15C}"
+ "PackageCode" = "8:{7BA5CB46-942B-4A86-9D00-918A7639EA59}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -3911,6 +3929,34 @@
{
}
}
+ "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
+ {
+ "SourcePath" = "8:..\\..\\src\\tests\\testtemporal\\debug\\testTemporal.exe"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ "ProjectOutputGroupRegister" = "3:1"
+ "OutputConfiguration" = "8:"
+ "OutputGroupCanonicalName" = "8:Built"
+ "OutputProjectGuid" = "8:{DCABCE43-DCF2-4F31-85D3-BEA3163B32D2}"
+ "ShowKeyOutput" = "11:TRUE"
+ "ExcludeFilters"
+ {
+ }
+ }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A0E68123D9D541DFA9691752981C903A"
{
"SourcePath" = "8:..\\..\\src\\tests\\testCMMLParser\\Debug\\testCMMLParser.exe"
Modified: trunk/oggdsf/src/lib/helper/libTemporalURI/C_TimeStamp.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libTemporalURI/C_TimeStamp.cpp 2005-01-03 04:47:51 UTC (rev 8584)
+++ trunk/oggdsf/src/lib/helper/libTemporalURI/C_TimeStamp.cpp 2005-01-03 05:00:45 UTC (rev 8585)
@@ -8,6 +8,7 @@
{
}
+
C_TimeStamp::~C_TimeStamp(void)
{
}
Modified: trunk/oggdsf/src/lib/helper/libTemporalURI/C_TimeStamp.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libTemporalURI/C_TimeStamp.h 2005-01-03 04:47:51 UTC (rev 8584)
+++ trunk/oggdsf/src/lib/helper/libTemporalURI/C_TimeStamp.h 2005-01-03 05:00:45 UTC (rev 8585)
@@ -1,14 +1,15 @@
#pragma once
+#include "libTemporalURI.h"
#include <string>
using namespace std;
#include "libilliCore/StringHelper.h"
-class C_TimeStamp
+class LIBTEMPORALURI_API C_TimeStamp
{
public:
C_TimeStamp(void);
- C_TimeStamp(string inTimeStamp);
+
virtual ~C_TimeStamp(void);
Modified: trunk/oggdsf/src/lib/helper/libTemporalURI/libTemporalURI.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libTemporalURI/libTemporalURI.cpp 2005-01-03 04:47:51 UTC (rev 8584)
+++ trunk/oggdsf/src/lib/helper/libTemporalURI/libTemporalURI.cpp 2005-01-03 05:00:45 UTC (rev 8585)
@@ -18,19 +18,3 @@
}
return TRUE;
}
-
-// This is an example of an exported variable
-LIBTEMPORALURI_API int nlibTemporalURI=0;
-
-// This is an example of an exported function.
-LIBTEMPORALURI_API int fnlibTemporalURI(void)
-{
- return 42;
-}
-
-// This is the constructor of a class that has been exported.
-// see libTemporalURI.h for the class definition
-ClibTemporalURI::ClibTemporalURI()
-{
- return;
-}
Modified: trunk/oggdsf/src/lib/helper/libTemporalURI/libTemporalURI.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libTemporalURI/libTemporalURI.h 2005-01-03 04:47:51 UTC (rev 8584)
+++ trunk/oggdsf/src/lib/helper/libTemporalURI/libTemporalURI.h 2005-01-03 05:00:45 UTC (rev 8585)
@@ -9,14 +9,3 @@
#else
#define LIBTEMPORALURI_API __declspec(dllimport)
#endif
-
-// This class is exported from the libTemporalURI.dll
-class LIBTEMPORALURI_API ClibTemporalURI {
-public:
- ClibTemporalURI(void);
- // TODO: add your methods here.
-};
-
-extern LIBTEMPORALURI_API int nlibTemporalURI;
-
-LIBTEMPORALURI_API int fnlibTemporalURI(void);
Modified: trunk/oggdsf/src/tests/testTemporal/testTemporal.cpp
===================================================================
--- trunk/oggdsf/src/tests/testTemporal/testTemporal.cpp 2005-01-03 04:47:51 UTC (rev 8584)
+++ trunk/oggdsf/src/tests/testTemporal/testTemporal.cpp 2005-01-03 05:00:45 UTC (rev 8585)
@@ -3,8 +3,30 @@
#include "stdafx.h"
-int _tmain(int argc, _TCHAR* argv[])
+#include "libTemporalURI/C_TimeStamp.h"
+
+int __cdecl _tmain(int argc, _TCHAR* argv[])
{
+
+ C_TimeStamp locStamp;
+
+ string locStr;
+
+ do {
+ cout<<" : "<<endl;
+ cin>>locStr;
+
+ if (locStr != "x") {
+ if ( locStamp.parseTimeStamp(locStr) ) {
+ cout<<"Time = "<<locStamp.toHunNanos()<<endl;
+ } else {
+ cout<<"Invalid"<<endl;
+ }
+ }
+
+
+
+ } while (locStr != "x");
return 0;
}
Modified: trunk/oggdsf/src/tests/testTemporal/testTemporal.vcproj
===================================================================
--- trunk/oggdsf/src/tests/testTemporal/testTemporal.vcproj 2005-01-03 04:47:51 UTC (rev 8584)
+++ trunk/oggdsf/src/tests/testTemporal/testTemporal.vcproj 2005-01-03 05:00:45 UTC (rev 8585)
@@ -19,6 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories="..\..\lib\helper"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -67,6 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\lib\helper"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
More information about the commits
mailing list