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

List:       kde-commits
Subject:    extragear/multimedia/kmid/src
From:       Pedro Lopez-Cabanillas <pedro.lopez.cabanillas () gmail ! com>
Date:       2010-07-27 10:08:33
Message-ID: 20100727100833.F0619AC7A9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1155421 by pedrol:

kmid_part: fix view can be 0

 M  +11 -4     kmid_part.cpp  


--- trunk/extragear/multimedia/kmid/src/kmid_part.cpp #1155420:1155421
@@ -99,27 +99,27 @@
     : KMediaPlayer::Player(parentWidget, "KMidPlayer", parent),
       d(new KMidPartPrivate(this, parentWidget))
 {
+    kDebug() << "KMediaPlayer/Player constructor";
     setComponentData( KMidPartFactory::componentData() );
     (void) new KMidPartAdaptor(this);
     QDBusConnection::sessionBus().registerObject(QLatin1String("/KMidPart"), this);
     setupActions();
     setXMLFile("kmid_part.rc");
+    setWidget(d->m_view);
     initialize();
-    setWidget(d->m_view);
-    kDebug() << "KMediaPlayer/Player constructor";
 }
 
 KMidPart::KMidPart( QObject *parent )
     : KMediaPlayer::Player(parent),
       d(new KMidPartPrivate(this, 0))
 {
+    kDebug() << "KMediaPlayer/Engine constructor";
     setComponentData( KMidPartFactory::componentData() );
     QDBusConnection::sessionBus().registerObject(QLatin1String("/KMidPart"), this);
     setupActions();
     setXMLFile("kmid_part.rc");
+    setWidget(0);
     initialize();
-    setWidget(0);
-    kDebug() << "KMediaPlayer/Engine constructor";
 }
 
 KMidPart::~KMidPart()
@@ -331,6 +331,7 @@
         d->m_pause->setEnabled(true);
         d->m_pause->setChecked(false);
         d->m_stop->setEnabled(true);
+        if (d->m_view != 0)
         d->m_view->setPlayingState(true);
         break;
     case KMid::PausedState:
@@ -344,6 +345,7 @@
         d->m_pause->setEnabled(false);
         d->m_pause->setChecked(false);
         d->m_stop->setEnabled(false);
+        if (d->m_view != 0)
         d->m_view->setPlayingState(false);
         break;
     default:
@@ -353,6 +355,7 @@
         d->m_pause->setEnabled(false);
         d->m_pause->setChecked(false);
         d->m_stop->setEnabled(false);
+        if (d->m_view != 0)
         d->m_view->setPlayingState(false);
         break;
     }
@@ -360,12 +363,14 @@
 
 void KMidPart::slotTick(qint64 ticks)
 {
+    if (d->m_view != 0)
     d->m_view->setPosition(ticks);
     emit tick(ticks);
 }
 
 void KMidPart::slotFinished()
 {
+    if (d->m_view != 0)
     d->m_view->setPosition(0);
     if (isLooping())
         play();
@@ -388,6 +393,7 @@
     if (d->m_midiobj != 0) {
         d->m_midiobj->setCurrentSource(localFile);
         d->m_midiobj->seek(0);
+        if (d->m_view != 0)
         d->m_view->resetTimePosition(d->m_midiobj->totalTime());
     }
     return true;
@@ -457,6 +463,7 @@
 
 void KMidPart::slotSourceChanged(QString src)
 {
+    if (d->m_view != 0)
     d->m_view->setPosition(0);
     if (d->m_autoStart)
         play();
[prev in list] [next in list] [prev in thread] [next in thread]