audio.h   audio.h 
skipping to change at line 19 skipping to change at line 19
* *
* This program is distributed in the hope that it will be useful, * This program 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 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
* *
* $Id: audio.h,v 1.3 2000/03/05 07:31:54 rob Exp $ * $Id: audio.h,v 1.4 2000/03/05 18:11:34 rob Exp $
*/ */
# ifndef AUDIO_H # ifndef AUDIO_H
# define AUDIO_H # define AUDIO_H
# include "libmad.h" # include "libmad.h"
# define MAX_NSAMPLES 1152 # define MAX_NSAMPLES 1152
enum { enum {
skipping to change at line 44 skipping to change at line 44
}; };
union audio_control { union audio_control {
short command; short command;
struct audio_init { struct audio_init {
short command; short command;
char const *path; char const *path;
} init; } init;
struct audio_config { struct audio_config {
short command; short command;
short stereo; unsigned short channels;
unsigned int speed; unsigned int speed;
} config; } config;
struct audio_play { struct audio_play {
short command; short command;
unsigned int nsamples; unsigned short nsamples;
fixed_t const *samples[2]; fixed_t const *samples[2];
} play; } play;
struct audio_finish { struct audio_finish {
short command; short command;
} finish; } finish;
}; };
extern char const *audio_error; extern char const *audio_error;
typedef int (*audio_ctlfunc_t)(union audio_control *); typedef int (*audio_ctlfunc_t)(union audio_control *);
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 libmad.h   libmad.h 
skipping to change at line 22 skipping to change at line 22
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
* *
* Id: version.h,v 1.8 2000/03/05 07:31:55 rob Exp * Id: version.h,v 1.8 2000/03/05 07:31:55 rob Exp
*/ */
# define MAD_VERSION "0.9.5 (beta)" # define MAD_VERSION "0.9.6 (beta)"
# define MAD_PUBLISHYEAR "2000" # define MAD_PUBLISHYEAR "2000"
# define MAD_AUTHOR "Robert Leslie" # define MAD_AUTHOR "Robert Leslie"
# define MAD_EMAIL "rob@mars.org" # define MAD_EMAIL "rob@mars.org"
extern char const mad_version[]; extern char const mad_version[];
extern char const mad_copyright[]; extern char const mad_copyright[];
extern char const mad_author[]; extern char const mad_author[];
extern char const mad_license[]; extern char const mad_license[];
/* /*
skipping to change at line 465 skipping to change at line 465
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
* *
* Id: synth.h,v 1.2 2000/03/05 07:31:55 rob Exp * Id: synth.h,v 1.2 2000/03/05 07:31:55 rob Exp
*/ */
# ifndef SYNTH_H # ifndef SYNTH_H
# define SYNTH_H # define SYNTH_H
struct mad_synth { struct mad_synth {
fixed_t filterout[2][2][256]; /* polyphase filterbank outp uts */ fixed_t filterout[2][2][256]; /* polyphase filterbank outp uts */
unsigned int slot; /* current processing slot */ unsigned short slot; /* current processing slot */
unsigned short pcmlen; /* number of PCM samples */
fixed_t pcmout[2][1152]; /* PCM sample outputs */ fixed_t pcmout[2][1152]; /* PCM sample outputs */
unsigned int pcmlen; /* number of PCM samples */
}; };
void mad_synth_init(struct mad_synth *); void mad_synth_init(struct mad_synth *);
void mad_synthesis(struct mad_frame *, struct mad_synth *); void mad_synthesis(struct mad_frame *, struct mad_synth *);
# endif # endif
/* /*
* mad - MPEG audio decoder * mad - MPEG audio decoder
 End of changes. 4 change blocks. 
3 lines changed or deleted 3 lines changed or added


 synth.h   synth.h 
skipping to change at line 19 skipping to change at line 19
* *
* This program is distributed in the hope that it will be useful, * This program 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 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
* *
* $Id: synth.h,v 1.2 2000/03/05 07:31:55 rob Exp $ * $Id: synth.h,v 1.3 2000/03/05 18:11:34 rob Exp $
*/ */
# ifndef SYNTH_H # ifndef SYNTH_H
# define SYNTH_H # define SYNTH_H
# include "frame.h" # include "frame.h"
struct mad_synth { struct mad_synth {
fixed_t filterout[2][2][256]; /* polyphase filterbank outp uts */ fixed_t filterout[2][2][256]; /* polyphase filterbank outp uts */
unsigned int slot; /* current processing slot */ unsigned short slot; /* current processing slot */
unsigned short pcmlen; /* number of PCM samples */
fixed_t pcmout[2][1152]; /* PCM sample outputs */ fixed_t pcmout[2][1152]; /* PCM sample outputs */
unsigned int pcmlen; /* number of PCM samples */
}; };
void mad_synth_init(struct mad_synth *); void mad_synth_init(struct mad_synth *);
void mad_synthesis(struct mad_frame *, struct mad_synth *); void mad_synthesis(struct mad_frame *, struct mad_synth *);
# endif # endif
 End of changes. 4 change blocks. 
3 lines changed or deleted 3 lines changed or added


 version.h   version.h 
skipping to change at line 19 skipping to change at line 19
* *
* This program is distributed in the hope that it will be useful, * This program 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 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
* *
* $Id: version.h,v 1.8 2000/03/05 07:31:55 rob Exp $ * $Id: version.h,v 1.9 2000/03/05 18:11:34 rob Exp $
*/ */
# define MAD_VERSION "0.9.5 (beta)" # define MAD_VERSION "0.9.6 (beta)"
# define MAD_PUBLISHYEAR "2000" # define MAD_PUBLISHYEAR "2000"
# define MAD_AUTHOR "Robert Leslie" # define MAD_AUTHOR "Robert Leslie"
# define MAD_EMAIL "rob@mars.org" # define MAD_EMAIL "rob@mars.org"
extern char const mad_version[]; extern char const mad_version[];
extern char const mad_copyright[]; extern char const mad_copyright[];
extern char const mad_author[]; extern char const mad_author[];
extern char const mad_license[]; extern char const mad_license[];
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/