aboutsummaryrefslogtreecommitdiff
path: root/sound
AgeCommit message (Collapse)Author
2003-09-05cleaned up sound/mixer.h a bit; renamed some mixer methods for consistencyMax Horn
svn-id: r10018
2003-09-05fixes for uninitialized pan and volumePaweł Kołodziejski
svn-id: r9998
2003-09-02remove shadow'd var by using variable name from prototypeJonathan Gray
svn-id: r9979
2003-09-02moved volume and pan control into flow funcPaweł Kołodziejski
svn-id: r9976
2003-09-02Fixed compiler warning that I introduced earlier.Torbjörn Andersson
svn-id: r9974
2003-09-02Added per-channel pausing. Maybe I should have named the pauseChannel()Torbjörn Andersson
function simply pause() to be consistent with stop(), but there already is a pause() function and I don't want to have two functions with the same name doing different things. (The current pause() function pauses all channels.) svn-id: r9968
2003-09-01forgot thisPaweł Kołodziejski
svn-id: r9957
2003-09-01The channel could be destroyed so changeVolumeAndPan can't access it in that ↵Chris Apers
case svn-id: r9955
2003-08-31added comments:Paweł Kołodziejski
volume: 0 - 127 pan: (-127 <-> 0 <-> 127) (left <-> center <-> right) svn-id: r9945
2003-08-31added mixer features: volume and pan control per channelPaweł Kołodziejski
svn-id: r9944
2003-08-30Made PlayingSoundHandle unsigned again, since the mixer change wasTorbjörn Andersson
reverted. svn-id: r9930
2003-08-30revert id handle stuffPaweł Kołodziejski
svn-id: r9927
2003-08-30If -1 is going to be a valid value for a PlayingSoundHandle, the data typeTorbjörn Andersson
had better be signed... svn-id: r9925
2003-08-30added func isChannelActive for mixer, and fixed handling numbers of channel 0Paweł Kołodziejski
svn-id: r9924
2003-08-24small cleanup for the Ogg playback codeMax Horn
svn-id: r9852
2003-08-16More corrections to the VAR_MUSIC_TIMERJamieson Christian
computations, mostly to produce the exptected output with AD resources. svn-id: r9730
2003-08-16Corrected timing mechanism for RO music streams.Jamieson Christian
RO streams have built-in timer markers (the unknown 0xA0 mentioned in FR [742249]) that override automated methods of updating VAR_MUSIC_TIMER. Since these timer markers do not seem to be present in AD resources, the old mechanism is used if MD_ADLIB is the current MidiDriver. svn-id: r9720
2003-08-14Removed incorrect acknowledgements (copy/paste error)Jamieson Christian
svn-id: r9680
2003-08-13ZeroInputStream::readBuffer didn't have the same signature as the base class ↵Bertrand Augereau
version, making VC.NET 2K3 complain svn-id: r9668
2003-08-13Added PC Speaker and PCjr command line options,Jamieson Christian
in preparation for Kirben's addition of WA support for games that already have AD tracks. svn-id: r9656
2003-08-09added SoundMixer::pauseChannels for pausing SFX and keeping adlib music ↵Robert Göffringmann
running (needed by BASS when menu bar drops down) svn-id: r9607
2003-08-08Added generic send() option to MidiChannel.Jamieson Christian
This circumvents problems doing generic send() calls to MidiDrivers that support more than 16 MIDI channels (i.e. Adlib). Because of the way it interacts with MidiDriver, Simon could have run into a problem if it tried to allocate more than 15 Adlib music channels (though this would only happen in very, VERY rare circumstances). Also fixed a problem with the channel numbering scheme used by MidiDriver_Adlib, in particular the percussion channel number. svn-id: r9604
2003-08-08Send All Notes Off to every channel on closeJamieson Christian
svn-id: r9593
2003-08-07my code was actually right. Rather the calling code is evil, it passes us ↵Max Horn
odd buffer sizes for 16 bit audio data, which of course made no sense -> I added some asserts against this svn-id: r9590
2003-08-07Fix for Bug [780924] IMUSE: Pitchbend isn't reset when changing tracksJamieson Christian
When scanning (not jumping) to a target location in a different track, the current track is first scanned to the end to update the player state before starting into the new track. Miscellaneous scan-related cleanup is included. svn-id: r9589
2003-08-07replace code in readBuffer by slightly less efficient but hopefully working ↵Max Horn
code (at least it fixes an endless loop in COMI for me). I did fix the originaly bug in my optimization, and right now I clueless as to why that code isn't working as it should <sigh>. Need sleep svn-id: r9588
2003-08-06Added comment to new macroJamieson Christian
svn-id: r9581
2003-08-06Changed readSample template functionJamieson Christian
to Fingolfin's new READSAMPLE macro. Circumvents buggy template function handling in MSVC6. Props to Fingolfin for tracking this bug down by remote. svn-id: r9580
2003-08-06some cleanupMax Horn
svn-id: r9575
2003-08-06Fixed type mismatch error compiling palmos portChris Apers
svn-id: r9552
2003-08-05getting rid of g_mixer; removing lots of whitespaceMax Horn
svn-id: r9527
2003-08-05some cleanup; added Channel::getVolume, once somebody tells me what exactly ↵Max Horn
is needed, I can add per-channel volume, and also per-channel panning svn-id: r9525
2003-08-05begone, old mixer codeMax Horn
svn-id: r9521
2003-08-05more cleanupMax Horn
svn-id: r9513
2003-08-05cleanupMax Horn
svn-id: r9512
2003-08-05fix bug #783423Max Horn
svn-id: r9484
2003-08-05more cleanup (like the previous two, I just moved around code, to clearly ↵Max Horn
separate the old and the new mixer code) svn-id: r9479
2003-08-05some more cleanupMax Horn
svn-id: r9478
2003-08-05cleanup; removed some code duplicationMax Horn
svn-id: r9477
2003-08-05and finally VorbisInputStream::readBuffer. Once we verified the new ↵Max Horn
readBuffer methods all work, we can get rid of readIntern again and merge those back into the regular read() methods svn-id: r9476
2003-08-05optimized MP3InputStream::readBuffer (once more, I won't gurantee for ↵Max Horn
correctness although it seems to work fine over here) svn-id: r9475
2003-08-05simplified code a bitMax Horn
svn-id: r9474
2003-08-05optimized WrappedMemoryStream::readBuffer (It's almost 3 AM, so I don't ↵Max Horn
trust myself, hence I'll leave this as an #ifdef for now :-) svn-id: r9473
2003-08-05catch one potential problem, namely if eos is already reached when ↵Max Horn
readBuffer is called ('This should never happen anyway', famous last words) svn-id: r9472
2003-08-05get rid of calls to the obsolete AudioInputStream::size methodMax Horn
svn-id: r9471
2003-08-04not really sure if using readBuffer would give any gain in CopyRateConverterMax Horn
svn-id: r9470
2003-08-04renamed eof -> eos (end of stream); hid MP3/Vorbis stream classes completly ↵Max Horn
(by providing factory methods); new readBuffer method for AudioInputStream for improved speed of the mixer; new MusicStream class (subclassed for MP3/Vorbis sound) which offers a getRate method; some other tweaks svn-id: r9467
2003-08-04fixed EOF handling of MP3 streams (subtract time from duration timer, ↵Max Horn
instead of adding it...) svn-id: r9464
2003-08-02one addition lessMax Horn
svn-id: r9425
2003-08-02some more tweaksMax Horn
svn-id: r9424