ekiga r6360 - in trunk: . src/endpoints src/gui
- From: dsandras svn gnome org
- To: svn-commits-list gnome org
- Subject: ekiga r6360 - in trunk: . src/endpoints src/gui
- Date: Wed, 4 Jun 2008 04:59:27 +0000 (UTC)
Author: dsandras
Date: Wed Jun 4 04:59:27 2008
New Revision: 6360
URL: http://svn.gnome.org/viewvc/ekiga?rev=6360&view=rev
Log:
s/GMManager/Opal::CallManager.
Modified:
trunk/ChangeLog
trunk/src/endpoints/accountshandler.cpp
trunk/src/endpoints/accountshandler.h
trunk/src/endpoints/h323.cpp
trunk/src/endpoints/h323.h
trunk/src/endpoints/manager.cpp
trunk/src/endpoints/manager.h
trunk/src/endpoints/opal-gmconf-bridge.cpp
trunk/src/endpoints/opal-main.cpp
trunk/src/endpoints/pcss.cpp
trunk/src/endpoints/pcss.h
trunk/src/endpoints/sip.cpp
trunk/src/endpoints/sip.h
trunk/src/gui/accounts.cpp
trunk/src/gui/accounts.h
trunk/src/gui/assistant.cpp
trunk/src/gui/main.cpp
trunk/src/gui/statusicon.cpp
trunk/src/gui/tools.cpp
Modified: trunk/src/endpoints/accountshandler.cpp
==============================================================================
--- trunk/src/endpoints/accountshandler.cpp (original)
+++ trunk/src/endpoints/accountshandler.cpp Wed Jun 4 04:59:27 2008
@@ -57,7 +57,7 @@
/* Class to register accounts in a thread.
*/
-GMAccountsEndpoint::GMAccountsEndpoint (GMManager & endpoint)
+GMAccountsEndpoint::GMAccountsEndpoint (Opal::CallManager & endpoint)
:PThread (1000, NoAutoDeleteThread),
ep (endpoint), accounts(NULL), active(TRUE)
{
Modified: trunk/src/endpoints/accountshandler.h
==============================================================================
--- trunk/src/endpoints/accountshandler.h (original)
+++ trunk/src/endpoints/accountshandler.h Wed Jun 4 04:59:27 2008
@@ -43,8 +43,9 @@
#include "accounts.h"
-class GMManager;
-
+namespace Opal {
+ class CallManager;
+}
/* Class to register accounts in a thread.
* SIP Accounts are registered asynchronously, H.323 accounts
@@ -62,7 +63,7 @@
* thread. Register all accounts in the Ekiga configuration.
* PRE : /
*/
- GMAccountsEndpoint (GMManager &endpoint);
+ GMAccountsEndpoint (Opal::CallManager &endpoint);
/* DESCRIPTION : The destructor.
@@ -101,7 +102,7 @@
PMutex quit_mutex;
PSyncPoint thread_sync_point;
- GMManager & ep;
+ Opal::CallManager & ep;
GSList *accounts;
PMutex accounts_mutex;
Modified: trunk/src/endpoints/h323.cpp
==============================================================================
--- trunk/src/endpoints/h323.cpp (original)
+++ trunk/src/endpoints/h323.cpp Wed Jun 4 04:59:27 2008
@@ -49,7 +49,7 @@
public:
- dialer (const std::string & uri, GMManager & ep)
+ dialer (const std::string & uri, Opal::CallManager & ep)
: PThread (1000, AutoDeleteThread),
dial_uri (uri),
endpoint (ep)
@@ -65,7 +65,7 @@
private:
const std::string dial_uri;
- GMManager & endpoint;
+ Opal::CallManager & endpoint;
};
@@ -73,7 +73,7 @@
/* The class */
-CallProtocolManager::CallProtocolManager (GMManager & ep, Ekiga::ServiceCore & _core, unsigned _listen_port)
+CallProtocolManager::CallProtocolManager (Opal::CallManager & ep, Ekiga::ServiceCore & _core, unsigned _listen_port)
: H323EndPoint (ep),
endpoint (ep),
core (_core),
Modified: trunk/src/endpoints/h323.h
==============================================================================
--- trunk/src/endpoints/h323.h (original)
+++ trunk/src/endpoints/h323.h Wed Jun 4 04:59:27 2008
@@ -58,7 +58,7 @@
PCLASSINFO(CallProtocolManager, H323EndPoint);
public:
- CallProtocolManager (GMManager &ep, Ekiga::ServiceCore & core, unsigned listen_port);
+ CallProtocolManager (CallManager &ep, Ekiga::ServiceCore & core, unsigned listen_port);
/* ContactDecorator and PresentityDecorator */
@@ -115,7 +115,7 @@
private:
void on_dial (std::string uri);
- GMManager & endpoint;
+ CallManager & endpoint;
Ekiga::ServiceCore & core;
Ekiga::Runtime & runtime;
Modified: trunk/src/endpoints/manager.cpp
==============================================================================
--- trunk/src/endpoints/manager.cpp (original)
+++ trunk/src/endpoints/manager.cpp Wed Jun 4 04:59:27 2008
@@ -63,7 +63,7 @@
public:
StunDetector (const std::string & _server,
- GMManager & _manager,
+ Opal::CallManager & _manager,
Ekiga::Runtime & _runtime)
: PThread (1000, AutoDeleteThread),
server (_server),
@@ -91,13 +91,16 @@
private:
const std::string server;
- GMManager & manager;
+ Opal::CallManager & manager;
Ekiga::Runtime & runtime;
};
+using namespace Opal;
+
+
/* The class */
-GMManager::GMManager (Ekiga::ServiceCore & _core)
+CallManager::CallManager (Ekiga::ServiceCore & _core)
: core (_core),
runtime (*(dynamic_cast<Ekiga::Runtime *> (core.get ("runtime"))))
{
@@ -143,21 +146,21 @@
}
-GMManager::~GMManager ()
+CallManager::~CallManager ()
{
ClearAllCalls (OpalConnection::EndedByLocalUser, false);
RemoveAccountsEndpoint ();
}
-void GMManager::start ()
+void CallManager::start ()
{
// Ready
new StunDetector ("stun.voxgratia.org", *this, runtime);
}
-void GMManager::set_display_name (const std::string & name)
+void CallManager::set_display_name (const std::string & name)
{
display_name = name;
@@ -165,13 +168,13 @@
}
-const std::string & GMManager::get_display_name () const
+const std::string & CallManager::get_display_name () const
{
return display_name;
}
-void GMManager::set_echo_cancellation (bool enabled)
+void CallManager::set_echo_cancellation (bool enabled)
{
OpalEchoCanceler::Params ec;
@@ -205,7 +208,7 @@
}
-bool GMManager::get_echo_cancellation () const
+bool CallManager::get_echo_cancellation () const
{
OpalEchoCanceler::Params ec = GetEchoCancelParams ();
@@ -213,7 +216,7 @@
}
-void GMManager::set_maximum_jitter (unsigned max_val)
+void CallManager::set_maximum_jitter (unsigned max_val)
{
// Adjust general settings
SetAudioJitterDelay (20, PMIN (max_val, 1000));
@@ -244,13 +247,13 @@
}
-unsigned GMManager::get_maximum_jitter () const
+unsigned CallManager::get_maximum_jitter () const
{
return GetMaxAudioJitterDelay ();
}
-void GMManager::set_silence_detection (bool enabled)
+void CallManager::set_silence_detection (bool enabled)
{
OpalSilenceDetector::Params sd;
@@ -284,7 +287,7 @@
}
-bool GMManager::get_silence_detection () const
+bool CallManager::get_silence_detection () const
{
OpalSilenceDetector::Params sd;
@@ -294,25 +297,25 @@
}
-void GMManager::set_reject_delay (unsigned delay)
+void CallManager::set_reject_delay (unsigned delay)
{
reject_delay = delay;
}
-unsigned GMManager::get_reject_delay () const
+unsigned CallManager::get_reject_delay () const
{
return reject_delay;
}
-const Ekiga::CodecList & GMManager::get_codecs () const
+const Ekiga::CodecList & CallManager::get_codecs () const
{
return codecs;
}
-void GMManager::set_codecs (Ekiga::CodecList & _codecs)
+void CallManager::set_codecs (Ekiga::CodecList & _codecs)
{
PStringArray initial_order;
PStringArray initial_mask;
@@ -332,7 +335,7 @@
// add missing codecs at the end of the list
//
- // Build the Ekiga::CodecList taken into account by the GMManager
+ // Build the Ekiga::CodecList taken into account by the CallManager
// It contains codecs given as argument to set_codecs, and other codecs
// supported by the manager
for (Ekiga::CodecList::iterator it = all_codecs.begin ();
@@ -404,37 +407,37 @@
SetMediaFormatOrder (order);
}
-void GMManager::set_forward_on_no_answer (bool enabled)
+void CallManager::set_forward_on_no_answer (bool enabled)
{
forward_on_no_answer = enabled;
}
-bool GMManager::get_forward_on_no_answer ()
+bool CallManager::get_forward_on_no_answer ()
{
return forward_on_no_answer;
}
-void GMManager::set_forward_on_busy (bool enabled)
+void CallManager::set_forward_on_busy (bool enabled)
{
forward_on_busy = enabled;
}
-bool GMManager::get_forward_on_busy ()
+bool CallManager::get_forward_on_busy ()
{
return forward_on_busy;
}
-void GMManager::set_unconditional_forward (bool enabled)
+void CallManager::set_unconditional_forward (bool enabled)
{
unconditional_forward = enabled;
}
-bool GMManager::get_unconditional_forward ()
+bool CallManager::get_unconditional_forward ()
{
return unconditional_forward;
}
-void GMManager::set_udp_ports (unsigned min_port,
+void CallManager::set_udp_ports (unsigned min_port,
unsigned max_port)
{
if (min_port < max_port) {
@@ -445,14 +448,14 @@
}
-void GMManager::get_udp_ports (unsigned & min_port,
+void CallManager::get_udp_ports (unsigned & min_port,
unsigned & max_port) const
{
min_port = GetUDPPortBase ();
max_port = GetUDPPortMax ();
}
-void GMManager::set_tcp_ports (unsigned min_port,
+void CallManager::set_tcp_ports (unsigned min_port,
unsigned max_port)
{
if (min_port < max_port)
@@ -460,7 +463,7 @@
}
-void GMManager::get_tcp_ports (unsigned & min_port,
+void CallManager::get_tcp_ports (unsigned & min_port,
unsigned & max_port) const
{
min_port = GetTCPPortBase ();
@@ -468,7 +471,7 @@
}
-bool GMManager::dial (const std::string & uri)
+bool CallManager::dial (const std::string & uri)
{
for (CallManager::iterator iter = begin ();
iter != end ();
@@ -480,7 +483,7 @@
}
-void GMManager::set_video_options (const GMManager::VideoOptions & options)
+void CallManager::set_video_options (const CallManager::VideoOptions & options)
{
OpalMediaFormatList media_formats_list;
OpalMediaFormat::GetAllRegisteredMediaFormats (media_formats_list);
@@ -566,7 +569,7 @@
}
-void GMManager::get_video_options (GMManager::VideoOptions & options) const
+void CallManager::get_video_options (CallManager::VideoOptions & options) const
{
OpalMediaFormatList media_formats_list;
OpalMediaFormat::GetAllRegisteredMediaFormats (media_formats_list);
@@ -601,7 +604,7 @@
void
-GMManager::Register (GmAccount *account)
+CallManager::Register (GmAccount *account)
{
PWaitAndSignal m(manager_access_mutex);
@@ -614,7 +617,7 @@
void
-GMManager::RemoveAccountsEndpoint ()
+CallManager::RemoveAccountsEndpoint ()
{
PWaitAndSignal m(manager_access_mutex);
@@ -624,7 +627,7 @@
}
-OpalCall *GMManager::CreateCall ()
+OpalCall *CallManager::CreateCall ()
{
Ekiga::Call *call = NULL;
@@ -636,7 +639,7 @@
void
-GMManager::OnClosedMediaStream (const OpalMediaStream & stream)
+CallManager::OnClosedMediaStream (const OpalMediaStream & stream)
{
OpalMediaFormatList list = pcssEP->GetMediaFormats ();
OpalManager::OnClosedMediaStream (stream);
@@ -647,7 +650,7 @@
bool
-GMManager::OnOpenMediaStream (OpalConnection & connection,
+CallManager::OnOpenMediaStream (OpalConnection & connection,
OpalMediaStream & stream)
{
OpalMediaFormatList list = pcssEP->GetMediaFormats ();
@@ -662,7 +665,7 @@
void
-GMManager::OnMWIReceived (const PString & account,
+CallManager::OnMWIReceived (const PString & account,
MessageWaitingType /*type*/,
const PString & msgs)
{
@@ -673,7 +676,7 @@
-void GMManager::GetAllowedFormats (OpalMediaFormatList & full_list)
+void CallManager::GetAllowedFormats (OpalMediaFormatList & full_list)
{
OpalMediaFormatList list = OpalTranscoder::GetPossibleFormats (pcssEP->GetMediaFormats ());
std::list<std::string> black_list;
Modified: trunk/src/endpoints/manager.h
==============================================================================
--- trunk/src/endpoints/manager.h (original)
+++ trunk/src/endpoints/manager.h Wed Jun 4 04:59:27 2008
@@ -62,140 +62,136 @@
class GMLid;
class GMPCSSEndpoint;
-/**
- * COMMON NOTICE: The Endpoint must be initialized with Init after its
- * creation.
- */
+namespace Opal {
-class GMManager:
- public Ekiga::Service,
- public Ekiga::CallManager,
- public OpalManager
-{
- PCLASSINFO(GMManager, OpalManager);
+ class CallManager : public Ekiga::Service,
+ public Ekiga::CallManager,
+ public OpalManager
+ {
+ PCLASSINFO(CallManager, OpalManager);
- friend class GMAccountsEndpoint;
-
- public:
+ friend class GMAccountsEndpoint;
- GMManager (Ekiga::ServiceCore & _core);
+public:
- ~GMManager ();
+ CallManager (Ekiga::ServiceCore & _core);
- /**/
- void start ();
+ ~CallManager ();
- /**/
- const std::string get_name () const
- { return "opal-component"; }
+ /**/
+ void start ();
- const std::string get_description () const
- { return "\tObject bringing in Opal support (calls, text messaging, sip, h323, ...)"; }
-
- /** Call Manager **/
- bool dial (const std::string & uri);
+ /**/
+ const std::string get_name () const
+ { return "opal-component"; }
- void set_display_name (const std::string & name);
- const std::string & get_display_name () const;
+ const std::string get_description () const
+ { return "\tObject bringing in Opal support (calls, text messaging, sip, h323, ...)"; }
- void set_echo_cancellation (bool enabled);
- bool get_echo_cancellation () const;
+ /** Call Manager **/
+ bool dial (const std::string & uri);
- void set_maximum_jitter (unsigned max_val);
- unsigned get_maximum_jitter () const;
+ void set_display_name (const std::string & name);
+ const std::string & get_display_name () const;
- void set_silence_detection (bool enabled);
- bool get_silence_detection () const;
+ void set_echo_cancellation (bool enabled);
+ bool get_echo_cancellation () const;
- void set_reject_delay (unsigned delay);
- unsigned get_reject_delay () const;
+ void set_maximum_jitter (unsigned max_val);
+ unsigned get_maximum_jitter () const;
- void set_codecs (Ekiga::CodecList & codecs);
- const Ekiga::CodecList & get_codecs () const;
+ void set_silence_detection (bool enabled);
+ bool get_silence_detection () const;
- /* Extended stuff, OPAL CallManager specific */
- void set_forward_on_busy (bool enabled);
- bool get_forward_on_busy ();
+ void set_reject_delay (unsigned delay);
+ unsigned get_reject_delay () const;
- void set_forward_on_no_answer (bool enabled);
- bool get_forward_on_no_answer ();
+ void set_codecs (Ekiga::CodecList & codecs);
+ const Ekiga::CodecList & get_codecs () const;
- void set_unconditional_forward (bool enabled);
- bool get_unconditional_forward ();
+ /* Extended stuff, OPAL CallManager specific */
+ void set_forward_on_busy (bool enabled);
+ bool get_forward_on_busy ();
- void set_udp_ports (unsigned min_port,
- unsigned max_port);
+ void set_forward_on_no_answer (bool enabled);
+ bool get_forward_on_no_answer ();
- void get_udp_ports (unsigned & min_port,
- unsigned & max_port) const;
+ void set_unconditional_forward (bool enabled);
+ bool get_unconditional_forward ();
- void set_tcp_ports (unsigned min_port,
- unsigned max_port);
+ void set_udp_ports (unsigned min_port,
+ unsigned max_port);
- void get_tcp_ports (unsigned & min_port,
- unsigned & max_port) const;
+ void get_udp_ports (unsigned & min_port,
+ unsigned & max_port) const;
+ void set_tcp_ports (unsigned min_port,
+ unsigned max_port);
- /**/
- struct VideoOptions
- {
- VideoOptions ()
- : size (0),
- maximum_frame_rate (0),
- temporal_spatial_tradeoff (0),
- maximum_received_bitrate (0),
- maximum_transmitted_bitrate (0) {};
-
- unsigned size;
- unsigned maximum_frame_rate;
- unsigned temporal_spatial_tradeoff;
- unsigned maximum_received_bitrate;
- unsigned maximum_transmitted_bitrate;
- };
+ void get_tcp_ports (unsigned & min_port,
+ unsigned & max_port) const;
- void set_video_options (const VideoOptions & options);
- void get_video_options (VideoOptions & options) const;
+ /**/
+ struct VideoOptions
+ {
+ VideoOptions ()
+ : size (0),
+ maximum_frame_rate (0),
+ temporal_spatial_tradeoff (0),
+ maximum_received_bitrate (0),
+ maximum_transmitted_bitrate (0) {};
- /**/
- void Register (GmAccount * = NULL);
+ unsigned size;
+ unsigned maximum_frame_rate;
+ unsigned temporal_spatial_tradeoff;
+ unsigned maximum_received_bitrate;
+ unsigned maximum_transmitted_bitrate;
+ };
- private:
- OpalCall *CreateCall ();
+ void set_video_options (const VideoOptions & options);
+ void get_video_options (VideoOptions & options) const;
- void RemoveAccountsEndpoint ();
- bool OnOpenMediaStream (OpalConnection &,
- OpalMediaStream &);
+ /**/
+ void Register (GmAccount * = NULL);
- void OnClosedMediaStream (const OpalMediaStream &);
+private:
+ OpalCall *CreateCall ();
- void OnMWIReceived (const PString & party,
- MessageWaitingType type,
- const PString & info);
+ void RemoveAccountsEndpoint ();
- void GetAllowedFormats (OpalMediaFormatList & full_list);
+ bool OnOpenMediaStream (OpalConnection &,
+ OpalMediaStream &);
- /* The various related endpoints */
- GMPCSSEndpoint *pcssEP;
+ void OnClosedMediaStream (const OpalMediaStream &);
- /* The various components of the endpoint */
- GMAccountsEndpoint *manager;
+ void OnMWIReceived (const PString & party,
+ MessageWaitingType type,
+ const PString & info);
- /* Various mutexes to ensure thread safeness around internal
- variables */
- PMutex manager_access_mutex;
+ void GetAllowedFormats (OpalMediaFormatList & full_list);
- Ekiga::ServiceCore & core;
- Ekiga::Runtime & runtime;
- Ekiga::CodecList codecs;
- Ekiga::CallCore *call_core;
+ /* The various related endpoints */
+ GMPCSSEndpoint *pcssEP;
- std::string display_name;
- unsigned reject_delay;
- bool forward_on_busy;
- bool unconditional_forward;
- bool forward_on_no_answer;
-};
+ /* The various components of the endpoint */
+ GMAccountsEndpoint *manager;
+ /* Various mutexes to ensure thread safeness around internal
+ variables */
+ PMutex manager_access_mutex;
+
+ Ekiga::ServiceCore & core;
+ Ekiga::Runtime & runtime;
+ Ekiga::CodecList codecs;
+ Ekiga::CallCore *call_core;
+
+ std::string display_name;
+ unsigned reject_delay;
+ bool forward_on_busy;
+ bool unconditional_forward;
+ bool forward_on_no_answer;
+ };
+};
#endif
Modified: trunk/src/endpoints/opal-gmconf-bridge.cpp
==============================================================================
--- trunk/src/endpoints/opal-gmconf-bridge.cpp (original)
+++ trunk/src/endpoints/opal-gmconf-bridge.cpp Wed Jun 4 04:59:27 2008
@@ -95,35 +95,35 @@
void ConfBridge::on_property_changed (std::string key, GmConfEntry *entry)
{
- GMManager & manager = (GMManager &) service;
+ CallManager & manager = (CallManager &) service;
//
// Video options
//
if (key == VIDEO_CODECS_KEY "maximum_video_tx_bitrate") {
- GMManager::VideoOptions options;
+ CallManager::VideoOptions options;
manager.get_video_options (options);
options.maximum_transmitted_bitrate = gm_conf_entry_get_int (entry);
manager.set_video_options (options);
}
else if (key == VIDEO_CODECS_KEY "temporal_spatial_tradeoff") {
- GMManager::VideoOptions options;
+ CallManager::VideoOptions options;
manager.get_video_options (options);
options.temporal_spatial_tradeoff = gm_conf_entry_get_int (entry);
manager.set_video_options (options);
}
else if (key == VIDEO_DEVICES_KEY "size") {
- GMManager::VideoOptions options;
+ CallManager::VideoOptions options;
manager.get_video_options (options);
options.size = gm_conf_entry_get_int (entry);
manager.set_video_options (options);
}
else if (key == VIDEO_DEVICES_KEY "max_frame_rate") {
- GMManager::VideoOptions options;
+ CallManager::VideoOptions options;
manager.get_video_options (options);
options.maximum_frame_rate = gm_conf_entry_get_int (entry);
if ( (options.maximum_frame_rate < 1) || (options.maximum_frame_rate > 30) ) {
@@ -134,7 +134,7 @@
}
else if (key == VIDEO_CODECS_KEY "maximum_video_rx_bitrate") {
- GMManager::VideoOptions options;
+ CallManager::VideoOptions options;
manager.get_video_options (options);
options.maximum_received_bitrate = gm_conf_entry_get_int (entry);
manager.set_video_options (options);
Modified: trunk/src/endpoints/opal-main.cpp
==============================================================================
--- trunk/src/endpoints/opal-main.cpp (original)
+++ trunk/src/endpoints/opal-main.cpp Wed Jun 4 04:59:27 2008
@@ -76,7 +76,7 @@
call_core = dynamic_cast<Ekiga::CallCore *> (core.get ("call-core"));
chat_core = dynamic_cast<Ekiga::ChatCore *> (core.get ("chat-core"));
- GMManager *call_manager = new GMManager (core);
+ CallManager *call_manager = new CallManager (core);
Sip::CallProtocolManager *sip_manager = new Sip::CallProtocolManager (*call_manager, core, sip_port);
H323::CallProtocolManager *h323_manager = new H323::CallProtocolManager (*call_manager, core, h323_port);
Modified: trunk/src/endpoints/pcss.cpp
==============================================================================
--- trunk/src/endpoints/pcss.cpp (original)
+++ trunk/src/endpoints/pcss.cpp Wed Jun 4 04:59:27 2008
@@ -44,7 +44,7 @@
#include "call.h"
-GMPCSSEndpoint::GMPCSSEndpoint (GMManager & ep,
+GMPCSSEndpoint::GMPCSSEndpoint (Opal::CallManager & ep,
Ekiga::ServiceCore & _core)
: OpalPCSSEndPoint (ep),
core (_core),
Modified: trunk/src/endpoints/pcss.h
==============================================================================
--- trunk/src/endpoints/pcss.h (original)
+++ trunk/src/endpoints/pcss.h Wed Jun 4 04:59:27 2008
@@ -44,14 +44,16 @@
#include "services.h"
#include "runtime.h"
-class GMManager;
+namespace Opal {
+ class CallManager;
+}
class GMPCSSEndpoint : public OpalPCSSEndPoint
{
PCLASSINFO (GMPCSSEndpoint, OpalPCSSEndPoint);
public:
- GMPCSSEndpoint (GMManager &manager, Ekiga::ServiceCore & _core);
+ GMPCSSEndpoint (Opal::CallManager &manager, Ekiga::ServiceCore & _core);
bool OnShowIncoming (const OpalPCSSConnection &connection);
Modified: trunk/src/endpoints/sip.cpp
==============================================================================
--- trunk/src/endpoints/sip.cpp (original)
+++ trunk/src/endpoints/sip.cpp Wed Jun 4 04:59:27 2008
@@ -54,7 +54,7 @@
public:
- dialer (const std::string & uri, GMManager & ep)
+ dialer (const std::string & uri, Opal::CallManager & ep)
: PThread (1000, AutoDeleteThread),
dial_uri (uri),
endpoint (ep)
@@ -70,16 +70,16 @@
private:
const std::string dial_uri;
- GMManager & endpoint;
+ Opal::CallManager & endpoint;
};
using namespace Opal::Sip;
/* The class */
-CallProtocolManager::CallProtocolManager (GMManager & ep,
- Ekiga::ServiceCore & _core,
- unsigned _listen_port)
+CallProtocolManager::CallProtocolManager (Opal::CallManager & ep,
+ Ekiga::ServiceCore & _core,
+ unsigned _listen_port)
: SIPEndPoint (ep),
Ekiga::PresencePublisher (_core),
endpoint (ep),
Modified: trunk/src/endpoints/sip.h
==============================================================================
--- trunk/src/endpoints/sip.h (original)
+++ trunk/src/endpoints/sip.h Wed Jun 4 04:59:27 2008
@@ -71,7 +71,7 @@
public:
- CallProtocolManager (GMManager &ep, Ekiga::ServiceCore & core, unsigned listen_port);
+ CallProtocolManager (CallManager &ep, Ekiga::ServiceCore & core, unsigned listen_port);
/* ContactDecorator and PresentityDecorator */
@@ -165,7 +165,7 @@
PMutex msgDataMutex;
msgDict msgData;
- GMManager & endpoint;
+ CallManager & endpoint;
std::list<std::string> subscribed_uris; // List of subscribed uris
std::list<std::string> domains; // List of registered domains
Modified: trunk/src/gui/accounts.cpp
==============================================================================
--- trunk/src/gui/accounts.cpp (original)
+++ trunk/src/gui/accounts.cpp Wed Jun 4 04:59:27 2008
@@ -896,7 +896,7 @@
/* Update the account */
//gdk_threads_leave ();
- dynamic_cast<GMManager *>(aw->core.get ("opal-component"))->Register (account);
+ dynamic_cast<Opal::CallManager *>(aw->core.get ("opal-component"))->Register (account);
//gdk_threads_enter ();
gm_account_delete (account);
Modified: trunk/src/gui/accounts.h
==============================================================================
--- trunk/src/gui/accounts.h (original)
+++ trunk/src/gui/accounts.h Wed Jun 4 04:59:27 2008
@@ -42,7 +42,9 @@
#include "common.h"
#include "services.h"
-class GMManager;
+namespace Opal {
+ class CallManager;
+}
/* An account is uniquely identified by its Account ID */
Modified: trunk/src/gui/assistant.cpp
==============================================================================
--- trunk/src/gui/assistant.cpp (original)
+++ trunk/src/gui/assistant.cpp Wed Jun 4 04:59:27 2008
@@ -464,7 +464,7 @@
apply_ekiga_net_page (EkigaAssistant *assistant)
{
GmAccount *account = gnomemeeting_get_account ("ekiga.net");
- GMManager *manager;
+ Opal::CallManager *manager;
gboolean new_account = FALSE;
if (account == NULL) {
@@ -508,7 +508,7 @@
/* Register the current Endpoint to GnomeMeeting.NET */
//gdk_threads_leave ();
if (account->enabled) {
- manager = dynamic_cast<GMManager *> (assistant->priv->core->get ("opal-component"));
+ manager = dynamic_cast<Opal::CallManager *> (assistant->priv->core->get ("opal-component"));
manager->Register (account);
}
//gdk_threads_enter ();
@@ -740,14 +740,14 @@
static void
prepare_audio_devices_page (EkigaAssistant *assistant)
{
- GMManager *manager;
+ Opal::CallManager *manager;
gchar *ringer;
gchar *player;
gchar *recorder;
PStringArray devices;
char **array;
- manager = dynamic_cast<GMManager *> (assistant->priv->core->get ("opal-component"));
+ manager = dynamic_cast<Opal::CallManager *> (assistant->priv->core->get ("opal-component"));
ringer = gm_conf_get_string (SOUND_EVENTS_KEY "output_device");
player = gm_conf_get_string (AUDIO_DEVICES_KEY "output_device");
@@ -1186,7 +1186,7 @@
{
EkigaAssistant *assistant = EKIGA_ASSISTANT (gtkassistant);
- GMManager *manager;
+ Opal::CallManager *manager;
GtkWidget *main_window;
@@ -1200,7 +1200,7 @@
apply_audio_devices_page (assistant);
apply_video_devices_page (assistant);
- manager = dynamic_cast<GMManager *> (assistant->priv->core->get ("opal-component"));
+ manager = dynamic_cast<Opal::CallManager *> (assistant->priv->core->get ("opal-component"));
main_window = GnomeMeeting::Process ()->GetMainWindow ();
/* Hide the druid and show the main Ekiga window */
Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp (original)
+++ trunk/src/gui/main.cpp Wed Jun 4 04:59:27 2008
@@ -3644,7 +3644,7 @@
GtkWidget *
gm_main_window_new (Ekiga::ServiceCore & core)
{
- GMManager *ep = NULL;
+ Opal::CallManager *ep = NULL;
GmMainWindow *mw = NULL;
GtkWidget *window = NULL;
@@ -3685,7 +3685,7 @@
mw, (GDestroyNotify) gm_mw_destroy);
/* Get the manager */
- ep = dynamic_cast<GMManager *> (core.get ("opal-component"));
+ ep = dynamic_cast<Opal::CallManager *> (core.get ("opal-component"));
#ifndef WIN32
mw->video_widget_gc = NULL;
@@ -4364,7 +4364,7 @@
g_timeout_add (15000, (GtkFunction) gnomemeeting_tray_hack_cb, NULL);
}
- GMManager *manager = dynamic_cast<GMManager *> (mw->core.get ("opal-component")); // FIXME
+ Opal::CallManager *manager = dynamic_cast<Opal::CallManager *> (mw->core.get ("opal-component")); // FIXME
manager->Register ();
Modified: trunk/src/gui/statusicon.cpp
==============================================================================
--- trunk/src/gui/statusicon.cpp (original)
+++ trunk/src/gui/statusicon.cpp Wed Jun 4 04:59:27 2008
@@ -527,7 +527,7 @@
const char *key)
{
StatusIcon *self = NULL;
- GMManager *manager = NULL;
+ Opal::CallManager *manager = NULL;
sigc::connection conn;
@@ -544,7 +544,7 @@
g_object_set (self, "key", key, NULL);
- manager = dynamic_cast<GMManager *> (core.get ("opal-component"));
+ manager = dynamic_cast<Opal::CallManager *> (core.get ("opal-component"));
// conn = manager->call_event.connect (sigc::bind (sigc::ptr_fun (on_call_event_cb), self));
//self->priv->connections.push_back (conn); // TODO Announce all events here
GtkFrontend *frontend = dynamic_cast<GtkFrontend*>(core.get ("gtk-frontend"));
Modified: trunk/src/gui/tools.cpp
==============================================================================
--- trunk/src/gui/tools.cpp (original)
+++ trunk/src/gui/tools.cpp Wed Jun 4 04:59:27 2008
@@ -147,7 +147,7 @@
gint response,
gpointer data)
{
- GMManager *ep = NULL;
+ Opal::CallManager *ep = NULL;
GmAccount *account = NULL;
GmPC2PhoneWindow *pcw = NULL;
@@ -164,7 +164,7 @@
g_return_if_fail (pcw != NULL);
- ep = dynamic_cast<GMManager *> (pcw->core.get ("opal-component"));
+ ep = dynamic_cast<Opal::CallManager *> (pcw->core.get ("opal-component"));
/* Get the data from the widgets */
username = gtk_entry_get_text (GTK_ENTRY (pcw->username_entry));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
