Narrate Both Sides
From c7c02a4d4642811ddf399d7913d226653d8f55c3 Mon Sep 17 00:00:00 2001
From: erew123 <35898566+erew123@users.noreply.github.com>
Date: Fri, 13 Dec 2024 17:29:09 +0000
Subject: [PATCH 2/5] AllTalk match PR to current Dev branch
Line 4184 & 11656
---
index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/index.html b/index.html
index de0776c..2b35301 100644
--- a/index.html
+++ b/index.html
@@ -4181,7 +4181,7 @@
var current_wi = []; //each item stores a wi object.
var wi_insertlocation = 0; //after memory
var wi_searchdepth = 0; //search everything
- var generateimagesinterval = 700; //if generated images is enabled, it will trigger after every 700 new characters in context.
+ var generateimagesinterval = 750; //if generated images is enabled, it will trigger after every 700 new characters in context.
var nextgeneratedimagemilestone = generateimagesinterval; //used to keep track of when to generate the next image
var image_db = {}; //stores a dictionary of pending images
var interrogation_db = {};
@@ -11653,7 +11653,7 @@
function do_auto_gen_image(truncated_context)
{
var tclen = truncated_context.length;
- var sentence = truncated_context.substring(tclen - 380, tclen);
+ var sentence = truncated_context.substring(tclen - 400, tclen);
sentence = start_trim_to_sentence(sentence);
sentence = end_trim_to_sentence(sentence,true);
if (sentence.length > 0) {
From b1c1f7d4dfc746fd331d528765e4a184159f1a96 Mon Sep 17 00:00:00 2001
From: Concedo
Date: Sat, 14 Dec 2024 10:21:15 +0800
Subject: [PATCH 3/5] changed global dom events to direct function calls from
the ui control event
---
index.html | 144 +++++++++++++++++++++++------------------------------
1 file changed, 61 insertions(+), 83 deletions(-)
diff --git a/index.html b/index.html
index 2b35301..4bee238 100644
--- a/index.html
+++ b/index.html
@@ -11881,23 +11881,22 @@
}
},false);
}
- function toggle_tts_mode() {
+
+ function toggle_tts_mode()
+ {
document.getElementById("xtts_container").classList.add("hidden");
document.getElementById("oai_tts_container").classList.add("hidden");
document.getElementById("alltalk_specific_controls").classList.add("hidden");
-
+
const selectedTTS = document.getElementById("ttsselect").value;
-
+
if(selectedTTS == XTTS_ID || selectedTTS == ALLTALK_ID) {
document.getElementById("xtts_container").classList.remove("hidden");
-
+
if(selectedTTS == ALLTALK_ID) {
document.getElementById("alltalk_specific_controls").classList.remove("hidden");
- if(localsettings.saved_alltalk_url) {
- fetch_rvc_voices(localsettings.saved_alltalk_url);
- }
- update_rvc_state();
- setupAllTalkControls(); // Add this line to setup the controls
+ fetch_rvc_voices();
+ adjust_alltalk_controls();
}
fetch_xtts_voices(true, selectedTTS == XTTS_ID);
}
@@ -11906,19 +11905,18 @@
}
}
- // Call setupAllTalkControls when the page loads
- document.addEventListener('DOMContentLoaded', function() {
- setupAllTalkControls();
- });
// Fetch RVC voices for AllTalk
- function fetch_rvc_voices(url) {
- fetch(url + "/api/rvcvoices")
+ function fetch_rvc_voices()
+ {
+ if(!xtts_is_connected) //prevent it from constantly fetching, will only fetch once before connecting
+ {
+ fetch(localsettings.saved_alltalk_url + "/api/rvcvoices")
.then(response => response.json())
.then(data => {
console.log("RVC voices response:", data); // Debug log
const rvcSelect = document.getElementById("alltalk_rvc_voice");
rvcSelect.innerHTML = '';
-
+
if (data.status === "success" && Array.isArray(data.rvcvoices)) { // Changed from data.voices to data.rvcvoices
data.rvcvoices.forEach(voice => { // Changed from data.voices to data.rvcvoices
if (voice !== "Disabled") {
@@ -11933,43 +11931,21 @@
.catch(error => {
console.log("Error fetching RVC voices:", error);
});
+ }
}
- // Function to handle RVC dropdown state (Disable if Streaming Selected)
- function update_rvc_state() {
+
+ //single callback to update alltalk controls on any alltalk UI event.
+ function adjust_alltalk_controls() {
+ const pitchSlider = document.getElementById("alltalk_rvc_pitch");
+ const pitchValue = document.getElementById("alltalk_rvc_pitch_value");
+ pitchValue.textContent = pitchSlider.value;
const streamingMode = document.getElementById("alltalk_streaming").value === "true";
const rvcSelect = document.getElementById("alltalk_rvc_voice");
const rvcPitch = document.getElementById("alltalk_rvc_pitch");
-
- console.log("Updating RVC state, streaming mode:", streamingMode);
-
- // Update disabled state
rvcSelect.disabled = streamingMode;
rvcPitch.disabled = streamingMode;
-
- // Only reset to Disabled if switching to streaming mode
- if (streamingMode) {
- rvcSelect.value = "Disabled";
- }
}
- // Make sure RVC Pitch Slider works
- function setupAllTalkControls() {
- const pitchSlider = document.getElementById("alltalk_rvc_pitch");
- const pitchValue = document.getElementById("alltalk_rvc_pitch_value");
-
- if (pitchSlider && pitchValue) {
- pitchSlider.addEventListener("input", function() {
- pitchValue.textContent = this.value;
- });
- }
- }
- // Listener for AllTalk streaming mode changes
- document.addEventListener('DOMContentLoaded', function() {
- const streamingSelect = document.getElementById("alltalk_streaming");
- streamingSelect.addEventListener("change", function() {
- console.log("Streaming mode changed to:", this.value); // Debug log
- update_rvc_state();
- });
- });
+
// Update set_xtts_url to use the new fetch_rvc_voices function
function set_xtts_url() {
let is_xtts = (document.getElementById("ttsselect").value==XTTS_ID);
@@ -11984,15 +11960,14 @@
userinput = (is_xtts?default_xtts_base:default_alltalk_base);
}
if (userinput != null && userinput!="") {
+ xtts_is_connected = false;
if(is_xtts) {
localsettings.saved_xtts_url = userinput.trim();
} else {
localsettings.saved_alltalk_url = userinput.trim();
// Fetch RVC voices with new URL
- fetch_rvc_voices(userinput.trim());
+ fetch_rvc_voices();
}
-
- xtts_is_connected = false;
fetch_xtts_voices(false, is_xtts);
}
},false);
@@ -12115,10 +12090,11 @@
console.log("XTTS Speak Error: " + error);
});
}
- else {
+ else
+ {
//alltalk
const isStreaming = document.getElementById("alltalk_streaming").value === "true";
-
+
if (isStreaming) {
// Create a URLSearchParams object for streaming
const params = new URLSearchParams({
@@ -12130,12 +12106,12 @@
// Create streaming URL
const streamingUrl = `${localsettings.saved_alltalk_url}/api/tts-generate-streaming?${params.toString()}`;
-
+
// Use the existing Web Audio API setup
const audioElement = new Audio(streamingUrl);
xtts_is_playing = true;
update_submit_button(false);
-
+
audioElement.onended = function() {
setTimeout(() => {
xtts_is_playing = false;
@@ -12143,13 +12119,13 @@
console.log("Audio finished playing");
}, 300);
};
-
+
audioElement.onerror = function(error) {
console.log("AllTalk Streaming Error:", error);
xtts_is_playing = false;
update_submit_button(false);
};
-
+
audioElement.play();
} else {
// Standard mode using FormData
@@ -12181,7 +12157,7 @@
const audioElement = new Audio(audioUrl);
xtts_is_playing = true;
update_submit_button(false);
-
+
audioElement.onended = function() {
setTimeout(() => {
xtts_is_playing = false;
@@ -12189,13 +12165,13 @@
console.log("Audio finished playing");
}, 300);
};
-
+
audioElement.onerror = function(error) {
console.log("AllTalk Playback Error:", error);
xtts_is_playing = false;
update_submit_button(false);
};
-
+
audioElement.play();
} else {
console.log("AllTalk Generation Error:", data);
@@ -19707,13 +19683,33 @@
-
+
+
+
Generation Mode
+
+
+
RVC Voice
+
+
+
RVC Pitch
+
+
+ 0
+
+
-