git-svn-id: http://subversion.jackaudio.org/jack/jack2/branches/libjacknet@3340 0c269be4-1314-0410-8aa9-9f06e86f4224tags/1.9.8
| @@ -26,7 +26,7 @@ Michael Voigt | |||||
| 2009-02-24 Stephane Letz <letz@grame.fr> | 2009-02-24 Stephane Letz <letz@grame.fr> | ||||
| * New libjacknet library with net.h and JackNetAPI.cpp files. New netmaster.c and netmaster.c examples. | * New libjacknet library with net.h and JackNetAPI.cpp files. New netmaster.c and netmaster.c examples. | ||||
| * Add iPhone sources and project. | |||||
| * Add sources and project for iPhone. | |||||
| 2009-02-23 Stephane Letz <letz@grame.fr> | 2009-02-23 Stephane Letz <letz@grame.fr> | ||||
| @@ -145,8 +145,16 @@ main (int argc, char *argv[]) | |||||
| memcpy(audio_output_buffer[i], audio_input_buffer[i], buffer_size * sizeof(float)); | memcpy(audio_output_buffer[i], audio_input_buffer[i], buffer_size * sizeof(float)); | ||||
| } | } | ||||
| jack_net_master_send(net, result.audio_output, audio_output_buffer, 0, NULL); | |||||
| jack_net_master_recv(net, result.audio_input, audio_input_buffer, 0, NULL); | |||||
| if (jack_net_master_send(net, result.audio_output, audio_output_buffer, 0, NULL) < 0) { | |||||
| printf("jack_net_master_send failure, exiting\n"); | |||||
| break; | |||||
| } | |||||
| if (jack_net_master_recv(net, result.audio_input, audio_input_buffer, 0, NULL) < 0) { | |||||
| printf("jack_net_master_recv failure, exiting\n"); | |||||
| break; | |||||
| } | |||||
| usleep(wait_usec); | usleep(wait_usec); | ||||
| }; | }; | ||||
| @@ -49,6 +49,10 @@ usage () | |||||
| " [ -p port (default = %d)]\n", DEFAULT_MULTICAST_IP, DEFAULT_PORT); | " [ -p port (default = %d)]\n", DEFAULT_MULTICAST_IP, DEFAULT_PORT); | ||||
| } | } | ||||
| static void net_shutdown(void* data) | |||||
| { | |||||
| printf("Restarting...\n"); | |||||
| } | |||||
| static int net_process(jack_nframes_t buffer_size, | static int net_process(jack_nframes_t buffer_size, | ||||
| int audio_input, | int audio_input, | ||||
| @@ -129,6 +133,8 @@ main (int argc, char *argv[]) | |||||
| printf("Slave is found and running...\n"); | printf("Slave is found and running...\n"); | ||||
| jack_set_net_slave_process_callback(net, net_process, NULL); | jack_set_net_slave_process_callback(net, net_process, NULL); | ||||
| jack_set_net_slave_shutdown_callback(net, net_shutdown, NULL); | |||||
| if (jack_net_slave_activate(net) != 0) { | if (jack_net_slave_activate(net) != 0) { | ||||
| fprintf(stderr, "Cannot sactivate client\n"); | fprintf(stderr, "Cannot sactivate client\n"); | ||||
| return 1; | return 1; | ||||