From: Debian Qt/KDE Maintainers Date: Thu, 6 Feb 2025 00:14:44 +0000 (-0500) Subject: normalize is named "normalize-audio" in Debian. X-Git-Tag: archive/raspbian/24.12.1-2+rpi1^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c38c97e89db658612fec5475a8a430bb40c5828d;p=k3b.git normalize is named "normalize-audio" in Debian. Reviewed-by: Didier Raboud Updated-by: Roderick B. Greening Updated-by: Pino Toscano Last-Update: 2017-12-24 Change that everywhere.... for real this time Gbp-Pq: Name 101_rename_normalize.diff --- diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp index 2ebf883..8220e11 100644 --- a/libk3b/core/k3bdefaultexternalprograms.cpp +++ b/libk3b/core/k3bdefaultexternalprograms.cpp @@ -424,11 +424,17 @@ QString K3b::VcdbuilderProgram::versionIdentifier( const ExternalBin& /*bin*/ ) K3b::NormalizeProgram::NormalizeProgram() - : K3b::SimpleExternalProgram( "normalize" ) + : K3b::SimpleExternalProgram( "normalize-audio" ) { } +QString K3b::NormalizeProgram::versionIdentifier( const ExternalBin& /*bin*/ ) const +{ + return QLatin1String( "normalize" ); +} + + K3b::GrowisofsProgram::GrowisofsProgram() : K3b::SimpleExternalProgram( "growisofs" ) { diff --git a/libk3b/core/k3bdefaultexternalprograms.h b/libk3b/core/k3bdefaultexternalprograms.h index 47cf06e..86ea0b5 100644 --- a/libk3b/core/k3bdefaultexternalprograms.h +++ b/libk3b/core/k3bdefaultexternalprograms.h @@ -115,6 +115,9 @@ namespace K3b { { public: NormalizeProgram(); + + protected: + virtual QString versionIdentifier( const ExternalBin& bin ) const; }; diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index 0b246b2..94ab092 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -584,7 +584,7 @@ bool K3b::AudioDoc::loadDocumentData( QDomElement* root ) return false; } - else if( e.nodeName() == "normalize" ) + else if( e.nodeName() == "normalize-audio" ) setNormalize( e.text() == "yes" ); else if( e.nodeName() == "hide_first_track" ) @@ -788,7 +788,7 @@ bool K3b::AudioDoc::saveDocumentData( QDomElement* docElem ) saveGeneralDocumentData( docElem ); // add normalize - QDomElement normalizeElem = doc.createElement( "normalize" ); + QDomElement normalizeElem = doc.createElement( "normalize-audio" ); normalizeElem.appendChild( doc.createTextNode( normalize() ? "yes" : "no" ) ); docElem->appendChild( normalizeElem ); diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp index be48921..80ec2ae 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp +++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp @@ -40,10 +40,10 @@ void K3b::AudioNormalizeJob::start() connect( m_process, SIGNAL(stderrLine(QString)), this, SLOT(slotStdLine(QString)) ); connect( m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(slotProcessExited(int,QProcess::ExitStatus)) ); - const K3b::ExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize" ); + const K3b::ExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" ); if( !bin ) { - emit infoMessage( i18n("Could not find normalize executable."), MessageError ); + emit infoMessage( i18n("Could not find normalize-audio executable."), MessageError ); jobFinished(false); return; } @@ -70,8 +70,8 @@ void K3b::AudioNormalizeJob::start() if( !m_process->start( KProcess::OnlyStderrChannel ) ) { // something went wrong when starting the program // it "should" be the executable - qDebug() << "(K3b::AudioNormalizeJob) could not start normalize"; - emit infoMessage( i18n("Could not start normalize."), K3b::Job::MessageError ); + qDebug() << "(K3b::AudioNormalizeJob) could not start normalize-audio"; + emit infoMessage( i18n("Could not start normalize-audio."), K3b::Job::MessageError ); jobFinished(false); } } @@ -94,7 +94,7 @@ void K3b::AudioNormalizeJob::slotStdLine( const QString& line ) // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)",t,tt,m_files.at(t-1)) ); - emit debuggingOutput( "normalize", line ); + emit debuggingOutput( "normalize-audio", line ); // wenn "% done" drin: // wenn ein --% drin ist, so beginnt ein neuer track @@ -173,7 +173,7 @@ void K3b::AudioNormalizeJob::slotProcessExited( int exitCode, QProcess::ExitStat break; default: if( !m_canceled ) { - emit infoMessage( i18n("%1 returned an unknown error (code %2).",QString("normalize"), exitCode), + emit infoMessage( i18n("%1 returned an unknown error (code %2).",QString("normalize-audio"), exitCode), K3b::Job::MessageError ); emit infoMessage( i18n("Please send me an email with the last output."), K3b::Job::MessageError ); emit infoMessage( i18n("Error while normalizing tracks."), MessageError ); diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp index c72cdfb..685acdb 100644 --- a/src/k3bprojectmanager.cpp +++ b/src/k3bprojectmanager.cpp @@ -301,7 +301,7 @@ void K3b::ProjectManager::loadDefaults( K3b::Doc* doc ) audioDoc->writeCdText( c.readEntry( "cd_text", true ) ); audioDoc->setHideFirstTrack( c.readEntry( "hide_first_track", false ) ); - audioDoc->setNormalize( c.readEntry( "normalize", false ) ); + audioDoc->setNormalize( c.readEntry( "normalize-audio", false ) ); audioDoc->setAudioRippingParanoiaMode( c.readEntry( "paranoia mode", 0 ) ); audioDoc->setAudioRippingRetries( c.readEntry( "read retries", 128 ) ); audioDoc->setAudioRippingIgnoreReadErrors( c.readEntry( "ignore read errors", false ) ); @@ -373,7 +373,7 @@ void K3b::ProjectManager::loadDefaults( K3b::Doc* doc ) K3b::MixedDoc* mixedDoc = static_cast(doc); mixedDoc->audioDoc()->writeCdText( c.readEntry( "cd_text", true ) ); - mixedDoc->audioDoc()->setNormalize( c.readEntry( "normalize", false ) ); + mixedDoc->audioDoc()->setNormalize( c.readEntry( "normalize-audio", false ) ); // load mixed type if( c.readEntry( "mixed_type" ) == "last_track" ) diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp index 68fb50c..b065ef0 100644 --- a/src/projects/k3baudioburndialog.cpp +++ b/src/projects/k3baudioburndialog.cpp @@ -181,7 +181,7 @@ void K3b::AudioBurnDialog::loadSettings( const KConfigGroup& c ) m_cdtextWidget->setChecked( c.readEntry( "cd_text", true ) ); m_checkHideFirstTrack->setChecked( c.readEntry( "hide_first_track", false ) ); - m_checkNormalize->setChecked( c.readEntry( "normalize", false ) ); + m_checkNormalize->setChecked( c.readEntry( "normalize-audio", false ) ); m_comboParanoiaMode->setCurrentIndex( c.readEntry( "paranoia mode", 0 ) ); m_checkAudioRippingIgnoreReadErrors->setChecked( c.readEntry( "ignore read errors", true ) ); @@ -197,7 +197,7 @@ void K3b::AudioBurnDialog::saveSettings( KConfigGroup c ) c.writeEntry( "cd_text", m_cdtextWidget->isChecked() ); c.writeEntry( "hide_first_track", m_checkHideFirstTrack->isChecked() ); - c.writeEntry( "normalize", m_checkNormalize->isChecked() ); + c.writeEntry( "normalize-audio", m_checkNormalize->isChecked() ); c.writeEntry( "paranoia mode", m_comboParanoiaMode->currentText() ); c.writeEntry( "ignore read errors", m_checkAudioRippingIgnoreReadErrors->isChecked() ); @@ -279,11 +279,11 @@ void K3b::AudioBurnDialog::slotNormalizeToggled( bool on ) { if( on ) { // we are not able to normalize in on-the-fly mode - if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) { - KMessageBox::error( this, i18n("

External program normalize is not installed." - "

K3b uses normalize (http://normalize.nongnu.org/) " + if( !k3bcore->externalBinManager()->foundBin( "normalize-audio" ) ) { + KMessageBox::error( this, i18n("

External program normalize-audio is not installed." + "

K3b uses normalize-audio (http://normalize.nongnu.org/) " "to normalize audio tracks. In order to " - "use this functionality, please install it first.") ); + "use this functionality, please install it first. (sudo apt-get install normalize-audio) " ) ); m_checkNormalize->setChecked( false ); } else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) { diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index e40e90c..eed19f5 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -191,7 +191,7 @@ void K3b::MixedBurnDialog::loadSettings( const KConfigGroup& c ) K3b::ProjectBurnDialog::loadSettings( c ); m_cdtextWidget->setChecked( c.readEntry( "cd_text", false ) ); - m_checkNormalize->setChecked( c.readEntry( "normalize", false ) ); + m_checkNormalize->setChecked( c.readEntry( "normalize-audio", false ) ); // load mixed type if( c.readEntry( "mixed_type" ) == "last_track" ) @@ -215,7 +215,7 @@ void K3b::MixedBurnDialog::saveSettings( KConfigGroup c ) K3b::ProjectBurnDialog::saveSettings(c); c.writeEntry( "cd_text", m_cdtextWidget->isChecked() ); - c.writeEntry( "normalize", m_checkNormalize->isChecked() ); + c.writeEntry( "normalize-audio", m_checkNormalize->isChecked() ); // save mixed type switch( m_comboMixedModeType->selectedValue() ) { @@ -280,11 +280,11 @@ void K3b::MixedBurnDialog::slotNormalizeToggled( bool on ) { if( on ) { // we are not able to normalize in on-the-fly mode - if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) { - KMessageBox::error( this, i18n("

External program normalize is not installed." - "

K3b uses normalize (http://normalize.nongnu.org/) " + if( !k3bcore->externalBinManager()->foundBin( "normalize-audio" ) ) { + KMessageBox::error( this, i18n("

External program normalize-audio is not installed." + "

K3b uses normalize-audio (http://normalize.nongnu.org/) " "to normalize audio tracks. In order to " - "use this functionality, please install it first.") ); + "use this functionality, please install it first (sudo apt-get install normalize-audio).") ); m_checkNormalize->setChecked( false ); } else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) {