Minor changes, polishing a few last things

Hrick87 · Feb 29, 2024 · 4d8c918 · 4d8c918
1 parent 0f2e3d4
commit 4d8c918
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/internal_modules/roc_audio/sample_spec.h b/src/internal_modules/roc_audio/sample_spec.h
@@ -65,7 +65,7 @@ class SampleSpec {
 
     //! Check if sample spec has non-zero rate and valid channel set.
     bool is_valid() const;
-    
+
     //! Check if sample spec has a zero rate, empty channel set, and invalid_format.
     bool is_empty() const;
 

diff --git a/src/internal_modules/roc_sndio/target_sndfile/roc_sndio/sndfile_extension_table.h b/src/internal_modules/roc_sndio/target_sndfile/roc_sndio/sndfile_extension_table.h
@@ -21,7 +21,7 @@ struct FileMap {
     int format_id;
     //! Name of driver mapped to SF_FORMAT
     const char* driver_name;
-    //! File extension associatied with driver and SF_FORMAT if it exists.
+    //! File extension associated with driver and SF_FORMAT if it exists.
     const char* file_extension;
 };
 static FileMap file_type_map[5] = { { SF_FORMAT_MAT4, "mat4", NULL },

diff --git a/src/internal_modules/roc_sndio/target_sndfile/roc_sndio/sndfile_sink.cpp b/src/internal_modules/roc_sndio/target_sndfile/roc_sndio/sndfile_sink.cpp
@@ -7,7 +7,7 @@
  */
 
 #define FORMAT_COUNT                                                                     \
-    2 // Number of major formats that don't allow for subtype SF_FORMAT_PCM_32;
+    2 // Number of major formats that don't allow for 32 bits;
 #define BUFFER_SIZE 512
 
 #include "roc_sndio/sndfile_sink.h"
@@ -151,7 +151,7 @@ SndfileSink::SndfileSink(core::IArena& arena, const Config& config)
     }
 
     memset(&file_info_, 0, sizeof(file_info_));
-
+    //file_info_.format = (int)config.sample_spec.pcm_format(); this needs to be converted to corresponding enum of sndfile somehow
     file_info_.format = SF_FORMAT_PCM_32;
     file_info_.channels = (int)config.sample_spec.num_channels();
     file_info_.samplerate = (int)config.sample_spec.sample_rate();
@@ -278,9 +278,10 @@ void SndfileSink::write(audio::Frame& frame) {
     // Write entire float buffer in one call
     sf_count_t count = sf_write_float(file_, frame_data, frame_left);
 
-    if (count != frame_left || sf_error(file_) != 0) {
+    int errnum = sf_error(file_);
+    if (count != frame_left || errnum != 0) {
         // TODO(gh-183): return error instead of panic
-        roc_panic("sndfile source: sf_write_float() failed: %s", sf_strerror(file_));
+        roc_panic("sndfile source: sf_write_float() failed: %s", sf_error_number(errnum));
     }
 }
 

diff --git a/src/internal_modules/roc_sndio/target_sndfile/roc_sndio/sndfile_source.cpp b/src/internal_modules/roc_sndio/target_sndfile/roc_sndio/sndfile_source.cpp
@@ -254,8 +254,8 @@ void SndfileSource::close_() {
     }
 
     roc_log(LogInfo, "sndfile source: closing input");
-
-    if (int err = sf_close(file_) != 0) {
+    int err = sf_close(file_);
+    if (err != 0) {
         roc_panic("sndfile source: sf_close() failed. Cannot close input: %s",
                   sf_error_number(err));
     }