afinternal.h   afinternal.h 
skipping to change at line 40 skipping to change at line 40
#include <sys/types.h> #include <sys/types.h>
struct _AFfilesetup struct _AFfilesetup
{ {
int fileFormat; int fileFormat;
int channelCount; int channelCount;
int sampleWidth, sampleFormat; int sampleWidth, sampleFormat;
int byteOrder; int byteOrder;
double sampleRate; double sampleRate;
int loopCount;
struct _Loop *loops;
int markerCount;
struct _Marker *markers;
int instrumentCount;
struct _Instrument *instruments;
}; };
struct _Marker struct _Marker
{ {
short id; short id;
unsigned long position; unsigned long position;
char *name; char *name;
}; };
struct _Loop struct _Loop
{ {
int id; int id;
short playMode; short playMode;
short beginLoop; short beginLoop;
short endLoop; short endLoop;
int loopCount; int loopCount;
}; };
struct _Instrument
{
int id;
char midiBaseNote;
char detune; /* detune is expressed in ce
nts. */
char midiLowNote;
char midiHighNote;
char midiLowVelocity;
char midiHighVelocity;
u_int16_t gain; /* gain is expressed in deci
bels. */
int sustainLoopID;
int releaseLoopID;
};
struct _AFfilehandle struct _AFfilehandle
{ {
int fd; int fd;
int channelCount; int channelCount;
int sampleWidth, sampleFormat; int sampleWidth, sampleFormat;
double sampleRate; double sampleRate;
off_t frameCount; off_t frameCount;
off_t dataStart; off_t dataStart;
off_t currentFrame; off_t currentFrame;
off_t trackBytes; off_t trackBytes;
int byteOrder, virtualByteOrder; int byteOrder, virtualByteOrder;
int fileFormat; int fileFormat;
int markerCount; int markerCount;
struct _Marker *markers; struct _Marker *markers;
int loopCount; int loopCount;
struct _Loop *loops; struct _Loop *loops;
int instrumentCount;
struct _Instrument *instruments;
}; };
#endif #endif
 End of changes. 4 change blocks. 
4 lines changed or deleted 32 lines changed or added


 audiofile.h   audiofile.h 
skipping to change at line 32 skipping to change at line 32
/* /*
audiofile.h audiofile.h
This file contains the public interfaces to the Audio File Library. This file contains the public interfaces to the Audio File Library.
*/ */
#ifndef AUDIOFILE_H #ifndef AUDIOFILE_H
#define AUDIOFILE_H #define AUDIOFILE_H
#include <sys/types.h> #include <sys/types.h>
#include "aupvlist.h"
/*
audio utility parameter-value list utilities
used only by Audio File Library
*/
typedef struct _AUpvlist *AUpvlist;
typedef struct _AFfilesetup *AFfilesetup; typedef struct _AFfilesetup *AFfilesetup;
typedef struct _AFfilehandle *AFfilehandle; typedef struct _AFfilehandle *AFfilehandle;
typedef off_t AFframecount; typedef off_t AFframecount;
typedef off_t AFfileoffset; typedef off_t AFfileoffset;
#define AF_NULL_FILEHANDLE ((struct _AFfilehandle *) 0) #define AF_NULL_FILEHANDLE ((struct _AFfilehandle *) 0)
#define AF_NULL_FILESETUP ((struct _AFfilesetup *) 0) #define AF_NULL_FILESETUP ((struct _AFfilesetup *) 0)
skipping to change at line 89 skipping to change at line 84
enum enum
{ {
AF_LOOP_MODE_NOLOOP = 0, AF_LOOP_MODE_NOLOOP = 0,
AF_LOOP_MODE_FORW = 1, AF_LOOP_MODE_FORW = 1,
AF_LOOP_MODE_FORWBACKW = 2 AF_LOOP_MODE_FORWBACKW = 2
}; };
enum enum
{ {
AF_INST_SUSLOOPID = 308,
AF_INST_RELLOOPID = 309
};
enum
{
AF_SAMPFMT_TWOSCOMP = 401, AF_SAMPFMT_TWOSCOMP = 401,
AF_SAMPFMT_UNSIGNED = 402, AF_SAMPFMT_UNSIGNED = 402,
AF_SAMPFMT_FLOAT = 403, AF_SAMPFMT_FLOAT = 403,
AF_SAMPFMT_DOUBLE = 404 AF_SAMPFMT_DOUBLE = 404
}; };
enum enum
{ {
AF_COMPRESSION_UNKNOWN = -1, AF_COMPRESSION_UNKNOWN = -1,
AF_COMPRESSION_NONE = 0, AF_COMPRESSION_NONE = 0,
AF_COMPRESSION_G722 = 501, AF_COMPRESSION_G722 = 501,
AF_COMPRESSION_G711_ULAW = 502, AF_COMPRESSION_G711_ULAW = 502,
AF_COMPRESSION_G711_ALAW = 503, AF_COMPRESSION_G711_ALAW = 503,
AF_COMPRESSION_APPLE_ACE2 = 504, AF_COMPRESSION_APPLE_ACE2 = 504,
AF_COMPRESSION_APPLE_ACE8 = 505, AF_COMPRESSION_APPLE_ACE8 = 505,
AF_COMPRESSION_APPLE_MAC3 = 506, AF_COMPRESSION_APPLE_MAC3 = 506,
AF_COMPRESSION_APPLE_MAC6 = 507 AF_COMPRESSION_APPLE_MAC6 = 507
}; };
/* basic operations on file handles and file setups */ enum
{
AF_INST_LOOP_OFF = 0, /* no looping */
AF_INST_LOOP_CONTINUOUS = 1, /* loop continuously through decay *
/
AF_INST_LOOP_SUSTAIN = 3, /* loop during sustain, then
continue */
};
enum
{
AF_INST_MIDI_BASENOTE = 301,
AF_INST_NUMCENTS_DETUNE = 302,
AF_INST_MIDI_LONOTE = 303,
AF_INST_MIDI_HINOTE = 304,
AF_INST_MIDI_LOVELOCITY = 305,
AF_INST_MIDI_HIVELOCITY = 306,
AF_INST_NUMDBS_GAIN = 307,
AF_INST_SUSLOOPID = 308, /* loop id for AIFF sustain
loop */
AF_INST_RELLOOPID = 309, /* loop id for AIFF release
loop */
AF_INST_SAMP_STARTFRAME = 310, /* start sample for this inst */
AF_INST_SAMP_ENDFRAME = 311, /* end sample for this inst */
AF_INST_SAMP_MODE = 312, /* looping mode for this ins
t */
AF_INST_TRACKID = 313,
AF_INST_NAME = 314, /* name of this inst
*/
AF_INST_SAMP_RATE = 315, /* sample rate of this inst'
s sample */
AF_INST_PRESETID = 316, /* ID of preset containing t
his inst */
AF_INST_PRESET_NAME = 317 /* name of preset containing
this inst */
};
/* basic operations on file handles and file setups */
AFfilesetup afNewFileSetup (void); AFfilesetup afNewFileSetup (void);
void afFreeFileSetup (AFfilesetup); void afFreeFileSetup (AFfilesetup);
AFfilehandle afOpenFile (const char *filename, const char *mode, AFfilehandle afOpenFile (const char *filename, const char *mode,
AFfilesetup setup); AFfilesetup setup);
int afCloseFile (AFfilehandle file); int afCloseFile (AFfilehandle file);
void afInitFileFormat (AFfilesetup, int format); void afInitFileFormat (AFfilesetup, int format);
int afGetFileFormat (AFfilehandle, int *version); int afGetFileFormat (AFfilehandle, int *version);
/* track */
void afInitTrackIDs (AFfilesetup, int *trackids, int trackCount);
int afGetTrackIDs (AFfilehandle, int *trackids);
/* track data: reading, writng, seeking, sizing frames */
int afReadFrames (AFfilehandle, int track, void *buffer, int frameCount); int afReadFrames (AFfilehandle, int track, void *buffer, int frameCount);
int afWriteFrames (AFfilehandle, int track, void *buffer, int frameCount); int afWriteFrames (AFfilehandle, int track, void *buffer, int frameCount);
AFframecount afSeekFrame (AFfilehandle, int track, void *buffer, int frameC AFframecount afSeekFrame (AFfilehandle, int track, AFframecount frameoffset
ount); );
AFfileoffset afTellFrame (AFfilehandle, int track, void *buffer, int frameC AFfileoffset afTellFrame (AFfilehandle, int track);
ount);
AFfileoffset afGetTrackBytes (AFfilehandle, int track); AFfileoffset afGetTrackBytes (AFfilehandle, int track);
float afGetFrameSize (AFfilehandle, int track, int expand3to4); float afGetFrameSize (AFfilehandle, int track, int expand3to4);
#if 0
AFframecount afGetFrameCount (AFfilehandle file, int track); float afGetVirtualFrameSize (AFfilehandle, int track, int expand3to4);
#endif
/* track data: byte order */ /* track data: byte order */
void afInitByteOrder (AFfilesetup, int track, int byteOrder); void afInitByteOrder (AFfilesetup, int track, int byteOrder);
int afGetByteOrder (AFfilehandle, int track); int afGetByteOrder (AFfilehandle, int track);
int afSetVirtualByteOrder (AFfilehandle, int track, int byteOrder); int afSetVirtualByteOrder (AFfilehandle, int track, int byteOrder);
int afGetVirtualByteOrder (AFfilehandle, int track); int afGetVirtualByteOrder (AFfilehandle, int track);
/* track data: number of channels */ /* track data: number of channels */
void afInitChannels (AFfilesetup, int track, int nchannels); void afInitChannels (AFfilesetup, int track, int nchannels);
int afGetChannels (AFfilehandle, int track); int afGetChannels (AFfilehandle, int track);
skipping to change at line 156 skipping to change at line 178
/* track data: sample format and sample width */ /* track data: sample format and sample width */
void afGetSampleFormat (AFfilehandle file, int track, int *sampfmt, void afGetSampleFormat (AFfilehandle file, int track, int *sampfmt,
int *sampwidth); int *sampwidth);
void afGetVirtualSampleFormat (AFfilehandle file, int track, int *sampfmt, void afGetVirtualSampleFormat (AFfilehandle file, int track, int *sampfmt,
int *sampwidth); int *sampwidth);
/* track data: sampling rate */ /* track data: sampling rate */
void afInitRate (AFfilesetup, int track, double rate); void afInitRate (AFfilesetup, int track, double rate);
double afGetRate (AFfilehandle, int track); double afGetRate (AFfilehandle, int track);
/* track data: count of frames in file */
AFframecount afGetFrameCount (AFfilehandle file, int track);
/* loop operations */ /* loop operations */
void afInitLoopIDs (AFfilesetup, int instid, int ids[], int nids); void afInitLoopIDs (AFfilesetup, int instid, int ids[], int nids);
int afGetLoopIDs (AFfilehandle, int instid, int loopids[]); int afGetLoopIDs (AFfilehandle, int instid, int loopids[]);
void afSetLoopMode (AFfilehandle, int instid, int loop, int mode); void afSetLoopMode (AFfilehandle, int instid, int loop, int mode);
int afGetLoopMode (AFfilehandle, int instid, int loopid); int afGetLoopMode (AFfilehandle, int instid, int loopid);
void afSetLoopCount (AFfilehandle, int instid, int loop, int count); int afSetLoopCount (AFfilehandle, int instid, int loop, int count);
int afGetLoopCount (AFfilehandle, int instid, int loopid); int afGetLoopCount (AFfilehandle, int instid, int loopid);
void afSetLoopStart (AFfilehandle, int instid, int loopid, int markerid); void afSetLoopStart (AFfilehandle, int instid, int loopid, int markerid);
int afGetLoopStart (AFfilehandle, int instid, int loopid); int afGetLoopStart (AFfilehandle, int instid, int loopid);
void afSetLoopEnd (AFfilehandle, int instid, int loopid, int markerid); void afSetLoopEnd (AFfilehandle, int instid, int loopid, int markerid);
int afGetLoopEnd (AFfilehandle, int instid, int loopid); int afGetLoopEnd (AFfilehandle, int instid, int loopid);
void afSetLoopTrack (AFfilehandle, int instid, int loopid, int trackid); void afSetLoopTrack (AFfilehandle, int instid, int loopid, int trackid);
int afGetLoopTrack (AFfilehandle, int instid, int loopid); int afGetLoopTrack (AFfilehandle, int instid, int loopid);
int afSetLoopStartFrame (AFfilehandle, int instid, int loop, int afSetLoopStartFrame (AFfilehandle, int instid, int loop,
AFframecount startFrame); AFframecount startFrame);
 End of changes. 9 change blocks. 
20 lines changed or deleted 53 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/