modules/audio-libsoundio: Code gardening

Author: IceDragon200

modules/audio-libsoundio/include/moon/audio/libsoundio/music.hxx

@@ -12,7 +12,7 @@ namespace Moon
   class Music : public Source {
     public:
       Music(const std::string filename);
-      ~Music();
+      virtual ~Music();
 
       int read(float* dst, int frames);
 

modules/audio-libsoundio/include/moon/audio/libsoundio/sound.hxx

@@ -12,7 +12,7 @@ namespace Moon
   class Sound : public Source {
     public:
       Sound(const std::string filename);
-      ~Sound();
+      virtual ~Sound();
 
       int read(float* dst, int frames);
 

modules/audio-libsoundio/src/mixer.cxx

@@ -7,16 +7,16 @@ namespace Moon {
   void Mixer::mix(struct SoundIoChannelArea *areas, const struct SoundIoChannelLayout &layout, const float sampleRate, unsigned int frames)
   {
     // silence the buffer first
-    for (size_t channel = 0; channel < layout.channel_count; ++channel) {
+    for (int channel = 0; channel < layout.channel_count; ++channel) {
       memset(areas[channel].ptr, 0, areas[channel].step * frames);
     }
     for(auto const& handle: handles) {
       handle->mix(areas, layout, sampleRate, frames);
     }
 
     // clipping, to avoid overdrive
-    for (int frame = 0; frame < frames; ++frame) {
-      for (size_t channel = 0; channel < layout.channel_count; ++channel) {
+    for (size_t frame = 0; frame < frames; ++frame) {
+      for (int channel = 0; channel < layout.channel_count; ++channel) {
         float* buffer = (float*)(areas[channel].ptr + areas[channel].step * frame);
         float sample = *buffer;
         *buffer = sample > 1.0f ? 1.0f : (sample < -1.0f ? -1.0f : sample);

modules/audio-libsoundio/src/mrb_moon_audio.cxx

@@ -7,51 +7,51 @@
 static mrb_value
 audio_update(mrb_state *mrb, mrb_value klass)
 {
-  Moon::Audio::Update();
-  return klass;
+	Moon::Audio::Update();
+	return klass;
 }
 
 MOON_C_API void
 mrb_mruby_moon_audio_libsoundio_gem_init(mrb_state* mrb)
 {
-  struct RClass *moon_module = mrb_define_module(mrb, "Moon");
-  struct RClass *audio_module = mrb_define_module_under(mrb, moon_module, "Audio");
-  struct RClass *audio_error = mrb_define_class_under(mrb, moon_module, "AudioError", E_RUNTIME_ERROR);
-  mrb_define_class_method(mrb, audio_module, "update", audio_update, MRB_ARGS_NONE());
-  //mmrb_sound_buffer_init(mrb, moon_module);
-  mmrb_music_init(mrb, moon_module);
-  mmrb_sound_init(mrb, moon_module);
+	struct RClass *moon_module = mrb_define_module(mrb, "Moon");
+	struct RClass *audio_module = mrb_define_module_under(mrb, moon_module, "Audio");
+	struct RClass *audio_error = mrb_define_class_under(mrb, moon_module, "AudioError", E_RUNTIME_ERROR);
+	mrb_define_class_method(mrb, audio_module, "update", audio_update, MRB_ARGS_NONE());
+	//mmrb_sound_buffer_init(mrb, moon_module);
+	mmrb_music_init(mrb, moon_module);
+	mmrb_sound_init(mrb, moon_module);
 
-  const Moon::Audio::ErrorCode err = Moon::Audio::Initialize();
-  switch (err) {
-	case Moon::Audio::ErrorCode::MOON_AUDIO_CREATE_ERROR:
-	  mrb_raise(mrb, audio_error, "Underlying backend could not be created");
-	  break;
-	case Moon::Audio::ErrorCode::MOON_AUDIO_CONNECTION_ERROR:
-      mrb_raise(mrb, audio_error, "Could not estabish connection to backend");
-	  break;
-	case Moon::Audio::ErrorCode::MOON_AUDIO_NO_DEVICE:
-	  mrb_raise(mrb, audio_error, "No default device present");
-	  break;
-	case Moon::Audio::ErrorCode::MOON_AUDIO_DEVICE_MISSING:
-	  mrb_raise(mrb, audio_error, "Default device is missing");
-	  break;
-	case Moon::Audio::ErrorCode::MOON_AUDIO_COULD_NOT_OPEN_STREAM:
-	  mrb_raise(mrb, audio_error, "Output stream could not be opened, does the selected device support it?");
-	  break;
-	case Moon::Audio::ErrorCode::MOON_AUDIO_STREAM_CHANNEL_LAYOUT_ERROR:
-	  mrb_raise(mrb, audio_error, "Channel layout is invalid for the stream");
-	  break;
-	case Moon::Audio::ErrorCode::MOON_AUDIO_STREAM_START_ERROR:
-	  mrb_raise(mrb, audio_error, "Stream could not be started");
-	  break;
-  	default:
-  	  break;
-  }
+	const Moon::Audio::ErrorCode err = Moon::Audio::Initialize();
+	switch (err) {
+		case Moon::Audio::ErrorCode::MOON_AUDIO_CREATE_ERROR:
+			mrb_raise(mrb, audio_error, "Underlying backend could not be created");
+			break;
+		case Moon::Audio::ErrorCode::MOON_AUDIO_CONNECTION_ERROR:
+			mrb_raise(mrb, audio_error, "Could not estabish connection to backend");
+			break;
+		case Moon::Audio::ErrorCode::MOON_AUDIO_NO_DEVICE:
+			mrb_raise(mrb, audio_error, "No default device present");
+			break;
+		case Moon::Audio::ErrorCode::MOON_AUDIO_DEVICE_MISSING:
+			mrb_raise(mrb, audio_error, "Default device is missing");
+			break;
+		case Moon::Audio::ErrorCode::MOON_AUDIO_COULD_NOT_OPEN_STREAM:
+			mrb_raise(mrb, audio_error, "Output stream could not be opened, does the selected device support it?");
+			break;
+		case Moon::Audio::ErrorCode::MOON_AUDIO_STREAM_CHANNEL_LAYOUT_ERROR:
+			mrb_raise(mrb, audio_error, "Channel layout is invalid for the stream");
+			break;
+		case Moon::Audio::ErrorCode::MOON_AUDIO_STREAM_START_ERROR:
+			mrb_raise(mrb, audio_error, "Stream could not be started");
+			break;
+		default:
+			break;
+	}
 }
 
 MOON_C_API void
 mrb_mruby_moon_audio_libsoundio_gem_final(mrb_state* mrb)
 {
-  Moon::Audio::Terminate();
+	Moon::Audio::Terminate();
 }

modules/audio-libsoundio/src/sound.cxx

@@ -6,10 +6,10 @@ namespace Moon
   Sound::Sound(const std::string filename)
   {
     SndfileHandle file(filename, SFM_READ);
-  	printf("Opened file '%s'\n", filename.c_str());
-	printf("    Sample rate : %d\n", file.samplerate ());
+    printf("Opened file '%s'\n", filename.c_str());
+    printf("    Sample rate : %d\n", file.samplerate ());
     printf("    Channels    : %d\n", file.channels ());
-    printf("    Frames    : %d\n", file.frames());
+    printf("    Frames    : %ld\n", file.frames());
 
     m_channels = file.channels();
     m_sampleRate = file.samplerate();
@@ -30,11 +30,11 @@ namespace Moon
   }
 
   int Sound::channels() {
-    return m_channels; 
+    return m_channels;
   }
 
   int Sound::sampleRate() {
-    return m_sampleRate; 
+    return m_sampleRate;
   }
 
   // returns how many frames we actually read