--- gmod-3.1.orig/load_669.C +++ gmod-3.1/load_669.C @@ -7,6 +7,7 @@ #include #include #include +#include #ifdef USE_LOCAL #include "soundcard.h" @@ -14,7 +15,7 @@ #include #endif -#include +#include #include "commands.h" #include "defines.h" @@ -56,7 +57,7 @@ songChar->comment = (char *)realloc(songChar->comment, 109); bzero(songChar->comment, 109); - strncpy(songChar->comment, header + 2, 108); + strncpy(songChar->comment, (char *)(header + 2), 108); songChar->commentLineLen = 36; npat = header[0x6f]; songChar->nrPatterns = npat; --- gmod-3.1.orig/Sequencer.C +++ gmod-3.1/Sequencer.C @@ -6,16 +6,19 @@ #include #include +#include +#include + #ifdef USE_LOCAL #include "soundcard.h" #else #include #endif -#include +#include #ifdef AWE_SUPPORT -#include +#include "awe_voice.h" #endif #include "VoiceGUS.h" @@ -30,7 +33,7 @@ #include "globals.h" #include "Sequencer.h" -#include +#include #ifdef USE_X #include "TopShell.h" @@ -150,9 +153,9 @@ parm &= 0x0f; if (parm <= 7) - voices_[channel].finetune(12.5 * parm); + voices_[channel].finetune((int)12.5 * parm); else - voices_[channel].finetune(12.5 * (parm - 16)); + voices_[channel].finetune((int)12.5 * (parm - 16)); break; @@ -329,7 +332,7 @@ Sequencer::open() { SEQ_DECLAREBUF(); - int i, n; + int i, n, hz; struct synth_info info; struct midi_info midi; @@ -417,6 +420,8 @@ force(); ioctl(seqfd_, SNDCTL_SEQ_SYNC, 0); ioctl(seqfd_, SNDCTL_SEQ_RESET, 0); + hz = 0; ioctl(seqfd_, SNDCTL_SEQ_CTRLRATE, &hz); + seqRate = hz; return (seqfd_); } --- gmod-3.1.orig/defines.h +++ gmod-3.1/defines.h @@ -36,7 +36,7 @@ #define INTEL_LONG(x) (INTEL_SHORT(x) | (INTEL_SHORT(x+2) <<16)) #define TICKS_PER_DIVISION(x) (ticksPerDivision = x) -#define TEMPO(x, y) ((x) ? (tickDuration = ((double)y * 100.0 / (24.0 * x))) : 0 ) +#define TEMPO(x, y) ((x) ? (tickDuration = ((double)y * seqRate / (24.0 * x))) : 0 ) #define MAX_TRACK 32 #define MAX_PATTERN 256 --- gmod-3.1.orig/TrackShell.h +++ gmod-3.1/TrackShell.h @@ -5,9 +5,9 @@ #ifndef __TrackShellH #define __TrackShellH -#include +#include #include -#include +#include #include "defines.h" // #include "structs.h" // for "pattern" type --- gmod-3.1.orig/SampleShell.moc +++ gmod-3.1/SampleShell.moc @@ -0,0 +1,97 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SampleShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "SampleShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SampleShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SampleShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x0a, + 31, 12, 12, 12, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_SampleShell[] = { + "SampleShell\0\0showSampleShell()\0" + "closeSampleShell()\0" +}; + +void SampleShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SampleShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->showSampleShell(); break; + case 1: _t->closeSampleShell(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SampleShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SampleShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_SampleShell, + qt_meta_data_SampleShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SampleShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SampleShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SampleShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SampleShell)) + return static_cast(const_cast< SampleShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int SampleShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE --- gmod-3.1.orig/load_ult.C +++ gmod-3.1/load_ult.C @@ -14,6 +14,7 @@ #include #include #include +#include #include #include "commands.h" --- gmod-3.1.orig/Voice.C +++ gmod-3.1/Voice.C @@ -3,7 +3,7 @@ // Copyright (C) 1997 by Andrew J. Robinson #include -#include +#include #include "defines.h" #include "structs.h" --- gmod-3.1.orig/TopShell.C +++ gmod-3.1/TopShell.C @@ -5,7 +5,7 @@ #include #include -#include +#include #include "defines.h" #include "structs.h" @@ -22,53 +22,53 @@ #include "SampleShell.h" const char *TopShell::backXbm = -"#define backWidth 16 -#define backHeight 15 -static unsigned char backBits[] = { - 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, - 0xfe, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, +"#define backWidth 16\n\ +#define backHeight 15\n\ +static unsigned char backBits[] = {\n\ + 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc,\n\ + 0xfe, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0,\n\ 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80};"; const char *TopShell::forwardXbm = -"#define forwardWidth 16 -#define forwardHeight 15 -static unsigned char forwardBits[] = { - 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, - 0x7f, 0x7f, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, +"#define forwardWidth 16\n\ +#define forwardHeight 15\n\ +static unsigned char forwardBits[] = {\n\ + 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f,\n\ + 0x7f, 0x7f, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f,\n\ 0x07, 0x07, 0x03, 0x03, 0x01, 0x01};"; const char *TopShell::previousXbm = -"#define previousWidth 18 -#define previousHeight 15 -static unsigned char previousBits[] = { - 0x03, 0x02, 0x02, 0x03, 0x03, 0x03, 0x83, 0x83, 0x03, 0xc3, 0xc3, 0x03, - 0xe3, 0xe3, 0x03, 0xf3, 0xf3, 0x03, 0xfb, 0xfb, 0x03, 0xff, 0xff, 0x03, - 0xfb, 0xfb, 0x03, 0xf3, 0xf3, 0x03, 0xe3, 0xe3, 0x03, 0xc3, 0xc3, 0x03, +"#define previousWidth 18\n\ +#define previousHeight 15\n\ +static unsigned char previousBits[] = {\n\ + 0x03, 0x02, 0x02, 0x03, 0x03, 0x03, 0x83, 0x83, 0x03, 0xc3, 0xc3, 0x03,\n\ + 0xe3, 0xe3, 0x03, 0xf3, 0xf3, 0x03, 0xfb, 0xfb, 0x03, 0xff, 0xff, 0x03,\n\ + 0xfb, 0xfb, 0x03, 0xf3, 0xf3, 0x03, 0xe3, 0xe3, 0x03, 0xc3, 0xc3, 0x03,\n\ 0x83, 0x83, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02};"; const char *TopShell::nextXbm = -"#define nextWidth 18 -#define nextHeight 15 -static unsigned char nextBits[] = { - 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x03, 0x0f, 0x0f, 0x03, - 0x1f, 0x1f, 0x03, 0x3f, 0x3f, 0x03, 0x7f, 0x7f, 0x03, 0xff, 0xff, 0x03, - 0x7f, 0x7f, 0x03, 0x3f, 0x3f, 0x03, 0x1f, 0x1f, 0x03, 0x0f, 0x0f, 0x03, +"#define nextWidth 18\n\ +#define nextHeight 15\n\ +static unsigned char nextBits[] = {\n\ + 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x03, 0x0f, 0x0f, 0x03,\n\ + 0x1f, 0x1f, 0x03, 0x3f, 0x3f, 0x03, 0x7f, 0x7f, 0x03, 0xff, 0xff, 0x03,\n\ + 0x7f, 0x7f, 0x03, 0x3f, 0x3f, 0x03, 0x1f, 0x1f, 0x03, 0x0f, 0x0f, 0x03,\n\ 0x07, 0x07, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x03};"; const char *TopShell::playXbm = -"#define playWidth 15 -#define playHeight 15 -static unsigned char playBits[] = { - 0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01, - 0xf8, 0x03, 0xf8, 0x07, 0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, +"#define playWidth 15\n\ +#define playHeight 15\n\ +static unsigned char playBits[] = {\n\ + 0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,\n\ + 0xf8, 0x03, 0xf8, 0x07, 0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00,\n\ 0x38, 0x00, 0x18, 0x00, 0x08, 0x00, };"; const char *TopShell::stopXbm = -"#define stopWidth 15 -#define stopHeight 15 -static unsigned char stopBits[] = { - 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, - 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, +"#define stopWidth 15\n\ +#define stopHeight 15\n\ +static unsigned char stopBits[] = {\n\ + 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f,\n\ + 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f,\n\ 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f};"; struct infoArray --- gmod-3.1.orig/VoiceAWE.C +++ gmod-3.1/VoiceAWE.C @@ -4,8 +4,8 @@ #ifdef AWE_SUPPORT #include -#include -#include +#include +#include "awe_voice.h" #include "defines.h" #include "structs.h" --- gmod-3.1.orig/awe_voice.h +++ gmod-3.1/awe_voice.h @@ -0,0 +1,490 @@ +/* + * sound/awe_voice.h + * + * Voice information definitions for the low level driver for the + * AWE32/Sound Blaster 32 wave table synth. + * version 0.4.2c; Oct. 7, 1997 + * + * Copyright (C) 1996,1997 Takashi Iwai + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef AWE_VOICE_H +#define AWE_VOICE_H + +#ifndef SAMPLE_TYPE_AWE32 +#define SAMPLE_TYPE_AWE32 0x20 +#endif + +#ifndef _PATCHKEY +#define _PATCHKEY(id) ((id<<8)|0xfd) +#endif + +/*---------------------------------------------------------------- + * patch information record + *----------------------------------------------------------------*/ + +/* patch interface header: 16 bytes */ +typedef struct awe_patch_info { + short key; /* use AWE_PATCH here */ +#define AWE_PATCH _PATCHKEY(0x07) + + short device_no; /* synthesizer number */ + unsigned short sf_id; /* file id (should be zero) */ + short optarg; /* optional argument */ + int len; /* data length (without this header) */ + + short type; /* patch operation type */ +#define AWE_LOAD_INFO 0 /* awe_voice_rec */ +#define AWE_LOAD_DATA 1 /* awe_sample_info */ +#define AWE_OPEN_PATCH 2 /* awe_open_parm */ +#define AWE_CLOSE_PATCH 3 /* none */ +#define AWE_UNLOAD_PATCH 4 /* none */ +#define AWE_REPLACE_DATA 5 /* awe_sample_info (optarg=#channels)*/ +#define AWE_MAP_PRESET 6 /* awe_voice_map */ +#define AWE_LOAD_CHORUS_FX 0x10 /* awe_chorus_fx_rec (optarg=mode) */ +#define AWE_LOAD_REVERB_FX 0x11 /* awe_reverb_fx_rec (optarg=mode) */ + + short reserved; /* word alignment data */ + + /* the actual patch data begins after this */ +#if defined(AWE_COMPAT_030) && AWE_COMPAT_030 + char data[0]; +#endif +} awe_patch_info; + +/*#define AWE_PATCH_INFO_SIZE 16*/ +#define AWE_PATCH_INFO_SIZE sizeof(awe_patch_info) + + +/*---------------------------------------------------------------- + * open patch + *----------------------------------------------------------------*/ + +#define AWE_PATCH_NAME_LEN 32 + +typedef struct _awe_open_parm { + unsigned short type; /* sample type */ +#define AWE_PAT_TYPE_MISC 0 +#define AWE_PAT_TYPE_GM 1 +#define AWE_PAT_TYPE_GS 2 +#define AWE_PAT_TYPE_MT32 3 +#define AWE_PAT_TYPE_XG 4 +#define AWE_PAT_TYPE_SFX 5 +#define AWE_PAT_TYPE_GUS 6 +#define AWE_PAT_TYPE_MAP 7 + +#define AWE_PAT_LOCKED 0x100 /* lock the samples */ + + short reserved; + char name[AWE_PATCH_NAME_LEN]; +} awe_open_parm; + +/*#define AWE_OPEN_PARM_SIZE 28*/ +#define AWE_OPEN_PARM_SIZE sizeof(awe_open_parm) + + +/*---------------------------------------------------------------- + * raw voice information record + *----------------------------------------------------------------*/ + +/* wave table envelope & effect parameters to control EMU8000 */ +typedef struct _awe_voice_parm { + unsigned short moddelay; /* modulation delay (0x8000) */ + unsigned short modatkhld; /* modulation attack & hold time (0x7f7f) */ + unsigned short moddcysus; /* modulation decay & sustain (0x7f7f) */ + unsigned short modrelease; /* modulation release time (0x807f) */ + short modkeyhold, modkeydecay; /* envelope change per key (not used) */ + unsigned short voldelay; /* volume delay (0x8000) */ + unsigned short volatkhld; /* volume attack & hold time (0x7f7f) */ + unsigned short voldcysus; /* volume decay & sustain (0x7f7f) */ + unsigned short volrelease; /* volume release time (0x807f) */ + short volkeyhold, volkeydecay; /* envelope change per key (not used) */ + unsigned short lfo1delay; /* LFO1 delay (0x8000) */ + unsigned short lfo2delay; /* LFO2 delay (0x8000) */ + unsigned short pefe; /* modulation pitch & cutoff (0x0000) */ + unsigned short fmmod; /* LFO1 pitch & cutoff (0x0000) */ + unsigned short tremfrq; /* LFO1 volume & freq (0x0000) */ + unsigned short fm2frq2; /* LFO2 pitch & freq (0x0000) */ + unsigned char cutoff; /* initial cutoff (0xff) */ + unsigned char filterQ; /* initial filter Q [0-15] (0x0) */ + unsigned char chorus; /* chorus send (0x00) */ + unsigned char reverb; /* reverb send (0x00) */ + unsigned short reserved[4]; /* not used */ +} awe_voice_parm; + +#define AWE_VOICE_PARM_SIZE 48 + + +/* wave table parameters: 92 bytes */ +typedef struct _awe_voice_info { + unsigned short sf_id; /* file id (should be zero) */ + unsigned short sample; /* sample id */ + int start, end; /* sample offset correction */ + int loopstart, loopend; /* loop offset correction */ + short rate_offset; /* sample rate pitch offset */ + unsigned short mode; /* sample mode */ +#define AWE_MODE_ROMSOUND 0x8000 +#define AWE_MODE_STEREO 1 +#define AWE_MODE_LOOPING 2 +#define AWE_MODE_NORELEASE 4 /* obsolete */ +#define AWE_MODE_INIT_PARM 8 + + short root; /* midi root key */ + short tune; /* pitch tuning (in cents) */ + char low, high; /* key note range */ + char vellow, velhigh; /* velocity range */ + char fixkey, fixvel; /* fixed key, velocity */ + char pan, fixpan; /* panning, fixed panning */ + short exclusiveClass; /* exclusive class (0 = none) */ + unsigned char amplitude; /* sample volume (127 max) */ + unsigned char attenuation; /* attenuation (0.375dB) */ + short scaleTuning; /* pitch scale tuning(%), normally 100 */ + awe_voice_parm parm; /* voice envelope parameters */ + short index; /* internal index (set by driver) */ +} awe_voice_info; + +/*#define AWE_VOICE_INFO_SIZE 92*/ +#define AWE_VOICE_INFO_SIZE sizeof(awe_voice_info) + +/*----------------------------------------------------------------*/ + +/* The info entry of awe_voice_rec is changed from 0 to 1 + * for some compilers refusing zero size array. + * Due to this change, sizeof(awe_voice_rec) becomes different + * from older versions. + * Use AWE_VOICE_REC_SIZE instead. + */ + +/* instrument info header: 4 bytes */ +typedef struct _awe_voice_rec_hdr { + unsigned char bank; /* midi bank number */ + unsigned char instr; /* midi preset number */ + char nvoices; /* number of voices */ + char write_mode; /* write mode; normally 0 */ +#define AWE_WR_APPEND 0 /* append anyway */ +#define AWE_WR_EXCLUSIVE 1 /* skip if already exists */ +#define AWE_WR_REPLACE 2 /* replace if already exists */ +} awe_voice_rec_hdr; + +/*#define AWE_VOICE_REC_SIZE 4*/ +#define AWE_VOICE_REC_SIZE sizeof(awe_voice_rec_hdr) + +/* the standard patch structure for one sample */ +typedef struct _awe_voice_rec_patch { + awe_patch_info patch; + awe_voice_rec_hdr hdr; + awe_voice_info info; +} awe_voice_rec_patch; + + +/* obsolete data type */ +#if defined(AWE_COMPAT_030) && AWE_COMPAT_030 +#define AWE_INFOARRAY_SIZE 0 +#else +#define AWE_INFOARRAY_SIZE 1 +#endif + +typedef struct _awe_voice_rec { + unsigned char bank; /* midi bank number */ + unsigned char instr; /* midi preset number */ + short nvoices; /* number of voices */ + /* voice information follows here */ + awe_voice_info info[AWE_INFOARRAY_SIZE]; +} awe_voice_rec; + + +/*---------------------------------------------------------------- + * sample wave information + *----------------------------------------------------------------*/ + +/* wave table sample header: 32 bytes */ +typedef struct awe_sample_info { + unsigned short sf_id; /* file id (should be zero) */ + unsigned short sample; /* sample id */ + int start, end; /* start & end offset */ + int loopstart, loopend; /* loop start & end offset */ + int size; /* size (0 = ROM) */ + short checksum_flag; /* use check sum = 1 */ + unsigned short mode_flags; /* mode flags */ +#define AWE_SAMPLE_8BITS 1 /* wave data is 8bits */ +#define AWE_SAMPLE_UNSIGNED 2 /* wave data is unsigned */ +#define AWE_SAMPLE_NO_BLANK 4 /* no blank loop is attached */ +#define AWE_SAMPLE_SINGLESHOT 8 /* single-shot w/o loop */ +#define AWE_SAMPLE_BIDIR_LOOP 16 /* bidirectional looping */ +#define AWE_SAMPLE_STEREO_LEFT 32 /* stereo left sound */ +#define AWE_SAMPLE_STEREO_RIGHT 64 /* stereo right sound */ +#define AWE_SAMPLE_REVERSE_LOOP 128 /* reverse looping */ + unsigned int checksum; /* check sum */ +#if defined(AWE_COMPAT_030) && AWE_COMPAT_030 + unsigned short data[0]; /* sample data follows here */ +#endif +} awe_sample_info; + +/*#define AWE_SAMPLE_INFO_SIZE 32*/ +#define AWE_SAMPLE_INFO_SIZE sizeof(awe_sample_info) + + +/*---------------------------------------------------------------- + * voice preset mapping + *----------------------------------------------------------------*/ + +typedef struct awe_voice_map { + int map_bank, map_instr, map_key; /* key = -1 means all keys */ + int src_bank, src_instr, src_key; +} awe_voice_map; + +#define AWE_VOICE_MAP_SIZE sizeof(awe_voice_map) + + +/*---------------------------------------------------------------- + * awe hardware controls + *----------------------------------------------------------------*/ + +#define _AWE_DEBUG_MODE 0x00 +#define _AWE_REVERB_MODE 0x01 +#define _AWE_CHORUS_MODE 0x02 +#define _AWE_REMOVE_LAST_SAMPLES 0x03 +#define _AWE_INITIALIZE_CHIP 0x04 +#define _AWE_SEND_EFFECT 0x05 +#define _AWE_TERMINATE_CHANNEL 0x06 +#define _AWE_TERMINATE_ALL 0x07 +#define _AWE_INITIAL_VOLUME 0x08 +#define _AWE_INITIAL_ATTEN _AWE_INITIAL_VOLUME +#define _AWE_RESET_CHANNEL 0x09 +#define _AWE_CHANNEL_MODE 0x0a +#define _AWE_DRUM_CHANNELS 0x0b +#define _AWE_MISC_MODE 0x0c +#define _AWE_RELEASE_ALL 0x0d +#define _AWE_NOTEOFF_ALL 0x0e +#define _AWE_CHN_PRESSURE 0x0f +/*#define _AWE_GET_CURRENT_MODE 0x10*/ +#define _AWE_EQUALIZER 0x11 +/*#define _AWE_GET_MISC_MODE 0x12*/ +/*#define _AWE_GET_FONTINFO 0x13*/ + +#define _AWE_MODE_FLAG 0x80 +#define _AWE_COOKED_FLAG 0x40 /* not supported */ +#define _AWE_MODE_VALUE_MASK 0x3F + +/*----------------------------------------------------------------*/ + +#define _AWE_SET_CMD(p,dev,voice,cmd,p1,p2) \ +{((char*)(p))[0] = SEQ_PRIVATE;\ + ((char*)(p))[1] = dev;\ + ((char*)(p))[2] = _AWE_MODE_FLAG|(cmd);\ + ((char*)(p))[3] = voice;\ + ((unsigned short*)(p))[2] = p1;\ + ((unsigned short*)(p))[3] = p2;} + +/* buffered access */ +#define _AWE_CMD(dev, voice, cmd, p1, p2) \ +{_SEQ_NEEDBUF(8);\ + _AWE_SET_CMD(_seqbuf + _seqbufptr, dev, voice, cmd, p1, p2);\ + _SEQ_ADVBUF(8);} + +/* direct access */ +#define _AWE_CMD_NOW(seqfd,dev,voice,cmd,p1,p2) \ +{struct seq_event_rec tmp;\ + _AWE_SET_CMD(&tmp, dev, voice, cmd, p1, p2);\ + ioctl(seqfd, SNDCTL_SEQ_OUTOFBAND, &tmp);} + +/*----------------------------------------------------------------*/ + +/* set debugging mode */ +#define AWE_DEBUG_MODE(dev,p1) _AWE_CMD(dev, 0, _AWE_DEBUG_MODE, p1, 0) +/* set reverb mode; from 0 to 7 */ +#define AWE_REVERB_MODE(dev,p1) _AWE_CMD(dev, 0, _AWE_REVERB_MODE, p1, 0) +/* set chorus mode; from 0 to 7 */ +#define AWE_CHORUS_MODE(dev,p1) _AWE_CMD(dev, 0, _AWE_CHORUS_MODE, p1, 0) + +/* reset channel */ +#define AWE_RESET_CHANNEL(dev,ch) _AWE_CMD(dev, ch, _AWE_RESET_CHANNEL, 0, 0) +#define AWE_RESET_CONTROL(dev,ch) _AWE_CMD(dev, ch, _AWE_RESET_CHANNEL, 1, 0) + +/* send an effect to all layers */ +#define AWE_SEND_EFFECT(dev,voice,type,value) _AWE_CMD(dev,voice,_AWE_SEND_EFFECT,type,value) +#define AWE_ADD_EFFECT(dev,voice,type,value) _AWE_CMD(dev,voice,_AWE_SEND_EFFECT,((type)|0x80),value) +#define AWE_UNSET_EFFECT(dev,voice,type) _AWE_CMD(dev,voice,_AWE_SEND_EFFECT,((type)|0x40),0) +/* send an effect to a layer */ +#define AWE_SEND_LAYER_EFFECT(dev,voice,layer,type,value) _AWE_CMD(dev,voice,_AWE_SEND_EFFECT,((layer+1)<<8|(type)),value) +#define AWE_ADD_LAYER_EFFECT(dev,voice,layer,type,value) _AWE_CMD(dev,voice,_AWE_SEND_EFFECT,((layer+1)<<8|(type)|0x80),value) +#define AWE_UNSET_LAYER_EFFECT(dev,voice,layer,type) _AWE_CMD(dev,voice,_AWE_SEND_EFFECT,((layer+1)<<8|(type)|0x40),0) + +/* terminate sound on the channel/voice */ +#define AWE_TERMINATE_CHANNEL(dev,voice) _AWE_CMD(dev,voice,_AWE_TERMINATE_CHANNEL,0,0) +/* terminate all sounds */ +#define AWE_TERMINATE_ALL(dev) _AWE_CMD(dev, 0, _AWE_TERMINATE_ALL, 0, 0) +/* release all sounds (w/o sustain effect) */ +#define AWE_RELEASE_ALL(dev) _AWE_CMD(dev, 0, _AWE_RELEASE_ALL, 0, 0) +/* note off all sounds (w sustain effect) */ +#define AWE_NOTEOFF_ALL(dev) _AWE_CMD(dev, 0, _AWE_NOTEOFF_ALL, 0, 0) + +/* set initial attenuation */ +#define AWE_INITIAL_VOLUME(dev,atten) _AWE_CMD(dev, 0, _AWE_INITIAL_VOLUME, atten, 0) +#define AWE_INITIAL_ATTEN AWE_INITIAL_VOLUME +/* relative attenuation */ +#define AWE_SET_ATTEN(dev,atten) _AWE_CMD(dev, 0, _AWE_INITIAL_VOLUME, atten, 1) + +/* set channel playing mode; mode=0/1/2 */ +#define AWE_SET_CHANNEL_MODE(dev,mode) _AWE_CMD(dev, 0, _AWE_CHANNEL_MODE, mode, 0) +#define AWE_PLAY_INDIRECT 0 /* indirect voice mode (default) */ +#define AWE_PLAY_MULTI 1 /* multi note voice mode */ +#define AWE_PLAY_DIRECT 2 /* direct single voice mode */ +#define AWE_PLAY_MULTI2 3 /* sequencer2 mode; used internally */ + +/* set drum channel mask; channels is 32bit long value */ +#define AWE_DRUM_CHANNELS(dev,channels) _AWE_CMD(dev, 0, _AWE_DRUM_CHANNELS, ((channels) & 0xffff), ((channels) >> 16)) + +/* set bass and treble control; values are from 0 to 11 */ +#define AWE_EQUALIZER(dev,bass,treble) _AWE_CMD(dev, 0, _AWE_EQUALIZER, bass, treble) + +/* remove last loaded samples */ +#define AWE_REMOVE_LAST_SAMPLES(seqfd,dev) _AWE_CMD_NOW(seqfd, dev, 0, _AWE_REMOVE_LAST_SAMPLES, 0, 0) +/* initialize emu8000 chip */ +#define AWE_INITIALIZE_CHIP(seqfd,dev) _AWE_CMD_NOW(seqfd, dev, 0, _AWE_INITIALIZE_CHIP, 0, 0) + +/* set miscellaneous modes; meta command */ +#define AWE_MISC_MODE(dev,mode,value) _AWE_CMD(dev, 0, _AWE_MISC_MODE, mode, value) +/* exclusive sound off; 1=off */ +#define AWE_EXCLUSIVE_SOUND(dev,mode) AWE_MISC_MODE(dev,AWE_MD_EXCLUSIVE_SOUND,mode) +/* default GUS bank number */ +#define AWE_SET_GUS_BANK(dev,bank) AWE_MISC_MODE(dev,AWE_MD_GUS_BANK,bank) +/* change panning position in realtime; 0=don't 1=do */ +#define AWE_REALTIME_PAN(dev,mode) AWE_MISC_MODE(dev,AWE_MD_REALTIME_PAN,mode) + +/* extended pressure controls; not portable with other sound drivers */ +#define AWE_KEY_PRESSURE(dev,ch,note,vel) SEQ_START_NOTE(dev,ch,(note)+128,vel) +#define AWE_CHN_PRESSURE(dev,ch,vel) _AWE_CMD(dev,ch,_AWE_CHN_PRESSURE,vel,0) + +/*----------------------------------------------------------------*/ + +/* reverb mode parameters */ +#define AWE_REVERB_ROOM1 0 +#define AWE_REVERB_ROOM2 1 +#define AWE_REVERB_ROOM3 2 +#define AWE_REVERB_HALL1 3 +#define AWE_REVERB_HALL2 4 +#define AWE_REVERB_PLATE 5 +#define AWE_REVERB_DELAY 6 +#define AWE_REVERB_PANNINGDELAY 7 +#define AWE_REVERB_PREDEFINED 8 +/* user can define reverb modes up to 32 */ +#define AWE_REVERB_NUMBERS 32 + +typedef struct awe_reverb_fx_rec { + unsigned short parms[28]; +} awe_reverb_fx_rec; + +/*----------------------------------------------------------------*/ + +/* chorus mode parameters */ +#define AWE_CHORUS_1 0 +#define AWE_CHORUS_2 1 +#define AWE_CHORUS_3 2 +#define AWE_CHORUS_4 3 +#define AWE_CHORUS_FEEDBACK 4 +#define AWE_CHORUS_FLANGER 5 +#define AWE_CHORUS_SHORTDELAY 6 +#define AWE_CHORUS_SHORTDELAY2 7 +#define AWE_CHORUS_PREDEFINED 8 +/* user can define chorus modes up to 32 */ +#define AWE_CHORUS_NUMBERS 32 + +typedef struct awe_chorus_fx_rec { + unsigned short feedback; /* feedback level (0xE600-0xE6FF) */ + unsigned short delay_offset; /* delay (0-0x0DA3) [1/44100 sec] */ + unsigned short lfo_depth; /* LFO depth (0xBC00-0xBCFF) */ + unsigned int delay; /* right delay (0-0xFFFFFFFF) [1/256/44100 sec] */ + unsigned int lfo_freq; /* LFO freq LFO freq (0-0xFFFFFFFF) */ +} awe_chorus_fx_rec; + +/*----------------------------------------------------------------*/ + +/* misc mode types */ +enum { +/* 0*/ AWE_MD_EXCLUSIVE_OFF, /* obsolete */ +/* 1*/ AWE_MD_EXCLUSIVE_ON, /* obsolete */ +/* 2*/ AWE_MD_VERSION, /* read only */ +/* 3*/ AWE_MD_EXCLUSIVE_SOUND, /* ignored */ +/* 4*/ AWE_MD_REALTIME_PAN, /* 0/1: do realtime pan change (default=1) */ +/* 5*/ AWE_MD_GUS_BANK, /* bank number for GUS patches (default=0) */ +/* 6*/ AWE_MD_KEEP_EFFECT, /* 0/1: keep effect values, (default=0) */ +/* 7*/ AWE_MD_ZERO_ATTEN, /* attenuation of max volume (default=32) */ +/* 8*/ AWE_MD_CHN_PRIOR, /* 0/1: set MIDI channel priority mode (default=1) */ +/* 9*/ AWE_MD_MOD_SENSE, /* integer: modwheel sensitivity (def=18) */ +/*10*/ AWE_MD_DEF_PRESET, /* integer: default preset number (def=0) */ +/*11*/ AWE_MD_DEF_BANK, /* integer: default bank number (def=0) */ +/*12*/ AWE_MD_DEF_DRUM, /* integer: default drumset number (def=0) */ +/*13*/ AWE_MD_TOGGLE_DRUM_BANK, /* 0/1: toggle drum flag with bank# (def=0) */ + AWE_MD_END, +}; + +/*----------------------------------------------------------------*/ + +/* effect parameters */ +enum { + +/* modulation envelope parameters */ +/* 0*/ AWE_FX_ENV1_DELAY, /* WORD: ENVVAL */ +/* 1*/ AWE_FX_ENV1_ATTACK, /* BYTE: up ATKHLD */ +/* 2*/ AWE_FX_ENV1_HOLD, /* BYTE: lw ATKHLD */ +/* 3*/ AWE_FX_ENV1_DECAY, /* BYTE: lw DCYSUS */ +/* 4*/ AWE_FX_ENV1_RELEASE, /* BYTE: lw DCYSUS */ +/* 5*/ AWE_FX_ENV1_SUSTAIN, /* BYTE: up DCYSUS */ +/* 6*/ AWE_FX_ENV1_PITCH, /* BYTE: up PEFE */ +/* 7*/ AWE_FX_ENV1_CUTOFF, /* BYTE: lw PEFE */ + +/* volume envelope parameters */ +/* 8*/ AWE_FX_ENV2_DELAY, /* WORD: ENVVOL */ +/* 9*/ AWE_FX_ENV2_ATTACK, /* BYTE: up ATKHLDV */ +/*10*/ AWE_FX_ENV2_HOLD, /* BYTE: lw ATKHLDV */ +/*11*/ AWE_FX_ENV2_DECAY, /* BYTE: lw DCYSUSV */ +/*12*/ AWE_FX_ENV2_RELEASE, /* BYTE: lw DCYSUSV */ +/*13*/ AWE_FX_ENV2_SUSTAIN, /* BYTE: up DCYSUSV */ + +/* LFO1 (tremolo & vibrato) parameters */ +/*14*/ AWE_FX_LFO1_DELAY, /* WORD: LFO1VAL */ +/*15*/ AWE_FX_LFO1_FREQ, /* BYTE: lo TREMFRQ */ +/*16*/ AWE_FX_LFO1_VOLUME, /* BYTE: up TREMFRQ */ +/*17*/ AWE_FX_LFO1_PITCH, /* BYTE: up FMMOD */ +/*18*/ AWE_FX_LFO1_CUTOFF, /* BYTE: lo FMMOD */ + +/* LFO2 (vibrato) parameters */ +/*19*/ AWE_FX_LFO2_DELAY, /* WORD: LFO2VAL */ +/*20*/ AWE_FX_LFO2_FREQ, /* BYTE: lo FM2FRQ2 */ +/*21*/ AWE_FX_LFO2_PITCH, /* BYTE: up FM2FRQ2 */ + +/* Other overall effect parameters */ +/*22*/ AWE_FX_INIT_PITCH, /* SHORT: pitch offset */ +/*23*/ AWE_FX_CHORUS, /* BYTE: chorus effects send (0-255) */ +/*24*/ AWE_FX_REVERB, /* BYTE: reverb effects send (0-255) */ +/*25*/ AWE_FX_CUTOFF, /* BYTE: up IFATN */ +/*26*/ AWE_FX_FILTERQ, /* BYTE: up CCCA */ + +/* Sample / loop offset changes */ +/*27*/ AWE_FX_SAMPLE_START, /* SHORT: offset */ +/*28*/ AWE_FX_LOOP_START, /* SHORT: offset */ +/*29*/ AWE_FX_LOOP_END, /* SHORT: offset */ +/*30*/ AWE_FX_COARSE_SAMPLE_START, /* SHORT: upper word offset */ +/*31*/ AWE_FX_COARSE_LOOP_START, /* SHORT: upper word offset */ +/*32*/ AWE_FX_COARSE_LOOP_END, /* SHORT: upper word offset */ +/*33*/ AWE_FX_ATTEN, /* BYTE: lo IFATN */ + + AWE_FX_END, +}; + +#endif /* AWE_VOICE_H */ --- gmod-3.1.orig/TopShell.h +++ gmod-3.1/TopShell.h @@ -5,11 +5,11 @@ #ifndef __TopShellH #define __TopShellH -#include +#include #include -#include +#include #include -#include +#include #include class CommentShell; --- gmod-3.1.orig/Makefile +++ gmod-3.1/Makefile @@ -7,16 +7,16 @@ # Note: do not define both USE_NCURSES and USE_X at the same time. # Use the next line for shared libqt -#LIBS = -lX11 -lqt +LIBS = -lX11 -lqt-mt # Use the next line for static libqt -LIBS = -lX11 /usr/local/qt/lib/libqt.a +#LIBS = -lX11 /usr/local/qt/lib/libqt.a DEFINES = -DUSE_X -DAWE_SUPPORT -INCLUDES = -I/usr/local/qt/include -LIBDIRS = -L/usr/X11R6/lib -L/usr/local/qt/lib +INCLUDES = -I/usr/include/qt3 +LIBDIRS = -L/usr/X11R6/lib CC = g++ -CFLAGS = -O2 -m486 -fomit-frame-pointer -fno-strength-reduce -w +CFLAGS = -O2 -fomit-frame-pointer -W -Wall -g #CFLAGS = -Wall -g # Where to put the binary and man page @@ -43,7 +43,7 @@ $(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) -c $< %.moc: %.h - /usr/local/qt/bin/moc $< -o $@ + /usr/bin/moc $< -o $@ .depend: $(CC) $(DEFINES) -MM -DDEPEND $(INCLUDES) $(CFILES) > .depend --- gmod-3.1.orig/SampleShell.h +++ gmod-3.1/SampleShell.h @@ -11,9 +11,13 @@ #ifdef USE_X -#include +#include #include -#include +#include + +#endif + +#ifndef USE_NCURSES class SampleShell : public QWidget { @@ -36,8 +40,9 @@ private slots: void closeSampleShell(); }; +#endif -#else /* !USE_X */ +#ifndef USE_X class SampleShell { --- gmod-3.1.orig/mod.C +++ gmod-3.1/mod.C @@ -17,7 +17,7 @@ int bytesRead = 0; int rc = -EINVAL; unsigned char ntscflag = *((unsigned char *)pf); - unsigned char *buf = (unsigned char *)header; + char *buf = (char *)header; sampleNum_ = sampleNo; length_ = REV_SHORT(buf + 22) * 2; --- gmod-3.1.orig/xm.C +++ gmod-3.1/xm.C @@ -4,6 +4,7 @@ #include #include +#include #include "xm.h" #include "Sequencer.h" --- gmod-3.1.orig/QueueShell.C +++ gmod-3.1/QueueShell.C @@ -3,7 +3,7 @@ // Copyright (C) 1997 by Andrew J. Robinson #include -#include +#include #include "defines.h" #include "structs.h" @@ -56,13 +56,13 @@ loadDialog = new XQFileDialog; loadDialog->setCaption("Xgmod - Add"); - connect (loadDialog, SIGNAL(fileSelected(const char *)), this, - SLOT(loadFileSelected(const char *))); + connect (loadDialog, SIGNAL(fileSelected(const QString &)), this, + SLOT(loadFileSelected(const QString & ))); saveDialog = new QFileDialog; saveDialog->setCaption("Xgmod - Save"); - connect (saveDialog, SIGNAL(fileSelected(const char *)), this, - SLOT(saveFileSelected(const char *))); + connect (saveDialog, SIGNAL(fileSelected(const QString &)), this, + SLOT(saveFileSelected(const QString &))); resize (265, 270); } @@ -122,7 +122,7 @@ } void -QueueShell::loadFileSelected (const char *filename) +QueueShell::loadFileSelected (const QString &filename) { int addPlace; FILE *fp; @@ -209,7 +209,7 @@ } void -QueueShell::saveFileSelected(const char *filename) +QueueShell::saveFileSelected(const QString &filename) { FILE *fp; int i; --- gmod-3.1.orig/CommentShell.moc +++ gmod-3.1/CommentShell.moc @@ -0,0 +1,97 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'CommentShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "CommentShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'CommentShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_CommentShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 14, 13, 13, 13, 0x0a, + 33, 13, 13, 13, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_CommentShell[] = { + "CommentShell\0\0showCommentShell()\0" + "closeCommentShell()\0" +}; + +void CommentShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CommentShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->showCommentShell(); break; + case 1: _t->closeCommentShell(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData CommentShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CommentShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_CommentShell, + qt_meta_data_CommentShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CommentShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CommentShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CommentShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CommentShell)) + return static_cast(const_cast< CommentShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int CommentShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE --- gmod-3.1.orig/QueueShell.moc +++ gmod-3.1/QueueShell.moc @@ -0,0 +1,202 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'QueueShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "QueueShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'QueueShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_XQFileDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 14, 13, 13, 13, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_XQFileDialog[] = { + "XQFileDialog\0\0done(int)\0" +}; + +void XQFileDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + XQFileDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->done((*reinterpret_cast< int(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData XQFileDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject XQFileDialog::staticMetaObject = { + { &QFileDialog::staticMetaObject, qt_meta_stringdata_XQFileDialog, + qt_meta_data_XQFileDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &XQFileDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *XQFileDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *XQFileDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_XQFileDialog)) + return static_cast(const_cast< XQFileDialog*>(this)); + return QFileDialog::qt_metacast(_clname); +} + +int XQFileDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QFileDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +static const uint qt_meta_data_QueueShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 12, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: signature, parameters, type, tag, flags + 12, 11, 11, 11, 0x05, + + // slots: signature, parameters, type, tag, flags + 29, 11, 11, 11, 0x0a, + 46, 11, 11, 11, 0x08, + 63, 11, 11, 11, 0x08, + 78, 11, 11, 11, 0x08, + 91, 11, 11, 11, 0x08, + 105, 11, 11, 11, 0x08, + 119, 11, 11, 11, 0x08, + 135, 11, 11, 11, 0x08, + 150, 11, 11, 11, 0x08, + 167, 11, 11, 11, 0x08, + 193, 11, 11, 11, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_QueueShell[] = { + "QueueShell\0\0currentDeleted()\0" + "currentClicked()\0showQueueShell()\0" + "closeClicked()\0addClicked()\0saveClicked()\0" + "playClicked()\0removeClicked()\0" + "clearClicked()\0shuffleClicked()\0" + "loadFileSelected(QString)\0" + "saveFileSelected(QString)\0" +}; + +void QueueShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + QueueShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->currentDeleted(); break; + case 1: _t->currentClicked(); break; + case 2: _t->showQueueShell(); break; + case 3: _t->closeClicked(); break; + case 4: _t->addClicked(); break; + case 5: _t->saveClicked(); break; + case 6: _t->playClicked(); break; + case 7: _t->removeClicked(); break; + case 8: _t->clearClicked(); break; + case 9: _t->shuffleClicked(); break; + case 10: _t->loadFileSelected((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 11: _t->saveFileSelected((*reinterpret_cast< const QString(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData QueueShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject QueueShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_QueueShell, + qt_meta_data_QueueShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &QueueShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *QueueShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *QueueShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_QueueShell)) + return static_cast(const_cast< QueueShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int QueueShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 12) + qt_static_metacall(this, _c, _id, _a); + _id -= 12; + } + return _id; +} + +// SIGNAL 0 +void QueueShell::currentDeleted() +{ + QMetaObject::activate(this, &staticMetaObject, 0, 0); +} +QT_END_MOC_NAMESPACE --- gmod-3.1.orig/gmod.C +++ gmod-3.1/gmod.C @@ -30,7 +30,7 @@ #include #endif -#include +#include #include #include @@ -44,7 +44,7 @@ #ifdef USE_X #include -#include +#include #include "TopShell.h" #include "TrackShell.h" @@ -73,7 +73,7 @@ int mixerfd; Sample *samples[MAX_SAMPLES]; -double thisTime, nextTime; +double thisTime, nextTime, seqRate; int ticksPerDivision; #ifndef USE_X --- gmod-3.1.orig/TrackShell.moc +++ gmod-3.1/TrackShell.moc @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'TrackShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "TrackShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'TrackShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_TrackShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 12, 11, 11, 11, 0x0a, + 29, 11, 11, 11, 0x0a, + 46, 11, 11, 11, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_TrackShell[] = { + "TrackShell\0\0showTrackShell()\0" + "setChannels(int)\0closeTrackShell()\0" +}; + +void TrackShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + TrackShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->showTrackShell(); break; + case 1: _t->setChannels((*reinterpret_cast< int(*)>(_a[1]))); break; + case 2: _t->closeTrackShell(); break; + default: ; + } + } +} + +const QMetaObjectExtraData TrackShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject TrackShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_TrackShell, + qt_meta_data_TrackShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &TrackShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *TrackShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *TrackShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_TrackShell)) + return static_cast(const_cast< TrackShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int TrackShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE --- gmod-3.1.orig/load_mod.C +++ gmod-3.1/load_mod.C @@ -6,6 +6,7 @@ #include #include #include +#include //lib6 change by Riku Voipio #ifdef USE_LOCAL #include "soundcard.h" @@ -104,7 +105,7 @@ else if (!memcmp(&header[1082], "CH", 2)) { nrSamples = 31; - songChar->nrChannels = strtol(&header[1080], NULL, 10); + songChar->nrChannels = strtol((char *)(&header[1080]), NULL, 10); } else if (!options.checkMagic) { --- gmod-3.1.orig/Sample.h +++ gmod-3.1/Sample.h @@ -6,6 +6,9 @@ #define __SampleH #include +#include + +using namespace std; #ifdef USE_NCURSES #include --- gmod-3.1.orig/OptShell.C +++ gmod-3.1/OptShell.C @@ -2,12 +2,16 @@ // This file is part of the gmod package // Copyright (C) 1997 by Andrew J. Robinson -#include -#include -#include +#include +//#include +#include +#include #include +using namespace std; + #include "OptShell.h" +#define String QString OptShell::OptShell(QWidget *w) : QWidget(w, "optShell") { --- gmod-3.1.orig/TrackShell.C +++ gmod-3.1/TrackShell.C @@ -5,6 +5,8 @@ #include #include +using namespace std; + #include "TrackShell.h" TrackShell::TrackShell(QWidget *w) : QWidget(w, "trackShell") --- gmod-3.1.orig/mtm.C +++ gmod-3.1/mtm.C @@ -15,7 +15,7 @@ { #define MTM_ATTRIBUTE_16BIT 1 int bytesRead; - unsigned char *buf = (unsigned char *)header; + char *buf = (char *)header; sampleNum_ = sampleNo; mode_ = WAVE_UNSIGNED; --- gmod-3.1.orig/s3m.C +++ gmod-3.1/s3m.C @@ -4,6 +4,7 @@ #include #include +#include #include "s3m.h" #include "Sequencer.h" @@ -14,7 +15,7 @@ S3M_sample::load(Sequencer &seq, FILE * modFd, int sampleNo, int cutFactor, void *lf, void *bf) { - unsigned char *buffer = (unsigned char *)bf; + char *buffer = (char *)bf; int bytesRead; int rc; --- gmod-3.1.orig/play_mod.C +++ gmod-3.1/play_mod.C @@ -14,7 +14,7 @@ #include #endif -#include +#include #include #include --- gmod-3.1.orig/Sequencer2.C +++ gmod-3.1/Sequencer2.C @@ -4,6 +4,7 @@ #include #include +#include #ifdef USE_LOCAL #include "soundcard.h" --- gmod-3.1.orig/Makefile.gmod +++ gmod-3.1/Makefile.gmod @@ -6,16 +6,16 @@ # USE_X will compile gmod with and X interface. # Note: do not define both USE_NCURSES and USE_X at the same time. -DEFINES = -DUSE_NCURSES -DAWE_SUPPORT +DEFINES = -DUSE_NCURSES -DAWE_SUPPORT LIBS = -lncurses -CFLAGS = -O2 -m486 -fomit-frame-pointer -fno-strength-reduce -w -I/usr/include/ncurses +CFLAGS = -O2 -fomit-frame-pointer -fno-strength-reduce -w -I/usr/include/ncurses #CFLAGS = -g -Wall -I/usr/include/ncurses CC = g++ # Where to put the binary and man page -BINDIR = /usr/local/bin -MANDIR = /usr/local/man/man1 +BINDIR = debian/gmod/tmp/usr/bin +MANDIR = debian/gmod/tmp/usr/man/man1 CFILES = compress.C cvt_period.C Sequencer.C gmod.C init.C \ load_669.C load_mod.C load_mtm.C load_s3m.C load_ult.C load_xm.C \ --- gmod-3.1.orig/OptShell.h +++ gmod-3.1/OptShell.h @@ -5,11 +5,11 @@ #ifndef __OptShellH #define __OptShellH -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include class OptShell : public QWidget --- gmod-3.1.orig/VoiceGUS.C +++ gmod-3.1/VoiceGUS.C @@ -3,7 +3,7 @@ // Copyright (C) 1997 by Andrew J. Robinson #include -#include +#include #include "defines.h" #include "structs.h" --- gmod-3.1.orig/CommentShell.h +++ gmod-3.1/CommentShell.h @@ -5,9 +5,9 @@ #ifndef __CommentShellH #define __CommentShellH -#include -#include -#include +#include +#include +#include class CommentShell : public QWidget { --- gmod-3.1.orig/TopShell.moc +++ gmod-3.1/TopShell.moc @@ -0,0 +1,119 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'TopShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "TopShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'TopShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_TopShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 8, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: signature, parameters, type, tag, flags + 10, 9, 9, 9, 0x05, + + // slots: signature, parameters, type, tag, flags + 29, 9, 9, 9, 0x08, + 43, 9, 9, 9, 0x08, + 60, 9, 9, 9, 0x08, + 74, 9, 9, 9, 0x08, + 88, 9, 9, 9, 0x08, + 106, 9, 9, 9, 0x08, + 120, 9, 9, 9, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_TopShell[] = { + "TopShell\0\0channelSignal(int)\0backClicked()\0" + "forwardClicked()\0playClicked()\0" + "nextClicked()\0previousClicked()\0" + "stopClicked()\0setRandom()\0" +}; + +void TopShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + TopShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->channelSignal((*reinterpret_cast< int(*)>(_a[1]))); break; + case 1: _t->backClicked(); break; + case 2: _t->forwardClicked(); break; + case 3: _t->playClicked(); break; + case 4: _t->nextClicked(); break; + case 5: _t->previousClicked(); break; + case 6: _t->stopClicked(); break; + case 7: _t->setRandom(); break; + default: ; + } + } +} + +const QMetaObjectExtraData TopShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject TopShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_TopShell, + qt_meta_data_TopShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &TopShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *TopShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *TopShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_TopShell)) + return static_cast(const_cast< TopShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int TopShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 8) + qt_static_metacall(this, _c, _id, _a); + _id -= 8; + } + return _id; +} + +// SIGNAL 0 +void TopShell::channelSignal(int _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} +QT_END_MOC_NAMESPACE --- gmod-3.1.orig/play_note.C +++ gmod-3.1/play_note.C @@ -8,7 +8,7 @@ #include #endif -#include +#include #include "commands.h" #include "defines.h" --- gmod-3.1.orig/OptShell.moc +++ gmod-3.1/OptShell.moc @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'OptShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "OptShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'OptShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_OptShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 10, 9, 9, 9, 0x0a, + 25, 9, 9, 9, 0x08, + 34, 9, 9, 9, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_OptShell[] = { + "OptShell\0\0showOptShell()\0closex()\0" + "saveClicked()\0" +}; + +void OptShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + OptShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->showOptShell(); break; + case 1: _t->closex(); break; + case 2: _t->saveClicked(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData OptShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject OptShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_OptShell, + qt_meta_data_OptShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &OptShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *OptShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *OptShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_OptShell)) + return static_cast(const_cast< OptShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int OptShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE --- gmod-3.1.orig/QueueShell.h +++ gmod-3.1/QueueShell.h @@ -5,11 +5,11 @@ #ifndef __QueueShellH #define __QueueShellH -#include +#include #undef Unsorted -#include +#include #include -#include +#include #include class TopShell; @@ -71,8 +71,8 @@ void removeClicked(); void clearClicked(); void shuffleClicked(); - void loadFileSelected(const char *); - void saveFileSelected(const char *); + void loadFileSelected(const QString &); + void saveFileSelected(const QString &); }; inline void --- gmod-3.1.orig/Six69.C +++ gmod-3.1/Six69.C @@ -21,7 +21,7 @@ void *header, void *) { int bytesRead; - unsigned char *buf = (unsigned char *)header; + char *buf = (char *)header; sampleNum_ = sampleNo; mode_ = WAVE_UNSIGNED; --- gmod-3.1.orig/globals.h +++ gmod-3.1/globals.h @@ -17,7 +17,7 @@ extern short voiceTable[MAX_POSITION][MAX_TRACK]; extern double tickDuration; extern int mixerfd; -extern double thisTime, nextTime; +extern double thisTime, nextTime, seqRate; extern int ticksPerDivision; extern double clockRate; /* HZ */ --- gmod-3.1.orig/misc.C +++ gmod-3.1/misc.C @@ -13,7 +13,7 @@ #include #endif -#include +#include #include "defines.h" #include "structs.h" --- gmod-3.1.orig/load_mtm.C +++ gmod-3.1/load_mtm.C @@ -14,6 +14,7 @@ #include #include #include +#include #include #include "commands.h" --- gmod-3.1.orig/Sequencer.h +++ gmod-3.1/Sequencer.h @@ -10,10 +10,15 @@ #include #include #include +#undef clear +#undef erase +#include + +using namespace std; #ifdef USE_X -#include -#include +#include +#include #endif #include "Voice.h" @@ -23,7 +28,9 @@ struct songInfo; struct optionsInfo; -template class deque; +//template class deque; + +using namespace std; class Sequencer #ifdef USE_X @@ -85,7 +92,7 @@ Voice *voices_; // bufferList is a pointer so deque.h doesn't need to be included - deque *bufferList; + deque *bufferList; #ifdef USE_X QSocketNotifier *writeNotifier_; --- gmod-3.1.orig/debian/control +++ gmod-3.1/debian/control @@ -0,0 +1,16 @@ +Source: gmod +Build-Depends: debhelper (>=5.0), libncurses5-dev | libncurses-dev, zlib1g-dev | libz-dev +Section: sound +Priority: optional +Maintainer: Riku Voipio +Standards-Version: 3.7.3 + +Package: gmod +Architecture: i386 +Section: sound +Priority: extra +Depends: ${shlibs:Depends} +Description: Module player for Ultrasound and SB AWE soundcards + Gmod plays MOD/669/MTM/S3M/ULT/XM modules on machines that have an + Gravis Ultrasound family sound card or a Sound Blaster AWE. + --- gmod-3.1.orig/debian/changelog +++ gmod-3.1/debian/changelog @@ -0,0 +1,169 @@ +gmod (3.1-14) unstable; urgency=low + + * The "maybe this package still works" Release + * Remove QT3 based xgmod package, closes: #604482 + + -- Riku Voipio Mon, 28 May 2012 17:08:44 +0300 + +gmod (3.1-13) unstable; urgency=low + + * The "I still maintain museumware" Release + * Add headers needed by g++-4.3, closes: #474800 + + -- Riku Voipio Mon, 07 Apr 2008 23:20:30 +0300 + +gmod (3.1-12) unstable; urgency=low + + * The "Dinosaurs still walk with us" Release + * use internal copy of awe_voice.h since it's gone from kernel. + Closes: #436362 + + -- Riku Voipio Wed, 08 Aug 2007 14:01:59 +0300 + +gmod (3.1-11) unstable; urgency=low + + * The "Biotech is GodzillaaaaaaRRrrGGH" release + * Add support for different HZ rates in modern kernels. + Lots of thanks to Claudio Matsuoka! + * Bump standards-version and debhelper compat level + + -- Riku Voipio Sat, 11 Nov 2006 22:53:00 +0200 + +gmod (3.1-10) unstable; urgency=low + + * The "Let freedom ring with a shotgun blast" Release + * Any kind of works/does not work reports from GUS/AWE owners appreceated + * upto date standards + * move xgmod binaries to /usr/bin + * remove x86isms from Makefile + * g++4 port + * Typo fix: Closes: #300076 + * rewrite history (changelog email) + + -- Riku Voipio Sat, 20 Aug 2005 21:49:17 +0300 + +gmod (3.1-9) unstable; urgency=low + + * qt3 port. Closes: #189762 + * Spelling error fixes, Closes: #124681, #125539 + * xlibs Build-depend ordering: Closes: #170239 + + -- Riku Voipio Sat, 7 Jun 2003 14:50:55 +0300 + +gmod (3.1-8.3) unstable; urgency=low + + * Latest qt rebuild again Closes: #89792, #97311, #72541 + + -- Riku Voipio Sun, 29 Jul 2001 23:30:08 +0300 + +gmod (3.1-8.2) unstable; urgency=low + + * Non-Maintainer Upload + * Build against libmng1 (fixes: #86639) + + -- Zed Pobre Sat, 24 Feb 2001 17:38:57 -0600 + +gmod (3.1-8.1) unstable; urgency=low + + * Building against libqt2.2 (Closes: #72541) + * Adding in build-depends just to be nice. + * NMU + + -- Ivan E. Moore II Sun, 08 Oct 2000 04:30:00 -0700 + +gmod (3.1-8) unstable; urgency=low + + * xgmod libqt2 -> libqt2.1 (any changes the names stablize?) + + -- Riku Voipio Mon, 7 Aug 2000 12:19:08 +0300 + +gmod (3.1-7) frozen unstable; urgency=low + + * fix ownership problems + * locate xgmod page the FHS way + + -- Riku Voipio Tue, 8 Feb 2000 18:23:42 +0200 + +gmod (3.1-6) unstable; urgency=low + + * qt2 -> libqt2 (closes: #47672) + * dirs: typo fix (closes: #47727) + * removed gmod menu entry - gmod needs + parameters to be useful + * policy standard 3.1.0.0 + + -- Riku Voipio Wed, 10 Nov 1999 23:27:19 +0200 + +gmod (3.1-5) unstable; urgency=low + + * control: moved to extra + * control: lintian clean + * control: xgmod goes main with qt2! + * corrected depencies + * other minor changes in code to make it compile + * FHS + + -- Riku Voipio Fri, 2 Jul 1999 18:38:22 +0300 + +gmod (3.1-4) unstable; urgency=low + + * standard 2.5.0.0 + * fixed menu entries + * compiled against glibc2.1 & friends + * converted to debhelper + * release this time... + * now tested with AWE64 + * OTOH, I can't currently test GUS support. + + -- Riku Voipio Sat, 10 Apr 1999 14:47:28 +0300 + +gmod (3.1-3) unstable; urgency=low + + * uses libstdc++2.9 and ncurses4 now + * fixed sampleshell to work under X + + -- Riku Voipio Wed, 7 Apr 1999 16:57:09 +0300 + +gmod (3.1-2) unstable; urgency=low + + * Added AWE support - <> + + -- Riku Voipio Wed, 29 Oct 1997 13:57:53 +0200 + +gmod (3.1-1) unstable; urgency=low + + * Did not yeat add AWE support - I'll have to hunt the headers... + * New upstream release (fixes #13398) + * Really release this one, unlike 3.0.6 (finally close #9670) + * Up to latest policy + + -- Riku Voipio Sat, 27 Sep 1997 17:49:40 +0300 + +gmod (3.0.6-1) unstable; urgency=low + + * New upstream release + * New maintainer address + * fixed changelog name #9670 + * libc6 release (sort of, uses a mess of libs) + + -- Riku Voipio Thu, 1 May 1997 20:33:33 +0300 + +gmod (3.0.5-1) unstable; urgency=low + + * New upstream release + + -- Riku Voipio Sat, 1 Mar 1997 11:46:25 +0200 + +gmod (3.0.3-2) unstable; urgency=low + + * changed sources to compile with debmake > 3.0 + * added note on howto add audio permissions. + + -- Riku Voipio Tue, 11 Feb 1997 17:37:36 +0200 + +gmod (3.0.3-1) unstable; urgency=low + + * Initial Release. + + -- Riku Voipio Mon, 30 Dec 1996 22:44:55 +0200 + --- gmod-3.1.orig/debian/README.debian +++ gmod-3.1/debian/README.debian @@ -0,0 +1,25 @@ +[x]gmod for DEBIAN +---------------------- + +* gmod needs access to /dev/sequencer and /dev/midi00, that can be + accomplished by either: + + 1. Adding yourself in the audio group (in /etc/group file, with "vigr") + + Recommended, has least security problems + + 2. by making [x]gmod audio sgid executable. + + I haven't tried this, but the author suggests that it's safe. + Lets anyone play music on your desktop, but nobody should be able + to do anything else with the soundcard. + + 2. Giving /dev/sequencer world read and write permissions + + It can be annoying when someone logs from the net and begins + playing music through your loudspeakers. Besides someone + may listen your conversions if you have a mic plugged in. + do this only of your absolutely sure what you're doing. + + +Riku Voipio , Mon, 30 Dec 1996 22:44:55 +0200 --- gmod-3.1.orig/debian/rules +++ gmod-3.1/debian/rules @@ -0,0 +1,58 @@ +#!/usr/bin/make -f +# Copyright 1994,1995 by Ian Jackson. +# Copyright 1996-1999 by Riku Voipio. +# Public Domain + +package=gmod + +build: + dh_testdir + make -f Makefile.gmod clean + make -f Makefile.gmod + + touch build + +clean: + dh_testdir + dh_testroot + -rm -f build install-stamp debian/substvars + -make -f Makefile.gmod clean + dh_clean + +binary-indep: build + dh_testdir + dh_testroot + +# There are no architecture-independent files to be uploaded +# generated by this package. If there were any they would be +# made here. + +binary-arch: build + dh_testdir -a + dh_testroot -a + dh_installdirs -a + install -s gmod debian/gmod/usr/bin/gmod + cp gmod.1 debian/gmod/usr/share/man/man1/gmod.1 + dh_installmenu -a + dh_strip -a + dh_installchangelogs -a ChangeLog + dh_installdocs -a -A README + dh_link -a + dh_compress -a + dh_fixperms -a + dh_shlibdeps -a + dh_gencontrol -a + dh_installdeb -a + dh_md5sums -a + dh_builddeb -a + +# Below here is fairly generic really + +binary: binary-indep binary-arch + + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +.PHONY: binary binary-arch binary-indep clean + --- gmod-3.1.orig/debian/copyright +++ gmod-3.1/debian/copyright @@ -0,0 +1,25 @@ +This package was debianized by Riku Voipio riku.voipio@sci.fi on +Mon, 30 Dec 1996 22:44:55 +0200. + +It was downloaded from +ftp://ftp.funet.fi/mirrors/sunsite.unc.edu/pub/Linux/apps/players/gmod-3.0.3.tar.gz + +GMOD Copying/Usage Policy: + +gmod and Xgmod are Copyright (C) 1996 by Andrew Robinson. + +Portions of the source not written by Andrew Robinson may be copyrighted by +their authors. + +This program (executable and source) may be freely distributed. + +If you use any of the source code of this program, you must retain the +copyright notice and credit the authors of gmod in the source code and +documentation. + +That's it! + +Of course, donations are always welcome. :-) + + -- Andrew J. Robinson + --- gmod-3.1.orig/debian/compat +++ gmod-3.1/debian/compat @@ -0,0 +1 @@ +5 --- gmod-3.1.orig/debian/gmod.dirs +++ gmod-3.1/debian/gmod.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/man/man1