Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
miniaudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
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
MyCard
miniaudio
Commits
5bba3c8f
Commit
5bba3c8f
authored
Apr 25, 2018
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some GCC compilation errors.
parent
d977266b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
mini_al.h
mini_al.h
+6
-5
No files found.
mini_al.h
View file @
5bba3c8f
...
...
@@ -2687,9 +2687,10 @@ typedef int (WINAPI * MAL_PFN_StringFromGUID2)(const GUID* const rguid, LPOL
typedef HWND (WINAPI * MAL_PFN_GetForegroundWindow)();
typedef HWND (WINAPI * MAL_PFN_GetDesktopWindow)();
typedef
LSTATUS
(
WINAPI
*
MAL_PFN_RegOpenKeyExA
)(
HKEY
hKey
,
LPCSTR
lpSubKey
,
DWORD
ulOptions
,
REGSAM
samDesired
,
PHKEY
phkResult
);
typedef
LSTATUS
(
WINAPI
*
MAL_PFN_RegCloseKey
)(
HKEY
hKey
);
typedef
LSTATUS
(
WINAPI
*
MAL_PFN_RegQueryValueExA
)(
HKEY
hKey
,
LPCSTR
lpValueName
,
LPDWORD
lpReserved
,
LPDWORD
lpType
,
LPBYTE
lpData
,
LPDWORD
lpcbData
);
// Microsoft documents these APIs as returning LSTATUS, but the Win32 API shipping with some compilers do not define it. It's just a LONG.
typedef LONG (WINAPI * MAL_PFN_RegOpenKeyExA)(HKEY hKey, LPCSTR lpSubKey, DWORD ulOptions, REGSAM samDesired, PHKEY phkResult);
typedef LONG (WINAPI * MAL_PFN_RegCloseKey)(HKEY hKey);
typedef LONG (WINAPI * MAL_PFN_RegQueryValueExA)(HKEY hKey, LPCSTR lpValueName, LPDWORD lpReserved, LPDWORD lpType, LPBYTE lpData, LPDWORD lpcbData);
#endif
...
...
@@ -7563,7 +7564,7 @@ mal_result mal_device_init__winmm(mal_context* pContext, mal_device_type type, m
const char* errorMsg = "";
mal_result errorCode = MAL_ERROR;
mal_result result = MAL_SUCCESS;
// WinMM doesn't seem to have a good way to query the format of the device. Therefore, we'll restrict the formats to the
// standard formats documented here https://msdn.microsoft.com/en-us/library/windows/desktop/dd743855(v=vs.85).aspx. If
...
...
@@ -7631,7 +7632,7 @@ mal_result mal_device_init__winmm(mal_context* pContext, mal_device_type type, m
wf.nChannels = wChannels;
mal_result
result
=
mal_get_best_info_from_formats_flags__winmm
(
dwFormats
,
wChannels
,
&
wf
.
wBitsPerSample
,
&
wf
.
nSamplesPerSec
);
result = mal_get_best_info_from_formats_flags__winmm(dwFormats, wChannels, &wf.wBitsPerSample, &wf.nSamplesPerSec);
if (result != MAL_SUCCESS) {
errorMsg = "[WinMM] Could not find appropriate format for internal device.", errorCode = result;
goto on_error;
...
...
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