simplify api return values

Author: anokta

examples/demo/c_demo.c

@@ -81,16 +81,14 @@ int main(void) {
   // Initialize the engine.
   BarelyEngineConfig config = BARELY_ENGINE_CONFIG_DEFAULT(kSampleRate);
   config.max_frame_count = kFrameCount;
-  int32_t allocation_size = 0;
-  BarelyEngineConfig_GetRequiredAllocationSize(&config, &allocation_size);
+  const int32_t allocation_size = BarelyEngineConfig_GetRequiredAllocationSize(&config);
   printf("Allocating %.2f KB...\n", (float)allocation_size / 1024.0f);
   void* allocation = malloc(allocation_size);
 
-  BarelyEngine* engine = NULL;
-  BarelyEngine_Create(&config, allocation, allocation_size, &engine);
+  BarelyEngine* engine = BarelyEngine_Create(&config, allocation, allocation_size);
   BarelyEngine_SetTempo(engine, kTempo);
 
-  BarelyEngine_CreateInstrument(engine, &g_instrument_id);
+  g_instrument_id = BarelyEngine_CreateInstrument(engine);
   BarelyInstrument_SetControl(engine, g_instrument_id, BarelyInstrumentControlType_kGain, kGain);
   BarelyInstrument_SetControl(engine, g_instrument_id, BarelyInstrumentControlType_kOscMix, 1.0f);
   BarelyInstrument_SetControl(engine, g_instrument_id, BarelyInstrumentControlType_kOscShape,
@@ -100,13 +98,11 @@ int main(void) {
   BarelyInstrument_SetControl(engine, g_instrument_id, BarelyInstrumentControlType_kRelease,
                               kRelease);
 
-  uint32_t performer_id = 0;
-  BarelyEngine_CreatePerformer(engine, &performer_id);
-  uint32_t task_ids[kMelodyNoteCount];
+  const uint32_t performer_id = BarelyEngine_CreatePerformer(engine);
   for (int i = 0; i < kMelodyNoteCount; ++i) {
     BarelyPerformer_CreateTask(engine, performer_id, kMelodyPositions[i],
                                kMelodyPositions[i + 1] - kMelodyPositions[i], 0, TaskCallback,
-                               engine, &task_ids[i]);
+                               engine);
   }
 
   // Initialize the audio device.

include/barelymusician.h

@@ -91,11 +91,7 @@ BarelyEngine::~BarelyEngine() {
   engine_ = nullptr;
 }
 
-double BarelyEngine::get_timestamp() {
-  double timestamp = 0.0;
-  BarelyEngine_GetTimestamp(get(), &timestamp);
-  return timestamp;
-}
+double BarelyEngine::get_timestamp() { return BarelyEngine_GetTimestamp(get()); }
 
 void BarelyEngine::set_tempo(double tempo) {
   if (tempo_ != tempo) {
@@ -108,11 +104,10 @@ ::BarelyEngine* BarelyEngine::get() {
   if (engine_ == nullptr) {
     sample_rate_ = static_cast<int32_t>(AudioServer::get_singleton()->get_mix_rate());
     const BarelyEngineConfig config = BARELY_ENGINE_CONFIG_DEFAULT(sample_rate_);
-    int32_t allocation_size = 0;
-    BarelyEngineConfig_GetRequiredAllocationSize(&config, &allocation_size);
+    const int32_t allocation_size = BarelyEngineConfig_GetRequiredAllocationSize(&config);
     engine_allocation_.resize(allocation_size);
     temp_samples_.resize(config.max_frame_count);
-    BarelyEngine_Create(&config, engine_allocation_.data(), allocation_size, &engine_);
+    engine_ = BarelyEngine_Create(&config, engine_allocation_.data(), allocation_size);
     BARELY_GODOT_ENGINE_CONTROLS(BARELY_SET_DEFAULT_GODOT_ENGINE_CONTROL);
     if (SceneTree* tree = Object::cast_to<SceneTree>(Engine::get_singleton()->get_main_loop())) {
       if (audio_player_ == nullptr) {  // start audio processing

platforms/godot/engine.cpp

@@ -71,7 +71,7 @@ void BarelySliceResource::_bind_methods() {
 
 BarelyInstrument::BarelyInstrument() {
   ::BarelyEngine* engine = BarelyEngine::get_singleton()->get();
-  BarelyEngine_CreateInstrument(engine, &instrument_id_);
+  instrument_id_ = BarelyEngine_CreateInstrument(engine);
   BARELY_GODOT_INSTRUMENT_CONTROLS(BARELY_SET_DEFAULT_GODOT_INSTRUMENT_CONTROL);
 }
 

platforms/godot/instrument.cpp

@@ -53,7 +53,7 @@ void BarelyTaskResource::_bind_methods() {
 }
 
 BarelyPerformer::BarelyPerformer() {
-  BarelyEngine_CreatePerformer(BarelyEngine::get_singleton()->get(), &performer_id_);
+  performer_id_ = BarelyEngine_CreatePerformer(BarelyEngine::get_singleton()->get());
   tasks_ = TypedArray<Ref<BarelyTaskResource>>();
 }
 
@@ -113,9 +113,7 @@ void BarelyPerformer::set_tasks(const TypedArray<Ref<BarelyTaskResource>>& tasks
 }
 
 double BarelyPerformer::get_position() const {
-  double position = 0.0;
-  BarelyPerformer_GetPosition(BarelyEngine::get_singleton()->get(), performer_id_, &position);
-  return position;
+  return BarelyPerformer_GetPosition(BarelyEngine::get_singleton()->get(), performer_id_);
 }
 
 void BarelyPerformer::_bind_methods() {
@@ -166,24 +164,19 @@ void BarelyPerformer::_on_task_changed() {
     if (task.is_null()) {
       continue;
     }
-
-    uint32_t task_id = 0;
-    BarelyPerformer_CreateTask(
+    task_ids_.push_back(BarelyPerformer_CreateTask(
         BarelyEngine::get_singleton()->get(), performer_id_, task->get_position(),
         task->get_duration(), task->get_priority(),
         [](BarelyTaskEventType type, void* user_data) {
           BarelyTaskResource* task = static_cast<BarelyTaskResource*>(user_data);
-
           if (!task) return;
-
           if (type == BarelyTaskEventType_kBegin) {
             task->emit_signal("task_begin");
           } else if (type == BarelyTaskEventType_kEnd) {
             task->emit_signal("task_end");
           }
         },
-        task.ptr(), &task_id);
-    task_ids_.push_back(task_id);
+        task.ptr()));
   }
 }
 

platforms/godot/performer.cpp

@@ -25,11 +25,7 @@ void BarelyQuantizationResource::set_amount(float amount) {
 }
 
 double BarelyQuantizationResource::get_position(double position) const {
-  double quantized_position = 0.0;
-  if (!BarelyQuantization_GetPosition(&quantization_, position, &quantized_position)) {
-    return position;
-  }
-  return quantized_position;
+  return BarelyQuantization_GetPosition(&quantization_, position);
 }
 
 void BarelyQuantizationResource::_bind_methods() {
@@ -68,11 +64,7 @@ void BarelyScaleResource::set_mode(int32_t mode) {
 }
 
 float BarelyScaleResource::get_pitch(int32_t degree) const {
-  float pitch = 0.0f;
-  if (!BarelyScale_GetPitch(&scale_, degree, &pitch)) {
-    return 0.0f;
-  }
-  return pitch;
+  return BarelyScale_GetPitch(&scale_, degree);
 }
 
 void BarelyScaleResource::_bind_methods() {