fix: correct typos in comments, error messages, variables
- Fixed spelling in comments throughout codebase - Corrected error messages and user-facing strings - Standardized variable names (cancleGenerateion --> cancelGeneration where needed) - No functional changes, purely cosmetic fixes
This commit is contained in:
parent
6db87d119d
commit
61003eb84c
4 changed files with 14 additions and 14 deletions
|
|
@ -18,14 +18,14 @@ AceStep::AceStep(QObject* parent): QObject(parent)
|
||||||
connect(&ditVaeProcess, &QProcess::finished, this, &AceStep::ditProcFinished);
|
connect(&ditVaeProcess, &QProcess::finished, this, &AceStep::ditProcFinished);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AceStep::isGenerateing(SongItem* song)
|
bool AceStep::isGenerating(SongItem* song)
|
||||||
{
|
{
|
||||||
if(!busy && song)
|
if(!busy && song)
|
||||||
*song = this->request.song;
|
*song = this->request.song;
|
||||||
return busy;
|
return busy;
|
||||||
}
|
}
|
||||||
|
|
||||||
void AceStep::cancleGenerateion()
|
void AceStep::cancelGeneration()
|
||||||
{
|
{
|
||||||
qwenProcess.blockSignals(true);
|
qwenProcess.blockSignals(true);
|
||||||
qwenProcess.terminate();
|
qwenProcess.terminate();
|
||||||
|
|
@ -39,7 +39,7 @@ void AceStep::cancleGenerateion()
|
||||||
|
|
||||||
progressUpdate(100);
|
progressUpdate(100);
|
||||||
if(busy)
|
if(busy)
|
||||||
generationCancled(request.song);
|
generationCanceled(request.song);
|
||||||
|
|
||||||
busy = false;
|
busy = false;
|
||||||
}
|
}
|
||||||
|
|
@ -50,7 +50,7 @@ bool AceStep::requestGeneration(SongItem song, QString requestTemplate, QString
|
||||||
{
|
{
|
||||||
if(busy)
|
if(busy)
|
||||||
{
|
{
|
||||||
qWarning()<<"Droping song:"<<song.caption;
|
qWarning()<<"Dropping song:"<<song.caption;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
busy = true;
|
busy = true;
|
||||||
|
|
@ -136,7 +136,7 @@ void AceStep::qwenProcFinished(int code, QProcess::ExitStatus status)
|
||||||
if(code != 0)
|
if(code != 0)
|
||||||
{
|
{
|
||||||
QString errorOutput = qwenProcess.readAllStandardError();
|
QString errorOutput = qwenProcess.readAllStandardError();
|
||||||
generationError("dit-vae exited with code " + QString::number(code) + ": " + errorOutput);
|
generationError("ace-qwen3 exited with code " + QString::number(code) + ": " + errorOutput);
|
||||||
busy = false;
|
busy = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -153,7 +153,7 @@ void AceStep::qwenProcFinished(int code, QProcess::ExitStatus status)
|
||||||
request.requestLlmFilePath = tempDir + "/request_" + QString::number(request.uid) + "0.json";
|
request.requestLlmFilePath = tempDir + "/request_" + QString::number(request.uid) + "0.json";
|
||||||
if (!QFileInfo::exists(request.requestLlmFilePath))
|
if (!QFileInfo::exists(request.requestLlmFilePath))
|
||||||
{
|
{
|
||||||
generationError("ace-qwen3 failed to create enhaced request file "+request.requestLlmFilePath);
|
generationError("ace-qwen3 failed to create enhanced request file "+request.requestLlmFilePath);
|
||||||
busy = false;
|
busy = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ class AceStep : public QObject
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void songGenerated(SongItem song);
|
void songGenerated(SongItem song);
|
||||||
void generationCancled(SongItem song);
|
void generationCanceled(SongItem song);
|
||||||
void generationError(QString error);
|
void generationError(QString error);
|
||||||
void progressUpdate(int progress);
|
void progressUpdate(int progress);
|
||||||
|
|
||||||
|
|
@ -50,8 +50,8 @@ public slots:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AceStep(QObject* parent = nullptr);
|
AceStep(QObject* parent = nullptr);
|
||||||
bool isGenerateing(SongItem* song = nullptr);
|
bool isGenerating(SongItem* song = nullptr);
|
||||||
void cancleGenerateion();
|
void cancelGeneration();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void qwenProcFinished(int code, QProcess::ExitStatus status);
|
void qwenProcFinished(int code, QProcess::ExitStatus status);
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||||
connect(audioPlayer, &AudioPlayer::positionChanged, this, &MainWindow::updatePosition);
|
connect(audioPlayer, &AudioPlayer::positionChanged, this, &MainWindow::updatePosition);
|
||||||
connect(audioPlayer, &AudioPlayer::durationChanged, this, &MainWindow::updateDuration);
|
connect(audioPlayer, &AudioPlayer::durationChanged, this, &MainWindow::updateDuration);
|
||||||
connect(aceStep, &AceStep::songGenerated, this, &MainWindow::songGenerated);
|
connect(aceStep, &AceStep::songGenerated, this, &MainWindow::songGenerated);
|
||||||
connect(aceStep, &AceStep::generationCancled, this, &MainWindow::generationCanceld);
|
connect(aceStep, &AceStep::generationCanceled, this, &MainWindow::generationCanceld);
|
||||||
connect(aceStep, &AceStep::generationError, this, &MainWindow::generationError);
|
connect(aceStep, &AceStep::generationError, this, &MainWindow::generationError);
|
||||||
connect(aceStep, &AceStep::progressUpdate, ui->progressBar, &QProgressBar::setValue);
|
connect(aceStep, &AceStep::progressUpdate, ui->progressBar, &QProgressBar::setValue);
|
||||||
|
|
||||||
|
|
@ -102,7 +102,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||||
|
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
{
|
{
|
||||||
aceStep->cancleGenerateion();
|
aceStep->cancelGeneration();
|
||||||
|
|
||||||
autoSavePlaylist();
|
autoSavePlaylist();
|
||||||
saveSettings();
|
saveSettings();
|
||||||
|
|
@ -523,7 +523,7 @@ void MainWindow::ensureSongsInQueue(bool enqeueCurrent)
|
||||||
|
|
||||||
SongItem lastSong;
|
SongItem lastSong;
|
||||||
SongItem workerSong;
|
SongItem workerSong;
|
||||||
if(aceStep->isGenerateing(&workerSong))
|
if(aceStep->isGenerating(&workerSong))
|
||||||
lastSong = workerSong;
|
lastSong = workerSong;
|
||||||
else if(!generatedSongQueue.empty())
|
else if(!generatedSongQueue.empty())
|
||||||
lastSong = generatedSongQueue.last();
|
lastSong = generatedSongQueue.last();
|
||||||
|
|
@ -553,7 +553,7 @@ void MainWindow::ensureSongsInQueue(bool enqeueCurrent)
|
||||||
void MainWindow::flushGenerationQueue()
|
void MainWindow::flushGenerationQueue()
|
||||||
{
|
{
|
||||||
generatedSongQueue.clear();
|
generatedSongQueue.clear();
|
||||||
aceStep->cancleGenerateion();
|
aceStep->cancelGeneration();
|
||||||
isGeneratingNext = false;
|
isGeneratingNext = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ public:
|
||||||
inline SongItem(const QString &caption = "", const QString &lyrics = "")
|
inline SongItem(const QString &caption = "", const QString &lyrics = "")
|
||||||
: caption(caption), lyrics(lyrics)
|
: caption(caption), lyrics(lyrics)
|
||||||
{
|
{
|
||||||
// Generate a unique ID using cryptographically secure random number
|
// Generate a unique ID using a cryptographically secure random number
|
||||||
uniqueId = QRandomGenerator::global()->generate64();
|
uniqueId = QRandomGenerator::global()->generate64();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue