Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19761
Modified Files: Tag: impd_0_37 g_all_guis.c g_all_guis.h g_vumeter.c Log Message: giving back to [vu] what belongs to [vu]
Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.1.1.4.2.2.2.3 retrieving revision 1.1.1.4.2.2.2.4 diff -C2 -d -r1.1.1.4.2.2.2.3 -r1.1.1.4.2.2.2.4 *** g_all_guis.h 10 Mar 2004 06:00:11 -0000 1.1.1.4.2.2.2.3 --- g_all_guis.h 28 Mar 2004 04:18:18 -0000 1.1.1.4.2.2.2.4 *************** *** 253,259 **** extern int sys_noloadbang; extern int iemgui_color_hex[]; - extern int iemgui_vu_db2i[]; - extern int iemgui_vu_col[]; - extern char *iemgui_vu_scale_str[];
EXTERN int pd_bluify(int colour); --- 253,256 ----
Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.1.1.3.2.2.2.4 retrieving revision 1.1.1.3.2.2.2.5 diff -C2 -d -r1.1.1.3.2.2.2.4 -r1.1.1.3.2.2.2.5 *** g_vumeter.c 14 Mar 2004 22:33:54 -0000 1.1.1.3.2.2.2.4 --- g_vumeter.c 28 Mar 2004 04:18:18 -0000 1.1.1.3.2.2.2.5 *************** *** 23,26 **** --- 23,63 ---- #endif
+ static int iemgui_vu_db2i[]= + { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 9, 9, 9, 9, 9,10,10,10,10,10,11,11,11,11,11,12,12,12,12,12, + 13,13,13,13,14,14,14,14,15,15,15,15,16,16,16,16,17,17,17,18, + 18,18,19,19,19,20,20,20,21,21,22,22,23,23,24,24,25,26,27,28, + 29,30,31,32,33,33,34,34,35,35,36,36,37,37,37,38,38,38,39,39, + 39,39,39,39,40,40 + }; + + static int iemgui_vu_col[]= + { + 0,17,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, + 15,15,15,15,15,15,15,15,15,15,14,14,13,13,13,13,13,13,13,13,13,13,13,19,19,19 + }; + + static char *iemgui_vu_scale_str[]= + { + "", "<-99", "", "", + "", "-50", "", "", + "", "-30", "", "", + "", "-20", "", "", + "", "-12", "", "", + "", "-6", "", "", + "", "-2", "", "", + "", "-0dB", "", "", + "", "+2", "", "", + "", "+6", "", "", + "", ">+12", "", "", "", "", "", + }; + /* ----- vu gui-peak- & rms- vu-meter-display ---------- */
Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.6 retrieving revision 1.1.1.4.2.4.2.7 diff -C2 -d -r1.1.1.4.2.4.2.6 -r1.1.1.4.2.4.2.7 *** g_all_guis.c 19 Mar 2004 20:19:55 -0000 1.1.1.4.2.4.2.6 --- g_all_guis.c 28 Mar 2004 04:18:18 -0000 1.1.1.4.2.4.2.7 *************** *** 38,90 **** };
- int iemgui_vu_db2i[]= - { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 9, 9, 9, 9, 9,10,10,10,10,10, - 11,11,11,11,11,12,12,12,12,12, - 13,13,13,13,14,14,14,14,15,15, - 15,15,16,16,16,16,17,17,17,18, - 18,18,19,19,19,20,20,20,21,21, - 22,22,23,23,24,24,25,26,27,28, - 29,30,31,32,33,33,34,34,35,35, - 36,36,37,37,37,38,38,38,39,39, - 39,39,39,39,40,40 - }; - - int iemgui_vu_col[]= - { - 0,17,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, - 15,15,15,15,15,15,15,15,15,15,14,14,13,13,13,13,13,13,13,13,13,13,13,19,19,19 - }; - - char *iemgui_vu_scale_str[]= - { - "", "<-99", "", "", - "", "-50", "", "", - "", "-30", "", "", - "", "-20", "", "", - "", "-12", "", "", - "", "-6", "", "", - "", "-2", "", "", - "", "-0dB", "", "", - "", "+2", "", "", - "", "+6", "", "", - "", ">+12", "", "", "", "", "", - }; - - /*------------------ global functions -------------------------*/
--- 38,41 ---- *************** *** 532,539 **** int sndable=1, rcvable=1, oldsndrcvable=0;
! if(iemgui->x_fsf.x_rcv_able) ! oldsndrcvable += IEM_GUI_OLD_RCV_FLAG; ! if(iemgui->x_fsf.x_snd_able) ! oldsndrcvable += IEM_GUI_OLD_SND_FLAG; if(IS_A_SYMBOL(argv,7)) srl[0] = atom_getsymbolarg(7, argc, argv); --- 483,488 ---- int sndable=1, rcvable=1, oldsndrcvable=0;
! if(iemgui->x_fsf.x_rcv_able) oldsndrcvable += IEM_GUI_OLD_RCV_FLAG; ! if(iemgui->x_fsf.x_snd_able) oldsndrcvable += IEM_GUI_OLD_SND_FLAG; if(IS_A_SYMBOL(argv,7)) srl[0] = atom_getsymbolarg(7, argc, argv);