[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/libkcompactdisc
From:       Adriaan de Groot <groot () kde ! org>
Date:       2008-07-28 23:25:20
Message-ID: 1217287520.542734.31630.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 838878 by adridg:

abs() applies to int or long args, applied to difference of two unsigned is \
ambiguous, so disambiguate; also minor cleanups and indentation consistency.

 M  +1 -1      kcompactdisc_p.h  
 M  +4 -5      phonon_interface.cpp  


--- trunk/KDE/kdemultimedia/libkcompactdisc/kcompactdisc_p.h #838877:838878
@@ -46,7 +46,7 @@
 		KCompactDisc::DiscStatus m_status;
 		KCompactDisc::DiscStatus m_statusExpected;
 		unsigned m_discId;
-        unsigned m_discLength;
+		unsigned m_discLength;
 		unsigned m_track;
 		unsigned m_tracks;
 		unsigned m_trackPosition;
--- trunk/KDE/kdemultimedia/libkcompactdisc/phonon_interface.cpp #838877:838878
@@ -269,7 +269,7 @@
 
 void KPhononCompactDiscPrivate::tick(qint64 t)
 {
-    unsigned track;
+	unsigned track;
 	Q_Q(KCompactDisc);
 
 	track = m_producerWidget->m_mediaController->currentTitle();
@@ -278,7 +278,7 @@
 		m_discLength = trackLength(m_track);
 		emit q->playoutTrackChanged(m_track);
 
-		/* phonon gives us Matadata only per Track */
+		/* phonon gives us Metadata only per Track */
 		if(m_autoMetadata)
 			queryMetadata();
 	}
@@ -288,15 +288,14 @@
 	// Update the current playing position.
 	if(m_seek) {
 		kDebug() << "seek: " << m_seek << " trackPosition " << m_trackPosition;
-		if(abs(m_trackExpectedPosition - m_trackPosition) > m_seek)
+		if(abs((long)(m_trackExpectedPosition - m_trackPosition)) > m_seek)
 			m_seek = 0;
 		else
-			m_seek = abs(m_trackExpectedPosition - m_trackPosition);
+			m_seek = abs((long)(m_trackExpectedPosition - m_trackPosition));
 	}
 
 	if(!m_seek) {
 		emit q->playoutPositionChanged(m_trackPosition);
-		//emit q->playoutDiscPositionChanged(m_discPosition);
 	}
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]