apply gcc fixes

Author: ololoshka2871

libs/pcm_utils

@@ -166,7 +166,7 @@ std::chrono::nanoseconds AudioReader::duration() const {
   return std::chrono::duration_cast<std::chrono::nanoseconds>(d);
 }
 
-bool AudioReader::getNextAudioData(const AudioSample *&pData,
+bool AudioReader::getNextAudioData(const AudioSample_t *&pData,
                                    uint32_t &nb_samples,
                                    std::chrono::nanoseconds &timestamp) {
   while (1) {
@@ -206,10 +206,11 @@ bool AudioReader::getNextAudioData(const AudioSample *&pData,
       throw FFmpegException{err};
     }
 
-    pData = reinterpret_cast<AudioSample *>(&ctx->pResampledFrame->data[0][0]);
+    pData =
+        reinterpret_cast<AudioSample_t *>(&ctx->pResampledFrame->data[0][0]);
     nb_samples = ctx->pResampledFrame->nb_samples;
   } else {
-    pData = reinterpret_cast<AudioSample *>(&ctx->pFrame->data[0][0]);
+    pData = reinterpret_cast<AudioSample_t *>(&ctx->pFrame->data[0][0]);
     nb_samples = ctx->pFrame->nb_samples;
   }
 

src/audioreader.cpp

@@ -13,7 +13,7 @@ struct AudioReader {
 
   static constexpr auto output_sample_rate = 44100;
 
-  using AudioSample = AudioSample<int16_t>;
+  using AudioSample_t = AudioSample<int16_t>;
 
   AudioReader(const std::string &filename);
   ~AudioReader();
@@ -22,7 +22,7 @@ struct AudioReader {
 
   std::chrono::nanoseconds duration() const;
 
-  bool getNextAudioData(const AudioSample *&pData, uint32_t &nb_samples,
+  bool getNextAudioData(const AudioSample_t *&pData, uint32_t &nb_samples,
                         std::chrono::nanoseconds &timestamp);
 
 private:

src/audioreader.h

@@ -41,37 +41,13 @@ struct Options {
         ->expected(1);
   }
 
-  template <>
-#ifdef _MSC_VER
-  static
-#endif
-      auto
-      newOption<std::string>(CLI::App &app, const std::string &option_name,
-                             std::string &value,
-                             const std::string &description) {
-    return app
-        .add_option(option_name, value,
-                    description + " [Default: " + value + "]")
-        ->expected(1);
-  }
-
   template <typename T>
   static std::string generate_default_str(std::string &default_str,
                                           const T &val) {
     return default_str.empty() ? " [Default: " + std::to_string(val) + "]"
                                : " [Default: " + default_str + "]";
   }
 
-  template <>
-#ifdef _MSC_VER
-  static
-#endif
-      std::string
-      generate_default_str<bool>(std::string &default_str, const bool &val) {
-    return default_str.empty() ? " [Default: " + Options::printBool(val) + "]"
-                               : " [Default: " + default_str + "]";
-  }
-
   template <typename T>
   static auto newFlag(CLI::App &app, const std::string &flag_name, T &value,
                       const std::string &description = "",
@@ -132,6 +108,23 @@ struct Options {
   }
 };
 
+template <>
+auto Options::newOption<std::string>(CLI::App &app,
+                                     const std::string &option_name,
+                                     std::string &value,
+                                     const std::string &description) {
+  return app
+      .add_option(option_name, value, description + " [Default: " + value + "]")
+      ->expected(1);
+}
+
+template <>
+std::string Options::generate_default_str<bool>(std::string &default_str,
+                                                const bool &val) {
+  return default_str.empty() ? " [Default: " + Options::printBool(val) + "]"
+                             : " [Default: " + default_str + "]";
+}
+
 const char Options::uncompresed[] = "rawvideo";
 
 static bool terminate_flag = false;