ekiga r6137 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Sun Apr  6 20:41:51 2008
New Revision: 6137
URL: http://svn.gnome.org/viewvc/ekiga?rev=6137&view=rev

Log:
Reduced the PCSS EndPoint to its minimal form to keep OPAL happy.


Modified:
   trunk/ChangeLog
   trunk/src/endpoints/pcss.cpp
   trunk/src/endpoints/pcss.h

Modified: trunk/src/endpoints/pcss.cpp
==============================================================================
--- trunk/src/endpoints/pcss.cpp	(original)
+++ trunk/src/endpoints/pcss.cpp	Sun Apr  6 20:41:51 2008
@@ -36,32 +36,14 @@
  */
 
 
-#include "config.h"
-
 #include "common.h"
 
-#include <opal/patch.h>
-
-#include "gmconf.h"
-#include "gmdialog.h"
-
 #include "pcss.h"
 #include "manager.h"
-#include "ekiga.h"
-#include "urlhandler.h"
 
-#include "misc.h"
-#include "audio.h"
-#include "main.h"
 
-
-#define new PNEW
-
-GMPCSSEndpoint::GMPCSSEndpoint (GMManager & ep, Ekiga::ServiceCore & _core) 
-: OpalPCSSEndPoint (ep), 
-  endpoint (ep), 
-  core (_core),
-  audiooutput_core (*(dynamic_cast<Ekiga::AudioOutputCore *> (_core.get ("audiooutput-core"))))
+GMPCSSEndpoint::GMPCSSEndpoint (GMManager & ep) 
+: OpalPCSSEndPoint (ep) 
 {
 #ifdef WIN32
   SetSoundChannelBufferDepth (20);
@@ -70,36 +52,14 @@
 #endif
 }
 
-void GMPCSSEndpoint::AcceptCurrentIncomingCall ()
-{
-  if (!incomingConnectionToken.IsEmpty ()) {
-    
-    AcceptIncomingConnection (incomingConnectionToken);
-    incomingConnectionToken = PString ();
-  }
-}
-
 
-bool GMPCSSEndpoint::OnShowIncoming (const OpalPCSSConnection & connection)
+bool GMPCSSEndpoint::OnShowIncoming (const OpalPCSSConnection & /*connection*/)
 {
-  guint status = CONTACT_ONLINE;
-
-  if (endpoint.GetCallingState() != GMManager::Called)
-    return FALSE;
-
-  /* Check the config keys */
-  gnomemeeting_threads_enter ();
-  status = gm_conf_get_int (PERSONAL_DATA_KEY "status");
-  gnomemeeting_threads_leave ();
-
-  /* The token identifying the current call */
-  incomingConnectionToken = connection.GetToken ();
-
-  return TRUE;
+  return true;
 }
 
 
 bool GMPCSSEndpoint::OnShowOutgoing (const OpalPCSSConnection & /*connection*/)
 {
-  return TRUE;
+  return true;
 }

Modified: trunk/src/endpoints/pcss.h
==============================================================================
--- trunk/src/endpoints/pcss.h	(original)
+++ trunk/src/endpoints/pcss.h	Sun Apr  6 20:41:51 2008
@@ -40,53 +40,19 @@
 #define _PCSS_ENDPOINT_H_
 
 #include "common.h"
-#include "manager.h"
-#include "audiooutput-core.h"
 
+class GMManager;
 
 class GMPCSSEndpoint : public OpalPCSSEndPoint
 {
   PCLASSINFO (GMPCSSEndpoint, OpalPCSSEndPoint);
 
 public:
-  GMPCSSEndpoint (GMManager &, Ekiga::ServiceCore & _core);
+  GMPCSSEndpoint (GMManager &);
 
+  bool OnShowIncoming (const OpalPCSSConnection &connection);
 
-  /* DESCRIPTION  :  /
-   * BEHAVIOR     :  Accept the current incoming call.
-   * PRE          :  /
-   */
-  void AcceptCurrentIncomingCall ();
-  
-
-  /* DESCRIPTION  :  This callback is called when there is an 
-   * 		     incoming PCSS connection. This only happens
-   * 		     when the SIP/H.323 connection is not rejected
-   * 		     or forwarded.
-   * 		     It triggers the appropriate timeouts (no answer, ringing).
-   *		     Display a popup if required.
-   * PRE          :  /
-   */
-  virtual bool OnShowIncoming (const OpalPCSSConnection &connection);
-
-
-  /* DESCRIPTION  :  This callback is called when there is an 
-   * 		     outgoing PCSS connection and the remote endpoint is
-   * 		     ringing.
-   * 		     It triggers the appropriate timeout in order
-   * 		     to generate a ring tone.
-   * PRE          :  /
-   */
-  virtual bool OnShowOutgoing (const OpalPCSSConnection &connection);  
-
-private:
-
-  GMManager & endpoint;
-
-  PString incomingConnectionToken; 
-
-  Ekiga::ServiceCore & core;
-  Ekiga::AudioOutputCore & audiooutput_core;
+  bool OnShowOutgoing (const OpalPCSSConnection &connection);  
 };
 
 #endif