Browse Source

Check client registration callback

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1794 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.70
sletz 18 years ago
parent
commit
69093daee0
1 changed files with 16 additions and 4 deletions
  1. +16
    -4
      tests/jack_test.cpp

+ 16
- 4
tests/jack_test.cpp View File

@@ -117,6 +117,8 @@ int linefw = 0;
int lineports = 0; int lineports = 0;
int linecl2 = 0; int linecl2 = 0;


int client_register = 0;

/** /**
*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -172,6 +174,10 @@ void Jack_Freewheel_Callback(int starting, void *arg)
void Jack_Client_Registration_Callback(const char* name, int val, void *arg) void Jack_Client_Registration_Callback(const char* name, int val, void *arg)
{ {
Log("Client registration callback name = %s has been successfully called with value %i. (msg from callback)\n", name, val); Log("Client registration callback name = %s has been successfully called with value %i. (msg from callback)\n", name, val);
if (val)
client_register++;
else
client_register--;
} }


int Jack_Update_Buffer_Size(jack_nframes_t nframes, void *arg) int Jack_Update_Buffer_Size(jack_nframes_t nframes, void *arg)
@@ -251,6 +257,7 @@ int Jack_Sync_Callback(jack_transport_state_t state, jack_position_t *pos, void
return res; return res;
} }



/** /**
*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -583,7 +590,7 @@ int main (int argc, char *argv[])
if (client2 == NULL) { if (client2 == NULL) {
Log ("valid : a second client with the same name cannot be registered\n"); Log ("valid : a second client with the same name cannot be registered\n");
} else { } else {
printf("!!! ERROR !!! Jackd server has accepted multiples client with the same name !");
printf("!!! ERROR !!! Jackd server has accepted multiples client with the same name !\n");
jack_client_close(client2); jack_client_close(client2);
} }
@@ -597,9 +604,9 @@ int main (int argc, char *argv[])
Log ("valid : a second client with the same name can be registered (client automatic renaming)\n"); Log ("valid : a second client with the same name can be registered (client automatic renaming)\n");
jack_client_close(client2); jack_client_close(client2);
} else { } else {
printf("!!! ERROR !!! Jackd server automatic renaming feature does not work!");
printf("!!! ERROR !!! Jackd server automatic renaming feature does not work!\n");
} }
/** /**
* testing client name... * testing client name...
* Verify that the name sended at registration and the one returned by jack server is the same... * Verify that the name sended at registration and the one returned by jack server is the same...
@@ -670,7 +677,7 @@ int main (int argc, char *argv[])
file = fopen(filename, "w"); file = fopen(filename, "w");
if (file == NULL) { if (file == NULL) {
fprintf(stderr, "Erreur dans l'ouverture du fichier log framefile.dat"); fprintf(stderr, "Erreur dans l'ouverture du fichier log framefile.dat");
exit( -1);
exit(-1);
} }


/** /**
@@ -1108,6 +1115,11 @@ int main (int argc, char *argv[])
} }
exit(1); exit(1);
} }
// Check client registration callback
sleep(1);
if (client_register == 0)
printf("!!! ERROR !!! Client registration callback not called!\n");


/** /**
* Register callback for this client. * Register callback for this client.


Loading…
Cancel
Save