Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b4d895b3
Commit
b4d895b3
authored
May 25, 2010
by
André Hentschel
Committed by
Alexandre Julliard
May 26, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winejack.drv: Use jack_client_open instead of deprecated function.
parent
9ce0ae1f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
audio.c
dlls/winejack.drv/audio.c
+7
-7
No files found.
dlls/winejack.drv/audio.c
View file @
b4d895b3
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment