File timidity-fix_implicit_declarations.patch of Package timidity
Index: interface/xaw_i.c
===================================================================
--- interface/xaw_i.c.orig 2011-01-18 19:54:20.377062052 +0100
+++ interface/xaw_i.c 2011-01-19 12:07:41.114927988 +0100
@@ -195,36 +195,112 @@ typedef struct {
char *basename;
} DirPath;
+typedef struct {
+ Boolean confirmexit;
+ Boolean repeat;
+ Boolean autostart;
+ Boolean autoexit;
+ Boolean hidetext;
+ Boolean shuffle;
+ Boolean disptrace;
+ int amplitude;
+ int extendopt;
+ int chorusopt;
+} Config;
+
+
void a_print_text(Widget,char *);
-static void drawProg(int,int,int,int,Boolean),drawPan(int,int,Boolean),
- draw1Chan(int,int,char),drawVol(int,int),drawExp(int,int),drawPitch(int,int),
- drawInstname(int,char *),drawDrumPart(int,int),drawBank(int,int),
- drawReverb(int,int),drawChorus(int,int),drawVoices(void),drawTitle(char *),
- quitCB(),playCB(),pauseCB(),stopCB(),prevCB(),nextCB(),
- optionsCB(),optionspopupCB(),optionscloseCB(),chorusCB(),optionsdestroyCB(),
- flistpopupCB(),flistcloseCB(),
- forwardCB(),backCB(),repeatCB(),randomCB(),menuCB(),sndspecCB(),
- volsetCB(),volupdownCB(),tuneslideCB(),filemenuCB(),
- fselectCB(),fdeleteCB(),fdelallCB(),backspaceCB(),aboutCB(),aboutcloseCB(),
+
+static void drawProg(int,int,int,int,Boolean);
+static void drawPan(int,int,Boolean);
+static void draw1Chan(int,int,char);
+static void drawVol(int,int);
+static void drawExp(int,int);
+static void drawPitch(int,int);
+static void drawInstname(int,char *);
+static void drawDrumPart(int,int);
+static void drawBank(int,int);
+static void drawReverb(int,int);
+static void drawChorus(int,int);
+static void drawVoices(void);
+static void drawTitle(char *);
+static void quitCB(Widget, XtPointer, XtPointer);
+static void playCB(Widget, XtPointer, XtPointer);
+static void pauseCB(Widget w, XtPointer data, XtPointer dummy);
+static void stopCB(Widget w, XtPointer data, XtPointer dummy);
+static void prevCB(Widget w, XtPointer data, XtPointer dummy);
+static void nextCB(Widget w, XtPointer data, XtPointer dummy);
+static void optionsCB(Widget, XtPointer, XtPointer);
+static void optionspopupCB(Widget, XtPointer, XtPointer);
+static void optionscloseCB(Widget, XtPointer, XtPointer);
+static void chorusCB(Widget, XtPointer, XtPointer);
+static void optionsdestroyCB(Widget, XtPointer, XtPointer);
+static void flistpopupCB(Widget, XtPointer, XtPointer);
+static void flistcloseCB(Widget, XtPointer, XtPointer);
+static void forwardCB(Widget w, XtPointer data, XtPointer dummy);
+static void backCB(Widget w, XtPointer data, XtPointer dummy);
+static void repeatCB(Widget, XtPointer, XtPointer);
+static void randomCB(Widget w, XtPointer data, XtPointer dummy);
+static void menuCB(Widget w, XtPointer data, XtPointer dummy);
+static void sndspecCB(Widget, XtPointer, XtPointer);
+static void volsetCB(Widget w, XtPointer data, XtPointer dummy);
+static void volupdownCB(Widget, XtPointer, XtPointer);
+static void tuneslideCB(Widget, XtPointer, XtPointer);
+static void filemenuCB(Widget, XtPointer, XtPointer);
+static void fselectCB(Widget, XtPointer, XtPointer);
+static void fdeleteCB(Widget, XtPointer, XtPointer);
+static void fdelallCB(Widget, XtPointer, XtPointer);
+static void backspaceCB(Widget, XtPointer, XtPointer);
+static void aboutCB(Widget, XtPointer, XtPointer);
+static void aboutcloseCB(Widget, XtPointer, XtPointer);
#ifndef WIDGET_IS_LABEL_WIDGET
- deleteTextCB(),
+static void deleteTextCB(Widget, XtPointer, XtPointer);
#endif
- toggleMark(),popupLoad(),popdownLoad(),volupdownAction(),tuneslideAction(),
- tunesetAction(),a_readconfig(),a_saveconfig(),filemenuAction(),
- setDirAction(),setDirList(),
- drawBar(),redrawTrace(Boolean),completeDir(),ctl_channel_note(),
- drawKeyboardAll(),draw1Note(),redrawAction(),redrawCaption(),
- exchgWidth(),toggletrace(),
- checkRightAndPopupSubmenu(),popdownSubmenuCB(),popdownSubmenu(),leaveSubmenu(),
- addOneFile(int,int,char *,Boolean),
- flistMove(),closeParent(),createOptions(),createFlist();
-static char *expandDir(),*strmatch();
-static int configcmp();
-static void pauseAction(),soundkeyAction(),speedAction(),voiceAction();
-static Boolean IsTracePlaying(),IsEffectiveFile();
+static void toggleMark(Widget, int);
+static void popupLoad(Widget w,XtPointer client_data,XtPointer call_data);
+static void popdownLoad(Widget w,XtPointer s,XtPointer data);
+static void volupdownAction(Widget w,XEvent* e,String* v,Cardinal* n);
+static void tuneslideAction(Widget w,XEvent* e,String* v,Cardinal* n);
+static void tunesetAction(Widget w,XEvent* e,String* v,Cardinal* n);
+static void a_readconfig(Config *Cfg);
+static void a_saveconfig(char* file);
+static void filemenuAction(Widget w,XEvent* e,String* v,Cardinal* n);
+static void setDirAction(Widget w,XEvent* e,String* v,Cardinal* n);
+static void setDirList(Widget list,Widget label,XawListReturnStruct* lrs);
+static void drawBar(int ch,int len,int xofs,int column,Pixel color);
+static void redrawTrace(Boolean draw);
+static void completeDir(Widget w,XEvent* e,XtPointer data);
+static void ctl_channel_note(int ch,int note,int velocity);
+static void drawKeyboardAll(Display* disp,Drawable pix);
+static void draw1Note(int ch,int note,int flag);
+static void redrawAction(Widget w,XEvent* e,String* v,Cardinal* n);
+static void redrawCaption(Widget w,XEvent* e,String* v,Cardinal* n);
+static void exchgWidth(Widget w,XEvent* e,String* v,Cardinal* n);
+static void toggletrace(Widget w,XEvent* e,String* v,Cardinal* n);
+static void checkRightAndPopupSubmenu(Widget w,XEvent* e,String* v,Cardinal* n);
+static void popdownSubmenuCB(Widget, XtPointer, XtPointer);
+static void popdownSubmenu(Widget w,XEvent* e,String* v,Cardinal* n);
+static void leaveSubmenu(Widget w,XEvent* e,String* v,Cardinal* n);
+static void addOneFile(int,int,char *,Boolean);
+static void flistMove(Widget w,XEvent* e,String* v,Cardinal* n);
+static void closeParent(Widget w,XEvent* e,String* v,Cardinal* n);
+static void createFlist(void);
+static void createOptions(void);
+
+static char* expandDir(char* path,DirPath* full);
+static char* strmatch(char* s1,char* s2);
+static int configcmp(char* s,int* num);
+static void pauseAction(Widget w,XEvent* e,String* v,Cardinal* n);
+static void soundkeyAction(Widget w,XEvent* e,String* v,Cardinal* n);
+static void speedAction(Widget w,XEvent* e,String* v,Cardinal* n);
+static void voiceAction(Widget w,XEvent* e,String* v,Cardinal* n);
+static Boolean IsTracePlaying(void);
+static Boolean IsEffectiveFile(char* file);
+
extern void a_pipe_write(char *);
extern int a_pipe_read(char *,int);
extern int a_pipe_nread(char *buf, int n);
+
static void initStatus(void);
static void xaw_vendor_setup(void);
static void safe_getcwd(char *cwd, int maxlen);
@@ -268,19 +344,6 @@ static int maxentry_on_a_menu = 0,submen
#define ABOUT_WINDOW 4
static int popup_shell_exist = 0;
-typedef struct {
- Boolean confirmexit;
- Boolean repeat;
- Boolean autostart;
- Boolean autoexit;
- Boolean hidetext;
- Boolean shuffle;
- Boolean disptrace;
- int amplitude;
- int extendopt;
- int chorusopt;
-} Config;
-
#define FLAG_NOTE_OFF 1
#define FLAG_NOTE_ON 2
#define FLAG_BANK 1
@@ -787,7 +850,7 @@ static void repeatAction(Widget w,XEvent
}
/*ARGSUSED*/
-static void pauseCB() {
+static void pauseCB(Widget w,XtPointer data,XtPointer dummy) {
Boolean s;
XtVaGetValues(play_b,XtNstate,&s,NULL);
Index: libunimod/mloader.c
===================================================================
--- libunimod/mloader.c.orig 2004-02-17 17:02:18.000000000 +0100
+++ libunimod/mloader.c 2011-01-18 19:54:20.930077947 +0100
@@ -527,7 +527,7 @@ SL_RegisterSample (SAMPLE * s, URL reade
}
static void
-FreeSampleList ()
+FreeSampleList (void)
{
SAMPLOAD *old, *s = musiclist;
@@ -543,7 +543,7 @@ FreeSampleList ()
/* Returns the total amount of memory required by the musiclist queue. */
#ifdef MAX_SAMPLESPACE
static ULONG
-SampleTotal ()
+SampleTotal (void)
{
int total = 0;
SAMPLOAD *samplist = musiclist;
@@ -636,14 +636,14 @@ SL_LoadSamples (void)
s->sample->flags = (s->sample->flags & ~SF_FORMATMASK) | s->outfmt;
if (s->sample->data == NULL)
{
- FreeSampleList (musiclist);
+ FreeSampleList ();
return 1;
}
}
s = s->next;
}
- FreeSampleList (musiclist);
+ FreeSampleList ();
return 0;
}
Index: timidity/effect.c
===================================================================
--- timidity/effect.c.orig 2004-03-25 06:51:51.000000000 +0100
+++ timidity/effect.c 2011-01-18 19:54:21.205085850 +0100
@@ -34,6 +34,7 @@
#else
#include <strings.h>
#endif
+#include <stdlib.h>
#include "mt19937ar.h"
#define RAND_MAX 0xffffffff
Index: timidity/oss_a.c
===================================================================
--- timidity/oss_a.c.orig 2004-02-17 17:02:19.000000000 +0100
+++ timidity/oss_a.c 2011-01-18 19:54:21.249087116 +0100
@@ -31,6 +31,10 @@
#include <unistd.h>
#include <fcntl.h>
+#ifdef __linux
+#include <sys/ioctl.h>
+#endif
+
#ifndef NO_STRING_H
#include <string.h>
#else
@@ -40,7 +44,6 @@
#if defined(HAVE_SYS_SOUNDCARD_H)
#include <sys/soundcard.h>
#elif defined(linux)
-#include <sys/ioctl.h> /* new with 1.2.0? Didn't need this under 1.1.64 */
#include <linux/soundcard.h>
#elif defined(__FreeBSD__)
#include <machine/soundcard.h>
Index: timidity/sndfont.c
===================================================================
--- timidity/sndfont.c.orig 2004-09-07 16:27:26.000000000 +0200
+++ timidity/sndfont.c 2011-01-18 19:54:21.282088064 +0100
@@ -55,7 +55,7 @@
#include "output.h"
#include "filter.h"
#include "resample.h"
-
+#include "freq.h"
#define FILENAME_NORMALIZE(fname) url_expand_home_dir(fname)
#define FILENAME_REDUCED(fname) url_unexpand_home_dir(fname)
#define SFMalloc(rec, count) new_segment(&(rec)->pool, count)
Index: timidity/speex_a.c
===================================================================
--- timidity/speex_a.c.orig 2004-04-23 10:18:04.000000000 +0200
+++ timidity/speex_a.c 2011-01-19 12:07:55.397339576 +0100
@@ -26,6 +26,8 @@
#include "config.h"
#endif /* HAVE_CONFIG_H */
#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -33,8 +35,9 @@
#include <fcntl.h>
#endif
-#include <speex.h>
-#include <speex_header.h>
+#include <speex/speex.h>
+#include <speex/speex_header.h>
+#include <speex/speex_stereo.h>
#include <ogg/ogg.h>
#include "timidity.h"
@@ -45,6 +48,7 @@
#include "playmidi.h"
#include "readmidi.h"
#include "miditrace.h"
+#include "common.h"
static int open_output(void); /* 0=success, 1=warning, -1=fatal error */
static void close_output(void);
