Replace the old QObject::connect syntax with the new one supported since Qt5
The old syntax is essentially based on the "normalised representation" created by the SIGNAL and SLOT macros, with potential mismatched only being caught at runtime. The new syntax causes these errors to appear in compile time.
This commit is contained in:
Daniel Kamil Kozar
parent
b79ef4c3e4
commit
b2ac11b0b5
@ -5,10 +5,10 @@ const static int MAX_ERRORS_CNT = 10000;
|
|||||||
MuxForm::MuxForm(QWidget *parent)
|
MuxForm::MuxForm(QWidget *parent)
|
||||||
: QDialog(parent, Qt::WindowMaximizeButtonHint), muxProcess(0) {
|
: QDialog(parent, Qt::WindowMaximizeButtonHint), muxProcess(0) {
|
||||||
ui.setupUi(this);
|
ui.setupUi(this);
|
||||||
connect(ui.progressBar, SIGNAL(valueChanged(int)), this,
|
connect(ui.progressBar, &QProgressBar::valueChanged, this,
|
||||||
SLOT(onProgressChanged()));
|
&MuxForm::onProgressChanged);
|
||||||
connect(ui.abortBtn, SIGNAL(clicked()), this, SLOT(onAbort()));
|
connect(ui.abortBtn, &QPushButton::clicked, this, &MuxForm::onAbort);
|
||||||
connect(ui.okBtn, SIGNAL(clicked()), this, SLOT(close()));
|
connect(ui.okBtn, &QPushButton::clicked, this, &MuxForm::close);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MuxForm::closeEvent(QCloseEvent *event) {
|
void MuxForm::closeEvent(QCloseEvent *event) {
|
||||||
|
|||||||
@ -229,8 +229,8 @@ QString myUnquoteStr(const QString &val) { return unquoteStr(val); }
|
|||||||
QnCheckBoxedHeaderView::QnCheckBoxedHeaderView(QWidget *parent)
|
QnCheckBoxedHeaderView::QnCheckBoxedHeaderView(QWidget *parent)
|
||||||
: base_type(Qt::Horizontal, parent), m_checkState(Qt::Unchecked),
|
: base_type(Qt::Horizontal, parent), m_checkState(Qt::Unchecked),
|
||||||
m_checkColumnIndex(0) {
|
m_checkColumnIndex(0) {
|
||||||
connect(this, SIGNAL(sectionClicked(int)), this,
|
connect(this, &QnCheckBoxedHeaderView::sectionClicked, this,
|
||||||
SLOT(at_sectionClicked(int)));
|
&QnCheckBoxedHeaderView::at_sectionClicked);
|
||||||
}
|
}
|
||||||
|
|
||||||
Qt::CheckState QnCheckBoxedHeaderView::checkState() const {
|
Qt::CheckState QnCheckBoxedHeaderView::checkState() const {
|
||||||
@ -370,8 +370,8 @@ TsMuxerWindow::TsMuxerWindow()
|
|||||||
m_header->setVisible(true);
|
m_header->setVisible(true);
|
||||||
m_header->setSectionsClickable(true);
|
m_header->setSectionsClickable(true);
|
||||||
|
|
||||||
connect(m_header, SIGNAL(checkStateChanged(Qt::CheckState)), this,
|
connect(m_header, &QnCheckBoxedHeaderView::checkStateChanged, this,
|
||||||
SLOT(at_sectionCheckstateChanged(Qt::CheckState)));
|
&TsMuxerWindow::at_sectionCheckstateChanged);
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////
|
||||||
for (int i = 0; i <= 3600; i += 5 * 60)
|
for (int i = 0; i <= 3600; i += 5 * 60)
|
||||||
@ -391,171 +391,174 @@ TsMuxerWindow::TsMuxerWindow()
|
|||||||
ui.listViewFont->item(i, 1)->setFlags(ui.listViewFont->item(i, 0)->flags() &
|
ui.listViewFont->item(i, 1)->setFlags(ui.listViewFont->item(i, 0)->flags() &
|
||||||
(~Qt::ItemIsEditable));
|
(~Qt::ItemIsEditable));
|
||||||
}
|
}
|
||||||
connect(&opacityTimer, SIGNAL(timeout()), this, SLOT(onOpacityTimer()));
|
const auto comboBoxIndexChanged = QOverload<int>::of(&QComboBox::currentIndexChanged);
|
||||||
connect(ui.trackLV, SIGNAL(itemSelectionChanged()), this,
|
const auto spinBoxValueChanged = QOverload<int>::of(&QSpinBox::valueChanged);
|
||||||
SLOT(trackLVItemSelectionChanged()));
|
const auto doubleSpinBoxValueChanged = QOverload<double>::of(&QDoubleSpinBox::valueChanged);
|
||||||
connect(ui.trackLV, SIGNAL(itemChanged(QTableWidgetItem *)), this,
|
connect(&opacityTimer, &QTimer::timeout, this, &TsMuxerWindow::onOpacityTimer);
|
||||||
SLOT(trackLVItemChanged(QTableWidgetItem *)));
|
connect(ui.trackLV, &QTableWidget::itemSelectionChanged, this,
|
||||||
connect(ui.inputFilesLV, SIGNAL(currentRowChanged(int)), this,
|
&TsMuxerWindow::trackLVItemSelectionChanged);
|
||||||
SLOT(inputFilesLVChanged()));
|
connect(ui.trackLV, &QTableWidget::itemChanged, this,
|
||||||
connect(ui.addBtn, SIGNAL(clicked()), this, SLOT(onAddBtnClick()));
|
&TsMuxerWindow::trackLVItemChanged);
|
||||||
connect(ui.btnAppend, SIGNAL(clicked()), this, SLOT(onAppendButtonClick()));
|
connect(ui.inputFilesLV, &QListWidget::currentRowChanged, this,
|
||||||
connect(ui.removeFile, SIGNAL(clicked()), this, SLOT(onRemoveBtnClick()));
|
&TsMuxerWindow::inputFilesLVChanged);
|
||||||
connect(ui.removeTrackBtn, SIGNAL(clicked()), this,
|
connect(ui.addBtn, &QPushButton::clicked, this, &TsMuxerWindow::onAddBtnClick);
|
||||||
SLOT(onRemoveTrackButtonClick()));
|
connect(ui.btnAppend, &QPushButton::clicked, this, &TsMuxerWindow::onAppendButtonClick);
|
||||||
connect(ui.moveupBtn, SIGNAL(clicked()), this, SLOT(onMoveUpButtonCLick()));
|
connect(ui.removeFile, &QPushButton::clicked, this, &TsMuxerWindow::onRemoveBtnClick);
|
||||||
connect(ui.movedownBtn, SIGNAL(clicked()), this,
|
connect(ui.removeTrackBtn, &QPushButton::clicked, this,
|
||||||
SLOT(onMoveDownButtonCLick()));
|
&TsMuxerWindow::onRemoveTrackButtonClick);
|
||||||
connect(ui.checkFPS, SIGNAL(stateChanged(int)), this,
|
connect(ui.moveupBtn, &QPushButton::clicked, this, &TsMuxerWindow::onMoveUpButtonCLick);
|
||||||
SLOT(onVideoCheckBoxChanged(int)));
|
connect(ui.movedownBtn, &QPushButton::clicked, this,
|
||||||
connect(ui.checkBoxLevel, SIGNAL(stateChanged(int)), this,
|
&TsMuxerWindow::onMoveDownButtonCLick);
|
||||||
SLOT(onVideoCheckBoxChanged(int)));
|
connect(ui.checkFPS, &QCheckBox::stateChanged, this,
|
||||||
connect(ui.comboBoxSEI, SIGNAL(currentIndexChanged(int)), this,
|
&TsMuxerWindow::onVideoCheckBoxChanged);
|
||||||
SLOT(onVideoCheckBoxChanged(int)));
|
connect(ui.checkBoxLevel, &QCheckBox::stateChanged, this,
|
||||||
connect(ui.checkBoxSecondaryVideo, SIGNAL(stateChanged(int)), this,
|
&TsMuxerWindow::onVideoCheckBoxChanged);
|
||||||
SLOT(onVideoCheckBoxChanged(int)));
|
connect(ui.comboBoxSEI, comboBoxIndexChanged, this,
|
||||||
connect(ui.checkBoxSPS, SIGNAL(stateChanged(int)), this,
|
&TsMuxerWindow::onVideoCheckBoxChanged);
|
||||||
SLOT(onVideoCheckBoxChanged(int)));
|
connect(ui.checkBoxSecondaryVideo, &QCheckBox::stateChanged, this,
|
||||||
connect(ui.checkBoxRemovePulldown, SIGNAL(stateChanged(int)), this,
|
&TsMuxerWindow::onVideoCheckBoxChanged);
|
||||||
SLOT(onPulldownCheckBoxChanged(int)));
|
connect(ui.checkBoxSPS, &QCheckBox::stateChanged, this,
|
||||||
connect(ui.comboBoxFPS, SIGNAL(currentIndexChanged(int)), this,
|
&TsMuxerWindow::onVideoCheckBoxChanged);
|
||||||
SLOT(onVideoComboBoxChanged(int)));
|
connect(ui.checkBoxRemovePulldown, &QCheckBox::stateChanged, this,
|
||||||
connect(ui.comboBoxLevel, SIGNAL(currentIndexChanged(int)), this,
|
&TsMuxerWindow::onPulldownCheckBoxChanged);
|
||||||
SLOT(onVideoComboBoxChanged(int)));
|
connect(ui.comboBoxFPS, comboBoxIndexChanged, this,
|
||||||
connect(ui.comboBoxAR, SIGNAL(currentIndexChanged(int)), this,
|
&TsMuxerWindow::onVideoComboBoxChanged);
|
||||||
SLOT(onVideoComboBoxChanged(int)));
|
connect(ui.comboBoxLevel, comboBoxIndexChanged, this,
|
||||||
connect(ui.checkBoxKeepFps, SIGNAL(stateChanged(int)), this,
|
&TsMuxerWindow::onVideoComboBoxChanged);
|
||||||
SLOT(onAudioSubtitlesParamsChanged()));
|
connect(ui.comboBoxAR, comboBoxIndexChanged, this,
|
||||||
connect(ui.dtsDwnConvert, SIGNAL(stateChanged(int)), this,
|
&TsMuxerWindow::onVideoComboBoxChanged);
|
||||||
SLOT(onAudioSubtitlesParamsChanged()));
|
connect(ui.checkBoxKeepFps, &QCheckBox::stateChanged, this,
|
||||||
connect(ui.secondaryCheckBox, SIGNAL(stateChanged(int)), this,
|
&TsMuxerWindow::onAudioSubtitlesParamsChanged);
|
||||||
SLOT(onAudioSubtitlesParamsChanged()));
|
connect(ui.dtsDwnConvert, &QCheckBox::stateChanged, this,
|
||||||
connect(ui.langComboBox, SIGNAL(currentIndexChanged(int)), this,
|
&TsMuxerWindow::onAudioSubtitlesParamsChanged);
|
||||||
SLOT(onAudioSubtitlesParamsChanged()));
|
connect(ui.secondaryCheckBox, &QCheckBox::stateChanged, this,
|
||||||
connect(ui.offsetsComboBox, SIGNAL(currentIndexChanged(int)), this,
|
&TsMuxerWindow::onAudioSubtitlesParamsChanged);
|
||||||
SLOT(onAudioSubtitlesParamsChanged()));
|
connect(ui.langComboBox, comboBoxIndexChanged, this,
|
||||||
connect(ui.comboBoxPipCorner, SIGNAL(currentIndexChanged(int)), this,
|
&TsMuxerWindow::onAudioSubtitlesParamsChanged);
|
||||||
SLOT(onSavedParamChanged()));
|
connect(ui.offsetsComboBox, comboBoxIndexChanged, this,
|
||||||
connect(ui.comboBoxPipSize, SIGNAL(currentIndexChanged(int)), this,
|
&TsMuxerWindow::onAudioSubtitlesParamsChanged);
|
||||||
SLOT(onSavedParamChanged()));
|
connect(ui.comboBoxPipCorner, comboBoxIndexChanged, this,
|
||||||
connect(ui.spinBoxPipOffsetH, SIGNAL(valueChanged(int)), this,
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
SLOT(onSavedParamChanged()));
|
connect(ui.comboBoxPipSize, comboBoxIndexChanged, this,
|
||||||
connect(ui.spinBoxPipOffsetV, SIGNAL(valueChanged(int)), this,
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
SLOT(onSavedParamChanged()));
|
connect(ui.spinBoxPipOffsetH, spinBoxValueChanged, this,
|
||||||
connect(ui.checkBoxSound, SIGNAL(stateChanged(int)), this,
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
SLOT(onSavedParamChanged()));
|
connect(ui.spinBoxPipOffsetV, spinBoxValueChanged, this,
|
||||||
connect(ui.editDelay, SIGNAL(valueChanged(int)), this,
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
SLOT(onEditDelayChanged(int)));
|
connect(ui.checkBoxSound, &QCheckBox::stateChanged, this,
|
||||||
connect(ui.muxTimeEdit, SIGNAL(timeChanged(QTime)), this,
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
SLOT(updateMuxTime1()));
|
connect(ui.editDelay, spinBoxValueChanged, this,
|
||||||
connect(ui.muxTimeClock, SIGNAL(valueChanged(int)), this,
|
&TsMuxerWindow::onEditDelayChanged);
|
||||||
SLOT(updateMuxTime2()));
|
connect(ui.muxTimeEdit, &QTimeEdit::timeChanged, this,
|
||||||
connect(ui.fontButton, SIGNAL(clicked()), this, SLOT(onFontBtnClicked()));
|
&TsMuxerWindow::updateMuxTime1);
|
||||||
connect(ui.colorButton, SIGNAL(clicked()), this, SLOT(onColorBtnClicked()));
|
connect(ui.muxTimeClock, spinBoxValueChanged, this,
|
||||||
connect(ui.checkBoxVBR, SIGNAL(clicked()), this,
|
&TsMuxerWindow::updateMuxTime2);
|
||||||
SLOT(onGeneralCheckboxClicked()));
|
connect(ui.fontButton, &QPushButton::clicked, this, &TsMuxerWindow::onFontBtnClicked);
|
||||||
connect(ui.spinBoxMplsNum, SIGNAL(valueChanged(int)), this,
|
connect(ui.colorButton, &QPushButton::clicked, this, &TsMuxerWindow::onColorBtnClicked);
|
||||||
SLOT(onGeneralCheckboxClicked()));
|
connect(ui.checkBoxVBR, &QPushButton::clicked, this,
|
||||||
connect(ui.spinBoxM2tsNum, SIGNAL(valueChanged(int)), this,
|
&TsMuxerWindow::onGeneralCheckboxClicked);
|
||||||
SLOT(onGeneralCheckboxClicked()));
|
connect(ui.spinBoxMplsNum, spinBoxValueChanged, this,
|
||||||
connect(ui.checkBoxBlankPL, SIGNAL(clicked()), this,
|
&TsMuxerWindow::onGeneralCheckboxClicked);
|
||||||
SLOT(onSavedParamChanged()));
|
connect(ui.spinBoxM2tsNum, spinBoxValueChanged, this,
|
||||||
connect(ui.BlackplaylistCombo, SIGNAL(valueChanged(int)), this,
|
&TsMuxerWindow::onGeneralCheckboxClicked);
|
||||||
SLOT(onSavedParamChanged()));
|
connect(ui.checkBoxBlankPL, &QPushButton::clicked, this,
|
||||||
connect(ui.checkBoxNewAudioPes, SIGNAL(clicked()), this,
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
SLOT(onSavedParamChanged()));
|
connect(ui.BlackplaylistCombo, spinBoxValueChanged, this,
|
||||||
connect(ui.checkBoxCrop, SIGNAL(stateChanged(int)), this,
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
SLOT(onSavedParamChanged()));
|
connect(ui.checkBoxNewAudioPes, &QAbstractButton::clicked, this,
|
||||||
connect(ui.checkBoxRVBR, SIGNAL(clicked()), this,
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
SLOT(onGeneralCheckboxClicked()));
|
connect(ui.checkBoxCrop, &QCheckBox::stateChanged, this,
|
||||||
connect(ui.checkBoxCBR, SIGNAL(clicked()), this,
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
SLOT(onGeneralCheckboxClicked()));
|
connect(ui.checkBoxRVBR, &QAbstractButton::clicked, this,
|
||||||
|
&TsMuxerWindow::onGeneralCheckboxClicked);
|
||||||
|
connect(ui.checkBoxCBR, &QAbstractButton::clicked, this,
|
||||||
|
&TsMuxerWindow::onGeneralCheckboxClicked);
|
||||||
// connect(ui.checkBoxuseAsynIO, SIGNAL(stateChanged(int)), this,
|
// connect(ui.checkBoxuseAsynIO, SIGNAL(stateChanged(int)), this,
|
||||||
// SLOT(onSavedParamChanged()));
|
// SLOT(onSavedParamChanged()));
|
||||||
connect(ui.radioButtonStoreOutput, SIGNAL(clicked()), this,
|
connect(ui.radioButtonStoreOutput, &QAbstractButton::clicked, this,
|
||||||
SLOT(onSavedParamChanged()));
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
connect(ui.radioButtonOutoutInInput, SIGNAL(clicked()), this,
|
connect(ui.radioButtonOutoutInInput, &QAbstractButton::clicked, this,
|
||||||
SLOT(onSavedParamChanged()));
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
connect(ui.editVBVLen, SIGNAL(valueChanged(int)), this,
|
connect(ui.editVBVLen, spinBoxValueChanged, this,
|
||||||
SLOT(onGeneralSpinboxValueChanged()));
|
&TsMuxerWindow::onGeneralSpinboxValueChanged);
|
||||||
connect(ui.editMaxBitrate, SIGNAL(valueChanged(double)), this,
|
connect(ui.editMaxBitrate, doubleSpinBoxValueChanged, this,
|
||||||
SLOT(onGeneralSpinboxValueChanged()));
|
&TsMuxerWindow::onGeneralSpinboxValueChanged);
|
||||||
connect(ui.editMinBitrate, SIGNAL(valueChanged(double)), this,
|
connect(ui.editMinBitrate, doubleSpinBoxValueChanged, this,
|
||||||
SLOT(onGeneralSpinboxValueChanged()));
|
&TsMuxerWindow::onGeneralSpinboxValueChanged);
|
||||||
connect(ui.editCBRBitrate, SIGNAL(valueChanged(double)), this,
|
connect(ui.editCBRBitrate, doubleSpinBoxValueChanged, this,
|
||||||
SLOT(onGeneralSpinboxValueChanged()));
|
&TsMuxerWindow::onGeneralSpinboxValueChanged);
|
||||||
connect(ui.rightEyeCheckBox, SIGNAL(stateChanged(int)), this,
|
connect(ui.rightEyeCheckBox, &QCheckBox::stateChanged, this,
|
||||||
SLOT(updateMetaLines()));
|
&TsMuxerWindow::updateMetaLines);
|
||||||
connect(ui.radioButtonAutoChapter, SIGNAL(clicked()), this,
|
connect(ui.radioButtonAutoChapter, &QAbstractButton::clicked, this,
|
||||||
SLOT(onChapterParamsChanged()));
|
&TsMuxerWindow::onChapterParamsChanged);
|
||||||
connect(ui.radioButtonNoChapters, SIGNAL(clicked()), this,
|
connect(ui.radioButtonNoChapters, &QAbstractButton::clicked, this,
|
||||||
SLOT(onChapterParamsChanged()));
|
&TsMuxerWindow::onChapterParamsChanged);
|
||||||
connect(ui.radioButtonCustomChapters, SIGNAL(clicked()), this,
|
connect(ui.radioButtonCustomChapters, &QAbstractButton::clicked, this,
|
||||||
SLOT(onChapterParamsChanged()));
|
&TsMuxerWindow::onChapterParamsChanged);
|
||||||
connect(ui.spinEditChapterLen, SIGNAL(valueChanged(int)), this,
|
connect(ui.spinEditChapterLen, spinBoxValueChanged, this,
|
||||||
SLOT(onChapterParamsChanged()));
|
&TsMuxerWindow::onChapterParamsChanged);
|
||||||
connect(ui.memoChapters, SIGNAL(textChanged()), this,
|
connect(ui.memoChapters, &QTextEdit::textChanged, this,
|
||||||
SLOT(onChapterParamsChanged()));
|
&TsMuxerWindow::onChapterParamsChanged);
|
||||||
connect(ui.noSplit, SIGNAL(clicked()), this, SLOT(onSplitCutParamsChanged()));
|
connect(ui.noSplit, &QAbstractButton::clicked, this, &TsMuxerWindow::onSplitCutParamsChanged);
|
||||||
connect(ui.splitByDuration, SIGNAL(clicked()), this,
|
connect(ui.splitByDuration, &QAbstractButton::clicked, this,
|
||||||
SLOT(onSplitCutParamsChanged()));
|
&TsMuxerWindow::onSplitCutParamsChanged);
|
||||||
connect(ui.splitBySize, SIGNAL(clicked()), this,
|
connect(ui.splitBySize, &QAbstractButton::clicked, this,
|
||||||
SLOT(onSplitCutParamsChanged()));
|
&TsMuxerWindow::onSplitCutParamsChanged);
|
||||||
connect(ui.spinEditSplitDuration, SIGNAL(valueChanged(int)), this,
|
connect(ui.spinEditSplitDuration, spinBoxValueChanged, this,
|
||||||
SLOT(onSplitCutParamsChanged()));
|
&TsMuxerWindow::onSplitCutParamsChanged);
|
||||||
connect(ui.editSplitSize, SIGNAL(valueChanged(double)), this,
|
connect(ui.editSplitSize, doubleSpinBoxValueChanged, this,
|
||||||
SLOT(onSplitCutParamsChanged()));
|
&TsMuxerWindow::onSplitCutParamsChanged);
|
||||||
connect(ui.comboBoxMeasure, SIGNAL(currentIndexChanged(int)), this,
|
connect(ui.comboBoxMeasure, comboBoxIndexChanged, this,
|
||||||
SLOT(onSplitCutParamsChanged()));
|
&TsMuxerWindow::onSplitCutParamsChanged);
|
||||||
connect(ui.checkBoxCut, SIGNAL(stateChanged(int)), this,
|
connect(ui.checkBoxCut, &QCheckBox::stateChanged, this,
|
||||||
SLOT(onSplitCutParamsChanged()));
|
&TsMuxerWindow::onSplitCutParamsChanged);
|
||||||
connect(ui.cutStartTimeEdit, SIGNAL(timeChanged(QTime)), this,
|
connect(ui.cutStartTimeEdit, &QTimeEdit::timeChanged, this,
|
||||||
SLOT(onSplitCutParamsChanged()));
|
&TsMuxerWindow::onSplitCutParamsChanged);
|
||||||
connect(ui.cutEndTimeEdit, SIGNAL(timeChanged(QTime)), this,
|
connect(ui.cutEndTimeEdit, &QTimeEdit::timeChanged, this,
|
||||||
SLOT(onSplitCutParamsChanged()));
|
&TsMuxerWindow::onSplitCutParamsChanged);
|
||||||
connect(ui.spinEditBorder, SIGNAL(valueChanged(int)), this,
|
connect(ui.spinEditBorder, spinBoxValueChanged, this,
|
||||||
SLOT(onSavedParamChanged()));
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
connect(ui.comboBoxAnimation, SIGNAL(currentIndexChanged(int)), this,
|
connect(ui.comboBoxAnimation, comboBoxIndexChanged, this,
|
||||||
SLOT(onSavedParamChanged()));
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
connect(ui.lineSpacing, SIGNAL(valueChanged(double)), this,
|
connect(ui.lineSpacing, doubleSpinBoxValueChanged, this,
|
||||||
SLOT(onSavedParamChanged()));
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
connect(ui.spinEditOffset, SIGNAL(valueChanged(int)), this,
|
connect(ui.spinEditOffset, spinBoxValueChanged, this,
|
||||||
SLOT(onSavedParamChanged()));
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
connect(ui.radioButtonTS, SIGNAL(clicked()), this,
|
connect(ui.radioButtonTS, &QAbstractButton::clicked, this,
|
||||||
SLOT(RadioButtonMuxClick()));
|
&TsMuxerWindow::RadioButtonMuxClick);
|
||||||
connect(ui.radioButtonM2TS, SIGNAL(clicked()), this,
|
connect(ui.radioButtonM2TS, &QAbstractButton::clicked, this,
|
||||||
SLOT(RadioButtonMuxClick()));
|
&TsMuxerWindow::RadioButtonMuxClick);
|
||||||
connect(ui.radioButtonBluRay, SIGNAL(clicked()), this,
|
connect(ui.radioButtonBluRay, &QAbstractButton::clicked, this,
|
||||||
SLOT(RadioButtonMuxClick()));
|
&TsMuxerWindow::RadioButtonMuxClick);
|
||||||
connect(ui.radioButtonBluRayISO, SIGNAL(clicked()), this,
|
connect(ui.radioButtonBluRayISO, &QAbstractButton::clicked, this,
|
||||||
SLOT(RadioButtonMuxClick()));
|
&TsMuxerWindow::RadioButtonMuxClick);
|
||||||
connect(ui.radioButtonBluRayUHD, SIGNAL(clicked()), this,
|
connect(ui.radioButtonBluRayUHD, &QAbstractButton::clicked, this,
|
||||||
SLOT(RadioButtonMuxClick()));
|
&TsMuxerWindow::RadioButtonMuxClick);
|
||||||
connect(ui.radioButtonBluRayISOUHD, SIGNAL(clicked()), this,
|
connect(ui.radioButtonBluRayISOUHD, &QAbstractButton::clicked, this,
|
||||||
SLOT(RadioButtonMuxClick()));
|
&TsMuxerWindow::RadioButtonMuxClick);
|
||||||
connect(ui.radioButtonAVCHD, SIGNAL(clicked()), this,
|
connect(ui.radioButtonAVCHD, &QAbstractButton::clicked, this,
|
||||||
SLOT(RadioButtonMuxClick()));
|
&TsMuxerWindow::RadioButtonMuxClick);
|
||||||
connect(ui.radioButtonDemux, SIGNAL(clicked()), this,
|
connect(ui.radioButtonDemux, &QAbstractButton::clicked, this,
|
||||||
SLOT(RadioButtonMuxClick()));
|
&TsMuxerWindow::RadioButtonMuxClick);
|
||||||
connect(ui.outFileName, SIGNAL(textChanged(const QString &)), this,
|
connect(ui.outFileName, &QLineEdit::textChanged, this,
|
||||||
SLOT(outFileNameChanged()));
|
&TsMuxerWindow::outFileNameChanged);
|
||||||
connect(ui.DiskLabelEdit, SIGNAL(textChanged(const QString &)), this,
|
connect(ui.DiskLabelEdit, &QLineEdit::textChanged, this,
|
||||||
SLOT(onGeneralCheckboxClicked()));
|
&TsMuxerWindow::onGeneralCheckboxClicked);
|
||||||
connect(ui.btnBrowse, SIGNAL(clicked()), this, SLOT(saveFileDialog()));
|
connect(ui.btnBrowse, &QAbstractButton::clicked, this, &TsMuxerWindow::saveFileDialog);
|
||||||
connect(ui.buttonMux, SIGNAL(clicked()), this, SLOT(startMuxing()));
|
connect(ui.buttonMux, &QAbstractButton::clicked, this, &TsMuxerWindow::startMuxing);
|
||||||
connect(ui.buttonSaveMeta, SIGNAL(clicked()), this,
|
connect(ui.buttonSaveMeta, &QAbstractButton::clicked, this,
|
||||||
SLOT(saveMetaFileBtnClick()));
|
&TsMuxerWindow::saveMetaFileBtnClick);
|
||||||
connect(ui.radioButtonOutoutInInput, SIGNAL(stateChanged(int)), this,
|
connect(ui.radioButtonOutoutInInput, &QAbstractButton::clicked, this,
|
||||||
SLOT(onSavedParamChanged()));
|
&TsMuxerWindow::onSavedParamChanged);
|
||||||
|
|
||||||
connect(&proc, SIGNAL(readyReadStandardOutput()), this,
|
connect(&proc, &QProcess::readyReadStandardOutput, this,
|
||||||
SLOT(readFromStdout()));
|
&TsMuxerWindow::readFromStdout);
|
||||||
connect(&proc, SIGNAL(readyReadStandardError()), this,
|
connect(&proc, &QProcess::readyReadStandardError, this,
|
||||||
SLOT(readFromStderr()));
|
&TsMuxerWindow::readFromStderr);
|
||||||
connect(&proc, SIGNAL(finished(int, QProcess::ExitStatus)), this,
|
connect(&proc, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this,
|
||||||
SLOT(onProcessFinished(int, QProcess::ExitStatus)));
|
&TsMuxerWindow::onProcessFinished);
|
||||||
connect(&proc, SIGNAL(error(QProcess::ProcessError)), this,
|
connect(&proc, QOverload<QProcess::ProcessError>::of(&QProcess::error), this,
|
||||||
SLOT(onProcessError(QProcess::ProcessError)));
|
&TsMuxerWindow::onProcessError);
|
||||||
|
|
||||||
ui.DiskLabel->setVisible(false);
|
ui.DiskLabel->setVisible(false);
|
||||||
ui.DiskLabelEdit->setVisible(false);
|
ui.DiskLabelEdit->setVisible(false);
|
||||||
@ -889,9 +892,9 @@ void TsMuxerWindow::addFile() {
|
|||||||
// disconnect(this, SIGNAL(tsMuxerSuccessFinished()));
|
// disconnect(this, SIGNAL(tsMuxerSuccessFinished()));
|
||||||
// disconnect(this, SIGNAL(codecListReady()));
|
// disconnect(this, SIGNAL(codecListReady()));
|
||||||
disconnect();
|
disconnect();
|
||||||
connect(this, SIGNAL(tsMuxerSuccessFinished()), this, SLOT(getCodecInfo()));
|
connect(this, &TsMuxerWindow::tsMuxerSuccessFinished, this, &TsMuxerWindow::getCodecInfo);
|
||||||
connect(this, SIGNAL(codecListReady()), this, SLOT(continueAddFile()));
|
connect(this, &TsMuxerWindow::codecListReady, this, &TsMuxerWindow::continueAddFile);
|
||||||
connect(this, SIGNAL(fileAdded()), this, SLOT(addFile()));
|
connect(this, &TsMuxerWindow::fileAdded, this, &TsMuxerWindow::addFile);
|
||||||
runInMuxMode = false;
|
runInMuxMode = false;
|
||||||
shellExecute(
|
shellExecute(
|
||||||
QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) +
|
QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) +
|
||||||
@ -2106,9 +2109,9 @@ void TsMuxerWindow::appendFile() {
|
|||||||
// disconnect(this, SIGNAL(tsMuxerSuccessFinished()));
|
// disconnect(this, SIGNAL(tsMuxerSuccessFinished()));
|
||||||
// disconnect(this, SIGNAL(codecListReady()));
|
// disconnect(this, SIGNAL(codecListReady()));
|
||||||
disconnect();
|
disconnect();
|
||||||
connect(this, SIGNAL(tsMuxerSuccessFinished()), this, SLOT(getCodecInfo()));
|
connect(this, &TsMuxerWindow::tsMuxerSuccessFinished, this, &TsMuxerWindow::getCodecInfo);
|
||||||
connect(this, SIGNAL(codecListReady()), this, SLOT(continueAppendFile()));
|
connect(this, &TsMuxerWindow::codecListReady, this, &TsMuxerWindow::continueAppendFile);
|
||||||
connect(this, SIGNAL(fileAppended()), this, SLOT(appendFile()));
|
connect(this, &TsMuxerWindow::fileAppended, this, &TsMuxerWindow::appendFile);
|
||||||
runInMuxMode = false;
|
runInMuxMode = false;
|
||||||
shellExecute(
|
shellExecute(
|
||||||
QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) +
|
QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) +
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user