Commit f62e0d3b authored by David Reid's avatar David Reid

Rearrange some code for consistency with other code.

parent 4442f926
...@@ -2,6 +2,21 @@ ...@@ -2,6 +2,21 @@
#define VOCLIB_IMPLEMENTATION #define VOCLIB_IMPLEMENTATION
#include "ma_vocoder_node.h" #include "ma_vocoder_node.h"
MA_API ma_vocoder_node_config ma_vocoder_node_config_init(ma_uint32 channels, ma_uint32 sampleRate)
{
ma_vocoder_node_config config;
MA_ZERO_OBJECT(&config);
config.nodeConfig = ma_node_config_init(); /* Input and output channels will be set in ma_vocoder_node_init(). */
config.channels = channels;
config.sampleRate = sampleRate;
config.bands = 16;
config.filtersPerBand = 6;
return config;
}
static void ma_vocoder_node_process_pcm_frames(ma_node* pNode, const float** ppFramesIn, ma_uint32* pFrameCountIn, float** ppFramesOut, ma_uint32* pFrameCountOut) static void ma_vocoder_node_process_pcm_frames(ma_node* pNode, const float** ppFramesIn, ma_uint32* pFrameCountIn, float** ppFramesOut, ma_uint32* pFrameCountOut)
{ {
ma_vocoder_node* pVocoderNode = (ma_vocoder_node*)pNode; ma_vocoder_node* pVocoderNode = (ma_vocoder_node*)pNode;
...@@ -20,22 +35,6 @@ static ma_node_vtable g_ma_vocoder_node_vtable = ...@@ -20,22 +35,6 @@ static ma_node_vtable g_ma_vocoder_node_vtable =
0 0
}; };
MA_API ma_vocoder_node_config ma_vocoder_node_config_init(ma_uint32 channels, ma_uint32 sampleRate)
{
ma_vocoder_node_config config;
MA_ZERO_OBJECT(&config);
config.nodeConfig = ma_node_config_init(); /* Input and output channels will be set in ma_vocoder_node_init(). */
config.channels = channels;
config.sampleRate = sampleRate;
config.bands = 16;
config.filtersPerBand = 6;
return config;
}
MA_API ma_result ma_vocoder_node_init(ma_node_graph* pNodeGraph, const ma_vocoder_node_config* pConfig, const ma_allocation_callbacks* pAllocationCallbacks, ma_vocoder_node* pVocoderNode) MA_API ma_result ma_vocoder_node_init(ma_node_graph* pNodeGraph, const ma_vocoder_node_config* pConfig, const ma_allocation_callbacks* pAllocationCallbacks, ma_vocoder_node* pVocoderNode)
{ {
ma_result result; ma_result result;
...@@ -57,8 +56,8 @@ MA_API ma_result ma_vocoder_node_init(ma_node_graph* pNodeGraph, const ma_vocode ...@@ -57,8 +56,8 @@ MA_API ma_result ma_vocoder_node_init(ma_node_graph* pNodeGraph, const ma_vocode
baseConfig = pConfig->nodeConfig; baseConfig = pConfig->nodeConfig;
baseConfig.vtable = &g_ma_vocoder_node_vtable; baseConfig.vtable = &g_ma_vocoder_node_vtable;
baseConfig.inputChannels[0] = pConfig->channels; /* Source/carrier. */ baseConfig.inputChannels [0] = pConfig->channels; /* Source/carrier. */
baseConfig.inputChannels[1] = 1; /* Excite/modulator. Must always be single channel. */ baseConfig.inputChannels [1] = 1; /* Excite/modulator. Must always be single channel. */
baseConfig.outputChannels[0] = pConfig->channels; /* Output channels is always the same as the source/carrier. */ baseConfig.outputChannels[0] = pConfig->channels; /* Output channels is always the same as the source/carrier. */
baseConfig.outputChannels[1] = 0; /* Unused. */ baseConfig.outputChannels[1] = 0; /* Unused. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment