I have made the following changes intended for : CE:Apps / voicecall Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/7265 Thank You, tswindell [This message was auto-generated] --- Request # 7265: Messages from BOSS: State: review at 2012-11-02T14:48:05 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:tswindell:CE:Apps / voicecall -> CE:Apps / voicecall changes files: -------------- --- voicecall.changes +++ voicecall.changes @@ -0,0 +1,3 @@ +* Fri Nov 02 2012 Tom Swindell <[email protected]> - 0.2.3 +- Updated sources to latest upstream version. + old: ---- voicecall-0.2.2.tar.gz new: ---- voicecall-0.2.3.tar.gz spec files: ----------- --- voicecall.spec +++ voicecall.spec @@ -1,6 +1,6 @@ Name: voicecall Summary: Voice Call Suite -Version: 0.2.2 +Version: 0.2.3 Release: 1 Group: Communications/Telephony and IM License: Apache License, Version 2.0 other changes: -------------- ++++++ voicecall-0.2.2.tar.gz -> voicecall-0.2.3.tar.gz --- plugins/pulseaudio/src/pacontrol.cpp +++ plugins/pulseaudio/src/pacontrol.cpp @@ -163,7 +163,7 @@ switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) { case PA_SUBSCRIPTION_EVENT_SINK: - DEBUG_T("PA_SUBSCRIPTION_EVENT_SINK event triggered"); + //DEBUG_T("PA_SUBSCRIPTION_EVENT_SINK event triggered"); foreach(PADevice* dev, paControl->sinkList) { delete dev; @@ -173,7 +173,7 @@ pa_context_get_sink_info_list(c, pa_sinklist_cb, NULL); break; case PA_SUBSCRIPTION_EVENT_SOURCE: - DEBUG_T("PA_SUBSCRIPTION_EVENT_SOURCE event triggered"); + //DEBUG_T("PA_SUBSCRIPTION_EVENT_SOURCE event triggered"); foreach(PADevice* dev, paControl->sourceList) { delete dev; @@ -183,7 +183,7 @@ pa_context_get_source_info_list(c, pa_sourcelist_cb, NULL); break; case PA_SUBSCRIPTION_EVENT_MODULE: - DEBUG_T("PA_SUBSCRIPTION_EVENT_MODULE event triggered"); + //DEBUG_T("PA_SUBSCRIPTION_EVENT_MODULE event triggered"); foreach(PAModule* dev, paControl->moduleList) { delete dev; --- src/basicringtonenotificationprovider.cpp +++ src/basicringtonenotificationprovider.cpp @@ -102,10 +102,10 @@ 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 @@ TRACE } -void BasicRingtoneNotificationProvider::onIncomingCall(AbstractVoiceCallHandler *handler) +void BasicRingtoneNotificationProvider::onVoiceCallAdded(AbstractVoiceCallHandler *handler) { TRACE Q_D(BasicRingtoneNotificationProvider); @@ -165,6 +165,11 @@ d->currentCall = NULL; } + else if(d->player->mediaStatus() != QMediaPlayer::PlayingState) + { + d->player->setPosition(0); + d->player->play(); + } } void BasicRingtoneNotificationProvider::onMediaPlayerMediaStatusChanged() --- src/basicringtonenotificationprovider.h +++ src/basicringtonenotificationprovider.h @@ -44,7 +44,7 @@ void finalize(); protected Q_SLOTS: - void onIncomingCall(AbstractVoiceCallHandler *handler); + void onVoiceCallAdded(AbstractVoiceCallHandler *handler); void onVoiceCallStatusChanged(); void onMediaPlayerMediaStatusChanged(); --- src/basicvoicecallconfigurator.cpp +++ src/basicvoicecallconfigurator.cpp @@ -64,7 +64,7 @@ // Install statically linked plugins. this->installPlugin(new VoiceCallManagerDBusService(this)); - //this->installPlugin(new BasicRingtoneNotificationProvider(this)); + this->installPlugin(new BasicRingtoneNotificationProvider(this)); QDir pluginPath("/usr/lib/voicecall/plugins"); --- src/src.pro +++ src/src.pro @@ -20,14 +20,16 @@ dbus/voicecallmanagerdbusservice.h \ basicvoicecallconfigurator.h \ audiocallpolicyproxy.h \ - voicecallmanager.h + voicecallmanager.h \ + basicringtonenotificationprovider.h SOURCES += \ dbus/voicecallmanagerdbusservice.cpp \ basicvoicecallconfigurator.cpp \ audiocallpolicyproxy.cpp \ voicecallmanager.cpp \ - main.cpp + main.cpp \ + basicringtonenotificationprovider.cpp target.path = /usr/bin
