aboutsummaryrefslogtreecommitdiff
path: root/engines/groovie/music.cpp
AgeCommit message (Collapse)Author
2011-08-06ALL: Reduce audio/ header dependencyEugene Sandulenko
2011-08-06OSYSTEM: extended installTimerProc() with timer ID parameterEugene Sandulenko
2011-06-20ALL: Remove trailing whitespacesMax Horn
This tries to make our code a bit more compliant with our code formatting conventions. For future use, this is the command I used: git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-03GROOVIE: Fix MusicPlayerIOS volume not correctly restoring on new songScott Thomas
2011-05-31GROOVIE: Rename MusicPlayerMPEG4 to MusicPlayerIOSMatthew Hoops
More fitting now that other music formats can be used now
2011-05-31Merge remote branch 'upstream/master' into t7g-iosMatthew Hoops
Conflicts: engines/groovie/script.cpp
2011-05-31GROOVIE: Use openStreamFile() to open iOS audio filesMatthew Hoops
Now MP3, FLAC, Vorbis, and QuickTime/MPEG-4 audio files can be used interchangeably.
2011-05-12GIT: Clean up: Suppress SVN tags, now uselessstrangerke
2011-05-11Merge remote branch 'upstream/master' into t7g-iosMatthew Hoops
Conflicts: audio/decoders/qdm2.h common/util.cpp engines/groovie/music.cpp engines/groovie/resource.h video/qt_decoder.cpp video/qt_decoder.h
2011-04-28JANITORIAL: Reduce header dependencies in shared codeOri Avtalion
Some backends may break as I only compiled SDL
2011-04-20GROOVIE: Add timer for MusicPlayerMPEG4 (required for music fade in/out)Scott Thomas
2011-04-20GROOVIE: Set some T7G iOS m4a files to loop based on DOS XMI loopingScott Thomas
2011-04-13Merge remote branch 'upstream/master' into t7g-iosMatthew Hoops
Conflicts: video/qt_decoder.cpp
2011-04-13GROOVIE: MPEG4 player should override unload so scripts can stop musicScott Thomas
2011-04-13GROOVIE: Use provided OCReMix song for T7G iOS creditsScott Thomas
2011-04-12COMMON: Replace MKID_BE by MKTAGMax Horn
MKID_BE relied on unspecified behavior of the C++ compiler, and as such was always a bit unsafe. The new MKTAG macro is slightly less elegant, but does no longer depend on the behavior of the compiler. Inspired by FFmpeg, which has an almost identical macro.
2011-04-11GROOVIE: T7G iOS patches in 7/11 soundtrack files during intro sequenceScott Thomas
2011-04-08GROOVIE: Determine correct MPEG4 resource to load for based on filerefScott Thomas
2011-04-07GROOVIE: Implement MusicPlayerMPEG4::updateVolume()Matthew Hoops
2011-04-07GROOVIE: Hook into the new QuickTimeAudioStream codeMatthew Hoops
2011-04-07GROOVIE: Add a stub MPEG4 music playerMatthew Hoops
2011-03-23ENGINES: Further simplify pseudo MidiDrivers; fix some regressionsMax Horn
The regression affected AGOS and maybe some others; specifically, the real MidiDriver would have been deleted twice -- I previously missed that the Engine instances takes care of freeing the real MidiDriver, not the MidiPlayer wrapping it. This commit should clarify the ownership of the real MidiDriver for most pseudo MidiDrivers.
2011-03-23AUDIO: Change several fake MidiDrivers to MidiDriver_BASE subclassesMax Horn
Many engines follow the advice in audio/midiparser.h and create a "pseudo-MidiDriver" subclass. But MidiParser really only needs a tiny subset of the MidiDriver capabilities, namely those found in MidiDriver_BASE. So we try to subclass from that whenever possible; this allows us to remove many stub methods, and enables further future simplifications.
2011-03-22AUDIO: Add pure virtual MidiDriver::isOpen() methodMax Horn
This in turn enables modifying MidiDriver_MPU401::close() to allow it to be called on a midi driver that has not yet been opened. The specific issue that triggered me to make these changes was a crash-upon-quit in HUGO, caused by it instantiating a midi driver, then encountering an error (missing hugo.dat) *before* having opened the new midi driver; the general cleanup code then tries to close the (not yet opened) midi driver -> kaboom Also fixed some engines which were leaking MidiDriver instances.
2011-02-09AUDIO: Rename sound/ dir to audio/Max Horn
svn-id: r55850
2010-11-19COMMON: Split common/stream.h into several headersMax Horn
svn-id: r54385
2010-11-08COMMON: Push #include audiocd.h in system.h out to .cpp filesMax Horn
svn-id: r54148
2010-10-13OPENGL: Merged from trunk, from rev 52105 to 53396.Johannes Schickel
This includes an rather hacky attempt to merge all the recent gp2x backend changes into the branch. I suppose the gp2x backend and probably all new backends, i.e. gph, dingux etc., might not compile anymore. Since I have no way of testing those it would be nice if porters could look into getting those up to speed in this branch. svn-id: r53399
2010-09-15MIDI: Send a reset MIDI device signal on startup.Johannes Schickel
This is currently done in the engine code. I adapted AGI, AGOS, DRACI, GROOVIE, LURE, MADE, QUEEN, SAGA, SKY, TINSEL and TOUCHE to send a reset device on startup. The sound output still works fine (started up a game from every engine), so this should hopefully not introduce any regressions. As far as I can tell it seems that SCUMM does send a proper device reset, so I did not touch it. KYRA only sends a proper reset for MT-32 currently. I am not sure about SCI though. This fixes bug #3066826 "SIMON: MIDI notes off when using RTL after SCI". svn-id: r52736
2010-07-13Merged from trunk, from Rev 49499 to HEADAlejandro Marzini
svn-id: r50840
2010-07-01Add support for the 'fallback' MIDI in T7G's intro when the CD track cannot ↵Matthew Hoops
be found. The intro music in the Mac version now plays. svn-id: r50564
2010-06-25AUDIO: get rid of MDT_PREFER_MIDI since it should be sufficient to either ↵Florian Kagerer
select MDT_PREFER_MT32 or MDT_PREFER_GM svn-id: r50288
2010-06-22Fix uncompressed MIDI in T7G Mac.Matthew Hoops
svn-id: r50165
2010-06-22Groovie: Add support for the compressed MIDI files of T7G Mac.Jordi Vilalta Prat
svn-id: r50163
2010-06-21Patch #1956501: "GUI/LAUNCHER: Midi device selection"Max Horn
svn-id: r50128
2010-06-15Renamed getAudioCD to getAudioCDManager.Alejandro Marzini
svn-id: r49678
2010-06-09- Revised abstract AudioCDManager.Alejandro Marzini
- Removed AudioCDManager Singleton, and changed code for using AudioCDManager in OSystem. - Added initialization code for new AudioCDManager in BaseBackend and OSystem_SDL. svn-id: r49548
2010-06-07Groovie:Jordi Vilalta Prat
- Rewritten T7G's font code to subclass Graphics::Font and make it cleaner. - Use theme fonts for the Mac version of T7G (which used ugly system fonts originally). With this the Mac version should be completable. - Cleanup include interdependencies. svn-id: r49487
2010-05-20Add initial support for T7G Mac MIDIs. Compressed MIDI is not yet supported.Matthew Hoops
svn-id: r49119
2010-05-20Groovie: Add support for MT-32 custom instrumentsJordi Vilalta Prat
svn-id: r49117
2010-01-16cleanupMax Horn
svn-id: r47333
2010-01-12Rename all "Adlib" uses to "AdLib" to match the real name of the sound card ↵Johannes Schickel
/ company. Check this for reference: http://en.wikipedia.org/wiki/Ad_Lib,_Inc. http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card) This commit does not touch "adlib" and "ADLIB" uses! Also it does not update all the SCUMM detection entries, which still use "Adlib". svn-id: r47279
2009-12-09Changed MidiDriver::createMidi to take a MidiDriverType instead of an intMax Horn
svn-id: r46316
2009-11-02Changed foo(void) to foo() in almost all non-backend source filesMax Horn
svn-id: r45616
2009-09-14Wording.Johannes Schickel
svn-id: r44086
2009-09-14Fix valgrind warning.Johannes Schickel
svn-id: r44084
2009-08-18Made AGOS, DRASCULA, GOB, GROOVIE, MADE, SCUMM and TINSEL properly stop CD ↵Johannes Schickel
audio playback on engine quit. (This only problem affected playback from CD, not from ripped audio files) svn-id: r43512
2009-08-05T7G: Fix bug #2831041 by implementing opcode responsible for starting music ↵Scott Thomas
partway through a video svn-id: r43068
2009-07-05- Refactorized Groovie::MusicPlayer to make it extensibleJordi Vilalta Prat
- Added an empty MusicPlayerMac to let the Macintosh version of The 7th Guest start svn-id: r42116
2009-03-10- Convert some file references from uint16 to uint32 to suit 11HScott Thomas
- Add some 11H opcodes svn-id: r39313
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:06:11 +0000