aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLars Persson2005-12-03 21:29:13 +0000
committerLars Persson2005-12-03 21:29:13 +0000
commit6ed67205ec31305ad19f2e4469de27e7a93c51e8 (patch)
treed32eeffc50c1a9a4d6d3db6c29e1f1774d441f63 /sound
parent02f5921cbeca2352df9fa84628d3e835df15cc2a (diff)
downloadscummvm-rg350-6ed67205ec31305ad19f2e4469de27e7a93c51e8.tar.gz
scummvm-rg350-6ed67205ec31305ad19f2e4469de27e7a93c51e8.tar.bz2
scummvm-rg350-6ed67205ec31305ad19f2e4469de27e7a93c51e8.zip
1. New build structure for Symbian builds to allow easier build and project updates
2. Updated framework files for new structure 3. Uncommented Debug statements in vorbis.cpp (Should probably be removed alltogether. 4. Incorporated Sevs code formatting changes in the new Symbian source structure. 5. Removed/Changed EScummVM to ScummVM instead, hopefully most cases covered. 6. Beginning vibration support to be used for Scumm shake effects (Work ongoing by SumthinWicked) 7. Replaced the ScummVM icon for the FavIcon and upscaled the icon to 32x32. I think it looks ok, comments are welcome. 8. Built for S60V1 and UIQ2 targets from the cvs 9. Updated Readme with new build instructions. Any comments are welcome. Hopefully the other builds are not affected by this and all Sevs code updates are also incorporated. svn-id: r19739
Diffstat (limited to 'sound')
-rw-r--r--sound/vorbis.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp
index 08bb1f230a..c99c75af86 100644
--- a/sound/vorbis.cpp
+++ b/sound/vorbis.cpp
@@ -158,7 +158,7 @@ static ov_callbacks g_File_wrap = {
VorbisTrackInfo::VorbisTrackInfo(File *file) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
_file = file;
if (openTrack()) {
@@ -173,7 +173,7 @@ debug(5, "" __FILE__ ":%i", __LINE__);
}
bool VorbisTrackInfo::openTrack() {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
assert(_file);
file_info *f = new file_info;
@@ -209,7 +209,7 @@ debug(5, "" __FILE__ ":%i", __LINE__);
}
VorbisTrackInfo::~VorbisTrackInfo() {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
if (! _error_flag) {
ov_clear(&_ov_file);
_file->decRef();
@@ -217,8 +217,8 @@ debug(5, "" __FILE__ ":%i", __LINE__);
}
void VorbisTrackInfo::play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration) {
-debug(5, "" __FILE__ ":%i", __LINE__);
- bool err = openTrack();
+//debug(5, "" __FILE__ ":%i", __LINE__);
+ bool err = openTrack(); err=err;//satisfy unused variable
assert(!err);
#ifdef USE_TREMOR // In Tremor, the ov_time_seek() and ov_time_seek_page() calls take seeking positions in milliseconds as 64 bit integers, rather than in seconds as doubles as in Vorbisfile.
@@ -236,7 +236,7 @@ debug(5, "" __FILE__ ":%i", __LINE__);
}
DigitalTrackInfo *getVorbisTrack(int track) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
char track_name[32];
File *file = new File();
@@ -287,7 +287,7 @@ VorbisInputStream::VorbisInputStream(OggVorbis_File *file, int duration, bool de
: _ov_file(file),
_bufferEnd(_buffer + ARRAYSIZE(_buffer)),
_deleteFileAfterUse(deleteFileAfterUse) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
// Check the header, determine if this is a stereo stream
_numChannels = ov_info(_ov_file, -1)->channels;
@@ -303,19 +303,19 @@ debug(5, "" __FILE__ ":%i", __LINE__);
}
VorbisInputStream::~VorbisInputStream() {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
ov_clear(_ov_file);
if (_deleteFileAfterUse)
delete _ov_file;
}
inline bool VorbisInputStream::eosIntern() const {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
return _pos >= _bufferEnd;
}
int VorbisInputStream::readBuffer(int16 *buffer, const int numSamples) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
int samples = 0;
while (samples < numSamples && !eosIntern()) {
const int len = MIN(numSamples - samples, (int)(_bufferEnd - _pos));
@@ -331,7 +331,7 @@ debug(5, "" __FILE__ ":%i", __LINE__);
}
void VorbisInputStream::refill() {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
// Read the samples
uint len_left = sizeof(_buffer);
char *read_pos = (char *)_buffer;
@@ -369,12 +369,12 @@ debug(5, "" __FILE__ ":%i", __LINE__);
}
static AudioStream *makeVorbisStream(OggVorbis_File *file, int duration) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
return new VorbisInputStream(file, duration, false);
}
AudioStream *makeVorbisStream(File *file, uint32 size) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
OggVorbis_File *ov_file = new OggVorbis_File;
file_info *f = new file_info;