From 72dda7df13e3b179f6d37c55a2340a082c86c06b Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Tue, 8 Apr 2014 21:31:11 -0400 Subject: [PATCH] Remove priority functions from public header file and move to agent-priv.h --- agent/agent-priv.h | 18 ++++++++++++++++++ agent/candidate.h | 19 ------------------- tests/test-priority.c | 2 ++ 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/agent/agent-priv.h b/agent/agent-priv.h index 0662cfa..4e99aba 100644 --- a/agent/agent-priv.h +++ b/agent/agent-priv.h @@ -232,6 +232,24 @@ output_message_get_size (const NiceOutputMessage *message); gssize agent_socket_send (NiceSocket *sock, const NiceAddress *addr, gsize len, const gchar *buf); + +guint32 +nice_candidate_jingle_priority (NiceCandidate *candidate); + +guint32 +nice_candidate_msn_priority (NiceCandidate *candidate); + +guint32 +nice_candidate_ice_priority_full (guint type_pref, guint local_pref, + guint component_id); + +guint32 +nice_candidate_ice_priority (const NiceCandidate *candidate, + gboolean reliable, gboolean nat_assisted); + +guint64 +nice_candidate_pair_priority (guint32 o_prio, guint32 a_prio); + /* * nice_debug_init: * diff --git a/agent/candidate.h b/agent/candidate.h index e324bb9..07dd2d1 100644 --- a/agent/candidate.h +++ b/agent/candidate.h @@ -220,25 +220,6 @@ nice_candidate_free (NiceCandidate *candidate); NiceCandidate * nice_candidate_copy (const NiceCandidate *candidate); - -guint32 -nice_candidate_jingle_priority (NiceCandidate *candidate); - -guint32 -nice_candidate_msn_priority (NiceCandidate *candidate); - -guint32 -nice_candidate_ice_priority_full (guint type_pref, guint local_pref, - guint component_id); - -guint32 -nice_candidate_ice_priority (const NiceCandidate *candidate, - gboolean reliable, gboolean nat_assisted); - -guint64 -nice_candidate_pair_priority (guint32 o_prio, guint32 a_prio); - - G_END_DECLS #endif /* _CANDIDATE_H */ diff --git a/tests/test-priority.c b/tests/test-priority.c index 1c151a3..f7d3273 100644 --- a/tests/test-priority.c +++ b/tests/test-priority.c @@ -39,6 +39,8 @@ #endif #include "agent.h" +#include "agent-priv.h" + int main (void) -- 2.7.4