Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-09-02 14:45:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix up / down audio

Browse Source
This commit is contained in:
WarmUpTill
2020-10-11 15:18:55 +02:00
parent 085225bdcc
commit 39067f6157
4 changed files with 186 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/switch-audio.cpp
View File

@@ -37,47 +37,42 @@ void SceneSwitcher::on_audioRemove_clicked()
void SceneSwitcher::on_audioUp_clicked()
{
int index = ui->audioSwitches->currentRow();
if (index != -1 && index != 0) {
delete ui->audioSwitches->itemWidget(
if (!listMoveUp(ui->audioSwitches))
return;
AudioSwitchWidget *as1 =
(AudioSwitchWidget *)ui->audioSwitches->itemWidget(
ui->audioSwitches->item(index));
AudioSwitchWidget *sw =
new AudioSwitchWidget(&switcher->audioSwitches[index]);
AudioSwitchWidget *as2 =
(AudioSwitchWidget *)ui->audioSwitches->itemWidget(
ui->audioSwitches->item(index - 1));
AudioSwitchWidget::swapSwitchData(as1, as2);
ui->audioSwitches->insertItem(
index - 1, ui->audioSwitches->takeItem(index));
ui->audioSwitches->setItemWidget(
ui->audioSwitches->item(index - 1), sw);
std::lock_guard<std::mutex> lock(switcher->m);
ui->audioSwitches->setCurrentRow(index - 1);
std::lock_guard<std::mutex> lock(switcher->m);
std::swap(switcher->audioSwitches[index],
switcher->audioSwitches[index - 1]);
}
std::swap(switcher->audioSwitches[index],
switcher->audioSwitches[index - 1]);
}
void SceneSwitcher::on_audioDown_clicked()
{
int index = ui->audioSwitches->currentRow();
if (index != -1 && index != ui->audioSwitches->count() - 1) {
delete ui->audioSwitches->itemWidget(
if (!listMoveDown(ui->audioSwitches))
return;
AudioSwitchWidget *as1 =
(AudioSwitchWidget *)ui->audioSwitches->itemWidget(
ui->audioSwitches->item(index));
AudioSwitchWidget *sw =
new AudioSwitchWidget(&switcher->audioSwitches[index]);
AudioSwitchWidget *as2 =
(AudioSwitchWidget *)ui->audioSwitches->itemWidget(
ui->audioSwitches->item(index + 1));
AudioSwitchWidget::swapSwitchData(as1, as2);
ui->audioSwitches->insertItem(
index + 1, ui->audioSwitches->takeItem(index));
ui->audioSwitches->setItemWidget(
ui->audioSwitches->item(index + 1), sw);
std::lock_guard<std::mutex> lock(switcher->m);
ui->audioSwitches->setCurrentRow(index + 1);
std::lock_guard<std::mutex> lock(switcher->m);
std::swap(switcher->audioSwitches[index],
switcher->audioSwitches[index + 1]);
}
std::swap(switcher->audioSwitches[index],
switcher->audioSwitches[index + 1]);
}
void SwitcherData::checkAudioSwitch(bool &match, OBSWeakSource &scene,
@@ -436,6 +431,19 @@ AudioSwitch *AudioSwitchWidget::getSwitchData()
return switchData;
}
void AudioSwitchWidget::setSwitchData(AudioSwitch *s)
{
switchData = s;
}
void AudioSwitchWidget::swapSwitchData(AudioSwitchWidget *as1,
AudioSwitchWidget *as2)
{
AudioSwitch *t = as1->getSwitchData();
as1->setSwitchData(as2->getSwitchData());
as2->setSwitchData(t);
}
void AudioSwitchWidget::TransitionChanged(const QString &text)
{
if (loading || !switchData)