[xiph-commits] r8671 - in trunk/oggdsf: sln/oggdsf_all
src/lib/codecs/cmml/libCMMLTags
ozone at motherfish-iii.xiph.org
ozone at motherfish-iii.xiph.org
Fri Jan 7 23:48:24 PST 2005
Author: ozone
Date: 2005-01-07 23:48:23 -0800 (Fri, 07 Jan 2005)
New Revision: 8671
Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj
Log:
oggdsf:
* Removed libCMMLTag dependency on libTemporalURI and libilliCore
* Note: This currently breaks the solution, since libOOOggChef won't build anymore. Will be fixed up again soon.
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2005-01-08 04:07:50 UTC (rev 8670)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2005-01-08 07:48:23 UTC (rev 8671)
@@ -837,8 +837,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLTags", "..\..\src\lib\codecs\cmml\libCMMLTags\libCMMLTags.vcproj", "{AD38DCC6-B431-4B32-8569-74F3376EF2DA}"
ProjectSection(ProjectDependencies) = postProject
- {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
- {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSubtitleVMR9", "..\..\src\lib\core\directshow\dsfSubtitleVMR9\dsfSubtitleVMR9.vcproj", "{88532BA9-1EED-421F-84BF-88A7A87FB2D3}"
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.cpp 2005-01-08 04:07:50 UTC (rev 8670)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.cpp 2005-01-08 07:48:23 UTC (rev 8671)
@@ -34,8 +34,6 @@
#include "stdafx.h"
#include <libCMMLTags/C_ClipTagList.h>
-#include <libilliCore/StringHelper.h>
-#include <libTemporalURI/C_TimeStamp.h>
#include <fstream>
@@ -79,53 +77,3 @@
return retList;
}
-/** Note that the returned C_ClipTagList must be deleted by you.
- */
-C_ClipTagList *C_ClipTagList::getClipsFrom(LOOG_INT64 inTimeInDirectShowUnits)
-{
- C_ClipTagList *locClipTagList = new C_ClipTagList;
-
- bool locAlreadyEncounteredClipInTimeRange = false;
-
- for (unsigned long i = 0; i < numTags(); i++) {
- C_ClipTag *locTag = getTag(i);
-
- // Convert the time stamp from a string to time in DirectSeconds(TM)
- wstring locStart = locTag->start();
- C_TimeStamp locTimeStamp;
- if (!locTimeStamp.parseTimeStamp(StringHelper::toNarrowStr(locStart))) {
- // Mmm, couldn't parse the time stamp for this clip ... so, err,
- // let's just skip it. Yeah, that's a grreeeeat idea ...
- continue;
- }
- LOOG_INT64 locStartTime = locTimeStamp.toHunNanos();
-
- if (locStartTime >= inTimeInDirectShowUnits) {
- if (!locAlreadyEncounteredClipInTimeRange) {
- // Only add the previous clip to the clip list if its end time
- // is beyond the requested time
- {
- wstring locEnd = locTag->end();
- C_TimeStamp locEndTimeStamp;
- if (locEndTimeStamp.parseTimeStamp(StringHelper::toNarrowStr(locEnd))) {
- // Clip has an end time: check if it's before the requested time
- LOOG_INT64 locEndTime = locEndTimeStamp.toHunNanos();
- if (locEndTime < inTimeInDirectShowUnits) {
- continue;
- }
- }
- }
-
- // If we're not the very first clip ...
- if (i > 0) {
- C_ClipTag *locClipInTimeRange = getTag(i - 1);
- locClipTagList->addTag(locClipInTimeRange->clone());
- }
- locAlreadyEncounteredClipInTimeRange = true;
- }
- locClipTagList->addTag(locTag->clone());
- }
- }
-
- return locClipTagList;
-}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h 2005-01-08 04:07:50 UTC (rev 8670)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTagList.h 2005-01-08 07:48:23 UTC (rev 8671)
@@ -37,8 +37,6 @@
#include <string>
using namespace std;
-#include <libilliCore/illicoreconfig.h>
-
//Local Include Files
#include <libCMMLTags/C_TagList.h>
#include <libCMMLTags/C_ClipTag.h>
@@ -60,8 +58,5 @@
void addTag(C_ClipTag* inTag);
C_ClipTag* getTag(unsigned long inTagNo);
- /// Returns a new C_ClipTagList, which contains clips occuring during or after the time given via inTimeInDirectShowUnits
- C_ClipTagList *getClipsFrom(LOOG_INT64 inTimeInDirectShowUnits);
-
virtual void privateClone(C_TagList* outTagList);
};
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj 2005-01-08 04:07:50 UTC (rev 8670)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj 2005-01-08 07:48:23 UTC (rev 8671)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..;..\..\..\helper"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -77,7 +77,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..;..\..\..\helper"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -137,7 +137,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..;..\..\..\helper"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -198,7 +198,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..;..\..\..\helper"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -252,7 +252,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..;..\..\..\helper"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -310,7 +310,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..;..\..\..\helper"
+ AdditionalIncludeDirectories=".."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
More information about the commits
mailing list