← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/xmp/oneiric

~ubuntu-branches/ubuntu/oneiric/xmp/oneiric

« back to all changes in this revision

Viewing changes to src/player/player.h

Committer: Bazaar Package Importer
Author(s): Artur Rona
Date: 2010-01-15 01:15:22 UTC
mfrom: (1.1.8 upstream) (4.2.3 squeeze)
Revision ID: james.westby@ubuntu.com-20100115011522-r4otlsg687ee1yx4

Tags: 3.0.0+20090923-1ubuntu1

https://launchpad.net/bugs/507732

* Merge from debian testing (LP: #507732).  Reamining changes:
  + Add PulseAudio support:
    - debian/rules: Add --enable-pulseaudio to ./configure
  + RFE Compile with 128 bit mixer:
    - dpatch support

files added:
Makefile.rules

debian/patches/01-rfe_compile_128bit.dpatch

depend

docs/formats/Soundtracker-Samplefiles.txt

docs/formats/d00.txt

docs/formats/it_samples.txt

docs/formats/j2b_format.txt

mod.syfuid.long

src/drivers/smix.c

src/include/config.h

src/loaders/gal4_load.c

src/loaders/gal5_load.c

src/main/drivers.c

src/misc/inflate.c

src/misc/muse.c

src/misc/unlzx.c

src/player/smix.h

src/plugin/tunenet

src/plugin/tunenet/AnnouncePlayer.c

src/plugin/tunenet/ClosePlayer.c

src/plugin/tunenet/DecodeFramePlayer.c

src/plugin/tunenet/DoNotify.c

src/plugin/tunenet/ExitPlayer.c

src/plugin/tunenet/Init.c

src/plugin/tunenet/InitPlayer.c

src/plugin/tunenet/Makefile

src/plugin/tunenet/Obtain.c

src/plugin/tunenet/OpenPlayer.c

src/plugin/tunenet/Release.c

src/plugin/tunenet/SeekPlayer.c

src/plugin/tunenet/TestPlayer.c

src/plugin/tunenet/Vectors.cpp

src/plugin/tunenet/include

src/plugin/tunenet/include/LibBase.h

src/plugin/tunenet/include/TNPlug.xml

src/plugin/tunenet/include/TN_XMP.tnplug_rev.h

src/plugin/tunenet/include/TN_XMP.tnplug_rev.h.in

src/plugin/tunenet/include/inline4

src/plugin/tunenet/include/inline4/TNPlug.h

src/plugin/tunenet/include/interfaces

src/plugin/tunenet/include/interfaces/TNPlug.h

src/plugin/tunenet/include/libraries

src/plugin/tunenet/include/libraries/TNPlug.h

src/plugin/tunenet/include/proto

src/plugin/tunenet/include/proto/TNPlug.h

src/win32/in_xmp.dsp.in

src/win32/xmp.dsp.in

files removed:
among the stars.xm

debian/patches/01-xmp-audacious-extension-mappings.dpatch

debian/patches/02-rfe_compile_128bit.dpatch

docs/formats/samples.txt

lib

lib/Makefile

src/Makefile

src/drivers/callback.c

src/os2

src/os2/Makefile

src/os2/version.c

src/os2/xmp.def

src/os2/xmp2.txt

src/plugin/driver.c

src/win32/libxmp.dsp

src/win32/libxmp.dsw

src/win32/version.c

files modified:
Makefile

Makefile.rules.in

README

configure

configure.in

debian/changelog

debian/control

debian/copyright

debian/patches/00list

debian/rules

docs/CREDITS

docs/ChangeLog

docs/Makefile

docs/README.trackers

docs/formats/Medsynth.txt *

docs/formats/PT-Play_2.1a.s *

docs/formats/PT.Effects_2.1a.txt *

docs/formats/PT.FileFormat_2.1a.txt *

docs/xmp.1

etc/Makefile

etc/xmp.spec

scripts/config.guess

scripts/config.sub

src/drivers/Makefile

src/drivers/aix.c *

src/drivers/alsa.c

src/drivers/alsa05.c

src/drivers/alsa_seq.c

src/drivers/amiga.c

src/drivers/arts.c

src/drivers/beos.c

src/drivers/bsd.c

src/drivers/debug.c

src/drivers/esd.c

src/drivers/file.c

src/drivers/hpux.c

src/drivers/nas.c

src/drivers/netbsd.c

src/drivers/openbsd.c

src/drivers/os2_dart.c

src/drivers/oss.c

src/drivers/oss_seq.c

src/drivers/osx.c

src/drivers/pulseaudio.c

src/drivers/qnx.c

src/drivers/sgi.c

src/drivers/sndio.c

src/drivers/solaris.c

src/drivers/wav.c

src/drivers/win32.c

src/include/Makefile

src/include/common.h

src/include/driver.h

src/include/mixer.h

src/include/period.h

src/include/xmp.h

src/include/xxm.h

src/loaders/669_load.c

src/loaders/Makefile

src/loaders/amf_load.c

src/loaders/fnk_load.c

src/loaders/gdm_load.c

src/loaders/iff.c

src/loaders/iff.h

src/loaders/imf_load.c

src/loaders/it_load.c

src/loaders/masi_load.c

src/loaders/mdl_load.c

src/loaders/med3_load.c

src/loaders/med4_load.c

src/loaders/mmd1_load.c

src/loaders/mmd3_load.c

src/loaders/mod_load.c

src/loaders/prowizard/Makefile

src/loaders/prowizard/mp.c

src/loaders/prowizard/prowiz.c

src/loaders/prowizard/prun1.c

src/loaders/prowizard/tdd.c

src/loaders/rtm_load.c

src/loaders/s3m_load.c

src/loaders/stm_load.c

src/loaders/stx_load.c

src/loaders/xm_load.c

src/main/Makefile

src/main/main.c

src/main/options.c

src/misc/Makefile

src/misc/control.c

src/misc/load.c

src/misc/mmcmp.c

src/misc/ppdepack.c

src/player/Makefile

src/player/driver.c

src/player/effects.c

src/player/fmopl.c

src/player/formats.c

src/player/mixer.c

src/player/period.c

src/player/player.c

src/player/player.h

src/player/readrc.c

src/player/scan.c

src/player/synth.c

src/player/ulaw.c

src/plugin/Makefile

src/plugin/audacious.c

src/plugin/bmp.c

src/plugin/winamp.c

src/plugin/xmms.c

src/win32/Makefile

src/win32/config.h

src/win32/in_xmp.dsp

src/win32/xmp.dsp

Show diffs side-by-side

added added

removed removed

src/player/player.h

9

9

#ifndef __XMP_PLAYER_H

10

10

#define __XMP_PLAYER_H

11

11

12

/* Flag control */

12

/* Quirk control */

13

#define HAS_QUIRK(x) (m->quirk & (x))

14

15

/* Channel flag control */

13

16

#define SET(f) SET_FLAG(xc->flags,f)

14

17

#define RESET(f) RESET_FLAG(xc->flags,f)

15

18

#define TEST(f) TEST_FLAG(xc->flags,f)

88

91

int per_flags; /* Persistent effect channel flags */

89

92

int note; /* Note number */

90

93

int key; /* Key number */

91

int period; /* Amiga or linear period */

94

double period; /* Amiga or linear period */

92

95

int pitchbend; /* Pitch bender value */

93

96

int finetune; /* Guess what */

94

97

int ins; /* Instrument number */

180

183

};

181

184

182

185

183

void process_fx(struct xmp_context *, int, uint8, uint8, uint8, struct xmp_channel *);

186

void process_fx(struct xmp_context *, int, uint8, uint8, uint8, struct xmp_channel *, int);

184

187

void xmp_med_synth(struct xmp_context *, int, struct xmp_channel *, int);

185

188

int get_med_arp(struct xmp_player_context *, struct xmp_channel *);

186

189

int get_med_vibrato(struct xmp_channel *);

Older »