Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
66cdfd6b
Commit
66cdfd6b
authored
Dec 27, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DirectSound: use DirectSoundEnumerateW iso DirectSoundEnumerateA
And other alignment changes
parent
9375bd72
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
10 deletions
+9
-10
modules/audio_output/directx.c
modules/audio_output/directx.c
+9
-10
No files found.
modules/audio_output/directx.c
View file @
66cdfd6b
...
@@ -66,7 +66,7 @@ struct aout_sys_t
...
@@ -66,7 +66,7 @@ struct aout_sys_t
{
{
HINSTANCE
hdsound_dll
;
/* handle of the opened dsound dll */
HINSTANCE
hdsound_dll
;
/* handle of the opened dsound dll */
char
*
psz_device
;
/* user defined device name */
char
*
psz_device
;
/* user defined device name */
LPGUID
p_device_guid
;
LPGUID
p_device_guid
;
LPDIRECTSOUND
p_dsobject
;
/* main Direct Sound object */
LPDIRECTSOUND
p_dsobject
;
/* main Direct Sound object */
...
@@ -76,14 +76,14 @@ struct aout_sys_t
...
@@ -76,14 +76,14 @@ struct aout_sys_t
notification_thread_t
*
p_notif
;
/* DirectSoundThread id */
notification_thread_t
*
p_notif
;
/* DirectSoundThread id */
int
b_playing
;
/* playing status */
int
b_playing
;
/* playing status */
int
i_frame_size
;
/* Size in bytes of one frame */
int
i_frame_size
;
/* Size in bytes of one frame */
int
i_speaker_setup
;
/* Speaker setup override */
int
i_speaker_setup
;
/* Speaker setup override */
bool
b_chan_reorder
;
/* do we need channel reordering */
bool
b_chan_reorder
;
/* do we need channel reordering */
int
pi_chan_table
[
AOUT_CHAN_MAX
];
int
pi_chan_table
[
AOUT_CHAN_MAX
];
uint32_t
i_channel_mask
;
uint32_t
i_channel_mask
;
uint32_t
i_bits_per_sample
;
uint32_t
i_bits_per_sample
;
uint32_t
i_channels
;
uint32_t
i_channels
;
...
@@ -191,8 +191,7 @@ static int OpenAudio( vlc_object_t *p_this )
...
@@ -191,8 +191,7 @@ static int OpenAudio( vlc_object_t *p_this )
if
(
*
ppsz_compare
==
NULL
)
if
(
*
ppsz_compare
==
NULL
)
{
{
msg_Err
(
p_aout
,
"(%s) isn't valid speaker setup option"
,
msg_Err
(
p_aout
,
"(%s) isn't valid speaker setup option"
,
psz_speaker
);
psz_speaker
);
msg_Err
(
p_aout
,
"Defaulting to Windows default speaker config"
);
msg_Err
(
p_aout
,
"Defaulting to Windows default speaker config"
);
i
=
0
;
i
=
0
;
}
}
...
@@ -693,7 +692,7 @@ static int InitDirectSound( aout_instance_t *p_aout )
...
@@ -693,7 +692,7 @@ static int InitDirectSound( aout_instance_t *p_aout )
/* Get DirectSoundEnumerate */
/* Get DirectSoundEnumerate */
OurDirectSoundEnumerate
=
(
void
*
)
OurDirectSoundEnumerate
=
(
void
*
)
GetProcAddress
(
p_aout
->
output
.
p_sys
->
hdsound_dll
,
GetProcAddress
(
p_aout
->
output
.
p_sys
->
hdsound_dll
,
"DirectSoundEnumerate
A
"
);
"DirectSoundEnumerate
W
"
);
if
(
OurDirectSoundEnumerate
)
if
(
OurDirectSoundEnumerate
)
{
{
p_aout
->
output
.
p_sys
->
psz_device
=
config_GetPsz
(
p_aout
,
"directx-audio-device-name"
);
p_aout
->
output
.
p_sys
->
psz_device
=
config_GetPsz
(
p_aout
,
"directx-audio-device-name"
);
...
@@ -1179,7 +1178,7 @@ static int ReloadDirectXDevices( vlc_object_t *p_this, char const *psz_name,
...
@@ -1179,7 +1178,7 @@ static int ReloadDirectXDevices( vlc_object_t *p_this, char const *psz_name,
/* Get DirectSoundEnumerate */
/* Get DirectSoundEnumerate */
OurDirectSoundEnumerate
=
(
void
*
)
OurDirectSoundEnumerate
=
(
void
*
)
GetProcAddress
(
hdsound_dll
,
GetProcAddress
(
hdsound_dll
,
"DirectSoundEnumerate
A
"
);
"DirectSoundEnumerate
W
"
);
int
nb_devices
=
0
;
int
nb_devices
=
0
;
OurDirectSoundEnumerate
(
CallBackConfigNBEnum
,
&
nb_devices
);
OurDirectSoundEnumerate
(
CallBackConfigNBEnum
,
&
nb_devices
);
msg_Dbg
(
p_this
,
"found %d devices"
,
nb_devices
);
msg_Dbg
(
p_this
,
"found %d devices"
,
nb_devices
);
...
...
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