[xiph-commits] r8713 - in trunk/oggdsf: sln/oggdsf_all
src/lib/codecs/cmml/libCMMLParse src/lib/codecs/cmml/libWinCMMLParse
src/lib/helper/libOOOggChef
ozone at motherfish-iii.xiph.org
ozone at motherfish-iii.xiph.org
Sun Jan 9 19:44:00 PST 2005
Author: ozone
Date: 2005-01-09 19:44:00 -0800 (Sun, 09 Jan 2005)
New Revision: 8713
Added:
trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLTagUtils.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLTagUtils.h
Removed:
trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.cpp
trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.h
Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj
trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.vcproj
trunk/oggdsf/src/lib/helper/libOOOggChef/CMMLRecomposer.cpp
Log:
oggdsf:
* Moved CMMLTagUtils class from libWinCMMLParse to libCMMLParse
* Made libOOOggChef use libCMMLParse rather than libWinCMMLParse
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2005-01-10 03:28:15 UTC (rev 8712)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2005-01-10 03:44:00 UTC (rev 8713)
@@ -856,7 +856,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libWinCMMLParse", "..\..\src\lib\codecs\cmml\libWinCMMLParse\libWinCMMLParse.vcproj", "{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}"
ProjectSection(ProjectDependencies) = postProject
- {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
@@ -1128,9 +1127,9 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOggChef", "..\..\src\lib\helper\libOOOggChef\libOOOggChef.vcproj", "{3D55194E-6732-4A74-A947-EDFF585A0F19}"
ProjectSection(ProjectDependencies) = postProject
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+ {899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
@@ -1167,6 +1166,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLParse", "..\..\src\lib\codecs\cmml\libCMMLParse\libCMMLParse.vcproj", "{899EB7AD-26BF-4495-9BE5-EADECCC288B2}"
ProjectSection(ProjectDependencies) = postProject
+ {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
Copied: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLTagUtils.cpp (from rev 8712, trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.cpp)
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.cpp 2005-01-10 03:28:15 UTC (rev 8712)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLTagUtils.cpp 2005-01-10 03:44:00 UTC (rev 8713)
@@ -0,0 +1,124 @@
+//===========================================================================
+//Copyright (C) 2005 Zentaro Kavanagh
+//
+//Copyright (C) 2005 Commonwealth Scientific and Industrial Research
+// Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#include "stdafx.h"
+
+#include <libCMMLParse/CMMLTagUtils.h>
+#include <libTemporalURI/C_TimeStamp.h>
+
+#include <fstream>
+
+#undef DEBUG
+
+/** Note that the returned C_ClipTagList must be deleted by you.
+ */
+C_ClipTagList *CMMLTagUtils::getClipsFrom(C_ClipTagList *inClipTagList, LOOG_INT64 inTimeInDirectShowUnits)
+{
+
+#ifdef DEBUG
+ fstream locDebugFile;
+ locDebugFile.open("G:\\Logs\\getClipsFrom.log", ios_base::out);
+#endif
+
+ C_ClipTagList *locClipTagList = new C_ClipTagList;
+
+ bool locAlreadyEncounteredClipInTimeRange = false;
+
+ for (unsigned long i = 0; i < inClipTagList->numTags(); i++) {
+ C_ClipTag *locTag = inClipTagList->getTag(i);
+
+#ifdef DEBUG
+ locDebugFile << "Processing tag " << i << endl;
+#endif
+
+ // 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))) {
+#ifdef DEBUG
+ locDebugFile << "Couldn't parse time stamp: " <<
+ StringHelper::toNarrowStr(locStart) << endl;
+#endif
+ // 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) {
+#ifdef DEBUG
+ locDebugFile << "Found clip with greater start time " << locStartTime << endl;
+#endif
+ 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 != 0
+ && locEndTime >= locStartTime
+ && locEndTime < inTimeInDirectShowUnits) {
+#ifdef DEBUG
+ locDebugFile << "Skipping add due to end time " << locEndTime << endl;
+#endif
+ continue;
+ }
+ }
+ }
+
+ // If we're not the very first clip ...
+ if (i > 0) {
+#ifdef DEBUG
+ locDebugFile << "Cloning previous clip " << i << endl;
+#endif
+ C_ClipTag *locClipInTimeRange = inClipTagList->getTag(i - 1);
+ locClipTagList->addTag(locClipInTimeRange->clone());
+ }
+ locAlreadyEncounteredClipInTimeRange = true;
+ }
+#ifdef DEBUG
+ locDebugFile << "Cloning clip " << i << endl;
+#endif
+ locClipTagList->addTag(locTag->clone());
+ }
+ }
+
+#ifdef DEBUG
+ locDebugFile.close();
+#endif
+ return locClipTagList;
+}
Copied: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLTagUtils.h (from rev 8708, trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.h)
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.h 2005-01-09 23:45:07 UTC (rev 8708)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLTagUtils.h 2005-01-10 03:44:00 UTC (rev 8713)
@@ -0,0 +1,47 @@
+//===========================================================================
+//Copyright (C) 2005 Zentaro Kavanagh
+//
+//Copyright (C) 2005 Commonwealth Scientific and Industrial Research
+// Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#pragma once
+
+
+#include <libCMMLParse/libCMMLParse.h>
+#include <libCMMLTags/libCMMLTags.h>
+#include <libilliCore/illicoreconfig.h>
+
+class LIBCMMLPARSE_API CMMLTagUtils
+{
+public:
+ /// Returns a new C_ClipTagList, which contains clips occuring in inClipTagList, during or after the time given via inTimeInDirectShowUnits
+ static C_ClipTagList *getClipsFrom(C_ClipTagList *inClipTagList, LOOG_INT64 inTimeInDirectShowUnits);
+};
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj 2005-01-10 03:28:15 UTC (rev 8712)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj 2005-01-10 03:44:00 UTC (rev 8713)
@@ -124,6 +124,9 @@
RelativePath=".\CMMLParser.cpp">
</File>
<File
+ RelativePath=".\CMMLTagUtils.cpp">
+ </File>
+ <File
RelativePath=".\ConvertUTF.c">
</File>
<File
@@ -171,6 +174,9 @@
RelativePath=".\CMMLParser.h">
</File>
<File
+ RelativePath=".\CMMLTagUtils.h">
+ </File>
+ <File
RelativePath=".\ConvertUTF.h">
</File>
<File
Deleted: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.cpp 2005-01-10 03:28:15 UTC (rev 8712)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.cpp 2005-01-10 03:44:00 UTC (rev 8713)
@@ -1,124 +0,0 @@
-//===========================================================================
-//Copyright (C) 2005 Zentaro Kavanagh
-//
-//Copyright (C) 2005 Commonwealth Scientific and Industrial Research
-// Organisation (CSIRO) Australia
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//- Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-//- Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-//- Neither the name of Zentaro Kavanagh nor the names of contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
-//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//===========================================================================
-
-#include "stdafx.h"
-
-#include <libWinCMMLParse/CMMLTagUtils.h>
-#include <libTemporalURI/C_TimeStamp.h>
-
-#include <fstream>
-
-#undef DEBUG
-
-/** Note that the returned C_ClipTagList must be deleted by you.
- */
-C_ClipTagList *CMMLTagUtils::getClipsFrom(C_ClipTagList *inClipTagList, LOOG_INT64 inTimeInDirectShowUnits)
-{
-
-#ifdef DEBUG
- fstream locDebugFile;
- locDebugFile.open("G:\\Logs\\getClipsFrom.log", ios_base::out);
-#endif
-
- C_ClipTagList *locClipTagList = new C_ClipTagList;
-
- bool locAlreadyEncounteredClipInTimeRange = false;
-
- for (unsigned long i = 0; i < inClipTagList->numTags(); i++) {
- C_ClipTag *locTag = inClipTagList->getTag(i);
-
-#ifdef DEBUG
- locDebugFile << "Processing tag " << i << endl;
-#endif
-
- // 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))) {
-#ifdef DEBUG
- locDebugFile << "Couldn't parse time stamp: " <<
- StringHelper::toNarrowStr(locStart) << endl;
-#endif
- // 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) {
-#ifdef DEBUG
- locDebugFile << "Found clip with greater start time " << locStartTime << endl;
-#endif
- 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 != 0
- && locEndTime >= locStartTime
- && locEndTime < inTimeInDirectShowUnits) {
-#ifdef DEBUG
- locDebugFile << "Skipping add due to end time " << locEndTime << endl;
-#endif
- continue;
- }
- }
- }
-
- // If we're not the very first clip ...
- if (i > 0) {
-#ifdef DEBUG
- locDebugFile << "Cloning previous clip " << i << endl;
-#endif
- C_ClipTag *locClipInTimeRange = inClipTagList->getTag(i - 1);
- locClipTagList->addTag(locClipInTimeRange->clone());
- }
- locAlreadyEncounteredClipInTimeRange = true;
- }
-#ifdef DEBUG
- locDebugFile << "Cloning clip " << i << endl;
-#endif
- locClipTagList->addTag(locTag->clone());
- }
- }
-
-#ifdef DEBUG
- locDebugFile.close();
-#endif
- return locClipTagList;
-}
Deleted: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.h 2005-01-10 03:28:15 UTC (rev 8712)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLTagUtils.h 2005-01-10 03:44:00 UTC (rev 8713)
@@ -1,46 +0,0 @@
-//===========================================================================
-//Copyright (C) 2005 Zentaro Kavanagh
-//
-//Copyright (C) 2005 Commonwealth Scientific and Industrial Research
-// Organisation (CSIRO) Australia
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-//- Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-//- Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-//- Neither the name of Zentaro Kavanagh nor the names of contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
-//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//===========================================================================
-
-#pragma once
-
-
-#include <libCMMLTags/libCMMLTags.h>
-#include <libilliCore/illicoreconfig.h>
-
-class LIBWINCMMLPARSE_API CMMLTagUtils
-{
-public:
- /// Returns a new C_ClipTagList, which contains clips occuring in inClipTagList, during or after the time given via inTimeInDirectShowUnits
- static C_ClipTagList *getClipsFrom(C_ClipTagList *inClipTagList, LOOG_INT64 inTimeInDirectShowUnits);
-};
Modified: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.vcproj 2005-01-10 03:28:15 UTC (rev 8712)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/libWinCMMLParse.vcproj 2005-01-10 03:44:00 UTC (rev 8713)
@@ -258,9 +258,6 @@
RelativePath="CMMLParser.cpp">
</File>
<File
- RelativePath=".\CMMLTagUtils.cpp">
- </File>
- <File
RelativePath="libWinCMMLParse.cpp">
</File>
<File
@@ -298,9 +295,6 @@
RelativePath="CMMLParser.h">
</File>
<File
- RelativePath=".\CMMLTagUtils.h">
- </File>
- <File
RelativePath="libWinCMMLParse.h">
</File>
<File
Modified: trunk/oggdsf/src/lib/helper/libOOOggChef/CMMLRecomposer.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libOOOggChef/CMMLRecomposer.cpp 2005-01-10 03:28:15 UTC (rev 8712)
+++ trunk/oggdsf/src/lib/helper/libOOOggChef/CMMLRecomposer.cpp 2005-01-10 03:44:00 UTC (rev 8713)
@@ -42,8 +42,8 @@
#include <libOOOgg/libOOOgg.h>
#include <libCMMLTags/libCMMLTags.h>
#include <libTemporalURI/C_TimeStamp.h>
-#include <libWinCMMLParse/CMMLParser.h>
-#include <libWinCMMLParse/CMMLTagUtils.h>
+#include <libCMMLParse/CMMLParser.h>
+#include <libCMMLParse/CMMLTagUtils.h>
#include <fstream>
#include <iostream>
More information about the commits
mailing list