Mercurial > audlegacy-plugins
changeset 2539:d137e1c827ba
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 28 Apr 2008 18:15:22 +0300 |
| parents | 1d93fa7b3037 (diff) f791c889f74c (current diff) |
| children | 7591d7534eb8 6a92c4f14338 |
| files | src/modplug/load_j2b.cxx src/modplug/modplug.h |
| diffstat | 2 files changed, 0 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/modplug/modplugbmp.h Mon Apr 28 16:46:35 2008 +0300 +++ b/src/modplug/modplugbmp.h Mon Apr 28 18:15:22 2008 +0300 @@ -9,10 +9,7 @@ #include <string> #include <glib.h> - -#ifndef __MODPLUGXMMS_STDDEFS_H__INCLUDED__ #include "stddefs.h" -#endif extern "C" { #include <audacious/plugin.h>
--- a/src/modplug/tables.cxx Mon Apr 28 16:46:35 2008 +0300 +++ b/src/modplug/tables.cxx Mon Apr 28 18:15:22 2008 +0300 @@ -7,10 +7,6 @@ #include "stdafx.h" #include "sndfile.h" -#ifndef MODPLUG_FASTSOUNDLIB -//#pragma data_seg(".tables") -#endif - BYTE ImpulseTrackerPortaVolCmd[16] = { 0x00, 0x01, 0x04, 0x08, 0x10, 0x20, 0x40, 0x60,