uvos/Aceradio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Song handling simplification

Browse source 
Add languge field to songs

Add lyric display
This commit is contained in:
Carl Philipp Klemm 2026-03-05 00:50:23 +01:00
parent 134e827053
commit 1fec61140c
13 changed files with 384 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

59
AceStepWorker.cpp
View file

@ -21,7 +21,7 @@ AceStepWorker::~AceStepWorker()
cancelGeneration();
}
void AceStepWorker::generateSong(const QString &caption, const QString &lyrics, const QString &jsonTemplate,
void AceStepWorker::generateSong(const SongItem& song, const QString &jsonTemplate,
const QString &aceStepPath, const QString &qwen3ModelPath,
const QString &textEncoderModelPath, const QString &ditModelPath,
const QString &vaeModelPath)
@ -30,21 +30,31 @@ void AceStepWorker::generateSong(const QString &caption, const QString &lyrics,
cancelGeneration();
// Create worker and start it
currentWorker = new Worker(this, caption, lyrics, jsonTemplate, aceStepPath, qwen3ModelPath,
currentWorker = new Worker(this, song, jsonTemplate, aceStepPath, qwen3ModelPath,
textEncoderModelPath, ditModelPath, vaeModelPath);
currentWorker->setAutoDelete(true);
QThreadPool::globalInstance()->start(currentWorker);
}
void AceStepWorker::cancelGeneration()
{
// Note: In a real implementation, we would need to implement proper cancellation
// For now, we just clear the reference
currentWorker = nullptr;
}
void AceStepWorker::workerFinished()
bool AceStepWorker::songGenerateing(SongItem* song)
{
emit generationFinished();
workerMutex.lock();
if(!currentWorker) {
workerMutex.unlock();
return false;
}
else {
SongItem workerSong = currentWorker->getSong();
workerMutex.unlock();
if(song)
*song = workerSong;
return true;
}
}
// Worker implementation
@ -64,15 +74,20 @@ void AceStepWorker::Worker::run()
}
QJsonObject requestObj = templateDoc.object();
requestObj["caption"] = caption;
requestObj["caption"] = song.caption;
if (!lyrics.isEmpty()) {
requestObj["lyrics"] = lyrics;
if (!song.lyrics.isEmpty()) {
requestObj["lyrics"] = song.lyrics;
} else {
// Remove lyrics field if empty to let the LLM generate them
requestObj.remove("lyrics");
}
// Apply vocal language override if set
if (!song.vocalLanguage.isEmpty()) {
requestObj["vocal_language"] = song.vocalLanguage;
}
// Write the request file
QFile requestFileHandle(requestFile);
if (!requestFileHandle.open(QIODevice::WriteOnly | QIODevice::Text)) {
@ -161,6 +176,21 @@ void AceStepWorker::Worker::run()
return;
}
// Load lyrics from the enhanced request file
QFile lmOutputFile(requestLmOutputFile);
if (lmOutputFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
QJsonParseError parseError;
QJsonDocument doc = QJsonDocument::fromJson(lmOutputFile.readAll(), &parseError);
lmOutputFile.close();
if (doc.isObject() && !parseError.error) {
QJsonObject obj = doc.object();
if (obj.contains("lyrics") && obj["lyrics"].isString()) {
song.lyrics = obj["lyrics"].toString();
}
}
}
emit parent->progressUpdate(50);
// Step 2: Run dit-vae to generate audio
@ -207,5 +237,14 @@ void AceStepWorker::Worker::run()
QFile::remove(requestFile);
emit parent->progressUpdate(100);
emit parent->songGenerated(wavFile);
song.file = wavFile;
emit parent->songGenerated(song);
parent->workerMutex.lock();
parent->currentWorker = nullptr;
parent->workerMutex.unlock();
}
const SongItem& AceStepWorker::Worker::getSong()
{
return song;
}