Be explicit if Songlenth DB is not loaded (#35)

libsidplayfp · Apr 5, 2024 · bbfcd05 · bbfcd05
1 parent 8cddb3c
commit bbfcd05
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/src/args.cpp b/src/args.cpp
@@ -547,18 +547,19 @@ int ConsolePlayer::args(int argc, const char *argv[])
                 ? (m_iniCfg.sidplay2()).recordLength
                 : (m_iniCfg.sidplay2()).playLength;
 
-
+            songlengthDB = SLDB_NONE;
             bool dbOpened = false;
             if (hvscBase)
             {
                 if (tryOpenDatabase(hvscBase, "md5"))
                 {
                     dbOpened = true;
-                    newSonglengthDB = true;
+                    songlengthDB = SLDB_MD5;
                 }
                 else if (tryOpenDatabase(hvscBase, "txt"))
                 {
                     dbOpened = true;
+                    songlengthDB = SLDB_TXT;
                 }
             }
 
@@ -587,7 +588,9 @@ int ConsolePlayer::args(int argc, const char *argv[])
                     }
 
                     if ((m_iniCfg.sidplay2()).database.find(TEXT(".md5")) != SID_STRING::npos)
-                        newSonglengthDB = true;
+                        songlengthDB = SLDB_MD5;
+                    else
+                        songlengthDB = SLDB_TXT;
                 }
             }
         }

diff --git a/src/menu.cpp b/src/menu.cpp
@@ -297,6 +297,8 @@ void ConsolePlayer::menu ()
     }
     else if (m_timer.valid)
         cerr << "FOREVER";
+    else if (songlengthDB == SLDB_NONE)
+        cerr << "NO SLDB";
     else
         cerr << "UNKNOWN";
     if (m_timer.start)

diff --git a/src/player.cpp b/src/player.cpp
@@ -328,7 +328,7 @@ ConsolePlayer::ConsolePlayer (const char * const name) :
     m_fcurve(-1.0),
     m_quietLevel(0),
     m_cpudebug(false),
-    newSonglengthDB(false),
+    songlengthDB(SLDB_NONE),
     m_autofilter(false)
 {
 #ifdef FEAT_REGS_DUMP_SID
@@ -799,7 +799,7 @@ bool ConsolePlayer::open (void)
     if (!m_timer.valid)
     {
 #ifdef FEAT_NEW_SONLEGTH_DB
-        const int_least32_t length = newSonglengthDB ? m_database.lengthMs(m_tune) : (m_database.length(m_tune) * 1000);
+        const int_least32_t length = songlengthDB == SLDB_MD5 ? m_database.lengthMs(m_tune) : (m_database.length(m_tune) * 1000);
 #else
         const int_least32_t length = m_database.length(m_tune) * 1000;
 #endif

diff --git a/src/player.h b/src/player.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of sidplayfp, a console SID player.
  *
- * Copyright 2011-2023 Leandro Nini
+ * Copyright 2011-2024 Leandro Nini
  * Copyright 2000-2001 Simon White
  *
  * This program is free software; you can redistribute it and/or modify
@@ -92,6 +92,14 @@ enum
     ERR_FILE_OPEN
 };
 
+// Songlength DB.
+typedef enum
+{
+    SLDB_NONE = 0,
+    SLDB_TXT,
+    SLDB_MD5
+} sldb_t;
+
 void displayError (const char *arg0, unsigned int num);
 
 
@@ -139,9 +147,9 @@ class ConsolePlayer
     uint_least8_t      m_quietLevel;
     uint_least8_t      m_verboseLevel;
 
-    bool               m_cpudebug;
+    sldb_t             songlengthDB;
 
-    bool               newSonglengthDB;
+    bool               m_cpudebug;
 
     bool               m_autofilter;