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
d0bfcf0c
Commit
d0bfcf0c
authored
Sep 05, 2020
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename ma_engine.h to miniaudio_engine.h.
parent
3c734f93
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
research/_examples/resource_manager.c
research/_examples/resource_manager.c
+5
-5
research/miniaudio_engine.c
research/miniaudio_engine.c
+1
-1
research/miniaudio_engine.h
research/miniaudio_engine.h
+0
-0
No files found.
research/_examples/resource_manager.c
View file @
d0bfcf0c
...
...
@@ -18,7 +18,7 @@ threads to manage internally and how to implement your own custom job thread.
#define MA_NO_ENGINE
/* We're intentionally not using the ma_engine API here. */
#define MINIAUDIO_IMPLEMENTATION
#include "../../miniaudio.h"
#include "../m
a
_engine.h"
#include "../m
iniaudio
_engine.h"
static
ma_mixer
g_mixer
;
static
ma_resource_manager_data_source
g_dataSources
[
16
];
...
...
@@ -37,10 +37,10 @@ void data_callback(ma_device* pDevice, void* pOutput, const void* pInput, ma_uin
{
size_t
iDataSource
;
for
(
iDataSource
=
0
;
iDataSource
<
g_dataSourceCount
;
iDataSource
+=
1
)
{
ma_mixer_mix_data_source
(
&
g_mixer
,
&
g_dataSources
[
iDataSource
],
frameCountIn
,
NULL
,
1
,
NULL
,
MA_TRUE
);
ma_mixer_mix_data_source
(
&
g_mixer
,
&
g_dataSources
[
iDataSource
],
0
,
frameCountIn
,
NULL
,
1
,
NULL
,
MA_TRUE
);
}
}
ma_mixer_end
(
&
g_mixer
,
NULL
,
ma_offset_ptr
(
pOutput
,
framesProcessed
*
bpf
));
ma_mixer_end
(
&
g_mixer
,
NULL
,
ma_offset_ptr
(
pOutput
,
framesProcessed
*
bpf
)
,
0
);
framesProcessed
+=
(
ma_uint32
)
frameCountOut
;
/* Safe cast. */
}
...
...
@@ -113,8 +113,8 @@ int main(int argc, char** argv)
int
iFile
;
deviceConfig
=
ma_device_config_init
(
ma_device_type_playback
);
deviceConfig
.
dataCallback
=
data_callback
;
deviceConfig
.
pUserData
=
NULL
;
deviceConfig
.
dataCallback
=
data_callback
;
deviceConfig
.
pUserData
=
NULL
;
result
=
ma_device_init
(
NULL
,
&
deviceConfig
,
&
device
);
if
(
result
!=
MA_SUCCESS
)
{
...
...
research/m
a
_engine.c
→
research/m
iniaudio
_engine.c
View file @
d0bfcf0c
...
...
@@ -4,7 +4,7 @@
#define MA_DEBUG_OUTPUT
#define MA_IMPLEMENTATION
#include "../miniaudio.h"
#include "m
a
_engine.h"
#include "m
iniaudio
_engine.h"
typedef
struct
{
...
...
research/m
a
_engine.h
→
research/m
iniaudio
_engine.h
View file @
d0bfcf0c
File moved
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