From f02b385138914f745223c51676e51c838837d3ab Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 8 Jun 2022 18:04:27 +0200
Subject: [PATCH] nilrider:: reverted duration check

---
 rogueviz/dynamic-wfc.cpp       |  4 +++-
 rogueviz/nilrider/nilrider.cpp | 30 ------------------------------
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/rogueviz/dynamic-wfc.cpp b/rogueviz/dynamic-wfc.cpp
index 9bb6d573..3cfb792c 100644
--- a/rogueviz/dynamic-wfc.cpp
+++ b/rogueviz/dynamic-wfc.cpp
@@ -435,7 +435,6 @@ void save(string s) {
   }
 
 auto wfc_hook = 
-  addHook(hooks_handleKey, 100, wfc_handleKey) +
   addHook(hooks_args, 100, [] {
     using namespace arg;
 
@@ -450,6 +449,9 @@ auto wfc_hook =
     else if(argis("-dynamic-wfc-save")) {
       shift(); save(args());
       }
+    else if(argis("-wfc-regen-key")) {
+      rogueviz::rv_hook(hooks_handleKey, 100, wfc_handleKey);
+      }
       
     else return 1;
     return 0;
diff --git a/rogueviz/nilrider/nilrider.cpp b/rogueviz/nilrider/nilrider.cpp
index 518163aa..278d1099 100644
--- a/rogueviz/nilrider/nilrider.cpp
+++ b/rogueviz/nilrider/nilrider.cpp
@@ -67,37 +67,7 @@ bool crash_sound = true;
 bool running;
 bool backing;
 
-static double music_internal_duration(Mix_Music *music)
-{
-    if (music->interface->Duration) {
-        return music->interface->Duration(music->context);
-    } else {
-        Mix_SetError("Duration not implemented for music type");
-        return -1;
-    }
-}
-
-double MIXCALLCC Mix_MusicDuration(Mix_Music *music)
-{
-    double retval;
-
-    Mix_LockAudio();
-    if (music) {
-        retval = music_internal_duration(music);
-    } else if (music_playing) {
-        retval = music_internal_duration(music_playing);
-    } else {
-        Mix_SetError("music is NULL and no playing music");
-        retval = -1.0;
-    }
-    Mix_UnlockAudio();
-
-    return(retval);
-}
-
 void sync_music(eLand l) {
-  if(music[laCanvas])
-    println(hlog, "duration = ", Mix_MusicDuration(music[laCanvas]));
   musicpos[laCanvas] = curlev->current.timer * 1000;
   }