ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winejack.drv: Use jack_client_open instead of deprecated function.

This commit is contained in:
André Hentschel 2010-05-25 19:12:30 +02:00 committed by Alexandre Julliard
parent 9ce0ae1feb
commit b4d895b3d2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/winejack.drv/audio.c
View File

@ -68,10 +68,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave);
#define MAKE_FUNCPTR(f) static typeof(f) * fp_##f = NULL;
/* Function pointers for dynamic loading of libjack */
/* these are prefixed with "fp_", ie. "fp_jack_client_new" */
/* these are prefixed with "fp_", ie. "fp_jack_client_open" */
MAKE_FUNCPTR(jack_activate);
MAKE_FUNCPTR(jack_connect);
MAKE_FUNCPTR(jack_client_new);
MAKE_FUNCPTR(jack_client_open);
MAKE_FUNCPTR(jack_client_close);
MAKE_FUNCPTR(jack_deactivate);
MAKE_FUNCPTR(jack_set_process_callback);
@ -633,12 +633,12 @@ static int JACK_OpenWaveOutDevice(WINE_WAVEOUT* wwo)
/* try to become a client of the JACK server */
snprintf(client_name, sizeof(client_name), "wine_jack_out_%d", wwo->wDevID);
TRACE("client name '%s'\n", client_name);
if ((client = fp_jack_client_new (client_name)) == 0)
if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0)
{
/* jack has problems with shutting down clients, so lets */
/* wait a short while and try once more before we give up */
Sleep(250);
if ((client = fp_jack_client_new (client_name)) == 0)
if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0)
{
ERR("jack server not running?\n");
return 0;
@ -904,7 +904,7 @@ static LONG JACK_WaveInit(void)
#define LOAD_FUNCPTR(f) if((fp_##f = wine_dlsym(jackhandle, #f, NULL, 0)) == NULL) goto sym_not_found;
LOAD_FUNCPTR(jack_activate);
LOAD_FUNCPTR(jack_connect);
LOAD_FUNCPTR(jack_client_new);
LOAD_FUNCPTR(jack_client_open);
LOAD_FUNCPTR(jack_client_close);
LOAD_FUNCPTR(jack_deactivate);
LOAD_FUNCPTR(jack_set_process_callback);
@ -1911,12 +1911,12 @@ static int JACK_OpenWaveInDevice(WINE_WAVEIN* wwi, WORD nChannels)
/* try to become a client of the JACK server */
snprintf(client_name, sizeof(client_name), "wine_jack_in_%d", wwi->wDevID);
TRACE("client name '%s'\n", client_name);
if ((client = fp_jack_client_new (client_name)) == 0)
if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0)
{
/* jack has problems with shutting down clients, so lets */
/* wait a short while and try once more before we give up */
Sleep(250);
if ((client = fp_jack_client_new (client_name)) == 0)
if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0)
{
ERR("jack server not running?\n");
return 0;