1 |
deathwing00 08/05/31 21:12:15 |
2 |
|
3 |
Added: k3b-1.0.5-eject_186173.patch |
4 |
Log: |
5 |
Version bump. |
6 |
(Portage version: 2.1.5.2) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 app-cdr/k3b/files/k3b-1.0.5-eject_186173.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/k3b/files/k3b-1.0.5-eject_186173.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/k3b/files/k3b-1.0.5-eject_186173.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: k3b-1.0.5-eject_186173.patch |
15 |
=================================================================== |
16 |
diff -ur k3b-1.0.4/ChangeLog k3b-1.0.4-verification-always-reload/ChangeLog |
17 |
--- k3b-1.0.4/ChangeLog 2007-11-02 10:55:57.000000000 +0100 |
18 |
+++ k3b-1.0.4-verification-always-reload/ChangeLog 2007-12-07 19:33:18.000000000 +0100 |
19 |
@@ -4,9 +4,6 @@ |
20 |
* Unmount medium before DVD formatting |
21 |
* Silently (without introducing new strings for translation) allow the burning of files |
22 |
bigger than 4 GB with appropriate versions of genisoimage or mkisofs. |
23 |
- * Do only reload the medium before verification if necessary, i.e. if the newly written |
24 |
- track cannot be read otherwise (many old drives depend on this). Hopefully this will |
25 |
- at least work around the aweful "DMA disabled" bug for many users. |
26 |
|
27 |
1.0.3 |
28 |
===== |
29 |
diff -ur k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp |
30 |
--- k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp 2007-11-02 10:55:53.000000000 +0100 |
31 |
+++ k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp 2007-07-21 21:53:53.000000000 +0200 |
32 |
@@ -84,8 +84,6 @@ |
33 |
K3bPipe pipe; |
34 |
|
35 |
bool readSuccessful; |
36 |
- |
37 |
- bool mediumHasBeenReloaded; |
38 |
}; |
39 |
|
40 |
|
41 |
@@ -151,13 +149,11 @@ |
42 |
d->currentTrackIndex = 0; |
43 |
d->alreadyReadSectors = 0; |
44 |
|
45 |
- emit newTask( i18n("Checking medium") ); |
46 |
+ // first we need to reload and mount the device |
47 |
+ emit newTask( i18n("Reloading the medium") ); |
48 |
|
49 |
- d->mediumHasBeenReloaded = false; |
50 |
- connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ), |
51 |
- SIGNAL(finished(K3bDevice::DeviceHandler*)), |
52 |
- this, |
53 |
- SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); |
54 |
+ connect( K3bDevice::reload( d->device ), SIGNAL(finished(bool)), |
55 |
+ this, SLOT(slotMediaReloaded(bool)) ); |
56 |
} |
57 |
|
58 |
|
59 |
@@ -169,8 +165,6 @@ |
60 |
K3bDevice::MEDIA_WRITABLE, |
61 |
i18n("Unable to Close the Tray") ); |
62 |
|
63 |
- d->mediumHasBeenReloaded = true; |
64 |
- |
65 |
emit newTask( i18n("Checking medium") ); |
66 |
|
67 |
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ), |
68 |
@@ -191,6 +185,12 @@ |
69 |
d->toc = dh->toc(); |
70 |
d->totalSectors = 0; |
71 |
|
72 |
+ if ( d->toc.isEmpty() ) { |
73 |
+ emit infoMessage( i18n( "No tracks to verify found." ), ERROR ); |
74 |
+ jobFinished( false ); |
75 |
+ return; |
76 |
+ } |
77 |
+ |
78 |
// just to be sure check if we actually have all the tracks |
79 |
int i = 0; |
80 |
for( QValueList<K3bVerificationJobTrackEntry>::iterator it = d->tracks.begin(); |
81 |
@@ -201,21 +201,9 @@ |
82 |
(*it).trackNumber = d->toc.count(); |
83 |
|
84 |
if( (int)d->toc.count() < (*it).trackNumber ) { |
85 |
- if ( d->mediumHasBeenReloaded ) { |
86 |
- emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)") |
87 |
- .arg( "Specified track number not found on medium" ), ERROR ); |
88 |
- jobFinished( false ); |
89 |
- return; |
90 |
- } |
91 |
- else { |
92 |
- // many drives need to reload the medium to return to a proper state |
93 |
- emit newTask( i18n("Reloading the medium") ); |
94 |
- connect( K3bDevice::reload( d->device ), |
95 |
- SIGNAL(finished(bool)), |
96 |
- this, |
97 |
- SLOT(slotMediaReloaded(bool)) ); |
98 |
- return; |
99 |
- } |
100 |
+ emit infoMessage( i18n("Internal Error: Verification job improperly initialized"), ERROR ); |
101 |
+ jobFinished( false ); |
102 |
+ return; |
103 |
} |
104 |
|
105 |
d->totalSectors += trackLength( i ); |
106 |
|
107 |
|
108 |
|
109 |
-- |
110 |
gentoo-commits@l.g.o mailing list |