Update remaining users of EnumStringConverters to use helper macros

Summary: The ENUM_CONVERTER macros help reduce boilerplate code. Let's use them.

Differential Revision: D77471130

fbshipit-source-id: d3976b7a730ad92902a9ddc20a0464d6627a3134

Author: georges-berenger

tools/vrsplayer/FileReader.cpp

@@ -58,18 +58,9 @@
 #define FIXED_3 fixed << setprecision(3)
 
 namespace {
+using namespace vrs;
 std::string_view sStateNames[] = {"UNDEFINED", "NO_MEDIA", "PAUSED", "PLAYING", "ERROR"};
-
-struct FileReaderStateConverter : public vrs::EnumStringConverter<
-                                      FileReaderState,
-                                      sStateNames,
-                                      vrs::array_size(sStateNames),
-                                      FileReaderState::Undefined,
-                                      FileReaderState::Undefined> {
-  static_assert(
-      cNamesCount == vrs::enumCount<FileReaderState>(),
-      "Missing FileReaderState name definitions");
-};
+ENUM_STRING_CONVERTER(FileReaderState, sStateNames, FileReaderState::Undefined);
 
 QString kLastMaxPerRow("last_max_per_row");
 QString kVisibleStreams("visible_streams");

tools/vrsplayer/PlayerWindow.cpp

@@ -28,15 +28,14 @@ using namespace vrsp;
 using namespace std;
 
 namespace {
+using namespace vrs;
 string_view sAudioModeNames[] = {"mono", "stereo-auto", "stereo-manual"};
-
-struct AudioModeConverter : public vrs::EnumStringConverter<
-                                AudioMode,
-                                sAudioModeNames,
-                                vrs::array_size(sAudioModeNames),
-                                AudioMode::autoStereo,
-                                AudioMode::autoStereo,
-                                true> {};
+ENUM_STRING_CONVERTER3(
+    AudioMode,
+    sAudioModeNames,
+    AudioMode::autoStereo,
+    AudioMode::autoStereo,
+    true);
 } // namespace
 
 inline QKeySequence shortcut(int keyA, int keyB, int keyC = 0) {
@@ -365,6 +364,9 @@ void PlayerWindow::setAudioMode(AudioMode audioMode) {
     case AudioMode::manualStereo:
       // Nothing to do
       break;
+
+    case AudioMode::COUNT:
+      break;
   }
 
   emit player_.selectedAudioChannelsChanged(leftAudioChannel_, rightAudioChannel_);

tools/vrsplayer/PlayerWindow.h

@@ -32,6 +32,8 @@ enum class AudioMode {
   mono = 0, // same audio channel sent to all output channels
   autoStereo = 1, // successive audio channels sent as left-right stereo pair
   manualStereo = 2, // arbitrary channels selected to be sent as stereo pair
+
+  COUNT
 };
 
 class PlayerWindow : public QMainWindow {

vrs/FileHandler.cpp

@@ -33,6 +33,7 @@
 using namespace std;
 
 namespace {
+using namespace vrs;
 using vrs::CachingStrategy;
 
 string_view sCachingStrategyNames[] = {
@@ -42,16 +43,7 @@ string_view sCachingStrategyNames[] = {
     "StreamingBidirectional",
     "StreamingBackward",
     "ReleaseAfterRead"};
-struct CachingStrategyConverter : public vrs::EnumStringConverter<
-                                      CachingStrategy,
-                                      sCachingStrategyNames,
-                                      vrs::array_size(sCachingStrategyNames),
-                                      CachingStrategy::Undefined,
-                                      CachingStrategy::Undefined> {
-  static_assert(
-      cNamesCount == vrs::enumCount<CachingStrategy>(),
-      "Missing CachingStrategy name definitions");
-};
+ENUM_STRING_CONVERTER(CachingStrategy, sCachingStrategyNames, CachingStrategy::Undefined);
 
 } // namespace
 
@@ -123,13 +115,6 @@ bool FileHandler::isFileHandlerMatch(const FileSpec& fileSpec) const {
   return fileSpec.fileHandlerName.empty() || getFileHandlerName() == fileSpec.fileHandlerName;
 }
 
-string toString(CachingStrategy cachingStrategy) {
-  return CachingStrategyConverter::toString(cachingStrategy);
-}
-
-template <>
-CachingStrategy toEnum<>(const string& name) {
-  return CachingStrategyConverter::toEnumNoCase(name.c_str());
-}
+DEFINE_ENUM_CONVERTERS(CachingStrategy);
 
 } // namespace vrs