New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
modules: add comm-telepathy #4
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| find_package(PkgConfig) | ||
|
|
||
| pkg_check_modules(QTVOICECALL qtvoicecall) | ||
|
|
||
| if(DEFINED QTVOICECALL_FOUND) | ||
| add_library(comm-voicecallmanager SHARED | ||
| comm-voicecallmanager.cpp | ||
| comm-voicecallmanager.h | ||
| comm-voicecallmanager-maemomanager.h | ||
| comm-voicecallmanager-maemoprovider.h | ||
| comm-voicecallmanager-maemomanager.cpp | ||
| comm-voicecallmanager-maemoprovider.cpp | ||
| comm-voicecallmanager-maemocallhandler.h | ||
| comm-voicecallmanager-maemocallhandler.cpp | ||
| ) | ||
| target_link_libraries(comm-voicecallmanager ${COMMON_LIBRARIES} Qt${QT_VERSION_MAJOR}::Widgets ${TELEPATHY_QT5_LIBRARIES}) | ||
|
|
||
| target_link_libraries(comm-voicecallmanager ${QTVOICECALL_LIBRARIES}) | ||
| target_include_directories(comm-voicecallmanager PUBLIC ${QTVOICECALL_INCLUDE_DIRS}) | ||
| target_compile_options(comm-voicecallmanager PUBLIC ${QTVOICECALL_CFLAGS_OTHER}) | ||
|
|
||
| target_compile_definitions(comm-voicecallmanager PUBLIC ${Qt5DBus_DEFINITIONS}) | ||
|
|
||
| target_include_directories(comm-voicecallmanager SYSTEM PRIVATE ${COMMON_INCLUDE_DIRS}) | ||
| target_include_directories(comm-voicecallmanager PRIVATE ${MODULE_INCLUDE_DIRS}) | ||
| target_include_directories(comm-voicecallmanager PRIVATE ${TELEPATHY_QT5_INCLUDE_DIR}) | ||
| target_include_directories(comm-voicecallmanager PRIVATE ${Qt5DBus_INCLUDE_DIRS}) | ||
|
|
||
| set_property(TARGET comm-voicecallmanager PROPERTY AUTOMOC ON) | ||
|
|
||
| install(TARGETS comm-voicecallmanager DESTINATION ${SPHONE_MODULE_DIR}) | ||
| endif(DEFINED QTVOICECALL_FOUND) |
127 changes: 127 additions & 0 deletions
127
src/modules/voicecallmanager/comm-voicecallmanager-maemocallhandler.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| #include <time.h> | ||
|
|
||
| #include "comm-voicecallmanager-maemocallhandler.h" | ||
|
|
||
| #include "moc_comm-voicecallmanager-maemocallhandler.cpp" | ||
|
|
||
| MaemoCallHandler::MaemoCallHandler(MaemoManager* mgr_, VoiceCallHandler* handler_) | ||
| { | ||
| this->mgr = mgr_; | ||
| this->voicecall_handler = handler_; | ||
| this->backend = NULL; | ||
| this->call_properties = NULL; | ||
| this->call_status = VoiceCallHandler::STATUS_NULL; | ||
|
|
||
| // Setup signals here, we could add more like line id changes, duration | ||
| // changes (I suppose hold might influence the duration) | ||
| connect(voicecall_handler, &VoiceCallHandler::statusChanged, this, &MaemoCallHandler::statusChanged); | ||
| } | ||
|
|
||
| MaemoCallHandler::~MaemoCallHandler() | ||
| { | ||
| disconnect(voicecall_handler); | ||
| call_properties_free(call_properties); | ||
| } | ||
|
|
||
| void MaemoCallHandler::setupProvider() | ||
| { | ||
| if (backend != NULL) | ||
| return; | ||
|
|
||
| sphone_module_log(LL_DEBUG, "setupProvider"); | ||
|
|
||
| QString provider_id = voicecall_handler->providerId(); | ||
| if (provider_id == "") | ||
| return; | ||
|
|
||
| backend = mgr->maemo_providers[provider_id]; | ||
| } | ||
|
|
||
| void MaemoCallHandler::statusChanged() | ||
| { | ||
| // Since it's not setup upon creation, let's check here first | ||
| setupProvider(); | ||
|
|
||
| int current_status = voicecall_handler->status(); | ||
|
|
||
| qDebug() << "statusChanged status:" << current_status << "old status:" << call_status; | ||
| sphone_module_log(LL_DEBUG, "statusChanged status: %d old status: %d", | ||
| current_status, call_status); | ||
|
|
||
| if (call_status == VoiceCallHandler::STATUS_NULL) { | ||
| sphone_module_log(LL_DEBUG, "Creating call"); | ||
| call_properties = (CallProperties*)g_malloc0(sizeof(*call_properties)); | ||
|
|
||
| call_properties->backend = backend->sphone_backend_id; | ||
| call_properties->needs_route = backend->type == "tel"; | ||
| call_properties->outbound = !voicecall_handler->isIncoming(); | ||
|
|
||
| if (current_status == VoiceCallHandler::STATUS_INCOMING) | ||
| call_properties->state = SPHONE_CALL_INCOMING; | ||
| else if (current_status == VoiceCallHandler::STATUS_DIALING) | ||
| call_properties->state = SPHONE_CALL_DIALING; | ||
| else if (current_status == VoiceCallHandler::STATUS_ALERTING) | ||
| call_properties->state = SPHONE_CALL_ALERTING; | ||
| else | ||
| sphone_module_log(LL_DEBUG, "Not sure what initial state to assign to call!!!"); | ||
|
|
||
| call_properties->start_time = time(NULL); | ||
|
|
||
| call_properties->emergency = voicecall_handler->isEmergency(); | ||
| call_properties->line_identifier = g_strdup(voicecall_handler->lineId().toStdString().c_str()); | ||
| call_properties->backend_data = g_strdup(voicecall_handler->handlerId().toStdString().c_str()); | ||
|
|
||
| execute_datapipe(&call_new_pipe, call_properties); | ||
| } else if (current_status == VoiceCallHandler::STATUS_ACTIVE) { | ||
| #if 0 | ||
| // Is this the right place? | ||
| if (call_properties->outbound) | ||
| call_properties->answered = true; | ||
| #endif | ||
| call_properties->answered = true; | ||
|
|
||
| call_properties->state = SPHONE_CALL_ACTIVE; | ||
| execute_datapipe(&call_properties_changed_pipe, call_properties); | ||
| } else if (current_status == VoiceCallHandler::STATUS_DIALING) { | ||
| call_properties->state = SPHONE_CALL_DIALING; | ||
| execute_datapipe(&call_properties_changed_pipe, call_properties); | ||
| } else if (current_status == VoiceCallHandler::STATUS_ALERTING) { | ||
| call_properties->state = SPHONE_CALL_ALERTING; | ||
| execute_datapipe(&call_properties_changed_pipe, call_properties); | ||
| } else if (current_status == VoiceCallHandler::STATUS_HELD) { | ||
| call_properties->state = SPHONE_CALL_HELD; | ||
| execute_datapipe(&call_properties_changed_pipe, call_properties); | ||
| } else if (current_status == VoiceCallHandler::STATUS_WAITING) { | ||
| call_properties->state = SPHONE_CALL_WAITING; | ||
| execute_datapipe(&call_properties_changed_pipe, call_properties); | ||
| } else if (current_status == VoiceCallHandler::STATUS_DISCONNECTED) { | ||
| sphone_module_log(LL_DEBUG, "call status: disconnected"); | ||
| call_properties->state = SPHONE_CALL_DISCONNECTED; | ||
| call_properties->end_time = time(NULL); | ||
|
|
||
| execute_datapipe(&call_properties_changed_pipe, call_properties); | ||
| } | ||
|
|
||
| call_status = current_status; | ||
| } | ||
|
|
||
| void MaemoCallHandler::answer() | ||
| { | ||
| sphone_module_log(LL_DEBUG, "accept()"); | ||
| voicecall_handler->answer(); | ||
| } | ||
|
|
||
| void MaemoCallHandler::hold(bool hold) | ||
| { | ||
| sphone_module_log(LL_DEBUG, "hold()"); | ||
| voicecall_handler->hold(hold); | ||
| } | ||
|
|
||
| void MaemoCallHandler::hangup() | ||
| { | ||
| sphone_module_log(LL_DEBUG, "hangup()"); | ||
| voicecall_handler->hangup(); | ||
| call_properties->state = SPHONE_CALL_DISCONNECTED; | ||
| call_properties->end_time = time(NULL); | ||
| execute_datapipe(&call_properties_changed_pipe, call_properties); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm?