From 7eae7bc5a714abcd08903ee2083080781a62d54f Mon Sep 17 00:00:00 2001 From: roy Date: Mon, 14 Oct 2013 13:33:31 +0000 Subject: Drop dependency on ncurses as system curses works fine. Regenrate patchset. --- audio/emixer/Makefile | 6 +- audio/emixer/distinfo | 12 +- audio/emixer/files/Makefile | 4 +- audio/emixer/patches/patch-aa | 16 -- audio/emixer/patches/patch-ab | 12 -- audio/emixer/patches/patch-ac | 184 ----------------- audio/emixer/patches/patch-ad | 390 ------------------------------------ audio/emixer/patches/patch-ae | 16 -- audio/emixer/patches/patch-main.c | 390 ++++++++++++++++++++++++++++++++++++ audio/emixer/patches/patch-mixer.c | 16 ++ audio/emixer/patches/patch-mixer.h | 16 ++ audio/emixer/patches/patch-nctgui.c | 184 +++++++++++++++++ audio/emixer/patches/patch-nctgui.h | 14 ++ 13 files changed, 631 insertions(+), 629 deletions(-) delete mode 100644 audio/emixer/patches/patch-aa delete mode 100644 audio/emixer/patches/patch-ab delete mode 100644 audio/emixer/patches/patch-ac delete mode 100644 audio/emixer/patches/patch-ad delete mode 100644 audio/emixer/patches/patch-ae create mode 100644 audio/emixer/patches/patch-main.c create mode 100644 audio/emixer/patches/patch-mixer.c create mode 100644 audio/emixer/patches/patch-mixer.h create mode 100644 audio/emixer/patches/patch-nctgui.c create mode 100644 audio/emixer/patches/patch-nctgui.h (limited to 'audio') diff --git a/audio/emixer/Makefile b/audio/emixer/Makefile index b168a47eaff..8e25dfd1600 100644 --- a/audio/emixer/Makefile +++ b/audio/emixer/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.31 2013/04/06 03:45:06 rodent Exp $ +# $NetBSD: Makefile,v 1.32 2013/10/14 13:33:31 roy Exp $ # DISTNAME= emixer-0.05.5 PKGNAME= emixer-0.5.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= audio MASTER_SITES= # http://emixer.linuxbox.com/ @@ -20,6 +20,6 @@ INSTALLATION_DIRS= bin share/doc post-extract: ${CP} ${FILESDIR}/Makefile ${WRKSRC} -.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/emixer/distinfo b/audio/emixer/distinfo index 7d7eb9dce35..093a3619dce 100644 --- a/audio/emixer/distinfo +++ b/audio/emixer/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 20:39:44 agc Exp $ +$NetBSD: distinfo,v 1.6 2013/10/14 13:33:31 roy Exp $ SHA1 (emixer-0.05.5.tar.gz) = acae7acf3cd11633d1f800047287d9f52e8e7d02 RMD160 (emixer-0.05.5.tar.gz) = f937ae68e32917e58983d9ccfec7039a8e8f1be3 Size (emixer-0.05.5.tar.gz) = 19609 bytes -SHA1 (patch-aa) = f6039822d61548ba93ec9db9b31380f14c36cdd8 -SHA1 (patch-ab) = a782737118c0ba6ae704a1839d93047a6f7e568e -SHA1 (patch-ac) = 453d5510e1a0c342b7a69fe3033c4677f9f77db5 -SHA1 (patch-ad) = 031e3f007b6c820c09f0673f592008a9c137bec7 -SHA1 (patch-ae) = 237b10820c528aa4fbcdef31331cd1b4d1098968 +SHA1 (patch-main.c) = c9afac560ffe1c91d558fcdf4e198dc1d260dc58 +SHA1 (patch-mixer.c) = 188b13e5b7210d875f3faa230ff1e1731146c8d9 +SHA1 (patch-mixer.h) = 765a989d6c036f68496e49345e258657caef48af +SHA1 (patch-nctgui.c) = 60d82c1b8a84e930068c8486a09edd36fbde2394 +SHA1 (patch-nctgui.h) = 4a87c54612a7c718617ceb85a31b4f61aee67338 diff --git a/audio/emixer/files/Makefile b/audio/emixer/files/Makefile index 307521b314c..e63cf129315 100644 --- a/audio/emixer/files/Makefile +++ b/audio/emixer/files/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2009/07/08 15:52:33 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2013/10/14 13:33:31 roy Exp $ all: emixer emixer: main.o - ${CC} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lncurses ${LIBOSSAUDIO} + ${CC} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lcurses ${LIBOSSAUDIO} install: ${BSD_INSTALL_PROGRAM} emixer ${DESTDIR}${PREFIX}/bin/emixer diff --git a/audio/emixer/patches/patch-aa b/audio/emixer/patches/patch-aa deleted file mode 100644 index 115d4fd20b7..00000000000 --- a/audio/emixer/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/12/13 02:48:41 hubertf Exp $ - ---- mixer.h.orig Mon Dec 13 02:18:43 1999 -+++ mixer.h Mon Dec 13 02:19:01 1999 -@@ -17,7 +17,11 @@ - #include - #include - #include -+#ifdef __NetBSD__ -+#include -+#else - #include -+#endif - #include - #include - #include diff --git a/audio/emixer/patches/patch-ab b/audio/emixer/patches/patch-ab deleted file mode 100644 index 1927222eba5..00000000000 --- a/audio/emixer/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2001/06/19 15:57:39 jlam Exp $ - ---- nctgui.h.orig Mon Dec 27 19:47:02 1999 -+++ nctgui.h -@@ -9,7 +9,6 @@ - - /* include files used by gui.c and main.c */ - #include --#include - #include - - /* defines used by gui.c and main.c */ diff --git a/audio/emixer/patches/patch-ac b/audio/emixer/patches/patch-ac deleted file mode 100644 index b0a2f5fc9df..00000000000 --- a/audio/emixer/patches/patch-ac +++ /dev/null @@ -1,184 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $ - ---- nctgui.c.orig Fri Jan 28 17:30:52 2000 -+++ nctgui.c -@@ -31,6 +31,10 @@ - { - (void) initscr(); - curs_set(0); -+ cbreak(); -+ noecho(); -+ timeout(2); -+ keypad(stdscr,TRUE); - }/* ncurses_init */ - - void ncurses_exit(void) -@@ -66,24 +70,23 @@ - int j; - int maxY,maxX; - -- wattrset(barWin,COLOR_PAIR(2)); wbkgdset(barWin,COLOR_PAIR(2)); -+ wbkgdset(barWin,COLOR_PAIR(2)); -+ wmove(barWin,0,0); wclrtoeol(barWin); - -- wmove(barWin,0,0); wclrtoeol(barWin); wrefresh(barWin); - for(j=0; j0) ? --hpos: num_menus-1; - display_bar(num_menus, menu_name); -@@ -270,7 +258,7 @@ - display_menu(menu_item,num_items); - break; - -- case SL_KEY_RIGHT: -+ case KEY_RIGHT: - vpos=0; - hpos=(hpos0) ? --vpos: num_items[hpos]-1; - display_menu(menu_item,num_items); - break; - -- case SL_KEY_DOWN: -+ case KEY_DOWN: - vpos=(vpos=(fader_bars/2))fader_pos=(fader_bars/2) ; - if(fader_pos == 0) -@@ -660,10 +646,10 @@ - display_fader(fader_pos); - break; - -- case SL_KEY_DOWN: -- case SL_KEY_UP: -- case SL_KEY_PPAGE: -- case SL_KEY_NPAGE: -+ case KEY_DOWN: -+ case KEY_UP: -+ case KEY_PPAGE: -+ case KEY_NPAGE: - adjust_display(extcode); - display_ch_window(active_channel); - display_listdata(); -@@ -671,9 +657,10 @@ - - case'r': /*redraws screen*/ - case'R': -+ clearok(stdscr,TRUE); - refresh_windows(); -- display_bar(num_menus, menu_name); -- break ; -+ display_bar(num_menus,menu_name); -+ break; - - default: - for(j=0; j= height-1)&&(current->fLink!=NULL)) - { - top=top->fLink; current=current->fLink; -@@ -800,7 +787,7 @@ - else if(current->fLink!=NULL) current=current->fLink; - break; - -- case SL_KEY_UP: -+ case KEY_UP: - if((top->bLink!=NULL)&&(top==current)) - { - top=top->bLink; current=current->bLink; -@@ -809,14 +796,14 @@ - if(current->bLink!=NULL) current=current->bLink ; - break; - -- case SL_KEY_NPAGE: /*pagedown*/ -+ case KEY_NPAGE: /*pagedown*/ - while((index < height-1)&&(current->fLink!=NULL)) - { - top=top->fLink; current=current->fLink; index++; - } - break; - -- case SL_KEY_PPAGE:/*pageup*/ -+ case KEY_PPAGE:/*pageup*/ - while((index < height-1)&(top->bLink!=NULL)) - { - top=top->bLink; current=current->bLink; index++; -@@ -884,11 +871,9 @@ - height1,width1; - node *top, *current, *temp; - -- - if (active_channel==CHANNEL_1) - { - top=ch1_Head; current=ch1_current; -- - } - else if(active_channel==CHANNEL_2) - { -@@ -904,46 +889,53 @@ - while(temp!=bHead){tracktotal++;temp=temp->fLink;} - - /* display current track number and total tracks */ -- /*wmove(chWin,height1-1,width1-15);*/ - mvwprintw(chWin,height1-1,width1-15,"[%5i][%5i]",tracknum,tracktotal); - -- touchwin(chWin); - wrefresh(chWin); - - getmaxyx(subWin,height,width); -- wbkgd(subWin,COLOR_PAIR(9)|A_BOLD); - - while (top!=NULL) - { -+ char *fnstart; - fpath=top->filePath; - playcount=top->playcount; - /*get songname from path, the songname is assumed to be - the characters after the last forward slash(/) */ -- songname=strstr(strrchr(fpath,'/'),"/")+1; -+ fnstart = strrchr(fpath,'/'); -+ if (fnstart == NULL) -+ songname=fpath; -+ else -+ songname=strstr(fnstart,"/")+1; - if(current==top) -+ { - if(active_channel==CHANNEL_1) - { -- wbkgdset(subWin,COLOR_PAIR(7)|A_BOLD); - wattrset(subWin,COLOR_PAIR(7)|A_BOLD); -+ wbkgdset(subWin,COLOR_PAIR(7)|A_BOLD); - } - else if(active_channel==CHANNEL_2) - { -- wbkgdset(subWin,COLOR_PAIR(8)|A_BOLD); - wattrset(subWin,COLOR_PAIR(8)|A_BOLD); -+ wbkgdset(subWin,COLOR_PAIR(8)|A_BOLD); - } -+ } -+ else -+ { -+ wattrset(subWin,COLOR_PAIR(9)); -+ wbkgdset(subWin,COLOR_PAIR(9)); -+ } - - tempname=strdup(songname); - /*shorten song so that it fits in channel/display window*/ - mvwaddstr(subWin,index,0,tempname); wclrtoeol(subWin); - mvwprintw(subWin,index,width-6,"*%5i",playcount); -- -- touchwin(subWin); -- wrefresh(subWin); - -- wbkgdset(subWin,COLOR_PAIR(9)|A_BOLD); -- index++; if(index==height)return; -+ index++; if(index==height)break; - top=top->fLink; - } -+ -+ wrefresh(subWin); - } /*display_listdata */ - - void menu_action(char *item_name) -@@ -967,21 +959,10 @@ - void exit_prog(void) - { - reset_audio(); -- sLang_exit(); -+ ncurses_exit(); - gui_exit(); - }/*exit_prog*/ - --int get_code(void) --{ -- int key; -- /*qiflush(); */ -- /*if(clickcount>=15){flushinp(); clickcount=0;}*/ -- if(SLang_input_pending(-10)) key= /*getch(); */ -- SLkp_getkey(); -- else key=0; -- /*clickcount++;*/ -- return(key); --} /* get_code */ - void refresh_windows(void) - { - erase();refresh(); diff --git a/audio/emixer/patches/patch-ae b/audio/emixer/patches/patch-ae deleted file mode 100644 index ef7f0ff0983..00000000000 --- a/audio/emixer/patches/patch-ae +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2000/04/16 03:59:54 mycroft Exp $ - ---- mixer.c.bak Fri Jan 28 11:29:40 2000 -+++ mixer.c Sat Apr 15 23:32:21 2000 -@@ -57,9 +57,9 @@ - int format; - int stereo = 1; - int rate = 44100; -- if ((audio_fd = open("/dev/dsp", O_WRONLY , 0)) == -1) -+ if ((audio_fd = open("/dev/sound", O_WRONLY , 0)) == -1) - { -- perror("/dev/dsp"); -+ perror("/dev/sound"); - return; - /*exit(1); */ - } diff --git a/audio/emixer/patches/patch-main.c b/audio/emixer/patches/patch-main.c new file mode 100644 index 00000000000..aa5551722c7 --- /dev/null +++ b/audio/emixer/patches/patch-main.c @@ -0,0 +1,390 @@ +$NetBSD: patch-main.c,v 1.1 2013/10/14 13:33:31 roy Exp $ + +--- main.c.orig 2000-01-26 00:11:56.000000000 +0000 ++++ main.c +@@ -115,8 +115,6 @@ void make_menus(int num_menus, char **me + + menus_active = FALSE; + /*initialize screen routines*/ +- sLang_init(); +- set_color_schemes(); + ncurses_init(); + set_ncurses_color_schemes(); + create_windows(); +@@ -125,19 +123,9 @@ void make_menus(int num_menus, char **me + change_channel(&ch1,mp3Path1); + change_channel(&ch2,mp3Path2); + +- + /*display windows*/ +- display_bar(num_menus, menu_name); +- display_ch_window(active_channel); +- display_track_path(active_channel,sim_play,ch1_current,ch2_current); +- display_track_status(); +- adjust_display(get_code()); +- display_listdata(); +- display_player_status(sim_play,playmode); +- display_volume(ch1_volume_pos,ch2_volume_pos,active_bar); +- display_speed(ch1_speed_pos,ch2_speed_pos,active_bar); +- display_fader(fader_pos); +- ++ refresh_windows(); ++ display_bar(num_menus,menu_name); + + while(TRUE) + { +@@ -149,9 +137,9 @@ void make_menus(int num_menus, char **me + if((ch1.end==1)||(ch2.end==1)) display_track_status(); + if(rcount==5) + { +- refresh_windows(); +- display_bar(num_menus, menu_name); +- rcount=0; ++ refresh_windows(); ++ display_bar(num_menus,menu_name); ++ rcount=0; + } + + if(playmode==1) /*loop play*/ +@@ -173,7 +161,7 @@ void make_menus(int num_menus, char **me + } + + } +- else if(playmode==2) /*continous play*/ ++ else if(playmode==2) /*continous play*/ + { + if((ch1.on==0)&&(ch1.end==1)) + { +@@ -215,7 +203,7 @@ void make_menus(int num_menus, char **me + } + + } +- else if(playmode==3) /*random play*/ ++ else if(playmode==3) /*random play*/ + { + if((ch1.on==0)&&(ch1.end==1)) + { +@@ -259,9 +247,9 @@ void make_menus(int num_menus, char **me + { + { + display_info(inactive_info); +- switch(get_code()) ++ switch(getch()) + { +- case SL_KEY_LEFT: ++ case KEY_LEFT: + vpos=0; + hpos=(hpos>0) ? --hpos: num_menus-1; + display_bar(num_menus, menu_name); +@@ -270,7 +258,7 @@ void make_menus(int num_menus, char **me + display_menu(menu_item,num_items); + break; + +- case SL_KEY_RIGHT: ++ case KEY_RIGHT: + vpos=0; + hpos=(hpos0) ? --vpos: num_items[hpos]-1; + display_menu(menu_item,num_items); + break; + +- case SL_KEY_DOWN: ++ case KEY_DOWN: + vpos=(vpos=(fader_bars/2))fader_pos=(fader_bars/2) ; + if(fader_pos == 0) +@@ -660,10 +646,10 @@ void make_menus(int num_menus, char **me + display_fader(fader_pos); + break; + +- case SL_KEY_DOWN: +- case SL_KEY_UP: +- case SL_KEY_PPAGE: +- case SL_KEY_NPAGE: ++ case KEY_DOWN: ++ case KEY_UP: ++ case KEY_PPAGE: ++ case KEY_NPAGE: + adjust_display(extcode); + display_ch_window(active_channel); + display_listdata(); +@@ -671,9 +657,10 @@ void make_menus(int num_menus, char **me + + case'r': /*redraws screen*/ + case'R': ++ clearok(stdscr,TRUE); + refresh_windows(); +- display_bar(num_menus, menu_name); +- break ; ++ display_bar(num_menus,menu_name); ++ break; + + default: + for(j=0; j= height-1)&&(current->fLink!=NULL)) + { + top=top->fLink; current=current->fLink; +@@ -800,7 +787,7 @@ void adjust_display(int key) + else if(current->fLink!=NULL) current=current->fLink; + break; + +- case SL_KEY_UP: ++ case KEY_UP: + if((top->bLink!=NULL)&&(top==current)) + { + top=top->bLink; current=current->bLink; +@@ -809,14 +796,14 @@ void adjust_display(int key) + if(current->bLink!=NULL) current=current->bLink ; + break; + +- case SL_KEY_NPAGE: /*pagedown*/ ++ case KEY_NPAGE: /*pagedown*/ + while((index < height-1)&&(current->fLink!=NULL)) + { + top=top->fLink; current=current->fLink; index++; + } + break; + +- case SL_KEY_PPAGE:/*pageup*/ ++ case KEY_PPAGE:/*pageup*/ + while((index < height-1)&(top->bLink!=NULL)) + { + top=top->bLink; current=current->bLink; index++; +@@ -884,11 +871,9 @@ void display_listdata(void) + height1,width1; + node *top, *current, *temp; + +- + if (active_channel==CHANNEL_1) + { + top=ch1_Head; current=ch1_current; +- + } + else if(active_channel==CHANNEL_2) + { +@@ -904,46 +889,53 @@ void display_listdata(void) + while(temp!=bHead){tracktotal++;temp=temp->fLink;} + + /* display current track number and total tracks */ +- /*wmove(chWin,height1-1,width1-15);*/ + mvwprintw(chWin,height1-1,width1-15,"[%5i][%5i]",tracknum,tracktotal); + +- touchwin(chWin); + wrefresh(chWin); + + getmaxyx(subWin,height,width); +- wbkgd(subWin,COLOR_PAIR(9)|A_BOLD); + + while (top!=NULL) + { ++ char *fnstart; + fpath=top->filePath; + playcount=top->playcount; + /*get songname from path, the songname is assumed to be + the characters after the last forward slash(/) */ +- songname=strstr(strrchr(fpath,'/'),"/")+1; ++ fnstart = strrchr(fpath,'/'); ++ if (fnstart == NULL) ++ songname=fpath; ++ else ++ songname=strstr(fnstart,"/")+1; + if(current==top) ++ { + if(active_channel==CHANNEL_1) + { +- wbkgdset(subWin,COLOR_PAIR(7)|A_BOLD); + wattrset(subWin,COLOR_PAIR(7)|A_BOLD); ++ wbkgdset(subWin,COLOR_PAIR(7)|A_BOLD); + } + else if(active_channel==CHANNEL_2) + { +- wbkgdset(subWin,COLOR_PAIR(8)|A_BOLD); + wattrset(subWin,COLOR_PAIR(8)|A_BOLD); ++ wbkgdset(subWin,COLOR_PAIR(8)|A_BOLD); + } ++ } ++ else ++ { ++ wattrset(subWin,COLOR_PAIR(9)); ++ wbkgdset(subWin,COLOR_PAIR(9)); ++ } + + tempname=strdup(songname); + /*shorten song so that it fits in channel/display window*/ + mvwaddstr(subWin,index,0,tempname); wclrtoeol(subWin); + mvwprintw(subWin,index,width-6,"*%5i",playcount); +- +- touchwin(subWin); +- wrefresh(subWin); + +- wbkgdset(subWin,COLOR_PAIR(9)|A_BOLD); +- index++; if(index==height)return; ++ index++; if(index==height)break; + top=top->fLink; + } ++ ++ wrefresh(subWin); + } /*display_listdata */ + + void menu_action(char *item_name) +@@ -967,21 +959,10 @@ void enter_action(void) + void exit_prog(void) + { + reset_audio(); +- sLang_exit(); ++ ncurses_exit(); + gui_exit(); + }/*exit_prog*/ + +-int get_code(void) +-{ +- int key; +- /*qiflush(); */ +- /*if(clickcount>=15){flushinp(); clickcount=0;}*/ +- if(SLang_input_pending(-10)) key= /*getch(); */ +- SLkp_getkey(); +- else key=0; +- /*clickcount++;*/ +- return(key); +-} /* get_code */ + void refresh_windows(void) + { + erase();refresh(); diff --git a/audio/emixer/patches/patch-mixer.c b/audio/emixer/patches/patch-mixer.c new file mode 100644 index 00000000000..ee7081c11cb --- /dev/null +++ b/audio/emixer/patches/patch-mixer.c @@ -0,0 +1,16 @@ +$NetBSD: patch-mixer.c,v 1.1 2013/10/14 13:33:31 roy Exp $ + +--- mixer.c.orig 2000-01-28 16:29:40.000000000 +0000 ++++ mixer.c +@@ -57,9 +57,9 @@ void open_sound_device(void) + int format; + int stereo = 1; + int rate = 44100; +- if ((audio_fd = open("/dev/dsp", O_WRONLY , 0)) == -1) ++ if ((audio_fd = open("/dev/sound", O_WRONLY , 0)) == -1) + { +- perror("/dev/dsp"); ++ perror("/dev/sound"); + return; + /*exit(1); */ + } diff --git a/audio/emixer/patches/patch-mixer.h b/audio/emixer/patches/patch-mixer.h new file mode 100644 index 00000000000..ad4907d7ff5 --- /dev/null +++ b/audio/emixer/patches/patch-mixer.h @@ -0,0 +1,16 @@ +$NetBSD: patch-mixer.h,v 1.1 2013/10/14 13:33:31 roy Exp $ + +--- mixer.h.orig 1999-12-28 00:45:52.000000000 +0000 ++++ mixer.h +@@ -17,7 +17,11 @@ + #include + #include + #include ++#ifdef __NetBSD__ ++#include ++#else + #include ++#endif + #include + #include + #include diff --git a/audio/emixer/patches/patch-nctgui.c b/audio/emixer/patches/patch-nctgui.c new file mode 100644 index 00000000000..8d8dbc0a174 --- /dev/null +++ b/audio/emixer/patches/patch-nctgui.c @@ -0,0 +1,184 @@ +$NetBSD: patch-nctgui.c,v 1.1 2013/10/14 13:33:31 roy Exp $ + +--- nctgui.c.orig 2000-01-28 16:30:52.000000000 +0000 ++++ nctgui.c +@@ -31,6 +31,10 @@ void ncurses_init(void) + { + (void) initscr(); + curs_set(0); ++ cbreak(); ++ noecho(); ++ timeout(2); ++ keypad(stdscr,TRUE); + }/* ncurses_init */ + + void ncurses_exit(void) +@@ -66,24 +70,23 @@ void display_bar(int num_menus,char **me + int j; + int maxY,maxX; + +- wattrset(barWin,COLOR_PAIR(2)); wbkgdset(barWin,COLOR_PAIR(2)); ++ wbkgdset(barWin,COLOR_PAIR(2)); ++ wmove(barWin,0,0); wclrtoeol(barWin); + +- wmove(barWin,0,0); wclrtoeol(barWin); wrefresh(barWin); + for(j=0; j +-#include ++#include + #include + + /* defines used by gui.c and main.c */ -- cgit v1.2.3