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

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

* 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/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/misc/control.c

#include "mixer.h"

static int drv_parm = 0;

extern struct xmp_drv_info drv_callback;

int pw_init(void);

o->flags = XMP_CTL_DYNPAN | XMP_CTL_FILTER | XMP_CTL_ITPT;

o->cf_cutoff = 0;

/* Set max number of voices per channel */

o->maxvoc = 16;

return ctx;

}

return &((struct xmp_context *)ctx)->o;

}

void xmp_init_callback(xmp_context ctx, void (*callback) (void *, int))

{

struct xmp_options *o = &((struct xmp_context *)ctx)->o;

xmp_drv_register(&drv_callback);

xmp_init_formats(ctx);

pw_init();

xmp_register_driver_callback(ctx, callback);

o->drv_id = "callback";

}

void xmp_init(xmp_context ctx, int argc, char **argv)

{

struct xmp_player_context *p = &((struct xmp_context *)ctx)->p;

int num;

xmp_init_drivers();

xmp_init_formats(ctx);

pw_init();

xmp_event_callback = NULL;

p->event_callback = NULL;

/* must be parsed before loading the rc file. */

for (num = 1; num < argc; num++) {

}

if (num >= argc)

_xmp_read_rc((struct xmp_context *)ctx);

100

101

/* _xmp_tell_wait(); */

102

}

103

104

inline int xmp_open_audio(xmp_context ctx)

119

100

drv_parm++;

120

101

}

121

102

122

inline void xmp_register_event_callback(void (*cb) (unsigned long))

103

inline void xmp_register_event_callback(xmp_context ctx, void (*cb) (unsigned long))

123

104

{

124

xmp_event_callback = cb;

105

struct xmp_player_context *p = &((struct xmp_context *)ctx)->p;

106

107

p->event_callback = cb;

125

108

}

126

109

127

110

void xmp_channel_mute(xmp_context ctx, int from, int num, int on)

155

138

case XMP_MOD_STOP:

156

139

p->pos = -2;

157

140

break;

158

case XMP_MOD_PAUSE:

159

p->pause ^= 1;

160

return p->pause;

161

141

case XMP_MOD_RESTART:

162

142

p->pos = -1;

163

143

break;

180

160

return 0;

181

161

}

182

162

183

int xmp_play_module(xmp_context ctx)

184

{

185

struct xmp_options *o = &((struct xmp_context *)ctx)->o;

186

time_t t0, t1;

187

int t;

188

189

time(&t0);

190

_xmp_player_start((struct xmp_context *)ctx);

191

time(&t1);

192

t = difftime(t1, t0);

193

194

o->start = 0;

195

196

return t;

197

}

198

199

#ifdef TEST_OPEN_LOOP

200

201

int xmp_play_module2(xmp_context ctx)

202

{

203

struct xmp_options *o = &((struct xmp_context *)ctx)->o;

204

time_t t0, t1;

205

int t;

206

207

time(&t0);

208

xmp_player_start((struct xmp_context *)ctx);

209

while (xmp_player_loop((struct xmp_context *)ctx) == 0);

210

xmp_player_end((struct xmp_context *)ctx);

211

time(&t1);

212

t = difftime(t1, t0);

213

214

o->start = 0;

215

216

return t;

217

}

218

#endif

219

163

inline int xmp_player_start(xmp_context ctx)

164

{

165

return _xmp_player_start((struct xmp_context *)ctx);

166

}

167

168

inline int xmp_player_frame(xmp_context ctx)

169

{

170

return _xmp_player_frame((struct xmp_context *)ctx);

171

}

172

173

inline void xmp_player_end(xmp_context ctx)

174

{

175

_xmp_player_end((struct xmp_context *)ctx);

176

}

177

178

inline void xmp_play_buffer(xmp_context ctx)

179

{

180

xmp_drv_bufdump((struct xmp_context *)ctx);

181

}

182

183

void xmp_get_buffer(xmp_context ctx, void **buffer, int *size)

184

{

185

*size = xmp_smix_softmixer((struct xmp_context *)ctx);

186

*buffer = xmp_smix_buffer((struct xmp_context *)ctx);

187

}

220

188

221

189

void xmp_get_driver_cfg(xmp_context ctx, int *srate, int *res, int *chn,

222

190

int *itpt)

Older »