[xiph-commits] r7396 - in trunk/oggdsf: docs sln
illiminable at dactyl.lonelymoon.com
illiminable
Wed Jul 28 07:46:34 PDT 2004
sln/libfishsoundWithToolsAndTests sln/oggdsf_all
src/lib/codecs/flac/filters/dsfFLACDecoder
src/lib/codecs/flac/libs/libflac/src/libFLAC
src/lib/codecs/helper/libfishsound/src/tests
src/lib/codecs/helper/libfishsound/win32
src/lib/codecs/helper/libfishsound/win32/encdec-audio
src/lib/codecs/helper/libfishsound/win32/encdec-comments
src/lib/codecs/helper/libfishsound/win32/libfishsound
src/lib/codecs/theora/libs/libtheora/win32/libtheora
src/lib/core/directshow/dsfOggDemux src/lib/core/ogg/libOOOgg
src/lib/core/ogg/libVorbisComment
Message-ID: <20040728144634.6C7799AAAB at dactyl.lonelymoon.com>
Author: illiminable
Date: Wed Jul 28 07:46:34 2004
New Revision: 7396
Added:
trunk/oggdsf/sln/libfishsoundWithToolsAndTests/
trunk/oggdsf/sln/libfishsoundWithToolsAndTests/libfishsoundWithToolsAndTests.sln
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/fs_compat.h
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/ReadMe.txt
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/encdec-audio.cpp
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/encdec-audio.vcproj
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/ReadMe.txt
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/encdec-comments.cpp
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/encdec-comments.vcproj
Modified:
trunk/oggdsf/docs/TODO.txt
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitbuffer.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_decoder.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-audio.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound/libfishsound.vcproj
trunk/oggdsf/src/lib/codecs/theora/libs/libtheora/win32/libtheora/libtheora.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/StringHelper.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/StringHelper.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj
trunk/oggdsf/src/lib/core/ogg/libVorbisComment/VorbisComments.cpp
Log:
* More build setting changes.
* Remove some redundant stuff.
* Fix a bug in the FLACStream, not converting gran pos corrent
* Added an assertion into libFLAC.
Modified: trunk/oggdsf/docs/TODO.txt
===================================================================
--- trunk/oggdsf/docs/TODO.txt 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/docs/TODO.txt 2004-07-28 14:46:32 UTC (rev 7396)
@@ -1,6 +1,5 @@
BUGS
====
-* When muxing very large packets, creates invalid stream.
* Figure out why the graph hangs at the end of lpayback sometimes. see debugging.txt
* Fix wmp 9 issues, probably by rewriting the decoder :(
@@ -17,12 +16,17 @@
# I think there may be a little memory leak in the encoders... nothing too serious, but if you try and encode really large files it may be a problem.
# Theora will not playback with Windows Media Player 9 or 10, but vorbis and speex are just fine, but will in previous WMP's and other DS players like BSPlayer
-
# DON'T try to stop a FLAC stream. It crashes. Running to the end is ok.
# FLAC will make media player do the error sound or crash on exit
# Only plays FLAC with 16 bit 2 channel 44100Hz settings. Still hardcoded.
# Only plays Ogg encapsulated FLAC. Won't play normal FLAC files.
+NEW
+===
+* Add get and set functions for the format block to flac encoder like in the others. Get rid of the mecpy.
+* Need to check sound buffers are empty when stop/start.
+* Need to check code at ends of streams. A seek here stops all audio until stop/start.
+
NOT BUG
=======
# Theora and annodex playback requires directX 9.
Added: trunk/oggdsf/sln/libfishsoundWithToolsAndTests/libfishsoundWithToolsAndTests.sln
===================================================================
--- trunk/oggdsf/sln/libfishsoundWithToolsAndTests/libfishsoundWithToolsAndTests.sln 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/sln/libfishsoundWithToolsAndTests/libfishsoundWithToolsAndTests.sln 2004-07-28 14:46:32 UTC (rev 7396)
@@ -0,0 +1,81 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "..\..\src\lib\codecs\speex\libs\libspeex\win32\libspeex\libspeex.vcproj", "{6D653C6F-8722-4B10-9C3A-CB7094DD159F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis", "..\..\src\lib\codecs\vorbis\libs\libvorbis\win32\vorbis_dynamic.vcproj", "{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "..\..\src\lib\core\ogg\libogg\win32\ogg_dynamic.vcproj", "{FB373486-0E6E-4BB6-8BF2-1F92EACA1468}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfishsound", "..\..\src\lib\codecs\helper\libfishsound\win32\libfishsound.vcproj", "{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6D653C6F-8722-4B10-9C3A-CB7094DD159F} = {6D653C6F-8722-4B10-9C3A-CB7094DD159F}
+ {FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+ {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encdec-comments", "..\..\src\lib\codecs\helper\libfishsound\win32\encdec-comments\encdec-comments.vcproj", "{193C79A4-4473-4084-A64C-8AE2850DE71C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encdec-audio", "..\..\src\lib\codecs\helper\libfishsound\win32\encdec-audio\encdec-audio.vcproj", "{425BA83B-DA0D-4BAF-B3A0-D6EB1F228200}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ MakeFile = MakeFile
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Debug.ActiveCfg = Debug|Win32
+ {6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Debug.Build.0 = Debug|Win32
+ {6D653C6F-8722-4B10-9C3A-CB7094DD159F}.MakeFile.ActiveCfg = Release|Win32
+ {6D653C6F-8722-4B10-9C3A-CB7094DD159F}.MakeFile.Build.0 = Release|Win32
+ {6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Release.ActiveCfg = Release|Win32
+ {6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Release.Build.0 = Release|Win32
+ {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Debug.ActiveCfg = Debug|Win32
+ {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Debug.Build.0 = Debug|Win32
+ {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.MakeFile.ActiveCfg = Release|Win32
+ {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.MakeFile.Build.0 = Release|Win32
+ {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Release.ActiveCfg = Release|Win32
+ {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Release.Build.0 = Release|Win32
+ {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Debug.ActiveCfg = Debug|Win32
+ {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Debug.Build.0 = Debug|Win32
+ {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.MakeFile.ActiveCfg = MakeFile|Win32
+ {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.MakeFile.Build.0 = MakeFile|Win32
+ {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Release.ActiveCfg = Release|Win32
+ {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Release.Build.0 = Release|Win32
+ {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Debug.ActiveCfg = Debug|Win32
+ {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Debug.Build.0 = Debug|Win32
+ {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.MakeFile.ActiveCfg = Debug|Win32
+ {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.MakeFile.Build.0 = Debug|Win32
+ {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Release.ActiveCfg = Release|Win32
+ {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Release.Build.0 = Release|Win32
+ {193C79A4-4473-4084-A64C-8AE2850DE71C}.Debug.ActiveCfg = Debug|Win32
+ {193C79A4-4473-4084-A64C-8AE2850DE71C}.Debug.Build.0 = Debug|Win32
+ {193C79A4-4473-4084-A64C-8AE2850DE71C}.MakeFile.ActiveCfg = Release|Win32
+ {193C79A4-4473-4084-A64C-8AE2850DE71C}.MakeFile.Build.0 = Release|Win32
+ {193C79A4-4473-4084-A64C-8AE2850DE71C}.Release.ActiveCfg = Release|Win32
+ {193C79A4-4473-4084-A64C-8AE2850DE71C}.Release.Build.0 = Release|Win32
+ {425BA83B-DA0D-4BAF-B3A0-D6EB1F228200}.Debug.ActiveCfg = Debug|Win32
+ {425BA83B-DA0D-4BAF-B3A0-D6EB1F228200}.Debug.Build.0 = Debug|Win32
+ {425BA83B-DA0D-4BAF-B3A0-D6EB1F228200}.MakeFile.ActiveCfg = Release|Win32
+ {425BA83B-DA0D-4BAF-B3A0-D6EB1F228200}.MakeFile.Build.0 = Release|Win32
+ {425BA83B-DA0D-4BAF-B3A0-D6EB1F228200}.Release.ActiveCfg = Release|Win32
+ {425BA83B-DA0D-4BAF-B3A0-D6EB1F228200}.Release.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-07-28 14:46:32 UTC (rev 7396)
@@ -1596,18 +1596,21 @@
{41CF6297-C38A-44E3-A564-25DB7E2904FC}.Release Unicode.ActiveCfg = Release
{41CF6297-C38A-44E3-A564-25DB7E2904FC}.Release Unicode.Build.0 = Release
{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Debug.ActiveCfg = Debug
+ {A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Debug.Build.0 = Debug
{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Debug Unicode.ActiveCfg = Debug
{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.MakeFile.ActiveCfg = Release
{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Release.ActiveCfg = Release
{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Release.Build.0 = Release
{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Release Unicode.ActiveCfg = Release
{E2A342FB-F183-4076-88D4-06F109CA5415}.Debug.ActiveCfg = Debug
+ {E2A342FB-F183-4076-88D4-06F109CA5415}.Debug.Build.0 = Debug
{E2A342FB-F183-4076-88D4-06F109CA5415}.Debug Unicode.ActiveCfg = Debug
{E2A342FB-F183-4076-88D4-06F109CA5415}.MakeFile.ActiveCfg = Release
{E2A342FB-F183-4076-88D4-06F109CA5415}.Release.ActiveCfg = Release
{E2A342FB-F183-4076-88D4-06F109CA5415}.Release.Build.0 = Release
{E2A342FB-F183-4076-88D4-06F109CA5415}.Release Unicode.ActiveCfg = Release
{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.Debug.ActiveCfg = Debug
+ {0176E805-7F0B-4144-9A31-2CE1DD228AC5}.Debug.Build.0 = Debug
{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.Debug Unicode.ActiveCfg = Debug
{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.MakeFile.ActiveCfg = Release
{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.Release.ActiveCfg = Release
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.cpp 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACDecoder/FLACDecodeInputPin.cpp 2004-07-28 14:46:32 UTC (rev 7396)
@@ -322,6 +322,8 @@
CAutoLock locLock(mFilterLock);
CAutoLock locCodecLock(mCodecLock);
debugLog<<"BeginFlush : Calling flush on the codec."<<endl;
+
+ HRESULT locHR = AbstractAudioDecodeInputPin::BeginFlush();
flush();
unsigned long locSize = mPendingPackets.size();
debugLog<<"BeginFlush : deleting "<<locSize<<" packets."<<endl;
@@ -329,7 +331,7 @@
delete mPendingPackets.front();
mPendingPackets.pop();
}
- return AbstractAudioDecodeInputPin::BeginFlush();
+ return locHR;
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitbuffer.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitbuffer.c 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitbuffer.c 2004-07-28 14:46:32 UTC (rev 7396)
@@ -193,6 +193,8 @@
bb->buffer[l] = bb->buffer[r];
for( ; l < r_end; l++)
bb->buffer[l] = 0;
+ //Added by Zen:::
+ FLAC__ASSERT(bb->blurbs >= bb->consumed_blurbs);
bb->blurbs -= bb->consumed_blurbs;
bb->total_bits -= FLAC__BLURBS_TO_BITS(bb->consumed_blurbs);
bb->consumed_blurbs = 0;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_decoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_decoder.c 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_decoder.c 2004-07-28 14:46:32 UTC (rev 7396)
@@ -551,7 +551,7 @@
}
decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
//Insert by ZEN:::
- //decoder->private_->samples_decoded = 0;
+ decoder->private_->samples_decoded = 0;
return true;
}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-audio.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-audio.c 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-audio.c 2004-07-28 14:46:32 UTC (rev 7396)
@@ -31,6 +31,9 @@
*/
#include "config.h"
+//Added by Zen::: compat for snprintf.
+#include "fs_compat.h"
+//
#include <stdio.h>
#include <stdlib.h>
@@ -187,7 +190,8 @@
char msg[128];
int i;
- snprintf (msg, 128,
+ //Change zen::: add underscore
+ _snprintf (msg, 128,
"+ %2d channel %6d Hz %s, %d frame buffer (%s)",
channels, samplerate,
format == FISH_SOUND_VORBIS ? "Vorbis" : "Speex",
@@ -207,6 +211,7 @@
fish_sound_flush (ed->encoder);
if (ed->frames_in != ed->frames_out) {
+
snprintf (msg, 128,
"%ld frames encoded, %ld frames decoded",
ed->frames_in, ed->frames_out);
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/fs_compat.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/fs_compat.h 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/fs_compat.h 2004-07-28 14:46:32 UTC (rev 7396)
@@ -0,0 +1,43 @@
+/*
+ Copyright (C) 2003 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 CSIRO Australia nor the names of its
+ 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 "config.h"
+
+/* WINDOWS */
+#ifdef WIN32
+#define inline __inline
+#define alloca _alloca
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+#define snprintf _snprintf
+#endif
+
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/ReadMe.txt
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/ReadMe.txt 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/ReadMe.txt 2004-07-28 14:46:32 UTC (rev 7396)
@@ -0,0 +1,32 @@
+========================================================================
+ CONSOLE APPLICATION : encdec-audio Project Overview
+========================================================================
+
+AppWizard has created this encdec-audio application for you.
+This file contains a summary of what you will find in each of the files that
+make up your encdec-audio application.
+
+
+encdec-audio.vcproj
+ This is the main project file for VC++ projects generated using an Application Wizard.
+ It contains information about the version of Visual C++ that generated the file, and
+ information about the platforms, configurations, and project features selected with the
+ Application Wizard.
+
+encdec-audio.cpp
+ This is the main application source file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+ These files are used to build a precompiled header (PCH) file
+ named encdec-audio.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/encdec-audio.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/encdec-audio.cpp 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/encdec-audio.cpp 2004-07-28 14:46:32 UTC (rev 7396)
@@ -0,0 +1,10 @@
+// encdec-audio.cpp : Defines the entry point for the console application.
+//
+
+#include "stdafx.h"
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+ return 0;
+}
+
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/encdec-audio.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/encdec-audio.vcproj 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-audio/encdec-audio.vcproj 2004-07-28 14:46:32 UTC (rev 7396)
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="encdec-audio"
+ ProjectGUID="{425BA83B-DA0D-4BAF-B3A0-D6EB1F228200}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..;..\..\include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/encdec-audio.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/encdec-audio.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="4"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/encdec-audio.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath="..\..\src\tests\encdec-audio.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath=".\fs_compat.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/ReadMe.txt
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/ReadMe.txt 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/ReadMe.txt 2004-07-28 14:46:32 UTC (rev 7396)
@@ -0,0 +1,32 @@
+========================================================================
+ CONSOLE APPLICATION : encdec-comments Project Overview
+========================================================================
+
+AppWizard has created this encdec-comments application for you.
+This file contains a summary of what you will find in each of the files that
+make up your encdec-comments application.
+
+
+encdec-comments.vcproj
+ This is the main project file for VC++ projects generated using an Application Wizard.
+ It contains information about the version of Visual C++ that generated the file, and
+ information about the platforms, configurations, and project features selected with the
+ Application Wizard.
+
+encdec-comments.cpp
+ This is the main application source file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+ These files are used to build a precompiled header (PCH) file
+ named encdec-comments.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/encdec-comments.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/encdec-comments.cpp 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/encdec-comments.cpp 2004-07-28 14:46:32 UTC (rev 7396)
@@ -0,0 +1,10 @@
+// encdec-comments.cpp : Defines the entry point for the console application.
+//
+
+#include "stdafx.h"
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+ return 0;
+}
+
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/encdec-comments.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/encdec-comments.vcproj 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encdec-comments/encdec-comments.vcproj 2004-07-28 14:46:32 UTC (rev 7396)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="encdec-comments"
+ ProjectGUID="{193C79A4-4473-4084-A64C-8AE2850DE71C}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..;..\..\include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/encdec-comments.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/encdec-comments.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="4"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/encdec-comments.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath="..\..\src\tests\encdec-comments.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound/libfishsound.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound/libfishsound.vcproj 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound/libfishsound.vcproj 2004-07-28 14:46:32 UTC (rev 7396)
@@ -1,192 +1,193 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="libfishsound"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="."
- IntermediateDirectory="."
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\libogg\include\,..\..\include\,..\,.\"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBFISHSOUND_EXPORTS"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile="./libfishsound.pch"
- AssemblerListingLocation="./"
- ObjectFile="./"
- ProgramDataBaseFileName="./"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ogg.lib vorbis.lib libspeex.lib odbc32.lib odbccp32.lib"
- OutputFile=".\libfishsound.dll"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\..\libogg\lib\"
- ModuleDefinitionFile=".\libfishsound.def"
- GenerateDebugInformation="FALSE"
- ProgramDatabaseFile="./libfishsound.pdb"
- ImportLibrary="./libfishsound.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName="./libfishsound.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="."
- IntermediateDirectory="."
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\libogg\include\,..\..\include\,..\,.\"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBFISHSOUND_EXPORTS"
- StringPooling="TRUE"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
- PrecompiledHeaderFile="./libfishsound.pch"
- AssemblerListingLocation="./"
- ObjectFile="./"
- ProgramDataBaseFileName="./"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib ogg.lib vorbis.lib libspeex.lib"
- OutputFile=".\libfishsound.dll"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\..\libogg\lib\"
- ModuleDefinitionFile=".\libfishsound.def"
- GenerateDebugInformation="FALSE"
- ProgramDatabaseFile="./libfishsound.pdb"
- ImportLibrary="./libfishsound.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName="./libfishsound.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- <File
- RelativePath="..\..\src\libfishsound\fishsound.c">
- </File>
- <File
- RelativePath=".\libfishsound.def">
- </File>
- <File
- RelativePath="..\..\src\libfishsound\speex.c">
- </File>
- <File
- RelativePath="..\..\src\libfishsound\vorbis.c">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- <File
- RelativePath="..\config.h">
- </File>
- <File
- RelativePath="..\..\include\fishsound\constants.h">
- </File>
- <File
- RelativePath="..\..\include\fishsound\fishsound.h">
- </File>
- <File
- RelativePath="..\..\src\libfishsound\fs_compat.h">
- </File>
- <File
- RelativePath="..\..\src\libfishsound\private.h">
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="libfishsound"
+ ProjectGUID="{B65B87CF-541F-406A-8E45-F33222C0629D}"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="."
+ IntermediateDirectory="."
+ ConfigurationType="2"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\libogg\include\,..\..\include\,..\,.\"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBFISHSOUND_EXPORTS"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ PrecompiledHeaderFile="./libfishsound.pch"
+ AssemblerListingLocation="./"
+ ObjectFile="./"
+ ProgramDataBaseFileName="./"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ogg.lib vorbis.lib libspeex.lib odbc32.lib odbccp32.lib"
+ OutputFile=".\libfishsound.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="..\..\..\libogg\lib\"
+ ModuleDefinitionFile=".\libfishsound.def"
+ GenerateDebugInformation="FALSE"
+ ProgramDatabaseFile="./libfishsound.pdb"
+ ImportLibrary="./libfishsound.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName="./libfishsound.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="."
+ IntermediateDirectory="."
+ ConfigurationType="2"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\libogg\include\,..\..\include\,..\,.\"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBFISHSOUND_EXPORTS"
+ StringPooling="TRUE"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="TRUE"
+ PrecompiledHeaderFile="./libfishsound.pch"
+ AssemblerListingLocation="./"
+ ObjectFile="./"
+ ProgramDataBaseFileName="./"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib ogg.lib vorbis.lib libspeex.lib"
+ OutputFile=".\libfishsound.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="..\..\..\libogg\lib\"
+ ModuleDefinitionFile=".\libfishsound.def"
+ GenerateDebugInformation="FALSE"
+ ProgramDatabaseFile="./libfishsound.pdb"
+ ImportLibrary="./libfishsound.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName="./libfishsound.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath="..\..\src\libfishsound\fishsound.c">
+ </File>
+ <File
+ RelativePath=".\libfishsound.def">
+ </File>
+ <File
+ RelativePath="..\..\src\libfishsound\speex.c">
+ </File>
+ <File
+ RelativePath="..\..\src\libfishsound\vorbis.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ <File
+ RelativePath="..\config.h">
+ </File>
+ <File
+ RelativePath="..\..\include\fishsound\constants.h">
+ </File>
+ <File
+ RelativePath="..\..\include\fishsound\fishsound.h">
+ </File>
+ <File
+ RelativePath="..\..\src\libfishsound\fs_compat.h">
+ </File>
+ <File
+ RelativePath="..\..\src\libfishsound\private.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libtheora/win32/libtheora/libtheora.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libtheora/win32/libtheora/libtheora.vcproj 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libtheora/win32/libtheora/libtheora.vcproj 2004-07-28 14:46:32 UTC (rev 7396)
@@ -14,7 +14,7 @@
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
- ConfigurationType="2"
+ ConfigurationType="4"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
@@ -32,15 +32,7 @@
<Tool
Name="VCCustomBuildTool"/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libtheora.dll"
- LinkIncremental="2"
- ModuleDefinitionFile="libtheora.def"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/libtheora.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)/libtheora.lib"
- TargetMachine="1"/>
+ Name="VCLibrarianTool"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -56,8 +48,6 @@
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp 2004-07-28 14:46:32 UTC (rev 7396)
@@ -140,12 +140,11 @@
//------------------------------------------
- OggInt64 locInt64;
- locInt64.setData(mHeaderPack->packetData() + 17);
- __int64 locTimePerBlock = locInt64.value();
+
+ __int64 locTimePerBlock = OggMath::CharArrToInt64(mHeaderPack->packetData() + 17);
- locInt64.setData(mHeaderPack->packetData() + 25);
- __int64 locSamplesPerBlock = locInt64.value();
+
+ __int64 locSamplesPerBlock = OggMath::CharArrToInt64(mHeaderPack->packetData() + 25);
mFFDShowVideoFormatBlock->AvgTimePerFrame = locTimePerBlock / locSamplesPerBlock;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.cpp 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.cpp 2004-07-28 14:46:32 UTC (rev 7396)
@@ -111,7 +111,9 @@
}
return true;
}
-
+void FLACStream::setLastEndGranPos(__int64 inPos) {
+ mLastEndGranulePos = (inPos * (__int64)mFLACFormatBlock->sampleRate)/ UNITS;
+}
bool FLACStream::deliverCodecHeaders() {
StampedOggPacket* locPacket = NULL;
for (unsigned long i = 0; i < mCodecHeaders->numPackets(); i++) {
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h 2004-07-28 14:46:32 UTC (rev 7396)
@@ -57,6 +57,8 @@
virtual bool FLACStream::processHeaderPacket(StampedOggPacket* inPacket);
virtual bool deliverCodecHeaders();
+ virtual void setLastEndGranPos(__int64 inPos);
+
protected:
sFLACFormatBlock* mFLACFormatBlock;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-07-28 14:46:32 UTC (rev 7396)
@@ -503,6 +503,7 @@
void OggDemuxSourceFilter::DeliverBeginFlush() {
CAutoLock locLock(m_pLock);
+
//debugLog << "Delivering Begin Flush"<<endl;
for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
mStreamMapper->getOggStream(i)->getPin()->DeliverBeginFlush();
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.cpp 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.cpp 2004-07-28 14:46:32 UTC (rev 7396)
@@ -98,7 +98,7 @@
//Write out the value of the character in a 2 hex-digit field
//cout << setw(2) << (int)mPageData[i] << " ";
- retStr.append(charToHexString(mPacketData[i]) + " ");
+ retStr.append(StringHelper::charToHexString(mPacketData[i]) + " ");
}
//Find out how many leftover charcters didn't get written out.
@@ -121,25 +121,8 @@
return retStr;
}
-unsigned char OggPacket::digitToHex(unsigned char inDigit) {
-
- unsigned char locDigit = (inDigit > 9) ? (inDigit - 10) + A_BASE
- : (inDigit) + ZERO_BASE;
- return locDigit;
-}
-string OggPacket::charToHexString(unsigned char inChar) {
-
- string retStr ="";
- retStr +=digitToHex(inChar / 16);
-
- retStr+= digitToHex(inChar % 16);
- return retStr;
-
-
-}
-
string OggPacket::padField(string inString, unsigned long inPadWidth, unsigned char inPadChar) {
//NOTE::: Need check for string being bigger than pad space
string retStr = "";
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.h 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPacket.h 2004-07-28 14:46:32 UTC (rev 7396)
@@ -43,8 +43,7 @@
static const unsigned long HEX_DUMP_LINE_LENGTH = 16;
- static const unsigned char A_BASE = 65; //A in ASCII
- static const unsigned char ZERO_BASE = 48;
+
virtual OggPacket* clone();
unsigned long packetSize();
@@ -63,9 +62,8 @@
unsigned char* mPacketData;
bool mIsComplete;
- unsigned char OggPacket::digitToHex(unsigned char inChar);
- string OggPacket::charToHexString(unsigned char inChar);
+
string OggPacket::dumpNCharsToString(unsigned char* inStartPoint, unsigned long inNumChars) ;
string OggPacket::padField(string inString, unsigned long inPadWidth, unsigned char inPadChar);
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.cpp 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.cpp 2004-07-28 14:46:32 UTC (rev 7396)
@@ -114,94 +114,3 @@
{
return mHeader->dataSize();
}
-
-
-
-
-//string OggPage::toString()
-//{
-//
-// return NULL;
-//}
-
-//void OggPage::screenDump()
-//{
-// //Dump the header
-// cout<< mHeader->toString();
-// //Dump the data
-// dataDumpAsHex();
-//}
-//
-//void OggPage::dumpNChars(unsigned char* inStartPoint, unsigned long inNumChars) {
-//
-// //NOTE::: Also needs reworking
-// const unsigned char BELL = 7;
-// //Set the fill character back to space ' '
-// cout << setfill(' ');
-//
-// //Put some space after the hex section
-// unsigned long locPadding = 3 * (HEX_DUMP_LINE_LENGTH - inNumChars) + 4;
-// cout << setw(locPadding) << " ";
-//
-// //Loop through the characters
-// for (unsigned long i = 0; i < inNumChars; i++) {
-//
-// //If they are *not* going to mess up the layout (\r, \n or \t or bell(7))
-// if ( (inStartPoint[i] != '\n') && (inStartPoint[i] != '\r') && (inStartPoint[i] != '\t') && (inStartPoint[i] != BELL )) {
-// //Write them out
-// cout << inStartPoint[i];
-// } else {
-// //Otherwise just write a null char
-// cout << (char) 0;
-// }
-// }
-// //End the line and put the fill character back to a number 0
-// cout << endl << setfill('0');
-//
-//}
-//
-//
-//
-//void OggPage::dataDumpAsHex() {
-// ///NOTE::: ShOuld be reworked.
-// //Needs dataSize and data pointer
-//
-// //Put the stream in hex mode with a fill character of 0
-// hex(cout);
-// cout << setfill('0');
-//
-// //Loop through every character of data
-// for (unsigned long i = 0; i < mHeader->dataSize(); i++) {
-// //If it is the end of the previous hex dump line or first line)
-// if ( (i % HEX_DUMP_LINE_LENGTH == 0) ) {
-// //And this is not the first line
-// if ( i != 0 ) {
-// //Write the actual characters out at the end of the line
-// dumpNChars( &mPageData[i - HEX_DUMP_LINE_LENGTH], HEX_DUMP_LINE_LENGTH);
-// }
-//
-// //At the start of the line write out the base address in an 8 hex-digit field
-// cout << setw(8) << i << ": ";
-// }
-//
-// //Write out the value of the character in a 2 hex-digit field
-// cout << setw(2) << (int)mPageData[i] << " ";
-// }
-//
-// //Find out how many leftover charcters didn't get written out.
-// unsigned long locLeftovers = (mHeader->dataSize() % HEX_DUMP_LINE_LENGTH);
-// locLeftovers = (locLeftovers > 0) ? (locLeftovers)
-// : (HEX_DUMP_LINE_LENGTH);
-//
-//
-// //If there was any data in this dump
-// if ( mHeader->dataSize() > 0 ) {
-// //Dump the last part out
-// dumpNChars( &mPageData[mHeader->dataSize() - locLeftovers], locLeftovers );
-// }
-//
-// cout << "==============================================================================" << endl;
-// //Put the stream back to decimal mode
-// dec(cout);
-//}
-
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.h 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPage.h 2004-07-28 14:46:32 UTC (rev 7396)
@@ -31,28 +31,38 @@
#pragma once
+//STL Includes
#include <vector>
using namespace std;
+//Class Includes
#include "StampedOggPacket.h"
#include "OggPageHeader.h"
#include "IOggPackSource.h"
//OggPage represents an Ogg Encapsulation Format page
-
class LIBOOOGG_API OggPage
: public IOggPackSource
{
public:
+ //Constants
+ static const unsigned long HEX_DUMP_LINE_LENGTH = 16;
+ //
+
+ //Constructors
OggPage(void);
~OggPage(void);
+ //
+
+ //Cloning
OggPage* clone();
- static const unsigned long HEX_DUMP_LINE_LENGTH = 16;
+ //
//Size functions
unsigned long pageSize();
unsigned long headerSize();
unsigned long dataSize();
+ //
//IOggPackSource Implementation
OggPacket* getPacket(unsigned long inPacketNo);
@@ -62,28 +72,19 @@
//Packet access
StampedOggPacket* getStampedPacket(unsigned long inPacketNo);
bool addPacket(StampedOggPacket* inPacket);
+ //
//Header access
OggPageHeader* header();
//
-
+
//Serialise
unsigned char* createRawPageData();
+ //
-
-
protected:
//Member data of packets and header.
vector<StampedOggPacket*> mPacketList;
OggPageHeader* mHeader;
-
-
-
- ////Basic output stuff
- //// Some of this should get out of here.
- //string toString();
- //void screenDump();
- //void dataDumpAsHex();
- //void dumpNChars(unsigned char* inStartPoint, unsigned long inNumChars);
-
+ //
};
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageHeader.h 2004-07-28 14:46:32 UTC (rev 7396)
@@ -33,7 +33,7 @@
#include "StringHelper.h"
//#include "OggSegmentTable.h"
-#include "OggInt64.h"
+//#include "OggInt64.h"
#include "OggMath.h"
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h 2004-07-28 14:46:32 UTC (rev 7396)
@@ -60,21 +60,20 @@
bool deliverCurrentPage();
bool setChecksum();
bool createFreshPage();
+
bool addPacketToPage(StampedOggPacket* inOggPacket);
- unsigned long OggPaginator::addAsMuchPacketAsPossible(StampedOggPacket* inOggPacket, unsigned long inStartAt, long inRemaining);
- //bool addPartOfPacketToPage(StampedOggPacket* inOggPacket, unsigned long inStartFrom);
+ unsigned long addAsMuchPacketAsPossible(StampedOggPacket* inOggPacket, unsigned long inStartAt, long inRemaining);
bool addPartOfPacketToPage(StampedOggPacket* inOggPacket, unsigned long inStartFrom, unsigned long inLength);
+ //bool addPartOfPacketToPage(StampedOggPacket* inOggPacket, unsigned long inStartFrom);
unsigned long mPacketCount;
-
unsigned long mCurrentPageSize;
unsigned char mSegmentTable[255];
unsigned char mSegmentTableSize;
unsigned long mSequenceNo;
bool mPendingPageHasData;
-
IOggCallback* mPageCallback;
OggPaginatorSettings* mSettings;
OggPage* mPendingPage;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/StringHelper.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/StringHelper.cpp 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/StringHelper.cpp 2004-07-28 14:46:32 UTC (rev 7396)
@@ -103,3 +103,22 @@
}
+//These should go out to the string helper.
+unsigned char StringHelper::digitToHex(unsigned char inDigit) {
+
+ unsigned char locDigit = (inDigit > 9) ? (inDigit - 10) + A_BASE
+ : (inDigit) + ZERO_BASE;
+ return locDigit;
+
+}
+
+string StringHelper::charToHexString(unsigned char inChar) {
+
+ string retStr ="";
+ retStr +=digitToHex(inChar / 16);
+
+ retStr+= digitToHex(inChar % 16);
+ return retStr;
+
+
+}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/StringHelper.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/StringHelper.h 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/StringHelper.h 2004-07-28 14:46:32 UTC (rev 7396)
@@ -32,12 +32,19 @@
#pragma once
#include "dllstuff.h"
+#include <string.h>
+using namespace std;
class LIBOOOGG_API StringHelper
{
public:
StringHelper(void);
~StringHelper(void);
+ static const unsigned char A_BASE = 65; //A in ASCII
+ static const unsigned char ZERO_BASE = 48;
+ static unsigned char digitToHex(unsigned char inChar);
+ static string charToHexString(unsigned char inChar);
+
static string numToString(unsigned __int64 inNum);
static unsigned __int64 stringToNum(string inString);
static wstring StringHelper::toWStr(string inString);
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.h 2004-07-28 14:46:32 UTC (rev 7396)
@@ -35,10 +35,10 @@
#include "SerialNoRego.h"
#include "CallbackRego.h"
#include "OggDataBuffer.h"
-#include "OggInt64.h"
+//#include "OggInt64.h"
#include "OggPage.h"
//#include "OggSegmentTable.h"
#include "OggTypeDefs.h"
#include "IOggCallback.h"
-#include "OggBOSPage.h"
+//#include "OggBOSPage.h"
#include "OggMath.h"
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj 2004-07-28 14:46:32 UTC (rev 7396)
@@ -140,18 +140,12 @@
RelativePath="libOOOgg.cpp">
</File>
<File
- RelativePath="OggBOSPage.cpp">
- </File>
- <File
RelativePath="OggCallbackRego.cpp">
</File>
<File
RelativePath="OggDataBuffer.cpp">
</File>
<File
- RelativePath="OggInt64.cpp">
- </File>
- <File
RelativePath="OggMath.cpp">
</File>
<File
@@ -237,18 +231,12 @@
RelativePath="libOOOgg.h">
</File>
<File
- RelativePath="OggBOSPage.h">
- </File>
- <File
RelativePath="OggCallbackRego.h">
</File>
<File
RelativePath="OggDataBuffer.h">
</File>
<File
- RelativePath="OggInt64.h">
- </File>
- <File
RelativePath="OggMath.h">
</File>
<File
Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisComment/VorbisComments.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisComment/VorbisComments.cpp 2004-07-28 07:33:07 UTC (rev 7395)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisComment/VorbisComments.cpp 2004-07-28 14:46:32 UTC (rev 7396)
@@ -208,12 +208,11 @@
string VorbisComments::toString() {
string retStr;
- retStr = "VENDOR : " + mVendorString + "\n\n";
- retStr +="USER COMMENTS\n";
- retStr +="=============\n";
+ retStr = "VENDOR : " + mVendorString + "\n";
for (size_t i = 0; i < mCommentList.size(); i++) {
- retStr += mCommentList[i]->toString() + "\n";
+ retStr += "-- " + mCommentList[i]->toString() + "\n";
}
+ retStr += "\n";
return retStr;
}
More information about the commits
mailing list