| 1 | Index: mythmusic/mythmusic/cdrip.h
|
|---|
| 2 | ===================================================================
|
|---|
| 3 | --- mythmusic/mythmusic/cdrip.h (revision 13716)
|
|---|
| 4 | +++ mythmusic/mythmusic/cdrip.h (working copy)
|
|---|
| 5 | @@ -79,7 +79,6 @@
|
|---|
| 6 |
|
|---|
| 7 | RipStatus *m_parent;
|
|---|
| 8 | bool m_quit;
|
|---|
| 9 | - QMutex m_mutex;
|
|---|
| 10 | QString m_CDdevice;
|
|---|
| 11 | int m_quality;
|
|---|
| 12 | vector<RipTrack*> *m_tracks;
|
|---|
| 13 | Index: mythmusic/mythmusic/cdrip.cpp
|
|---|
| 14 | ===================================================================
|
|---|
| 15 | --- mythmusic/mythmusic/cdrip.cpp (revision 13716)
|
|---|
| 16 | +++ mythmusic/mythmusic/cdrip.cpp (working copy)
|
|---|
| 17 | @@ -124,18 +124,12 @@
|
|---|
| 18 |
|
|---|
| 19 | void CDRipperThread::cancel(void)
|
|---|
| 20 | {
|
|---|
| 21 | - m_mutex.lock();
|
|---|
| 22 | m_quit = true;
|
|---|
| 23 | - m_mutex.unlock();
|
|---|
| 24 | }
|
|---|
| 25 |
|
|---|
| 26 | bool CDRipperThread::isCancelled(void)
|
|---|
| 27 | {
|
|---|
| 28 | - bool res;
|
|---|
| 29 | - m_mutex.lock();
|
|---|
| 30 | - res = m_quit;
|
|---|
| 31 | - m_mutex.unlock();
|
|---|
| 32 | - return res;
|
|---|
| 33 | + return m_quit;
|
|---|
| 34 | }
|
|---|
| 35 |
|
|---|
| 36 | void CDRipperThread::sendEvent(int eventType, const QString &value)
|
|---|