author | kergoth <kergoth> | 2003-08-09 18:00:34 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 18:00:34 (UTC) |
commit | 7670c56f5952f7772e8fbab65e9233274e2a0564 (patch) (unidiff) | |
tree | 10932f8976c76755b8edf2ab9397a6e53d95a13c /core/multimedia/opieplayer/modplug | |
parent | 1ab4ca95e4d2cf24d32b38c9031cb6076351e730 (diff) | |
download | opie-7670c56f5952f7772e8fbab65e9233274e2a0564.zip opie-7670c56f5952f7772e8fbab65e9233274e2a0564.tar.gz opie-7670c56f5952f7772e8fbab65e9233274e2a0564.tar.bz2 |
Merge from BRANCH_1_0
Diffstat (limited to 'core/multimedia/opieplayer/modplug') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/modplug/config.in | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/modplug/load_j2b.cpp | 1 | ||||
-rw-r--r-- | core/multimedia/opieplayer/modplug/tables.cpp | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/core/multimedia/opieplayer/modplug/config.in b/core/multimedia/opieplayer/modplug/config.in index 86e4725..769db1b 100644 --- a/core/multimedia/opieplayer/modplug/config.in +++ b/core/multimedia/opieplayer/modplug/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config MODPLUG | 1 | config MODPLUG |
2 | boolean "opieplayer1-modplugin (play MOD/XM/S3M/IT amiga tracker modules)" | 2 | boolean "modplugin" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER |
diff --git a/core/multimedia/opieplayer/modplug/load_j2b.cpp b/core/multimedia/opieplayer/modplug/load_j2b.cpp index 5f60bbb..4f0b85c 100644 --- a/core/multimedia/opieplayer/modplug/load_j2b.cpp +++ b/core/multimedia/opieplayer/modplug/load_j2b.cpp | |||
@@ -5,14 +5,13 @@ | |||
5 | * option) any later version. | 5 | * option) any later version. |
6 | * | 6 | * |
7 | * Authors: Olivier Lapicque <olivierl@jps.net> | 7 | * Authors: Olivier Lapicque <olivierl@jps.net> |
8 | */ | 8 | */ |
9 | 9 | ||
10 | 10 | ||
11 | /////////////////////////////////////////////////// | 11 | /////////////////////////////////////////////////// |
12 | // | 12 | // |
13 | // J2B module loader | 13 | // J2B module loader |
14 | // | 14 | // |
15 | /////////////////////////////////////////////////// | 15 | /////////////////////////////////////////////////// |
16 | #include "stdafx.h" | 16 | #include "stdafx.h" |
17 | #include "sndfile.h" | ||
18 | 17 | ||
diff --git a/core/multimedia/opieplayer/modplug/tables.cpp b/core/multimedia/opieplayer/modplug/tables.cpp index e7198b2..baf4517 100644 --- a/core/multimedia/opieplayer/modplug/tables.cpp +++ b/core/multimedia/opieplayer/modplug/tables.cpp | |||
@@ -1,23 +1,22 @@ | |||
1 | /* | 1 | /* |
2 | * This program is free software; you can redistribute it and modify it | 2 | * This program is free software; you can redistribute it and modify it |
3 | * under the terms of the GNU General Public License as published by the | 3 | * under the terms of the GNU General Public License as published by the |
4 | * Free Software Foundation; either version 2 of the license or (at your | 4 | * Free Software Foundation; either version 2 of the license or (at your |
5 | * option) any later version. | 5 | * option) any later version. |
6 | * | 6 | * |
7 | * Authors: Olivier Lapicque <olivierl@jps.net> | 7 | * Authors: Olivier Lapicque <olivierl@jps.net> |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "stdafx.h" | 10 | #include "stdafx.h" |
11 | #include "sndfile.h" | ||
12 | 11 | ||
13 | #ifndef FASTSOUNDLIB | 12 | #ifndef FASTSOUNDLIB |
14 | //#pragma data_seg(".tables") | 13 | //#pragma data_seg(".tables") |
15 | #endif | 14 | #endif |
16 | 15 | ||
17 | extern const BYTE ImpulseTrackerPortaVolCmd[16]; | 16 | extern const BYTE ImpulseTrackerPortaVolCmd[16]; |
18 | const BYTE ImpulseTrackerPortaVolCmd[16] = | 17 | const BYTE ImpulseTrackerPortaVolCmd[16] = |
19 | { | 18 | { |
20 | 0x00, 0x01, 0x04, 0x08, 0x10, 0x20, 0x40, 0x60, | 19 | 0x00, 0x01, 0x04, 0x08, 0x10, 0x20, 0x40, 0x60, |
21 | 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF | 20 | 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF |
22 | }; | 21 | }; |
23 | 22 | ||