From c099adfba445c6ae5cea915d729376df919d76ab Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Wed, 6 Aug 2014 18:41:37 -0400
Subject: [PATCH] sflphone_api: use spaces, not tabs
Refs #48032
---
daemon/bin/dbus/dbusvideomanager.cpp | 4 +-
daemon/src/sflphone.h | 90 ++++++++++++++--------------
daemon/src/sflphone_api.cpp | 4 +-
3 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/daemon/bin/dbus/dbusvideomanager.cpp b/daemon/bin/dbus/dbusvideomanager.cpp
index e394e2ea50..425b69e402 100644
--- a/daemon/bin/dbus/dbusvideomanager.cpp
+++ b/daemon/bin/dbus/dbusvideomanager.cpp
@@ -53,7 +53,7 @@ std::vector<std::string> DBusVideoManager::getDeviceList()
std::map<std::string, std::map<std::string, std::vector<std::string>>> DBusVideoManager::getCapabilities(const std::string& name)
{
- return sflph_video_get_capabilities(name);
+ return sflph_video_get_capabilities(name);
}
std::map<std::string, std::string> DBusVideoManager::getSettings(const std::string& name)
@@ -63,7 +63,7 @@ std::map<std::string, std::string> DBusVideoManager::getSettings(const std::stri
void DBusVideoManager::applySettings(const std::string& name, const std::map<std::string, std::string>& settings)
{
- sflph_video_apply_settings(name, settings);
+ sflph_video_apply_settings(name, settings);
}
void DBusVideoManager::setDefaultDevice(const std::string &dev)
diff --git a/daemon/src/sflphone.h b/daemon/src/sflphone.h
index d4837ab382..8d703b326e 100644
--- a/daemon/src/sflphone.h
+++ b/daemon/src/sflphone.h
@@ -45,88 +45,88 @@ sflph_version();
#ifdef SFL_PRESENCE
struct sflph_pres_ev_handlers
{
- void (*on_new_server_subscription_request)(const std::string& remote);
- void (*on_server_error)(const std::string& account_id, const std::string& error, const std::string& msg);
- void (*on_new_buddy_notification)(const std::string& account_id, const std::string& buddy_uri, int status, const std::string& line_status);
- void (*on_subscription_state_change)(const std::string& account_id, const std::string& buddy_uri, int state);
+ void (*on_new_server_subscription_request)(const std::string& remote);
+ void (*on_server_error)(const std::string& account_id, const std::string& error, const std::string& msg);
+ void (*on_new_buddy_notification)(const std::string& account_id, const std::string& buddy_uri, int status, const std::string& line_status);
+ void (*on_subscription_state_change)(const std::string& account_id, const std::string& buddy_uri, int state);
};
#endif /* SFL_PRESENCE */
/* configuration events */
struct sflph_config_ev_handlers
{
- void (*on_volume_change)(const std::string& device, int value);
- void (*on_accounts_change)(void);
- void (*on_history_change)(void);
- void (*on_stun_status_fail)(const std::string& account_id);
- void (*on_registration_state_change)(const std::string& account_id, int state);
- void (*on_sip_registration_state_change)(const std::string& account_id, const std::string& state, int code);
- void (*on_error)(int alert);
+ void (*on_volume_change)(const std::string& device, int value);
+ void (*on_accounts_change)(void);
+ void (*on_history_change)(void);
+ void (*on_stun_status_fail)(const std::string& account_id);
+ void (*on_registration_state_change)(const std::string& account_id, int state);
+ void (*on_sip_registration_state_change)(const std::string& account_id, const std::string& state, int code);
+ void (*on_error)(int alert);
};
/* call events */
struct sflph_call_ev_handlers
{
- void (*on_state_change)(const std::string& call_id, const std::string& state);
- void (*on_transfer_fail)(void);
- void (*on_transfer_success)(void);
- void (*on_record_playback_stopped)(const std::string& path);
- void (*on_voice_mail_notify)(const std::string& call_id, int nd_msg);
- void (*on_incoming_message)(const std::string& id, const std::string& from, const std::string& msg);
- void (*on_incoming_call)(const std::string& account_id, const std::string& call_id, const std::string& from);
- void (*on_record_playback_filepath)(const std::string& id, const std::string& filename);
- void (*on_conference_created)(const std::string& conf_id);
- void (*on_conference_changed)(const std::string& conf_id, const std::string& state);
- void (*on_update_playback_scale)(const std::string& filepath, int position, int scale);
- void (*on_conference_remove)(const std::string& conf_id);
- void (*on_new_call)(const std::string& account_id, const std::string& call_id, const std::string& to);
- void (*on_sip_call_state_change)(const std::string& call_id, const std::string& state, int code);
- void (*on_record_state_change)(const std::string& call_id, int state);
- void (*on_secure_sdes_on)(const std::string& call_id);
- void (*on_secure_sdes_off)(const std::string& call_id);
- void (*on_secure_zrtp_on)(const std::string& call_id, const std::string& cipher);
- void (*on_secure_zrtp_off)(const std::string& call_id);
- void (*on_show_sas)(const std::string& call_id, const std::string& sas, int verified);
- void (*on_zrtp_not_supp_other)(const std::string& call_id);
- void (*on_zrtp_negotiation_fail)(const std::string& call_id, const std::string& reason, const std::string& severity);
- void (*on_rtcp_receive_report)(const std::string& call_id, const std::map<std::string, int>& stats);
+ void (*on_state_change)(const std::string& call_id, const std::string& state);
+ void (*on_transfer_fail)(void);
+ void (*on_transfer_success)(void);
+ void (*on_record_playback_stopped)(const std::string& path);
+ void (*on_voice_mail_notify)(const std::string& call_id, int nd_msg);
+ void (*on_incoming_message)(const std::string& id, const std::string& from, const std::string& msg);
+ void (*on_incoming_call)(const std::string& account_id, const std::string& call_id, const std::string& from);
+ void (*on_record_playback_filepath)(const std::string& id, const std::string& filename);
+ void (*on_conference_created)(const std::string& conf_id);
+ void (*on_conference_changed)(const std::string& conf_id, const std::string& state);
+ void (*on_update_playback_scale)(const std::string& filepath, int position, int scale);
+ void (*on_conference_remove)(const std::string& conf_id);
+ void (*on_new_call)(const std::string& account_id, const std::string& call_id, const std::string& to);
+ void (*on_sip_call_state_change)(const std::string& call_id, const std::string& state, int code);
+ void (*on_record_state_change)(const std::string& call_id, int state);
+ void (*on_secure_sdes_on)(const std::string& call_id);
+ void (*on_secure_sdes_off)(const std::string& call_id);
+ void (*on_secure_zrtp_on)(const std::string& call_id, const std::string& cipher);
+ void (*on_secure_zrtp_off)(const std::string& call_id);
+ void (*on_show_sas)(const std::string& call_id, const std::string& sas, int verified);
+ void (*on_zrtp_not_supp_other)(const std::string& call_id);
+ void (*on_zrtp_negotiation_fail)(const std::string& call_id, const std::string& reason, const std::string& severity);
+ void (*on_rtcp_receive_report)(const std::string& call_id, const std::map<std::string, int>& stats);
};
/* video events */
#ifdef SFL_VIDEO
struct sflph_video_ev_handlers
{
- void (*on_device_event)(void);
- void (*on_start_decoding)(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer);
- void (*on_stop_decoding)(const std::string& id, const std::string& shm_path, bool is_mixer);
+ void (*on_device_event)(void);
+ void (*on_start_decoding)(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer);
+ void (*on_stop_decoding)(const std::string& id, const std::string& shm_path, bool is_mixer);
};
#endif /* SFL_VIDEO */
/* all handlers */
struct sflph_ev_handlers
{
- struct sflph_call_ev_handlers call_ev_handlers;
- struct sflph_config_ev_handlers config_ev_handlers;
+ struct sflph_call_ev_handlers call_ev_handlers;
+ struct sflph_config_ev_handlers config_ev_handlers;
#ifdef SFL_PRESENCE
- struct sflph_pres_ev_handlers pres_ev_handlers;
+ struct sflph_pres_ev_handlers pres_ev_handlers;
#endif /* SFL_PRESENCE */
#ifdef SFL_VIDEO
- struct sflph_video_ev_handlers video_ev_handlers;
+ struct sflph_video_ev_handlers video_ev_handlers;
#endif /* SFL_VIDEO */
};
/* error codes returned by functions of this API */
enum sflph_error {
- SFLPH_ERR_MANAGER_INIT,
- SFLPH_ERR_UNKNOWN,
+ SFLPH_ERR_MANAGER_INIT,
+ SFLPH_ERR_UNKNOWN,
};
/* flags for initialization */
enum sflph_init_flag {
- SFLPH_FLAG_DEBUG = 1,
- SFLPH_FLAG_CONSOLE_LOG = 2,
+ SFLPH_FLAG_DEBUG = 1,
+ SFLPH_FLAG_CONSOLE_LOG = 2,
};
/**
diff --git a/daemon/src/sflphone_api.cpp b/daemon/src/sflphone_api.cpp
index 4ef5990427..0e3405648b 100644
--- a/daemon/src/sflphone_api.cpp
+++ b/daemon/src/sflphone_api.cpp
@@ -778,12 +778,12 @@ bool sflph_video_is_camera_started(void)
void sflph_video_apply_settings(const std::string& name, const std::map<std::string, std::string>& settings)
{
- getVideoManager()->applySettings(name, settings);
+ getVideoManager()->applySettings(name, settings);
}
std::map<std::string, std::map<std::string, std::vector<std::string>>> sflph_video_get_capabilities(const std::string& name)
{
- return getVideoManager()->getCapabilities(name);
+ return getVideoManager()->getCapabilities(name);
}
#endif // SFL_VIDEO
--
GitLab