af_vfs.h   af_vfs.h 
skipping to change at line 28 skipping to change at line 28
Boston, MA 02111-1307 USA. Boston, MA 02111-1307 USA.
*/ */
/* /*
af_vfs.h af_vfs.h
Virtual file operations for the Audio File Library. Virtual file operations for the Audio File Library.
*/ */
#ifndef AUDIOFILE_VFS_H #ifndef AUDIOFILE_VFS_H
#define AUDIOFILE_VFS_H 1 #define AUDIOFILE_VFS_H
#include <audiofile.h> #include <audiofile.h>
#include <sys/types.h> #include <sys/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if (defined(__GNUC__) && __GNUC__ >= 4) || defined(__clang__)
#define AFAPI __attribute__((visibility("default")))
#else
#define AFAPI
#endif
struct _AFvirtualfile struct _AFvirtualfile
{ {
ssize_t (*read) (AFvirtualfile *vfile, void *data, size_t nbytes); ssize_t (*read) (AFvirtualfile *vfile, void *data, size_t nbytes);
AFfileoffset (*length) (AFvirtualfile *vfile); AFfileoffset (*length) (AFvirtualfile *vfile);
ssize_t (*write) (AFvirtualfile *vfile, const void *data, size_t nby tes); ssize_t (*write) (AFvirtualfile *vfile, const void *data, size_t nby tes);
void (*destroy) (AFvirtualfile *vfile); void (*destroy) (AFvirtualfile *vfile);
AFfileoffset (*seek) (AFvirtualfile *vfile, AFfileoffset offset, int is_relative); AFfileoffset (*seek) (AFvirtualfile *vfile, AFfileoffset offset, int is_relative);
AFfileoffset (*tell) (AFvirtualfile *vfile); AFfileoffset (*tell) (AFvirtualfile *vfile);
void *closure; void *closure;
}; };
AFvirtualfile *af_virtual_file_new (void); AFAPI AFvirtualfile *af_virtual_file_new (void);
void af_virtual_file_destroy (AFvirtualfile *vfile); AFAPI void af_virtual_file_destroy (AFvirtualfile *vfile);
#undef AFAPI
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 3 change blocks. 
3 lines changed or deleted 11 lines changed or added


 audiofile.h   audiofile.h 
/* /*
Audio File Library Audio File Library
Copyright (C) 1998-2000, 2010-2011, Michael Pruett <michael@68k.org> Copyright (C) 1998-2000, 2010-2012, Michael Pruett <michael@68k.org>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version. version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful, This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details. Library General Public License for more details.
skipping to change at line 36 skipping to change at line 36
#ifndef AUDIOFILE_H #ifndef AUDIOFILE_H
#define AUDIOFILE_H #define AUDIOFILE_H
#include <aupvlist.h> #include <aupvlist.h>
#include <stdint.h> #include <stdint.h>
#include <sys/types.h> #include <sys/types.h>
#define LIBAUDIOFILE_MAJOR_VERSION 0 #define LIBAUDIOFILE_MAJOR_VERSION 0
#define LIBAUDIOFILE_MINOR_VERSION 3 #define LIBAUDIOFILE_MINOR_VERSION 3
#define LIBAUDIOFILE_MICRO_VERSION 3 #define LIBAUDIOFILE_MICRO_VERSION 4
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if (defined(__GNUC__) && __GNUC__ >= 4) || defined(__clang__)
#define AFAPI __attribute__((visibility("default")))
#else
#define AFAPI
#endif
typedef struct _AFvirtualfile AFvirtualfile; typedef struct _AFvirtualfile AFvirtualfile;
typedef struct _AFfilesetup *AFfilesetup; typedef struct _AFfilesetup *AFfilesetup;
typedef struct _AFfilehandle *AFfilehandle; typedef struct _AFfilehandle *AFfilehandle;
typedef void (*AFerrfunc)(long, const char *); typedef void (*AFerrfunc)(long, const char *);
// Define AFframecount and AFfileoffset as 64-bit signed integers. // Define AFframecount and AFfileoffset as 64-bit signed integers.
#if defined(__FreeBSD__) || \ #if defined(__FreeBSD__) || \
defined(__DragonFly__) || \ defined(__DragonFly__) || \
defined(__NetBSD__) || \ defined(__NetBSD__) || \
skipping to change at line 107 skipping to change at line 113
AF_FILE_AIFF = 2, AF_FILE_AIFF = 2,
AF_FILE_NEXTSND = 3, AF_FILE_NEXTSND = 3,
AF_FILE_WAVE = 4, AF_FILE_WAVE = 4,
AF_FILE_BICSF = 5, AF_FILE_BICSF = 5,
AF_FILE_IRCAM = AF_FILE_BICSF, AF_FILE_IRCAM = AF_FILE_BICSF,
AF_FILE_MPEG1BITSTREAM = 6, /* not implemented */ AF_FILE_MPEG1BITSTREAM = 6, /* not implemented */
AF_FILE_SOUNDDESIGNER1 = 7, /* not implemented */ AF_FILE_SOUNDDESIGNER1 = 7, /* not implemented */
AF_FILE_SOUNDDESIGNER2 = 8, /* not implemented */ AF_FILE_SOUNDDESIGNER2 = 8, /* not implemented */
AF_FILE_AVR = 9, AF_FILE_AVR = 9,
AF_FILE_IFF_8SVX = 10, AF_FILE_IFF_8SVX = 10,
AF_FILE_SAMPLEVISION = 11, /* not implemented */ AF_FILE_SAMPLEVISION = 11,
AF_FILE_VOC = 12, AF_FILE_VOC = 12,
AF_FILE_NIST_SPHERE = 13, AF_FILE_NIST_SPHERE = 13,
AF_FILE_SOUNDFONT2 = 14, /* not implemented */ AF_FILE_SOUNDFONT2 = 14, /* not implemented */
AF_FILE_CAF = 15 AF_FILE_CAF = 15
}; };
enum enum
{ {
AF_LOOP_MODE_NOLOOP = 0, AF_LOOP_MODE_NOLOOP = 0,
AF_LOOP_MODE_FORW = 1, AF_LOOP_MODE_FORW = 1,
skipping to change at line 411 skipping to change at line 417
AF_ERR_BAD_AIFF_SSND = 68+AF_ERR_BASE, /* failed to parse SSND chun k */ AF_ERR_BAD_AIFF_SSND = 68+AF_ERR_BASE, /* failed to parse SSND chun k */
AF_ERR_BAD_AIFF_CHUNKID = 69+AF_ERR_BASE, /* unrecognized AIFF /AIFF-C chunk id */ AF_ERR_BAD_AIFF_CHUNKID = 69+AF_ERR_BASE, /* unrecognized AIFF /AIFF-C chunk id */
AF_ERR_BAD_AIFF_COMM = 70+AF_ERR_BASE, /* failed to parse COMM chun k */ AF_ERR_BAD_AIFF_COMM = 70+AF_ERR_BASE, /* failed to parse COMM chun k */
AF_ERR_BAD_AIFF_INST = 71+AF_ERR_BASE, /* failed to parse INST chun k */ AF_ERR_BAD_AIFF_INST = 71+AF_ERR_BASE, /* failed to parse INST chun k */
AF_ERR_BAD_AIFF_MARK = 72+AF_ERR_BASE, /* failed to parse MARK chun k */ AF_ERR_BAD_AIFF_MARK = 72+AF_ERR_BASE, /* failed to parse MARK chun k */
AF_ERR_BAD_AIFF_SKIP = 73+AF_ERR_BASE, /* failed to skip unsupporte d chunk */ AF_ERR_BAD_AIFF_SKIP = 73+AF_ERR_BASE, /* failed to skip unsupporte d chunk */
AF_ERR_BAD_AIFF_LOOPMODE = 74+AF_ERR_BASE /* unrecognized loop mode (forw, etc) */ AF_ERR_BAD_AIFF_LOOPMODE = 74+AF_ERR_BASE /* unrecognized loop mode (forw, etc) */
}; };
/* global routines */ /* global routines */
AFerrfunc afSetErrorHandler (AFerrfunc efunc); AFAPI AFerrfunc afSetErrorHandler (AFerrfunc efunc);
/* query routines */ /* query routines */
AUpvlist afQuery (int querytype, int arg1, int arg2, int arg3, int arg4); AFAPI AUpvlist afQuery (int querytype, int arg1, int arg2, int arg3, int ar
long afQueryLong (int querytype, int arg1, int arg2, int arg3, int arg4); g4);
double afQueryDouble (int querytype, int arg1, int arg2, int arg3, int arg4 AFAPI long afQueryLong (int querytype, int arg1, int arg2, int arg3, int ar
); g4);
void *afQueryPointer (int querytype, int arg1, int arg2, int arg3, int arg4 AFAPI double afQueryDouble (int querytype, int arg1, int arg2, int arg3, in
); t arg4);
AFAPI void *afQueryPointer (int querytype, int arg1, int arg2, int arg3, in
t arg4);
/* basic operations on file handles and file setups */ /* basic operations on file handles and file setups */
AFfilesetup afNewFileSetup (void); AFAPI AFfilesetup afNewFileSetup (void);
void afFreeFileSetup (AFfilesetup); AFAPI void afFreeFileSetup (AFfilesetup);
int afIdentifyFD (int); AFAPI int afIdentifyFD (int);
int afIdentifyNamedFD (int, const char *filename, int *implemented); AFAPI int afIdentifyNamedFD (int, const char *filename, int *implemented);
AFfilehandle afOpenFile (const char *filename, const char *mode, AFAPI AFfilehandle afOpenFile (const char *filename, const char *mode,
AFfilesetup setup); AFfilesetup setup);
AFfilehandle afOpenVirtualFile (AFvirtualfile *vfile, const char *mode, AFAPI AFfilehandle afOpenVirtualFile (AFvirtualfile *vfile, const char *mod e,
AFfilesetup setup); AFfilesetup setup);
AFfilehandle afOpenFD (int fd, const char *mode, AFfilesetup setup); AFAPI AFfilehandle afOpenFD (int fd, const char *mode, AFfilesetup setup);
AFfilehandle afOpenNamedFD (int fd, const char *mode, AFfilesetup setup, AFAPI AFfilehandle afOpenNamedFD (int fd, const char *mode, AFfilesetup set
up,
const char *filename); const char *filename);
void afSaveFilePosition (AFfilehandle file); AFAPI void afSaveFilePosition (AFfilehandle file);
void afRestoreFilePosition (AFfilehandle file); AFAPI void afRestoreFilePosition (AFfilehandle file);
int afSyncFile (AFfilehandle file); AFAPI int afSyncFile (AFfilehandle file);
int afCloseFile (AFfilehandle file); AFAPI int afCloseFile (AFfilehandle file);
void afInitFileFormat (AFfilesetup, int format); AFAPI void afInitFileFormat (AFfilesetup, int format);
int afGetFileFormat (AFfilehandle, int *version); AFAPI int afGetFileFormat (AFfilehandle, int *version);
/* track */ /* track */
void afInitTrackIDs (AFfilesetup, const int *trackids, int trackCount); AFAPI void afInitTrackIDs (AFfilesetup, const int *trackids, int trackCount
int afGetTrackIDs (AFfilehandle, int *trackids); );
AFAPI int afGetTrackIDs (AFfilehandle, int *trackids);
/* track data: reading, writng, seeking, sizing frames */ /* track data: reading, writng, seeking, sizing frames */
int afReadFrames (AFfilehandle, int track, void *buffer, int frameCount); AFAPI int afReadFrames (AFfilehandle, int track, void *buffer, int frameCou
int afWriteFrames (AFfilehandle, int track, const void *buffer, int frameCo nt);
unt); AFAPI int afWriteFrames (AFfilehandle, int track, const void *buffer, int f
AFframecount afSeekFrame (AFfilehandle, int track, AFframecount frameoffset rameCount);
); AFAPI AFframecount afSeekFrame (AFfilehandle, int track, AFframecount frame
AFframecount afTellFrame (AFfilehandle, int track); offset);
AFfileoffset afGetTrackBytes (AFfilehandle, int track); AFAPI AFframecount afTellFrame (AFfilehandle, int track);
float afGetFrameSize (AFfilehandle, int track, int expand3to4); AFAPI AFfileoffset afGetTrackBytes (AFfilehandle, int track);
float afGetVirtualFrameSize (AFfilehandle, int track, int expand3to4); AFAPI float afGetFrameSize (AFfilehandle, int track, int expand3to4);
AFAPI float afGetVirtualFrameSize (AFfilehandle, int track, int expand3to4)
;
/* track data: AES data */ /* track data: AES data */
/* afInitAESChannelData is obsolete -- use afInitAESChannelDataTo() */ /* afInitAESChannelData is obsolete -- use afInitAESChannelDataTo() */
void afInitAESChannelData (AFfilesetup, int track); /* obsolete */ AFAPI void afInitAESChannelData (AFfilesetup, int track); /* obsolete */
void afInitAESChannelDataTo (AFfilesetup, int track, int willBeData); AFAPI void afInitAESChannelDataTo (AFfilesetup, int track, int willBeData);
int afGetAESChannelData (AFfilehandle, int track, unsigned char buf[24]); AFAPI int afGetAESChannelData (AFfilehandle, int track, unsigned char buf[2
void afSetAESChannelData (AFfilehandle, int track, unsigned char buf[24]); 4]);
AFAPI void afSetAESChannelData (AFfilehandle, int track, unsigned char buf[
24]);
/* track data: byte order */ /* track data: byte order */
void afInitByteOrder (AFfilesetup, int track, int byteOrder); AFAPI void afInitByteOrder (AFfilesetup, int track, int byteOrder);
int afGetByteOrder (AFfilehandle, int track); AFAPI int afGetByteOrder (AFfilehandle, int track);
int afSetVirtualByteOrder (AFfilehandle, int track, int byteOrder); AFAPI int afSetVirtualByteOrder (AFfilehandle, int track, int byteOrder);
int afGetVirtualByteOrder (AFfilehandle, int track); AFAPI int afGetVirtualByteOrder (AFfilehandle, int track);
/* track data: number of channels */ /* track data: number of channels */
void afInitChannels (AFfilesetup, int track, int nchannels); AFAPI void afInitChannels (AFfilesetup, int track, int nchannels);
int afGetChannels (AFfilehandle, int track); AFAPI int afGetChannels (AFfilehandle, int track);
int afSetVirtualChannels (AFfilehandle, int track, int channelCount); AFAPI int afSetVirtualChannels (AFfilehandle, int track, int channelCount);
int afGetVirtualChannels (AFfilehandle, int track); AFAPI int afGetVirtualChannels (AFfilehandle, int track);
void afSetChannelMatrix (AFfilehandle, int track, double *matrix); AFAPI void afSetChannelMatrix (AFfilehandle, int track, double *matrix);
/* track data: sample format and sample width */ /* track data: sample format and sample width */
void afInitSampleFormat (AFfilesetup, int track, int sampleFormat, AFAPI void afInitSampleFormat (AFfilesetup, int track, int sampleFormat,
int sampleWidth); int sampleWidth);
void afGetSampleFormat (AFfilehandle file, int track, int *sampleFormat, AFAPI void afGetSampleFormat (AFfilehandle file, int track, int *sampleForm at,
int *sampleWidth); int *sampleWidth);
int afSetVirtualSampleFormat (AFfilehandle, int track, AFAPI int afSetVirtualSampleFormat (AFfilehandle, int track,
int sampleFormat, int sampleWidth); int sampleFormat, int sampleWidth);
void afGetVirtualSampleFormat (AFfilehandle, int track, AFAPI void afGetVirtualSampleFormat (AFfilehandle, int track,
int *sampleFormat, int *sampleWidth); int *sampleFormat, int *sampleWidth);
/* track data: sampling rate */ /* track data: sampling rate */
void afInitRate (AFfilesetup, int track, double rate); AFAPI void afInitRate (AFfilesetup, int track, double rate);
double afGetRate (AFfilehandle, int track); AFAPI double afGetRate (AFfilehandle, int track);
#if 0 #if 0
int afSetVirtualRate (AFfilehandle, int track, double rate); int afSetVirtualRate (AFfilehandle, int track, double rate);
double afGetVirtualRate (AFfilehandle, int track); double afGetVirtualRate (AFfilehandle, int track);
#endif #endif
/* track data: compression */ /* track data: compression */
void afInitCompression (AFfilesetup, int track, int compression); AFAPI void afInitCompression (AFfilesetup, int track, int compression);
#if 0 #if 0
void afInitCompressionParams (AFfilesetup, int track, int compression void afInitCompressionParams (AFfilesetup, int track, int compression
AUpvlist params, int parameterCount); AUpvlist params, int parameterCount);
#endif #endif
int afGetCompression (AFfilehandle, int track); AFAPI int afGetCompression (AFfilehandle, int track);
#if 0 #if 0
void afGetCompressionParams (AFfilehandle, int track, int *compression, void afGetCompressionParams (AFfilehandle, int track, int *compression,
AUpvlist params, int parameterCount); AUpvlist params, int parameterCount);
int afSetVirtualCompression (AFfilesetup, int track, int compression); int afSetVirtualCompression (AFfilesetup, int track, int compression);
void afSetVirtualCompressionParams (AFfilehandle, int track, int compressio n, void afSetVirtualCompressionParams (AFfilehandle, int track, int compressio n,
AUpvlist params, int parameterCount); AUpvlist params, int parameterCount);
int afGetVirtualCompression (AFfilesetup, int track, int compression); int afGetVirtualCompression (AFfilesetup, int track, int compression);
void afGetVirtualCompressionParams (AFfilehandle, int track, int *compressi on, void afGetVirtualCompressionParams (AFfilehandle, int track, int *compressi on,
AUpvlist params, int parameterCount); AUpvlist params, int parameterCount);
#endif #endif
/* track data: pcm mapping */ /* track data: pcm mapping */
void afInitPCMMapping (AFfilesetup filesetup, int track, AFAPI void afInitPCMMapping (AFfilesetup filesetup, int track,
double slope, double intercept, double minClip, double maxClip); double slope, double intercept, double minClip, double maxClip);
void afGetPCMMapping (AFfilehandle file, int track, AFAPI void afGetPCMMapping (AFfilehandle file, int track,
double *slope, double *intercept, double *minClip, double *maxClip); double *slope, double *intercept, double *minClip, double *maxClip);
/* NOTE: afSetTrackPCMMapping() is special--it does not set the virtual */ /* NOTE: afSetTrackPCMMapping() is special--it does not set the virtual */
/* format; it changes what the AF thinks the track format is! Be careful. * / /* format; it changes what the AF thinks the track format is! Be careful. * /
int afSetTrackPCMMapping (AFfilehandle file, int track, AFAPI int afSetTrackPCMMapping (AFfilehandle file, int track,
double slope, double intercept, double minClip, double maxClip); double slope, double intercept, double minClip, double maxClip);
/* NOTE: afSetVirtualPCMMapping() is different from afSetTrackPCMMapping(): */ /* NOTE: afSetVirtualPCMMapping() is different from afSetTrackPCMMapping(): */
/* see comment for afSetTrackPCMMapping(). */ /* see comment for afSetTrackPCMMapping(). */
int afSetVirtualPCMMapping (AFfilehandle file, int track, AFAPI int afSetVirtualPCMMapping (AFfilehandle file, int track,
double slope, double intercept, double minClip, double maxClip); double slope, double intercept, double minClip, double maxClip);
void afGetVirtualPCMMapping (AFfilehandle file, int track, AFAPI void afGetVirtualPCMMapping (AFfilehandle file, int track,
double *slope, double *intercept, double *minClip, double *maxClip); double *slope, double *intercept, double *minClip, double *maxClip);
/* track data: data offset within the file */ /* track data: data offset within the file */
/* initialize for raw reading only */ /* initialize for raw reading only */
void afInitDataOffset(AFfilesetup, int track, AFfileoffset offset); AFAPI void afInitDataOffset(AFfilesetup, int track, AFfileoffset offset);
AFfileoffset afGetDataOffset (AFfilehandle, int track); AFAPI AFfileoffset afGetDataOffset (AFfilehandle, int track);
/* track data: count of frames in file */ /* track data: count of frames in file */
void afInitFrameCount (AFfilesetup, int track, AFframecount frameCount); AFAPI void afInitFrameCount (AFfilesetup, int track, AFframecount frameCoun
AFframecount afGetFrameCount (AFfilehandle file, int track); t);
AFAPI AFframecount afGetFrameCount (AFfilehandle file, int track);
/* loop operations */ /* loop operations */
void afInitLoopIDs (AFfilesetup, int instid, const int *ids, int nids); AFAPI void afInitLoopIDs (AFfilesetup, int instid, const int *ids, int nids
int afGetLoopIDs (AFfilehandle, int instid, int loopids[]); );
void afSetLoopMode (AFfilehandle, int instid, int loop, int mode); AFAPI int afGetLoopIDs (AFfilehandle, int instid, int loopids[]);
int afGetLoopMode (AFfilehandle, int instid, int loopid); AFAPI void afSetLoopMode (AFfilehandle, int instid, int loop, int mode);
int afSetLoopCount (AFfilehandle, int instid, int loop, int count); AFAPI int afGetLoopMode (AFfilehandle, int instid, int loopid);
int afGetLoopCount (AFfilehandle, int instid, int loopid); AFAPI int afSetLoopCount (AFfilehandle, int instid, int loop, int count);
void afSetLoopStart (AFfilehandle, int instid, int loopid, int markerid); AFAPI int afGetLoopCount (AFfilehandle, int instid, int loopid);
int afGetLoopStart (AFfilehandle, int instid, int loopid); AFAPI void afSetLoopStart (AFfilehandle, int instid, int loopid, int marker
void afSetLoopEnd (AFfilehandle, int instid, int loopid, int markerid); id);
int afGetLoopEnd (AFfilehandle, int instid, int loopid); AFAPI int afGetLoopStart (AFfilehandle, int instid, int loopid);
AFAPI void afSetLoopEnd (AFfilehandle, int instid, int loopid, int markerid
);
AFAPI int afGetLoopEnd (AFfilehandle, int instid, int loopid);
int afSetLoopStartFrame (AFfilehandle, int instid, int loop, AFAPI int afSetLoopStartFrame (AFfilehandle, int instid, int loop,
AFframecount startFrame); AFframecount startFrame);
AFframecount afGetLoopStartFrame (AFfilehandle, int instid, int loop); AFAPI AFframecount afGetLoopStartFrame (AFfilehandle, int instid, int loop)
int afSetLoopEndFrame (AFfilehandle, int instid, int loop, ;
AFAPI int afSetLoopEndFrame (AFfilehandle, int instid, int loop,
AFframecount startFrame); AFframecount startFrame);
AFframecount afGetLoopEndFrame (AFfilehandle, int instid, int loop); AFAPI AFframecount afGetLoopEndFrame (AFfilehandle, int instid, int loop);
void afSetLoopTrack (AFfilehandle, int instid, int loopid, int trackid); AFAPI void afSetLoopTrack (AFfilehandle, int instid, int loopid, int tracki
int afGetLoopTrack (AFfilehandle, int instid, int loopid); d);
AFAPI int afGetLoopTrack (AFfilehandle, int instid, int loopid);
/* marker operations */ /* marker operations */
void afInitMarkIDs (AFfilesetup, int trackid, const int *ids, int nids); AFAPI void afInitMarkIDs (AFfilesetup, int trackid, const int *ids, int nid
int afGetMarkIDs (AFfilehandle file, int trackid, int markids[]); s);
void afSetMarkPosition (AFfilehandle file, int trackid, int markid, AFAPI int afGetMarkIDs (AFfilehandle file, int trackid, int markids[]);
AFAPI void afSetMarkPosition (AFfilehandle file, int trackid, int markid,
AFframecount markpos); AFframecount markpos);
AFframecount afGetMarkPosition (AFfilehandle file, int trackid, int markid) AFAPI AFframecount afGetMarkPosition (AFfilehandle file, int trackid, int m
; arkid);
void afInitMarkName (AFfilesetup, int trackid, int marker, const char *name AFAPI void afInitMarkName (AFfilesetup, int trackid, int marker, const char
); *name);
void afInitMarkComment (AFfilesetup, int trackid, int marker, AFAPI void afInitMarkComment (AFfilesetup, int trackid, int marker,
const char *comment); const char *comment);
char *afGetMarkName (AFfilehandle file, int trackid, int markid); AFAPI char *afGetMarkName (AFfilehandle file, int trackid, int markid);
char *afGetMarkComment (AFfilehandle file, int trackid, int markid); AFAPI char *afGetMarkComment (AFfilehandle file, int trackid, int markid);
/* instrument operations */ /* instrument operations */
void afInitInstIDs (AFfilesetup, const int *ids, int nids); AFAPI void afInitInstIDs (AFfilesetup, const int *ids, int nids);
int afGetInstIDs (AFfilehandle file, int *instids); AFAPI int afGetInstIDs (AFfilehandle file, int *instids);
void afGetInstParams (AFfilehandle file, int instid, AUpvlist pvlist, AFAPI void afGetInstParams (AFfilehandle file, int instid, AUpvlist pvlist,
int nparams); int nparams);
void afSetInstParams (AFfilehandle file, int instid, AUpvlist pvlist, AFAPI void afSetInstParams (AFfilehandle file, int instid, AUpvlist pvlist,
int nparams); int nparams);
long afGetInstParamLong (AFfilehandle file, int instid, int param); AFAPI long afGetInstParamLong (AFfilehandle file, int instid, int param);
void afSetInstParamLong (AFfilehandle file, int instid, int param, long val AFAPI void afSetInstParamLong (AFfilehandle file, int instid, int param, lo
ue); ng value);
/* miscellaneous data operations */ /* miscellaneous data operations */
void afInitMiscIDs (AFfilesetup, const int *ids, int nids); AFAPI void afInitMiscIDs (AFfilesetup, const int *ids, int nids);
int afGetMiscIDs (AFfilehandle, int *ids); AFAPI int afGetMiscIDs (AFfilehandle, int *ids);
void afInitMiscType (AFfilesetup, int miscellaneousid, int type); AFAPI void afInitMiscType (AFfilesetup, int miscellaneousid, int type);
int afGetMiscType (AFfilehandle, int miscellaneousid); AFAPI int afGetMiscType (AFfilehandle, int miscellaneousid);
void afInitMiscSize (AFfilesetup, int miscellaneousid, int size); AFAPI void afInitMiscSize (AFfilesetup, int miscellaneousid, int size);
int afGetMiscSize (AFfilehandle, int miscellaneousid); AFAPI int afGetMiscSize (AFfilehandle, int miscellaneousid);
int afWriteMisc (AFfilehandle, int miscellaneousid, const void *buf, int by AFAPI int afWriteMisc (AFfilehandle, int miscellaneousid, const void *buf,
tes); int bytes);
int afReadMisc (AFfilehandle, int miscellaneousid, void *buf, int bytes); AFAPI int afReadMisc (AFfilehandle, int miscellaneousid, void *buf, int byt
int afSeekMisc (AFfilehandle, int miscellaneousid, int offset); es);
AFAPI int afSeekMisc (AFfilehandle, int miscellaneousid, int offset);
#undef AFAPI
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* AUDIOFILE_H */ #endif /* AUDIOFILE_H */
 End of changes. 43 change blocks. 
108 lines changed or deleted 132 lines changed or added


 aupvlist.h   aupvlist.h 
skipping to change at line 32 skipping to change at line 32
aupvlist.h aupvlist.h
This file contains the interface to the parameter value list data This file contains the interface to the parameter value list data
structures and routines. structures and routines.
*/ */
#ifndef AUPVLIST_H #ifndef AUPVLIST_H
#define AUPVLIST_H #define AUPVLIST_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C" {
{ #endif
#endif /* __cplusplus */
#if (defined(__GNUC__) && __GNUC__ >= 4) || defined(__clang__)
#define AFAPI __attribute__((visibility("default")))
#else
#define AFAPI
#endif
enum enum
{ {
AU_PVTYPE_LONG = 1, AU_PVTYPE_LONG = 1,
AU_PVTYPE_DOUBLE = 2, AU_PVTYPE_DOUBLE = 2,
AU_PVTYPE_PTR = 3 AU_PVTYPE_PTR = 3
}; };
typedef struct _AUpvlist *AUpvlist; typedef struct _AUpvlist *AUpvlist;
#define AU_NULL_PVLIST ((struct _AUpvlist *) 0) #define AU_NULL_PVLIST ((struct _AUpvlist *) 0)
AUpvlist AUpvnew (int maxItems); AFAPI AUpvlist AUpvnew (int maxItems);
int AUpvgetmaxitems (AUpvlist); AFAPI int AUpvgetmaxitems (AUpvlist);
int AUpvfree (AUpvlist); AFAPI int AUpvfree (AUpvlist);
int AUpvsetparam (AUpvlist, int item, int param); AFAPI int AUpvsetparam (AUpvlist, int item, int param);
int AUpvsetvaltype (AUpvlist, int item, int type); AFAPI int AUpvsetvaltype (AUpvlist, int item, int type);
int AUpvsetval (AUpvlist, int item, void *val); AFAPI int AUpvsetval (AUpvlist, int item, void *val);
int AUpvgetparam (AUpvlist, int item, int *param); AFAPI int AUpvgetparam (AUpvlist, int item, int *param);
int AUpvgetvaltype (AUpvlist, int item, int *type); AFAPI int AUpvgetvaltype (AUpvlist, int item, int *type);
int AUpvgetval (AUpvlist, int item, void *val); AFAPI int AUpvgetval (AUpvlist, int item, void *val);
#undef AFAPI
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif
#endif /* AUPVLIST_H */ #endif /* AUPVLIST_H */
 End of changes. 3 change blocks. 
13 lines changed or deleted 20 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/