← Back to branch summary

~ubuntu-branches/ubuntu/hardy/k3b/hardy-backports

« back to all changes in this revision

Viewing changes to debian/patches/101_rename_normalize.diff

  • Committer: Bazaar Package Importer
  • Author(s): agent 8131
  • Date: 2008-09-01 15:59:09 UTC
  • mfrom: (46.1.6 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080901155909-uor0tq73yt6ph9sx
Tags: 1.0.5-1ubuntu4~hardy1
Automated backport upload; no source changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/101_rename_normalize.diff
 
1
diff -Nurp k3b-1.0rc1/libk3b/core/k3bdefaultexternalprograms.cpp k3b-1.0rc1-copy/libk3b/core/k3bdefaultexternalprograms.cpp
 
2
--- k3b-1.0rc1/libk3b/core/k3bdefaultexternalprograms.cpp       2006-12-11 16:36:12.000000000 +0000
 
3
+++ k3b-1.0rc1-copy/libk3b/core/k3bdefaultexternalprograms.cpp  2006-12-12 14:21:32.000000000 +0000
 
4
@@ -715,7 +715,7 @@ bool K3bVcdbuilderProgram::scan( const Q
 
5
 
 
6
 
 
7
 K3bNormalizeProgram::K3bNormalizeProgram()
 
8
-  : K3bExternalProgram( "normalize" )
 
9
+  : K3bExternalProgram( "normalize-audio" )
 
10
 {
 
11
 }
 
12
 
 
13
@@ -730,7 +730,7 @@ bool K3bNormalizeProgram::scan( const QS
 
14
   if( fi.isDir() ) {
 
15
     if( path[path.length()-1] != '/' )
 
16
       path.append("/");
 
17
-    path.append("normalize");
 
18
+    path.append("normalize-audio");
 
19
   }
 
20
 
 
21
   if( !QFile::exists( path ) )
 
22
 
 
23
diff -Nurp k3b-1.0rc1/libk3b/projects/audiocd/k3baudionormalizejob.cpp k3b-1.0rc1-copy/libk3b/projects/audiocd/k3baudionormalizejob.cpp
 
24
--- k3b-1.0rc1/libk3b/projects/audiocd/k3baudionormalizejob.cpp 2006-12-11 16:36:16.000000000 +0000
 
25
+++ k3b-1.0rc1-copy/libk3b/projects/audiocd/k3baudionormalizejob.cpp    2006-12-12 14:23:51.000000000 +0000
 
26
@@ -52,10 +52,10 @@ void K3bAudioNormalizeJob::start()
 
27
   connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) );
 
28
   connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) );
 
29
 
 
30
-  const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize" );
 
31
+  const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" );
 
32
 
 
33
   if( !bin ) {
 
34
-    emit infoMessage( i18n("Could not find normalize executable."), ERROR );
 
35
+    emit infoMessage( i18n("Could not find normalize-audio executable."), ERROR );
 
36
     jobFinished(false);
 
37
     return;
 
38
   }
 
39
@@ -82,8 +82,8 @@ void K3bAudioNormalizeJob::start()
 
40
   if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
 
41
     // something went wrong when starting the program
 
42
     // it "should" be the executable
 
43
-    kdDebug() << "(K3bAudioNormalizeJob) could not start normalize" << endl;
 
44
-    emit infoMessage( i18n("Could not start normalize."), K3bJob::ERROR );
 
45
+    kdDebug() << "(K3bAudioNormalizeJob) could not start normalize-audio" << endl;
 
46
+    emit infoMessage( i18n("Could not start normalize-audio."), K3bJob::ERROR );
 
47
     jobFinished(false);
 
48
   }
 
49
 }
 
50
@@ -106,7 +106,7 @@ void K3bAudioNormalizeJob::slotStdLine( 
 
51
 
 
52
   //  emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").arg(t).arg(tt).arg(m_files.at(t-1)) );
 
53
 
 
54
-  emit debuggingOutput( "normalize", line );
 
55
+  emit debuggingOutput( "normalize-audio", line );
 
56
 
 
57
   // wenn "% done" drin:
 
58
   //    wenn ein --% drin ist, so beginnt ein neuer track
 
59
@@ -185,7 +185,7 @@ void K3bAudioNormalizeJob::slotProcessEx
 
60
       break;
 
61
     default:
 
62
       if( !m_canceled ) {
 
63
-       emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize").arg(p->exitStatus()), 
 
64
+       emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()), 
 
65
                          K3bJob::ERROR );
 
66
        emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
 
67
        emit infoMessage( i18n("Error while normalizing tracks."), ERROR );
 
68
diff -Nurp k3b-1.0rc1/src/projects/k3baudioburndialog.cpp k3b-1.0rc1-copy/src/projects/k3baudioburndialog.cpp
 
69
--- k3b-1.0rc1/src/projects/k3baudioburndialog.cpp      2006-12-11 16:36:02.000000000 +0000
 
70
+++ k3b-1.0rc1-copy/src/projects/k3baudioburndialog.cpp 2006-12-12 14:28:32.000000000 +0000
 
71
@@ -298,11 +298,11 @@ void K3bAudioBurnDialog::slotNormalizeTo
 
72
 {
 
73
   if( on ) {
 
74
     // we are not able to normalize in on-the-fly mode
 
75
-    if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) {
 
76
-      KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize</em> is not installed.</b>"
 
77
-                                    "<p>K3b uses <em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
 
78
+    if( !k3bcore->externalBinManager()->foundBin( "normalize-audio" ) ) {
 
79
+      KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize-audio</em> is not installed.</b>"
 
80
+                                    "<p>K3b uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
 
81
                                     "to normalize audio tracks. In order to "
 
82
-                                    "use this functionality, please install it first.") );
 
83
+                                    "use this functionality, please install it first. (sudo apt-get install normalize-audio)") );
 
84
       m_checkNormalize->setChecked( false );
 
85
     }
 
86
     else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) {
 
87
diff -Nurp k3b-1.0rc1/src/projects/k3bmixedburndialog.cpp k3b-1.0rc1-copy/src/projects/k3bmixedburndialog.cpp
 
88
--- k3b-1.0rc1/src/projects/k3bmixedburndialog.cpp      2006-12-11 16:36:03.000000000 +0000
 
89
+++ k3b-1.0rc1-copy/src/projects/k3bmixedburndialog.cpp 2006-12-12 14:29:27.000000000 +0000
 
90
@@ -309,10 +309,10 @@ void K3bMixedBurnDialog::slotNormalizeTo
 
91
   if( on ) {
 
92
     // we are not able to normalize in on-the-fly mode
 
93
     if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) {
 
94
-      KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize</em> is not installed.</b>"
 
95
-                                    "<p>K3b uses <em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
 
96
+      KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize-audio</em> is not installed.</b>"
 
97
+                                    "<p>K3b uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
 
98
                                     "to normalize audio tracks. In order to "
 
99
-                                    "use this functionality, please install it first.") );
 
100
+                                    "use this functionality, please install it first (sudo apt-get install normalize-audio.") );
 
101
       m_checkNormalize->setChecked( false );
 
102
     }
 
103
     else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) {