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/7722 Thank You, tswindell [This message was auto-generated] --- Request # 7722: Messages from BOSS: State: review at 2013-01-24T15:54:34 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 @@ +* Thu Jan 24 2013 Tom Swindell <[email protected]> - 0.3.5 +- Updated audio routing logic to work with new policy config + old: ---- voicecall-0.3.4.tar.gz new: ---- voicecall-0.3.5.tar.gz spec files: ----------- --- voicecall.spec +++ voicecall.spec @@ -1,6 +1,6 @@ Name: voicecall Summary: Voice Call Suite -Version: 0.3.4 +Version: 0.3.5 Release: 1 Group: Communications/Telephony and IM License: Apache License, Version 2.0 @@ -113,7 +113,6 @@ %files core %defattr(-,root,root,-) %{_bindir}/voicecall-manager -%{_libdir}/voicecall/plugins/libvoicecall-resource-policy-routing-plugin.so %{_libdir}/voicecall/plugins/libvoicecall-playback-manager-plugin.so %{_libdir}/voicecall/plugins/libvoicecall-telepathy-plugin.so %{_libdir}/voicecall/plugins/libvoicecall-ngf-plugin.so other changes: -------------- ++++++ voicecall-0.3.4.tar.gz -> voicecall-0.3.5.tar.gz --- packaging/voicecall.spec.in +++ packaging/voicecall.spec.in @@ -113,7 +113,6 @@ %files core %defattr(-,root,root,-) %{_bindir}/voicecall-manager -%{_libdir}/voicecall/plugins/libvoicecall-resource-policy-routing-plugin.so %{_libdir}/voicecall/plugins/libvoicecall-playback-manager-plugin.so %{_libdir}/voicecall/plugins/libvoicecall-telepathy-plugin.so %{_libdir}/voicecall/plugins/libvoicecall-ngf-plugin.so --- plugins/ngf/src/ngfringtoneplugin.cpp +++ plugins/ngf/src/ngfringtoneplugin.cpp @@ -147,7 +147,6 @@ { DEBUG_T("Stopping ringtone"); d->ngf->stop("ringtone"); - d->manager->setAudioMode("earpeice"); d->ringtoneEventId = -1; } } else if(d->ringtoneEventId == -1) { @@ -159,7 +158,6 @@ props.insert("type", "voip"); } - d->manager->setAudioMode("ihf"); d->ringtoneEventId = d->ngf->play("ringtone", props); DEBUG_T(QString("Playing ringtone, event id: %1").arg(d->ringtoneEventId)); } --- plugins/playback-manager/src/playbackmanagerplugin.cpp +++ plugins/playback-manager/src/playbackmanagerplugin.cpp @@ -118,11 +118,11 @@ { TRACE Q_D(PlaybackManagerPlugin); - bool on = true; + bool on = false; if(mode == "ihf") { - on = false; + on = true; } QDBusMessage message = QDBusMessage::createMethodCall(ORG_MAEMO_PLAYBACK_DEST, @@ -133,9 +133,13 @@ if(!QDBusConnection::sessionBus().send(message)) { - WARNING_T("Failed to send RequestMute method call."); + WARNING_T("Failed to send RequestPrivacyOverride method call."); return; } + else + DEBUG_T(on ? "Set PrivacyOverride true." : "Set PirvacyOverride false."); + + d->manager->onAudioModeChanged(mode); } void PlaybackManagerPlugin::setMuteMicrophone(bool on) @@ -146,13 +150,15 @@ ORG_MAEMO_PLAYBACK_PATH, ORG_MAEMO_PLAYBACK_IFACE, ORG_MAEMO_PLAYBACK_REQUEST_MUTE); - message << !on; + message << on; if(!QDBusConnection::sessionBus().send(message)) { WARNING_T("Failed to send RequestMute method call."); return; } + else + DEBUG_T(on ? "Set Mute true." : "Set Mute false."); d->manager->onMuteMicrophoneChanged(on); } @@ -183,9 +189,9 @@ if(d->manager->voiceCalls().empty()) { - this->setMode("earpiece"); - this->setMuteMicrophone(false); - this->setMuteSpeaker(false); + d->manager->onAudioModeChanged("earpiece"); + d->manager->onMuteMicrophoneChanged(false); + d->manager->onMuteSpeakerChanged(false); } }
