From ad8a83122a3e77be5a32390a8fd0c7b300429abc Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 14 Aug 2016 16:51:17 +0200
Subject: [PATCH] Just rewrite this instead

---
 mednafen/cdrom/CDAFReader.cpp | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/mednafen/cdrom/CDAFReader.cpp b/mednafen/cdrom/CDAFReader.cpp
index c07612a..ed6bcfc 100644
--- a/mednafen/cdrom/CDAFReader.cpp
+++ b/mednafen/cdrom/CDAFReader.cpp
@@ -28,7 +28,9 @@
 #include <mednafen/mednafen.h>
 #include "CDAFReader.h"
 #include "CDAFReader_Vorbis.h"
+#ifdef HAVE_MPC
 #include "CDAFReader_MPC.h"
+#endif
 
 CDAFReader::CDAFReader() : LastReadPos(0)
 {
@@ -40,19 +42,32 @@ CDAFReader::~CDAFReader()
 
 }
 
+enum
+{
+   AUDIO_VORBIS = 0,
+#ifdef HAVE_MPC
+   AUDIO_MPC,
+#endif
+   AUDIO_LAST
+};
+
 CDAFReader *CDAFR_Open(Stream *fp)
 {
- static CDAFReader* (* const OpenFuncs[])(Stream* fp) =
- {
-#ifdef HAVE_MPC
-  CDAFR_MPC_Open,
-#endif
-  CDAFR_Vorbis_Open
- };
+  unsigned i;
 
- for(auto const& f : OpenFuncs)
+ for (i = 0; i < AUDIO_LAST; i++)
  {
-    return f(fp);
+    switch (i)
+    {
+       case AUDIO_VORBIS:
+          return CDAFR_Vorbis_Open(fp);
+#ifdef HAVE_MPC
+       case AUDIO_MPC:
+          return CDAFR_MPC_Open(fp);
+#endif
+       default:
+          break;
+    }
  }
 
  return(NULL);