foxygit / doom Log in
commit 448adb31d703afed9e9cc2bfd109c1fcd34447c4
Merge: c4fe7aa8 b9e18229
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Mar 8 01:14:23 2010 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Mon Mar 8 01:14:23 2010 +0000

    Merge opl-branch to trunk.

    OPL support still isn't perfect, and it certainly isn't complete.
    However, for now, it's good enough.

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 1878

 BUGS                     |   15 -
 Makefile.am              |    3 +-
 OPL-TODO                 |   20 +
 README.OPL               |  107 ++++
 codeblocks/game.cbp      |   38 ++
 configure.in             |   10 +-
 man/manpage.template     |   11 +
 opl/.gitignore           |    5 +
 opl/Makefile.am          |   19 +
 opl/examples/.gitignore  |    5 +
 opl/examples/Makefile.am |    8 +
 opl/examples/droplay.c   |  217 +++++++
 opl/fmopl.c              | 1155 ++++++++++++++++++++++++++++++++++++
 opl/fmopl.h              |  167 ++++++
 opl/ioperm_sys.c         |  361 ++++++++++++
 opl/ioperm_sys.h         |   36 ++
 opl/opl.c                |  466 +++++++++++++++
 opl/opl.h                |  137 +++++
 opl/opl_internal.h       |   64 ++
 opl/opl_linux.c          |  110 ++++
 opl/opl_obsd.c           |  125 ++++
 opl/opl_queue.c          |  280 +++++++++
 opl/opl_queue.h          |   45 ++
 opl/opl_sdl.c            |  452 ++++++++++++++
 opl/opl_timer.c          |  251 ++++++++
 opl/opl_timer.h          |   42 ++
 opl/opl_win32.c          |  172 ++++++
 pkg/win32/GNUmakefile    |    2 +
 rpm.spec.in              |    1 +
 setup/sound.c            |   69 ++-
 src/Makefile.am          |    8 +-
 src/i_oplmusic.c         | 1457 ++++++++++++++++++++++++++++++++++++++++++++++
 src/i_sdlmusic.c         |    2 -
 src/midifile.c           |  815 ++++++++++++++++++++++++++
 src/midifile.h           |  175 ++++++
 src/s_sound.c            |   11 +
 36 files changed, 6823 insertions(+), 38 deletions(-)