/[packages]/cauldron/amarok/current/SOURCES/0003-Fix-CD-titleChanged-from-2.2.2.90.patch
ViewVC logotype

Contents of /cauldron/amarok/current/SOURCES/0003-Fix-CD-titleChanged-from-2.2.2.90.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 7513 - (show annotations) (download)
Wed Jan 12 18:36:34 2011 UTC (10 years, 8 months ago) by mikala
File size: 1582 byte(s)
imported package amarok
1 #
2 # Description: Fix CD TitleChanged
3 # Forwarded: No
4 # Bug: N/A
5 # Author: lmenut@mandriva.org
6 #
7
8 --- src/EngineController.cpp~ 2010-04-15 23:57:09.000000000 +0200
9 +++ src/EngineController.cpp 2010-04-27 09:29:16.000000000 +0200
10 @@ -76,6 +76,7 @@
11 EngineController::EngineController()
12 : m_playWhenFetched( true )
13 , m_fadeoutTimer( new QTimer( this ) )
14 + , m_currentCDtrack( 1 )
15 , m_volume( 0 )
16 , m_currentIsAudioCd( false )
17 , m_ignoreVolumeChangeAction ( false )
18 @@ -434,7 +435,7 @@
19 // return;
20
21
22 - int trackNumber = parts.at( 1 ).toInt();
23 + m_currentCDtrack = parts.at( 1 ).toInt();
24
25 debug() << "3.2.1...";
26
27 @@ -446,7 +447,7 @@
28 }
29
30 debug() << "boom?";
31 - m_controller->setCurrentTitle( trackNumber );
32 + m_controller->setCurrentTitle( m_currentCDtrack );
33 debug() << "no boom?";
34
35 if( type == Phonon::MediaSource::Disc )
36 @@ -1234,9 +1235,9 @@
37 void EngineController::slotTitleChanged( int titleNumber )
38 {
39 DEBUG_BLOCK
40 - Q_UNUSED( titleNumber );
41
42 - slotAboutToFinish();
43 + if( titleNumber != m_currentCDtrack )
44 + slotAboutToFinish();
45 }
46
47 void EngineController::slotVolumeChanged( qreal newVolume )
48 --- src/EngineController.h~ 2010-04-15 23:57:09.000000000 +0200
49 +++ src/EngineController.h 2010-04-27 09:30:08.000000000 +0200
50 @@ -369,6 +369,7 @@
51 QPointer<Capabilities::MultiSourceCapability> m_multiSource;
52 bool m_playWhenFetched;
53 QTimer* m_fadeoutTimer;
54 + int m_currentCDtrack;
55 int m_volume;
56 bool m_currentIsAudioCd;
57

  ViewVC Help
Powered by ViewVC 1.1.28