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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/widgets
From:       Seb Ruiz <ruiz () kde ! org>
Date:       2009-06-21 1:03:09
Message-ID: 1245546189.109822.4842.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 984541 by seb:

The OSD no longer subscribes to metadata changes. This fixes showing the
osd when a track finishes (because finishedPlaying updates stats which
notifies observers). It also fixes annoying problems of showing the osd
when metadata changes (eg, editing a title) or the scanner updates a
particular Track.

 M  +1 -12     Osd.cpp  
 M  +1 -5      Osd.h  


--- trunk/extragear/multimedia/amarok/src/widgets/Osd.cpp #984540:984541
@@ -659,10 +659,8 @@
     switch( state )
     {
         case Phonon::PlayingState:
-            unsubscribeFrom( m_currentTrack );
             m_currentTrack = track;
-            subscribeTo( track );
-            metadataChanged( track );
+            show( m_currentTrack );
             m_paused = false;
             break;
 
@@ -677,16 +675,7 @@
     }
 }
 
-void
-Amarok::OSD::metadataChanged( Meta::TrackPtr track )
-{
-    Q_UNUSED( track )
-    DEBUG_BLOCK
 
-    show( m_currentTrack );
-}
-
-
 /* Code copied from kshadowengine.cpp
  *
  * Copyright (C) 2003 Laur Ivan <laurivan@eircom.net>
--- trunk/extragear/multimedia/amarok/src/widgets/Osd.h #984540:984541
@@ -152,7 +152,7 @@
 
 namespace Amarok
 {
-    class OSD : public OSDWidget, public EngineObserver, public Meta::Observer
+    class OSD : public OSDWidget, public EngineObserver
     {
         Q_OBJECT
 
@@ -172,10 +172,6 @@
         virtual void engineMuteStateChanged( bool );
         virtual void engineStateChanged( Phonon::State state, Phonon::State oldState );
 
-        // Reimplemented from Meta::Observer
-        using Observer::metadataChanged;
-        virtual void metadataChanged( Meta::TrackPtr track );
-
     public slots:
         /**
          * When user pushs global shortcut or uses script to toggle
[prev in list] [next in list] [prev in thread] [next in thread]