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.4 2000/03/05 18:11:34 rob Exp $ * $Id: audio.h,v 1.5 2000/03/06 15:20:43 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 67 skipping to change at line 67
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 *);
audio_ctlfunc_t audio_output(char const *); audio_ctlfunc_t audio_output(char const *);
int audio_oss(union audio_control *); int audio_oss(union audio_control *);
int audio_sun(union audio_control *); int audio_sun(union audio_control *);
int audio_wav(union audio_control *); int audio_wav(union audio_control *);
int audio_hex(union audio_control *);
int audio_null(union audio_control *); int audio_null(union audio_control *);
# endif # endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 libmad.h   libmad.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.10 2000/03/06 15:20:43 rob Exp
*/ */
# define MAD_VERSION "0.9.6 (beta)" # define MAD_VERSION "0.9.7 (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 274 skipping to change at line 274
* *
* 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: timer.h,v 1.4 2000/03/05 07:31:55 rob Exp * Id: timer.h,v 1.5 2000/03/07 07:59:25 rob Exp
*/ */
# ifndef TIMER_H # ifndef TIMER_H
# define TIMER_H # define TIMER_H
enum { enum {
timer_hours, timer_hours,
timer_minutes, timer_minutes,
timer_seconds timer_seconds
}; };
struct mad_timer { struct mad_timer {
unsigned long seconds; /* whole seconds */ unsigned long seconds; /* whole seconds */
unsigned int parts36750; /* 1/36750 seconds */ unsigned int parts36750; /* 1/36750 seconds */
}; };
void mad_timer_init(struct mad_timer *); void mad_timer_init(struct mad_timer *);
void mad_timer_add(struct mad_timer *, struct mad_timer const *); void mad_timer_add(struct mad_timer *, struct mad_timer const *);
void mad_timer_str(struct mad_timer const *, char *, char const *, int); void mad_timer_str(struct mad_timer const *, char *, char const *, int);
# define mad_timer_seconds(timer) ((timer)->seconds)
# define mad_timer_tenths(timer) ((timer)->parts36750 / 3675)
# endif # endif
/* /*
* mad - MPEG audio decoder * mad - MPEG audio decoder
* Copyright (C) 2000 Robert Leslie * Copyright (C) 2000 Robert Leslie
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
skipping to change at line 457 skipping to change at line 460
* *
* 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
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 short slot; /* current processing slot */ unsigned short slot; /* current processing slot */
unsigned short pcmlen; /* number of PCM samples */ unsigned short pcmlen; /* number of PCM samples */
 End of changes. 5 change blocks. 
4 lines changed or deleted 7 lines changed or added


 timer.h   timer.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: timer.h,v 1.4 2000/03/05 07:31:55 rob Exp $ * $Id: timer.h,v 1.5 2000/03/07 07:59:25 rob Exp $
*/ */
# ifndef TIMER_H # ifndef TIMER_H
# define TIMER_H # define TIMER_H
enum { enum {
timer_hours, timer_hours,
timer_minutes, timer_minutes,
timer_seconds timer_seconds
}; };
struct mad_timer { struct mad_timer {
unsigned long seconds; /* whole seconds */ unsigned long seconds; /* whole seconds */
unsigned int parts36750; /* 1/36750 seconds */ unsigned int parts36750; /* 1/36750 seconds */
}; };
void mad_timer_init(struct mad_timer *); void mad_timer_init(struct mad_timer *);
void mad_timer_add(struct mad_timer *, struct mad_timer const *); void mad_timer_add(struct mad_timer *, struct mad_timer const *);
void mad_timer_str(struct mad_timer const *, char *, char const *, int); void mad_timer_str(struct mad_timer const *, char *, char const *, int);
# define mad_timer_seconds(timer) ((timer)->seconds)
# define mad_timer_tenths(timer) ((timer)->parts36750 / 3675)
# endif # endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 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.9 2000/03/05 18:11:34 rob Exp $ * $Id: version.h,v 1.10 2000/03/06 15:20:43 rob Exp $
*/ */
# define MAD_VERSION "0.9.6 (beta)" # define MAD_VERSION "0.9.7 (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/