Browse Source

Merge pull request #68 from smiszym/master

Indentation fix from smiszym
tags/v1.9.11-RC1
Adrian Knoth 10 years ago
parent
commit
e72d0441f4
2 changed files with 39 additions and 39 deletions
  1. +22
    -22
      example-clients/control.c
  2. +17
    -17
      example-clients/simple_client.c

+ 22
- 22
example-clients/control.c View File

@@ -17,28 +17,28 @@ static int reorder = 0;


static int Jack_Graph_Order_Callback(void *arg) static int Jack_Graph_Order_Callback(void *arg)
{ {
const char **ports;
int i;
const char **ports;
int i;


printf("Jack_Graph_Order_Callback count = %d\n", reorder++);
printf("Jack_Graph_Order_Callback count = %d\n", reorder++);


ports = jack_get_ports(client, NULL, NULL, JackPortIsPhysical|JackPortIsOutput);
if (ports) {
for (i = 0; ports[i]; ++i) {
printf("name: %s\n", ports[i]);
}
jack_free(ports);
}
ports = jack_get_ports(client, NULL, NULL, JackPortIsPhysical|JackPortIsOutput);
if (ports) {
for (i = 0; ports[i]; ++i) {
printf("name: %s\n", ports[i]);
}
jack_free(ports);
}


ports = jack_get_ports(client, NULL, NULL, JackPortIsPhysical|JackPortIsInput);
if (ports) {
for (i = 0; ports[i]; ++i) {
printf("name: %s\n", ports[i]);
}
jack_free(ports);
}
ports = jack_get_ports(client, NULL, NULL, JackPortIsPhysical|JackPortIsInput);
if (ports) {
for (i = 0; ports[i]; ++i) {
printf("name: %s\n", ports[i]);
}
jack_free(ports);
}


return 0;
return 0;
} }


int int
@@ -56,8 +56,8 @@ main (int argc, char *argv[])
} }


if (jack_set_graph_order_callback(client, Jack_Graph_Order_Callback, 0) != 0) { if (jack_set_graph_order_callback(client, Jack_Graph_Order_Callback, 0) != 0) {
printf("Error when calling jack_set_graph_order_callback() !\n");
}
printf("Error when calling jack_set_graph_order_callback() !\n");
}


/* Tell the JACK server that we are ready to roll. Our /* Tell the JACK server that we are ready to roll. Our
* process() callback will start running now. */ * process() callback will start running now. */
@@ -67,8 +67,8 @@ main (int argc, char *argv[])
exit(1); exit(1);
} }


printf("Type 'q' to quit\n");
while ((getchar() != 'q')) {}
printf("Type 'q' to quit\n");
while ((getchar() != 'q')) {}


jack_client_close(client); jack_client_close(client);
exit (0); exit (0);


+ 17
- 17
example-clients/simple_client.c View File

@@ -25,9 +25,9 @@ jack_client_t *client;
#define TABLE_SIZE (200) #define TABLE_SIZE (200)
typedef struct typedef struct
{ {
float sine[TABLE_SIZE];
int left_phase;
int right_phase;
float sine[TABLE_SIZE];
int left_phase;
int right_phase;
} }
paTestData; paTestData;


@@ -57,14 +57,14 @@ process (jack_nframes_t nframes, void *arg)
out2 = (jack_default_audio_sample_t*)jack_port_get_buffer (output_port2, nframes); out2 = (jack_default_audio_sample_t*)jack_port_get_buffer (output_port2, nframes);


for( i=0; i<nframes; i++ ) for( i=0; i<nframes; i++ )
{
out1[i] = data->sine[data->left_phase]; /* left */
out2[i] = data->sine[data->right_phase]; /* right */
data->left_phase += 1;
if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
}
{
out1[i] = data->sine[data->left_phase]; /* left */
out2[i] = data->sine[data->right_phase]; /* right */
data->left_phase += 1;
if( data->left_phase >= TABLE_SIZE ) data->left_phase -= TABLE_SIZE;
data->right_phase += 3; /* higher pitch so we can distinguish left and right. */
if( data->right_phase >= TABLE_SIZE ) data->right_phase -= TABLE_SIZE;
}
return 0; return 0;
} }
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
client_name = argv[1]; client_name = argv[1];
if (argc >= 3) { /* server name specified? */ if (argc >= 3) { /* server name specified? */
server_name = argv[2]; server_name = argv[2];
int my_option = JackNullOption | JackServerName;
int my_option = JackNullOption | JackServerName;
options = (jack_options_t)my_option; options = (jack_options_t)my_option;
} }
} else { /* use basename of argv[0] */ } else { /* use basename of argv[0] */
@@ -107,10 +107,10 @@ main (int argc, char *argv[])
} }


for( i=0; i<TABLE_SIZE; i++ ) for( i=0; i<TABLE_SIZE; i++ )
{
data.sine[i] = 0.2 * (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
}
data.left_phase = data.right_phase = 0;
{
data.sine[i] = 0.2 * (float) sin( ((double)i/(double)TABLE_SIZE) * M_PI * 2. );
}
data.left_phase = data.right_phase = 0;


/* open a client connection to the JACK server */ /* open a client connection to the JACK server */
@@ -196,7 +196,7 @@ main (int argc, char *argv[])
/* install a signal handler to properly quits jack client */ /* install a signal handler to properly quits jack client */
#ifdef WIN32 #ifdef WIN32
signal(SIGINT, signal_handler); signal(SIGINT, signal_handler);
signal(SIGABRT, signal_handler);
signal(SIGABRT, signal_handler);
signal(SIGTERM, signal_handler); signal(SIGTERM, signal_handler);
#else #else
signal(SIGQUIT, signal_handler); signal(SIGQUIT, signal_handler);


Loading…
Cancel
Save