Changed name to avoid conflict with MacOS Classic headers
authorSam Lantinga <slouken@libsdl.org>
Sun, 14 May 2006 04:36:31 +0000
changeset 3191aa81b70e07b
parent 318 97fd4f55a72b
child 320 3ea536c90a50
Changed name to avoid conflict with MacOS Classic headers
timidity/common.c
timidity/controls.c
timidity/controls.h
timidity/ctrlmode.c
timidity/ctrlmode.h
timidity/filter.c
timidity/instrum.c
timidity/mix.c
timidity/playmidi.c
timidity/readmidi.c
timidity/resample.c
timidity/sdl_c.c
timidity/timidity.c
     1.1 --- a/timidity/common.c	Sat May 13 04:51:04 2006 +0000
     1.2 +++ b/timidity/common.c	Sun May 14 04:36:31 2006 +0000
     1.3 @@ -29,7 +29,7 @@
     1.4  #include "config.h"
     1.5  #include "common.h"
     1.6  #include "output.h"
     1.7 -#include "controls.h"
     1.8 +#include "ctrlmode.h"
     1.9  
    1.10  /* I guess "rb" should be right for any libc */
    1.11  #define OPEN_MODE "rb"
     2.1 --- a/timidity/controls.c	Sat May 13 04:51:04 2006 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,41 +0,0 @@
     2.4 -/* 
     2.5 -
     2.6 -    TiMidity -- Experimental MIDI to WAVE converter
     2.7 -    Copyright (C) 1995 Tuukka Toivonen <toivonen@clinet.fi>
     2.8 -
     2.9 -    This program is free software; you can redistribute it and/or modify
    2.10 -    it under the terms of the GNU General Public License as published by
    2.11 -    the Free Software Foundation; either version 2 of the License, or
    2.12 -    (at your option) any later version.
    2.13 -
    2.14 -    This program is distributed in the hope that it will be useful,
    2.15 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
    2.16 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    2.17 -    GNU General Public License for more details.
    2.18 -
    2.19 -    You should have received a copy of the GNU General Public License
    2.20 -    along with this program; if not, write to the Free Software
    2.21 -    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    2.22 -
    2.23 -   controls.c
    2.24 -   
    2.25 -   */
    2.26 -
    2.27 -#include "config.h"
    2.28 -#include "controls.h"
    2.29 -
    2.30 -#ifdef SDL
    2.31 -  extern ControlMode sdl_control_mode;
    2.32 -# ifndef DEFAULT_CONTROL_MODE
    2.33 -#  define DEFAULT_CONTROL_MODE &sdl_control_mode
    2.34 -# endif
    2.35 -#endif
    2.36 -
    2.37 -ControlMode *ctl_list[]={
    2.38 -#ifdef SDL
    2.39 -  &sdl_control_mode,
    2.40 -#endif
    2.41 -  0
    2.42 -};
    2.43 -
    2.44 -ControlMode *ctl=DEFAULT_CONTROL_MODE;
     3.1 --- a/timidity/controls.h	Sat May 13 04:51:04 2006 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,88 +0,0 @@
     3.4 -/*
     3.5 -
     3.6 -    TiMidity -- Experimental MIDI to WAVE converter
     3.7 -    Copyright (C) 1995 Tuukka Toivonen <toivonen@clinet.fi>
     3.8 -
     3.9 -    This program is free software; you can redistribute it and/or modify
    3.10 -    it under the terms of the GNU General Public License as published by
    3.11 -    the Free Software Foundation; either version 2 of the License, or
    3.12 -    (at your option) any later version.
    3.13 -
    3.14 -    This program is distributed in the hope that it will be useful,
    3.15 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
    3.16 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    3.17 -    GNU General Public License for more details.
    3.18 -
    3.19 -    You should have received a copy of the GNU General Public License
    3.20 -    along with this program; if not, write to the Free Software
    3.21 -    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    3.22 -
    3.23 -    controls.h
    3.24 -*/
    3.25 -
    3.26 -/* Return values for ControlMode.read */
    3.27 -
    3.28 -#define RC_ERROR -1
    3.29 -#define RC_NONE 0
    3.30 -#define RC_QUIT 1
    3.31 -#define RC_NEXT 2
    3.32 -#define RC_PREVIOUS 3 /* Restart this song at beginning, or the previous
    3.33 -			 song if we're less than a second into this one. */
    3.34 -#define RC_FORWARD 4
    3.35 -#define RC_BACK 5
    3.36 -#define RC_JUMP 6
    3.37 -#define RC_TOGGLE_PAUSE 7 /* Pause/continue */
    3.38 -#define RC_RESTART 8 /* Restart song at beginning */
    3.39 -
    3.40 -#define RC_PAUSE 9 /* Really pause playing */
    3.41 -#define RC_CONTINUE 10 /* Continue if paused */
    3.42 -#define RC_REALLY_PREVIOUS 11 /* Really go to the previous song */
    3.43 -#define RC_CHANGE_VOLUME 12
    3.44 -#define RC_LOAD_FILE 13		/* Load a new midifile */
    3.45 -#define RC_TUNE_END 14		/* The tune is over, play it again sam? */
    3.46 -
    3.47 -#define CMSG_INFO	0
    3.48 -#define CMSG_WARNING	1
    3.49 -#define CMSG_ERROR	2
    3.50 -#define CMSG_FATAL	3
    3.51 -#define CMSG_TRACE	4
    3.52 -#define CMSG_TIME	5
    3.53 -#define CMSG_TOTAL	6
    3.54 -#define CMSG_FILE	7
    3.55 -#define CMSG_TEXT	8
    3.56 -
    3.57 -#define VERB_NORMAL	0
    3.58 -#define VERB_VERBOSE	1
    3.59 -#define VERB_NOISY	2
    3.60 -#define VERB_DEBUG	3
    3.61 -#define VERB_DEBUG_SILLY	4
    3.62 -
    3.63 -typedef struct {
    3.64 -  char *id_name, id_character;
    3.65 -  int verbosity, trace_playing, opened;
    3.66 -
    3.67 -  int (*open)(int using_stdin, int using_stdout);
    3.68 -  void (*pass_playing_list)(int number_of_files, char *list_of_files[]);
    3.69 -  void (*close)(void);
    3.70 -  int (*read)(int32 *valp);
    3.71 -  int (*cmsg)(int type, int verbosity_level, char *fmt, ...);
    3.72 -
    3.73 -  void (*refresh)(void);
    3.74 -  void (*reset)(void);
    3.75 -  void (*file_name)(char *name);
    3.76 -  void (*total_time)(int tt);
    3.77 -  void (*current_time)(int ct);
    3.78 -
    3.79 -  void (*note)(int v);
    3.80 -  void (*master_volume)(int mv);
    3.81 -  void (*program)(int channel, int val); /* val<0 means drum set -val */
    3.82 -  void (*volume)(int channel, int val);
    3.83 -  void (*expression)(int channel, int val);
    3.84 -  void (*panning)(int channel, int val);
    3.85 -  void (*sustain)(int channel, int val);
    3.86 -  void (*pitch_bend)(int channel, int val);
    3.87 -  
    3.88 -} ControlMode;
    3.89 -
    3.90 -extern ControlMode *ctl_list[], *ctl; 
    3.91 -extern char timidity_error[];
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/timidity/ctrlmode.c	Sun May 14 04:36:31 2006 +0000
     4.3 @@ -0,0 +1,41 @@
     4.4 +/* 
     4.5 +
     4.6 +    TiMidity -- Experimental MIDI to WAVE converter
     4.7 +    Copyright (C) 1995 Tuukka Toivonen <toivonen@clinet.fi>
     4.8 +
     4.9 +    This program is free software; you can redistribute it and/or modify
    4.10 +    it under the terms of the GNU General Public License as published by
    4.11 +    the Free Software Foundation; either version 2 of the License, or
    4.12 +    (at your option) any later version.
    4.13 +
    4.14 +    This program is distributed in the hope that it will be useful,
    4.15 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
    4.16 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    4.17 +    GNU General Public License for more details.
    4.18 +
    4.19 +    You should have received a copy of the GNU General Public License
    4.20 +    along with this program; if not, write to the Free Software
    4.21 +    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    4.22 +
    4.23 +   ctrlmode.c
    4.24 +   
    4.25 +   */
    4.26 +
    4.27 +#include "config.h"
    4.28 +#include "ctrlmode.h"
    4.29 +
    4.30 +#ifdef SDL
    4.31 +  extern ControlMode sdl_control_mode;
    4.32 +# ifndef DEFAULT_CONTROL_MODE
    4.33 +#  define DEFAULT_CONTROL_MODE &sdl_control_mode
    4.34 +# endif
    4.35 +#endif
    4.36 +
    4.37 +ControlMode *ctl_list[]={
    4.38 +#ifdef SDL
    4.39 +  &sdl_control_mode,
    4.40 +#endif
    4.41 +  0
    4.42 +};
    4.43 +
    4.44 +ControlMode *ctl=DEFAULT_CONTROL_MODE;
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/timidity/ctrlmode.h	Sun May 14 04:36:31 2006 +0000
     5.3 @@ -0,0 +1,88 @@
     5.4 +/*
     5.5 +
     5.6 +    TiMidity -- Experimental MIDI to WAVE converter
     5.7 +    Copyright (C) 1995 Tuukka Toivonen <toivonen@clinet.fi>
     5.8 +
     5.9 +    This program is free software; you can redistribute it and/or modify
    5.10 +    it under the terms of the GNU General Public License as published by
    5.11 +    the Free Software Foundation; either version 2 of the License, or
    5.12 +    (at your option) any later version.
    5.13 +
    5.14 +    This program is distributed in the hope that it will be useful,
    5.15 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
    5.16 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    5.17 +    GNU General Public License for more details.
    5.18 +
    5.19 +    You should have received a copy of the GNU General Public License
    5.20 +    along with this program; if not, write to the Free Software
    5.21 +    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    5.22 +
    5.23 +    controls.h
    5.24 +*/
    5.25 +
    5.26 +/* Return values for ControlMode.read */
    5.27 +
    5.28 +#define RC_ERROR -1
    5.29 +#define RC_NONE 0
    5.30 +#define RC_QUIT 1
    5.31 +#define RC_NEXT 2
    5.32 +#define RC_PREVIOUS 3 /* Restart this song at beginning, or the previous
    5.33 +			 song if we're less than a second into this one. */
    5.34 +#define RC_FORWARD 4
    5.35 +#define RC_BACK 5
    5.36 +#define RC_JUMP 6
    5.37 +#define RC_TOGGLE_PAUSE 7 /* Pause/continue */
    5.38 +#define RC_RESTART 8 /* Restart song at beginning */
    5.39 +
    5.40 +#define RC_PAUSE 9 /* Really pause playing */
    5.41 +#define RC_CONTINUE 10 /* Continue if paused */
    5.42 +#define RC_REALLY_PREVIOUS 11 /* Really go to the previous song */
    5.43 +#define RC_CHANGE_VOLUME 12
    5.44 +#define RC_LOAD_FILE 13		/* Load a new midifile */
    5.45 +#define RC_TUNE_END 14		/* The tune is over, play it again sam? */
    5.46 +
    5.47 +#define CMSG_INFO	0
    5.48 +#define CMSG_WARNING	1
    5.49 +#define CMSG_ERROR	2
    5.50 +#define CMSG_FATAL	3
    5.51 +#define CMSG_TRACE	4
    5.52 +#define CMSG_TIME	5
    5.53 +#define CMSG_TOTAL	6
    5.54 +#define CMSG_FILE	7
    5.55 +#define CMSG_TEXT	8
    5.56 +
    5.57 +#define VERB_NORMAL	0
    5.58 +#define VERB_VERBOSE	1
    5.59 +#define VERB_NOISY	2
    5.60 +#define VERB_DEBUG	3
    5.61 +#define VERB_DEBUG_SILLY	4
    5.62 +
    5.63 +typedef struct {
    5.64 +  char *id_name, id_character;
    5.65 +  int verbosity, trace_playing, opened;
    5.66 +
    5.67 +  int (*open)(int using_stdin, int using_stdout);
    5.68 +  void (*pass_playing_list)(int number_of_files, char *list_of_files[]);
    5.69 +  void (*close)(void);
    5.70 +  int (*read)(int32 *valp);
    5.71 +  int (*cmsg)(int type, int verbosity_level, char *fmt, ...);
    5.72 +
    5.73 +  void (*refresh)(void);
    5.74 +  void (*reset)(void);
    5.75 +  void (*file_name)(char *name);
    5.76 +  void (*total_time)(int tt);
    5.77 +  void (*current_time)(int ct);
    5.78 +
    5.79 +  void (*note)(int v);
    5.80 +  void (*master_volume)(int mv);
    5.81 +  void (*program)(int channel, int val); /* val<0 means drum set -val */
    5.82 +  void (*volume)(int channel, int val);
    5.83 +  void (*expression)(int channel, int val);
    5.84 +  void (*panning)(int channel, int val);
    5.85 +  void (*sustain)(int channel, int val);
    5.86 +  void (*pitch_bend)(int channel, int val);
    5.87 +  
    5.88 +} ControlMode;
    5.89 +
    5.90 +extern ControlMode *ctl_list[], *ctl; 
    5.91 +extern char timidity_error[];
     6.1 --- a/timidity/filter.c	Sat May 13 04:51:04 2006 +0000
     6.2 +++ b/timidity/filter.c	Sun May 14 04:36:31 2006 +0000
     6.3 @@ -35,7 +35,7 @@
     6.4  #include <stdlib.h>
     6.5  #include "config.h"
     6.6  #include "common.h"
     6.7 -#include "controls.h"
     6.8 +#include "ctrlmode.h"
     6.9  #include "instrum.h"
    6.10  #include "filter.h"
    6.11  
     7.1 --- a/timidity/instrum.c	Sat May 13 04:51:04 2006 +0000
     7.2 +++ b/timidity/instrum.c	Sun May 14 04:36:31 2006 +0000
     7.3 @@ -32,7 +32,7 @@
     7.4  #include "instrum.h"
     7.5  #include "playmidi.h"
     7.6  #include "output.h"
     7.7 -#include "controls.h"
     7.8 +#include "ctrlmode.h"
     7.9  #include "resample.h"
    7.10  #include "tables.h"
    7.11  #include "filter.h"
     8.1 --- a/timidity/mix.c	Sat May 13 04:51:04 2006 +0000
     8.2 +++ b/timidity/mix.c	Sun May 14 04:36:31 2006 +0000
     8.3 @@ -30,7 +30,7 @@
     8.4  #include "instrum.h"
     8.5  #include "playmidi.h"
     8.6  #include "output.h"
     8.7 -#include "controls.h"
     8.8 +#include "ctrlmode.h"
     8.9  #include "tables.h"
    8.10  #include "resample.h"
    8.11  #include "mix.h"
     9.1 --- a/timidity/playmidi.c	Sat May 13 04:51:04 2006 +0000
     9.2 +++ b/timidity/playmidi.c	Sun May 14 04:36:31 2006 +0000
     9.3 @@ -34,7 +34,7 @@
     9.4  #include "readmidi.h"
     9.5  #include "output.h"
     9.6  #include "mix.h"
     9.7 -#include "controls.h"
     9.8 +#include "ctrlmode.h"
     9.9  #include "timidity.h"
    9.10  
    9.11  #include "tables.h"
    10.1 --- a/timidity/readmidi.c	Sat May 13 04:51:04 2006 +0000
    10.2 +++ b/timidity/readmidi.c	Sun May 14 04:36:31 2006 +0000
    10.3 @@ -32,7 +32,7 @@
    10.4  #include "playmidi.h"
    10.5  #include "readmidi.h"
    10.6  #include "output.h"
    10.7 -#include "controls.h"
    10.8 +#include "ctrlmode.h"
    10.9  
   10.10  int32 quietchannels=0;
   10.11  
    11.1 --- a/timidity/resample.c	Sat May 13 04:51:04 2006 +0000
    11.2 +++ b/timidity/resample.c	Sun May 14 04:36:31 2006 +0000
    11.3 @@ -29,7 +29,7 @@
    11.4  #include "instrum.h"
    11.5  #include "playmidi.h"
    11.6  #include "output.h"
    11.7 -#include "controls.h"
    11.8 +#include "ctrlmode.h"
    11.9  #include "tables.h"
   11.10  #include "resample.h"
   11.11  
    12.1 --- a/timidity/sdl_c.c	Sat May 13 04:51:04 2006 +0000
    12.2 +++ b/timidity/sdl_c.c	Sun May 14 04:36:31 2006 +0000
    12.3 @@ -28,7 +28,7 @@
    12.4  #include "config.h"
    12.5  #include "common.h"
    12.6  #include "output.h"
    12.7 -#include "controls.h"
    12.8 +#include "ctrlmode.h"
    12.9  #include "instrum.h"
   12.10  #include "playmidi.h"
   12.11  
    13.1 --- a/timidity/timidity.c	Sat May 13 04:51:04 2006 +0000
    13.2 +++ b/timidity/timidity.c	Sun May 14 04:36:31 2006 +0000
    13.3 @@ -29,7 +29,7 @@
    13.4  #include "playmidi.h"
    13.5  #include "readmidi.h"
    13.6  #include "output.h"
    13.7 -#include "controls.h"
    13.8 +#include "ctrlmode.h"
    13.9  #include "timidity.h"
   13.10  
   13.11  #include "tables.h"