q3k/openlase
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2 from macpod/master

Browse source 
Update depreciated jack_client_new calls with jack_client_open calls.
This commit is contained in:
Hector Martin 2013-02-05 19:03:05 -08:00
commit 31a0db8c76
6 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/circlescope.c
View file

@ -104,8 +104,10 @@ void jack_shutdown (void *arg)
int main (int argc, char *argv[])
{
jack_client_t *client;
static const char jack_client_name[] = "circlescope";
jack_status_t jack_status;
if ((client = jack_client_new ("circlescope")) == 0) {
if ((client = jack_client_open(jack_client_name, JackNullOption, &jack_status)) == 0) {
fprintf (stderr, "jack server not running?\n");
return 1;
}

4
examples/scope.c
View file

@ -104,8 +104,10 @@ void jack_shutdown (void *arg)
int main (int argc, char *argv[])
{
jack_client_t *client;
static const char jack_client_name[] = "scope";
jack_status_t jack_status;
if ((client = jack_client_new ("circlescope")) == 0) {
if ((client = jack_client_open(jack_client_name, JackNullOption, &jack_status)) == 0) {
fprintf (stderr, "jack server not running?\n");
return 1;
}

5
libol/libol.c
View file

@ -229,6 +229,9 @@ static int process (nframes_t nframes, void *arg)
int olInit(int buffer_count, int max_points)
{
int i;
static const char jack_client_name[] = "libol";
jack_status_t jack_status;
if (buffer_count < 2)
return -1;
@ -257,7 +260,7 @@ int olInit(int buffer_count, int max_points)
frames[i].audio_r = malloc(frames[i].pmax * sizeof(float));
}
if ((client = jack_client_new ("libol")) == 0) {
if ((client = jack_client_open(jack_client_name, JackNullOption, &jack_status)) == 0) {
olLog ("jack server not running?\n");
return -1;
}

4
output/output.cpp
View file

@ -226,13 +226,15 @@ int main (int argc, char *argv[])
{
int retval;
jack_client_t *client;
static const char jack_client_name[] = "output";
jack_status_t jack_status;
QApplication app(argc, argv);
OutputSettings settings;
cfg = &settings.cfg;
if ((client = jack_client_new ("output")) == 0) {
if ((client = jack_client_open(jack_client_name, JackNullOption, &jack_status)) == 0) {
fprintf (stderr, "jack server not running?\n");
return 1;
}

4
tools/playilda.c
View file

@ -459,6 +459,8 @@ int main (int argc, char *argv[])
char **argvp = &argv[1];
char *fname;
jack_client_t *client;
static const char jack_client_name[] = "playilda";
jack_status_t jack_status;
struct stat st1, st2;
if (argc > 2 && !strcmp(argvp[0],"-s")) {
@ -478,7 +480,7 @@ int main (int argc, char *argv[])
pointrate = atoi(argvp[1]);
}
if ((client = jack_client_new ("playilda")) == 0) {
if ((client = jack_client_open(jack_client_name, JackNullOption, &jack_status)) == 0) {
fprintf (stderr, "jack server not running?\n");
return 1;
}

5
tools/simulator.c
View file

@ -231,7 +231,10 @@ void init_gl(int width, int height)
int main (int argc, char *argv[])
{
if ((client = jack_client_new ("simulator")) == 0) {
static const char jack_client_name[] = "simulator";
jack_status_t jack_status;
if ((client = jack_client_open(jack_client_name, JackNullOption, &jack_status)) == 0) {
fprintf (stderr, "jack server not running?\n");
return 1;
}