Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8452
Modified Files: Tag: desiredata s_audio_jack.c s_audio_asio.cpp s_stuff.h Log Message: removed old decls
Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.26.2.4.2.2 retrieving revision 1.1.4.26.2.4.2.3 diff -C2 -d -r1.1.4.26.2.4.2.2 -r1.1.4.26.2.4.2.3 *** s_audio_asio.cpp 10 Jul 2007 05:47:03 -0000 1.1.4.26.2.4.2.2 --- s_audio_asio.cpp 10 Jul 2007 15:48:57 -0000 1.1.4.26.2.4.2.3 *************** *** 85,88 **** --- 85,89 ---- static void float32toInt32_S(void* inbuffer, void* outbuffer, long frames); static void Int32tofloat32_S(void* inbuffer, void* outbuffer, long frames); + void asio_close_audio(void);
typedef void converter_t(void* inbuffer, void* outbuffer, long frames);
Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.5.4.8.2.7.2.7 retrieving revision 1.5.4.8.2.7.2.8 diff -C2 -d -r1.5.4.8.2.7.2.7 -r1.5.4.8.2.7.2.8 *** s_audio_jack.c 9 Jul 2007 19:59:42 -0000 1.5.4.8.2.7.2.7 --- s_audio_jack.c 10 Jul 2007 15:48:57 -0000 1.5.4.8.2.7.2.8 *************** *** 119,122 **** --- 119,123 ---- }
+ void jack_close_audio(void); static int jack_ignore_graph_callback = 0; static t_int jack_shutdown_handler(t_int* none) { *************** *** 163,169 **** * was already in spot 0 to the end. */ if (strcmp("alsa_pcm",tmp_client_name)==0 && num_clients>0) { - char* tmp; /* alsa_pcm goes in spot 0 */ ! tmp = jack_client_names[ num_clients ]; jack_client_names[ num_clients ] = jack_client_names[0]; jack_client_names[0] = tmp; --- 164,169 ---- * was already in spot 0 to the end. */ if (strcmp("alsa_pcm",tmp_client_name)==0 && num_clients>0) { /* alsa_pcm goes in spot 0 */ ! char* tmp = jack_client_names[ num_clients ]; jack_client_names[ num_clients ] = jack_client_names[0]; jack_client_names[0] = tmp; *************** *** 184,188 **** static int jack_connect_ports(char *client) { char regex_pattern[100]; /* its always the same, ... */ - int i; const char **jack_ports; static int entered = 0; --- 184,187 ---- *************** *** 193,202 **** jack_ports = jack_get_ports(jack_client, regex_pattern, NULL, JackPortIsOutput); if (jack_ports) ! for (i=0;jack_ports[i] != NULL && i < sys_inchannels;i++) if (jack_connect (jack_client, jack_ports[i], jack_port_name (input_port[i]))) fprintf (stderr, "cannot connect input ports %s -> %s\n", jack_ports[i],jack_port_name (input_port[i])); jack_ports = jack_get_ports(jack_client, regex_pattern, NULL, JackPortIsInput); if (jack_ports) ! for (i=0;jack_ports[i] != NULL && i < sys_outchannels;i++) if (jack_connect (jack_client, jack_port_name (output_port[i]), jack_ports[i])) fprintf (stderr, "cannot connect output ports %s -> %s\n", jack_port_name (output_port[i]),jack_ports[i]); --- 192,201 ---- jack_ports = jack_get_ports(jack_client, regex_pattern, NULL, JackPortIsOutput); if (jack_ports) ! for (int i=0;jack_ports[i] != NULL && i < sys_inchannels;i++) if (jack_connect (jack_client, jack_ports[i], jack_port_name (input_port[i]))) fprintf (stderr, "cannot connect input ports %s -> %s\n", jack_ports[i],jack_port_name (input_port[i])); jack_ports = jack_get_ports(jack_client, regex_pattern, NULL, JackPortIsInput); if (jack_ports) ! for (int i=0;jack_ports[i] != NULL && i < sys_outchannels;i++) if (jack_connect (jack_client, jack_port_name (output_port[i]), jack_ports[i])) fprintf (stderr, "cannot connect output ports %s -> %s\n", jack_port_name (output_port[i]),jack_ports[i]); *************** *** 208,212 ****
int jack_open_audio(int inchans, int outchans, int rate, int scheduler) { - int j; char port_name[80] = ""; int client_iterator = 0; --- 207,210 ---- *************** *** 269,273 **** it ever shuts down, either entirely, or if it just decides to stop calling us. */ jack_on_shutdown (jack_client, jack_shutdown, 0); ! for (j=0;j<NUM_JACK_PORTS;j++) { input_port[j]=NULL; output_port[j] = NULL; --- 267,271 ---- it ever shuts down, either entirely, or if it just decides to stop calling us. */ jack_on_shutdown (jack_client, jack_shutdown, 0); ! for (int j=0;j<NUM_JACK_PORTS;j++) { input_port[j]=NULL; output_port[j] = NULL; *************** *** 326,330 **** int jack_send_dacs() { float *fp; - int j; int rtnval = SENDDACS_YES; int timenow; --- 324,327 ---- *************** *** 342,351 **** jack_started = 1; fp = sys_soundout; ! for (j = 0; j < sys_outchannels; j++) { memcpy(jack_outbuf + (j * BUF_JACK) + jack_filled,fp, sys_dacblocksize*sizeof(float)); fp += sys_dacblocksize; } fp = sys_soundin; ! for (j = 0; j < sys_inchannels; j++) { memcpy(fp, jack_inbuf + (j * BUF_JACK) + jack_filled, sys_dacblocksize*sizeof(float)); fp += sys_dacblocksize; --- 339,348 ---- jack_started = 1; fp = sys_soundout; ! for (int j=0; j<sys_outchannels; j++) { memcpy(jack_outbuf + (j * BUF_JACK) + jack_filled,fp, sys_dacblocksize*sizeof(float)); fp += sys_dacblocksize; } fp = sys_soundin; ! for (int j=0; j<sys_inchannels; j++) { memcpy(fp, jack_inbuf + (j * BUF_JACK) + jack_filled, sys_dacblocksize*sizeof(float)); fp += sys_dacblocksize;
Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.5.4.10.2.8.2.11 retrieving revision 1.5.4.10.2.8.2.12 diff -C2 -d -r1.5.4.10.2.8.2.11 -r1.5.4.10.2.8.2.12 *** s_stuff.h 10 Jul 2007 15:39:40 -0000 1.5.4.10.2.8.2.11 --- s_stuff.h 10 Jul 2007 15:48:57 -0000 1.5.4.10.2.8.2.12 *************** *** 243,246 **** --- 243,255 ---- #endif
+ struct t_audiodevs { + int ndev; + int dev[MAXAUDIOINDEV]; + int chdev[MAXAUDIOINDEV]; + #ifdef __cplusplus + t_audiodevs() : ndev(-1) {} + #endif + }; + /* new audio api interface */ typedef struct t_audioapi { *************** *** 256,265 **** int pa_open_audio(int inchans, int outchans, int rate, int advance, int indeviceno, int outdeviceno, int schedmode); - void pa_close_audio(void); - int pa_send_dacs(void); void sys_reportidle(void); - void pa_listdevs(void); - void pa_getdevs(char *indevlist, int *nindevs, char *outdevlist, - int *noutdevs, int *canmulti, int maxndev, int devdescsize);
/* tb { */ --- 265,269 ---- *************** *** 273,311 **** int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev, int rate); /* IOhannes */ - void oss_close_audio(void); - int oss_send_dacs(void); void oss_reportidle(void); void oss_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize); - int alsa_open_audio(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev, int rate); - void alsa_close_audio(void); - int alsa_send_dacs(void); void alsa_reportidle(void); void alsa_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize); - int jack_open_audio(int wantinchans, int wantoutchans, int srate, int scheduler); - void jack_close_audio(void); - int jack_send_dacs(void); void jack_reportidle(void); void jack_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize); void jack_listdevs(void); - void mmio_open_audio(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev, int rate); - void mmio_close_audio( void); void mmio_reportidle(void); - int mmio_send_dacs(void); void mmio_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize); - void asio_open_audio(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev, int srate, int scheduler); - void asio_close_audio(void); void asio_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize); - int asio_send_dacs(void); - void sys_listmididevs(void); void sys_set_midi_api(int whichapi); --- 277,300 ---- *************** *** 381,393 **** void inmidi_polyaftertouch(int portno, int channel, int pitch, int value);
- struct t_audiodevs { - int ndev; - int dev[MAXAUDIOINDEV]; - int chdev[MAXAUDIOINDEV]; - #ifdef __cplusplus - t_audiodevs() : ndev(-1) {} - #endif - }; - #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) } --- 370,373 ----