Fixed issues with API break in ringtone generation code

Signed-off-by: Tom Swindell <t.swindell@rubyx.co.uk>
nemomobile · Nov 2, 2012 · 39893e9 · 39893e9
1 parent f9b3428
commit 39893e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/basicringtonenotificationprovider.cpp b/src/basicringtonenotificationprovider.cpp
@@ -102,10 +102,10 @@ bool BasicRingtoneNotificationProvider::configure(VoiceCallManagerInterface *man
     Q_D(BasicRingtoneNotificationProvider);
 
     d->manager = manager;
-    QObject::connect(manager, SIGNAL(incomingVoiceCall(AbstractVoiceCallHandler*)), SLOT(onIncomingCall(AbstractVoiceCallHandler*)));
+    QObject::connect(manager, SIGNAL(voiceCallAdded(AbstractVoiceCallHandler*)), SLOT(onVoiceCallAdded(AbstractVoiceCallHandler*)));
     QObject::connect(manager, SIGNAL(silenceRingtoneNotification()), d->player, SLOT(stop()));
 
-    d->player->setMedia(QMediaContent(QUrl::fromLocalFile("/usr/share/sounds/darko/stereo/ring-1.wav")));
+    d->player->setMedia(QMediaContent(QUrl::fromLocalFile("/usr/share/voicecall/sounds/ring-1.wav")));
     d->player->setVolume(100);
     QObject::connect(d->player, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus)), SLOT(onMediaPlayerMediaStatusChanged()));
 
@@ -135,7 +135,7 @@ void BasicRingtoneNotificationProvider::finalize()
     TRACE
 }
 
-void BasicRingtoneNotificationProvider::onIncomingCall(AbstractVoiceCallHandler *handler)
+void BasicRingtoneNotificationProvider::onVoiceCallAdded(AbstractVoiceCallHandler *handler)
 {
     TRACE
     Q_D(BasicRingtoneNotificationProvider);
@@ -165,6 +165,11 @@ void BasicRingtoneNotificationProvider::onVoiceCallStatusChanged()
 
         d->currentCall = NULL;
     }
+    else if(d->player->mediaStatus() != QMediaPlayer::PlayingState)
+    {
+        d->player->setPosition(0);
+        d->player->play();
+    }
 }
 
 void BasicRingtoneNotificationProvider::onMediaPlayerMediaStatusChanged()

diff --git a/src/basicringtonenotificationprovider.h b/src/basicringtonenotificationprovider.h
@@ -44,7 +44,7 @@ public Q_SLOTS:
     void finalize();
 
 protected Q_SLOTS:
-    void onIncomingCall(AbstractVoiceCallHandler *handler);
+    void onVoiceCallAdded(AbstractVoiceCallHandler *handler);
     void onVoiceCallStatusChanged();
     void onMediaPlayerMediaStatusChanged();