Opened 17 years ago

Closed 17 years ago

Last modified 12 months ago

#8108 closed patch

Ogg/Vorbis CD music support

Reported by: SF/dschepler Owned by: SF/khalek
Priority: normal Component: Audio
Keywords: Cc:
Game:

Description

This patch supports playing CD music encoded into Vorbis format.
Currently, the Vorbis files must be 22050 Hz to work properly.

This requires Makefile changes, to remove definitions of
COMPRESSED_SOUND_FILE and possibly add definitions of
USE_MAD and/or USE_VORBIS. I've updated the main Makefile,
but other ports might need updating.

This also rearranges the MP3 code, in order to ease putting the
Vorbis code in parallel. I separated common code (looping logic, for
example) from the mad-specific parts, which are now in
Sound::MP3TrackInfo. Both this and the new
Sound::VorbisTrackInfo class implement the interface specified in
Sound::DigitalTrackInfo.

Ticket imported from: #628997. Ticket imported from: patches/213.

Attachments (2)

ogg.diff (17.6 KB ) - added by SF/dschepler 17 years ago.
New version, fixes problems compiling with just Vorbis.
loomcd.s03 (42.6 KB ) - added by SF/khalek 17 years ago.
save before shephards

Download all attachments as: .zip

Change History (7)

by SF/dschepler, 17 years ago

Attachment: ogg.diff added

New version, fixes problems compiling with just Vorbis.

comment:1 by SF/khalek, 17 years ago

there can be a slight bit of tearing with loom but apart
from that it sounds good in both loom and monkey island. As
soon as I figure out how to record access to /dev/dsp I'll
attach a small sample. It happens at least just before the
title screen and alsa in the shepards scene. Attached is a
save just before the shepards. Note that daniel doesn't
have loomcd unfortunately and as such can't test loom himself.

by SF/khalek, 17 years ago

Attachment: loomcd.s03 added

save before shephards

comment:2 by SF/dschepler, 17 years ago

Whoops, the maximum music volume is 256, not 128. So change the two
occurrences of 128 to 256 near the end of sound/mixer.cpp, and this
should fix the "tearing" problems.

comment:3 by SF/khalek, 17 years ago

Great that fixed it, applied to cvs with the relevant lines
in the makefile commented for now. Bring on the .sog support :)

comment:4 by SF/khalek, 17 years ago

Owner: set to SF/khalek
Status: newclosed

comment:5 by digitall, 12 months ago

Component: Audio
Note: See TracTickets for help on using tickets.