Updated QSU for v4.2+

DuckBoss · Sep 15, 2020 · d9b2f3f · d9b2f3f
1 parent eb670a0
commit d9b2f3f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/docs/js/qsu/main.js b/docs/js/qsu/main.js
@@ -20,23 +20,23 @@ function get_media_directories() {
   return `
 [Media Directories]
 ; VLC location
-VLCPath = ${document.getElementById('media-vlc-path').value}
+FfmpegPath = ${document.getElementById('media-ffmpeg-path').value}
 ; Use Stereo Audio
-VLCStereoAudio = ${document.getElementById('media-stereo-enable').value}
+UseStereoAudio = ${document.getElementById('media-stereo-enable').value}
 ; Enable/Disable VLC Console Messages
-VLCRunQuiet = ${document.getElementById('media-quiet-enable').value}
+FfmpegRunQuiet = ${document.getElementById('media-quiet-enable').value}
 ; The default volume when the bot starts (default=0.3)
-VLCDefaultVolume = ${document.getElementById('media-default-volume').value}
+DefaultVolume = ${document.getElementById('media-default-volume').value}
 ; Enable Audio Ducking (off by default, use !duckaudio to toggle on and off)
-VLCAudioDuck = ${document.getElementById('media-duck-audio-enable').value}
+AudioDuck = ${document.getElementById('media-duck-audio-enable').value}
 ; The default audio ducking volume (How low the volume will drop down when ducking) (default=0.05)
-VLCDuckingVolume: ${document.getElementById('media-ducking-volume').value}
+DuckingVolume: ${document.getElementById('media-ducking-volume').value}
 ; The default threshold before audio is ducked (default=2500.0)
-VLCDuckingThreshold: ${document.getElementById('media-ducking-threshold').value}
+DuckingThreshold: ${document.getElementById('media-ducking-threshold').value}
 ; The default delay before the audio ducking reacts to user voices (default=1.0)
-VLCDuckingDelay: ${document.getElementById('media-ducking-delay').value}
+DuckingDelay: ${document.getElementById('media-ducking-delay').value}
 ; The default maximum queue length for the audio interface (default=50)
-VLCMaxQueueLength = ${document.getElementById('media-max-queue-length').value}
+MaxQueueLength = ${document.getElementById('media-max-queue-length').value}
 ; Optional Proxy URL - If you want to use a proxy server to use the youtube-dl library, fill this out.
 YoutubeDLProxyURL = ${document.getElementById('media-proxy-url').value}
 ; Optionally use a cookies.txt file for the youtube-dl library (useful to deal with rate limits).

diff --git a/docs/pages/qsu/qsu.html b/docs/pages/qsu/qsu.html
@@ -10,7 +10,6 @@
           padding: 15px;
           background-color: rgb(28, 30, 31);
       }
-
       body {
           color: rgb(218, 215, 210);
           background-color: rgb(24, 26, 27);
@@ -29,7 +28,7 @@
   </head>
   <body>
     <div class="container">
-      <h2 id=title-id>JJMumbleBot Quick Setup Utility</h2>
+      <h2 id=title-id>JJMumbleBot Quick Setup Utility - Master Branch</h2>
     </div>
     <hr>
     <div class='container'>
@@ -123,10 +122,10 @@ <h3>Web Interface</h3>
       <h3>Media Settings</h3>
       <br>
       <div class='container bg-dark text-white rounded'>
-        <p>The file path to VLC.</p>
-        <b>[Example: path/to/vlc]</b><br>
-        <label for='media-vlc-path-input'>VLC Path:</label><br>
-        <input type="text" id="media-vlc-path" name='media-vlc-path-input' class='required form-control border border-danger' size='100' value="vlc" required>
+        <p>The file path to FFmpeg.</p>
+        <b>[Example: path/to/ffmpeg]</b><br>
+        <label for='media-vlc-path-input'>FFmpeg Path:</label><br>
+        <input type="text" id="media-ffmpeg-path" name='media-ffmpeg-path-input' class='required form-control border border-danger' size='100' value="ffmpeg" required>
       </div>
       <br>
       <div class='container bg-dark text-white rounded'>
@@ -136,15 +135,15 @@ <h3>Media Settings</h3>
       </div>
       <br>
       <div class='container bg-dark text-white rounded'>
-        <p>To enable vlc quiet mode, check the box.</p>
+        <p>To enable ffmpeg quiet mode, check the box.</p>
         <input type="checkbox" id="media-quiet-enable" name='media-quiet-enable-input' class='required' checked required>
-        <label for='media-quiet-enable-input'>Enable VLC Quiet</label>
+        <label for='media-quiet-enable-input'>Enable FFmpeg Quiet Mode</label>
       </div>
       <br>
       <div class='container bg-dark text-white rounded'>
         <p>The default volume when the bot starts.</p>
         <b>[Default: 0.3]</b><br>
-        <label for='media-default-volume-input'>VLC Default Volume:</label><br>
+        <label for='media-default-volume-input'>Audio Default Volume:</label><br>
         <input type="number" id="media-default-volume" name='media-default-volume-input' class='required form-control border border-danger' size='100' value="0.3" required>
       </div>
       <br>
@@ -157,28 +156,28 @@ <h3>Media Settings</h3>
       <div class='container bg-dark text-white rounded'>
         <p>The default audio ducking volume (How low the volume will drop down when ducking)</p>
         <b>[Default: 0.05]</b><br>
-        <label for='media-ducking-volume-input'>VLC Ducking Volume:</label><br>
+        <label for='media-ducking-volume-input'>Audio Ducking Volume:</label><br>
         <input type="number" id="media-ducking-volume" name='media-ducking-volume-input' class='required form-control border border-danger' size='100' value="0.05" required>
       </div>
       <br>
       <div class='container bg-dark text-white rounded'>
         <p>The default threshold before audio is ducked.</p>
         <b>[Default: 2500.0]</b><br>
-        <label for='media-ducking-threshold-input'>VLC Ducking Threshold:</label><br>
+        <label for='media-ducking-threshold-input'>Audio Ducking Threshold:</label><br>
         <input type="number" id="media-ducking-threshold" name='media-ducking-threshold-input' class='required form-control border border-danger' size='100' value="2500.0" required>
       </div>
       <br>
       <div class='container bg-dark text-white rounded'>
         <p>The default delay before the audio ducking reacts to user voices.</p>
         <b>[Default: 1.0]</b><br>
-        <label for='media-ducking-delay-input'>VLC Ducking Delay:</label><br>
+        <label for='media-ducking-delay-input'>Audio Ducking Delay:</label><br>
         <input type="number" id="media-ducking-delay" name='media-ducking-delay-input' class='required form-control border border-danger' size='100' value="1.0" required>
       </div>
       <br>
       <div class='container bg-dark text-white rounded'>
         <p>The default maximum queue length for the audio interface.</p>
         <b>[Default: 50]</b><br>
-        <label for='media-max-queue-length-input'>VLC Max Queue Length:</label><br>
+        <label for='media-max-queue-length-input'>Audio Max Queue Length:</label><br>
         <input type="number" id="media-max-queue-length" name='media-max-queue-length-input' class='required form-control border border-danger' size='100' value="50" required>
       </div>
       <br>
@@ -381,6 +380,6 @@ <h3>PGUI Settings</h3>
       <button onclick="get_all_data()" class="generate_button btn btn-primary btn-lg btn-block">Download Config.ini File</button>
     </div>
   </footer>
-  <script src="../../js/qsu/main.js"></script>
+  <script src="../../js/qsu/qsu_master.js"></script>
   </body>
 </html>