[ekiga/ds-opal-refactoring] OpalEndPoint: More cleanups.

[Damien Sandras <dsandras src gnome org>]

commit ec957715f6d6c8a4d336bb46efb4d386e22f8167
Author: Damien Sandras <dsandras seconix com>
Date:   Sun Mar 22 18:47:25 2015 +0100

    OpalEndPoint: More cleanups.

 .../components/opal/process/opal-endpoint.cpp      |   25 ++++++++++---------
 lib/engine/components/opal/process/opal-endpoint.h |   11 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/lib/engine/components/opal/process/opal-endpoint.cpp 
b/lib/engine/components/opal/process/opal-endpoint.cpp
index b3c167f..b227e1c 100644
--- a/lib/engine/components/opal/process/opal-endpoint.cpp
+++ b/lib/engine/components/opal/process/opal-endpoint.cpp
@@ -130,8 +130,6 @@ Opal::EndPoint::EndPoint (Ekiga::ServiceCore& core)
   SetTCPPorts (30000, 30100);
   SetRtpIpPorts (5000, 5100);
 
-  pcssEP = NULL;
-
   forward_on_no_answer = false;
   forward_on_busy = false;
   unconditional_forward = false;
@@ -162,10 +160,9 @@ Opal::EndPoint::EndPoint (Ekiga::ServiceCore& core)
 
   // Create endpoints
   // Their destruction is controlled by Opal
-  pcssEP = new GMPCSSEndpoint (*this, core);
-  pcssEP->SetSoundChannelPlayDevice("EKIGA");
-  pcssEP->SetSoundChannelRecordDevice("EKIGA");
-
+  GMPCSSEndpoint *pcss_endpoint = new GMPCSSEndpoint (*this, core);
+  pcss_endpoint->SetSoundChannelPlayDevice("EKIGA");
+  pcss_endpoint->SetSoundChannelRecordDevice("EKIGA");
   sip_endpoint = new Sip::EndPoint (*this, core);
 #ifdef HAVE_H323
   h323_endpoint= new H323::EndPoint (*this, core);
@@ -616,6 +613,7 @@ Opal::EndPoint::HandleSTUNResult ()
   }
 }
 
+
 void
 Opal::EndPoint::ReportSTUNError (const std::string error)
 {
@@ -631,12 +629,13 @@ Opal::EndPoint::ReportSTUNError (const std::string error)
   }
 }
 
+
 PBoolean
-Opal::EndPoint::CreateVideoOutputDevice(const OpalConnection & connection,
-                                     const OpalMediaFormat & media_fmt,
-                                     PBoolean preview,
-                                     PVideoOutputDevice * & device,
-                                     PBoolean & auto_delete)
+Opal::EndPoint::CreateVideoOutputDevice (const OpalConnection & connection,
+                                         const OpalMediaFormat & media_fmt,
+                                         PBoolean preview,
+                                         PVideoOutputDevice * & device,
+                                         PBoolean & auto_delete)
 {
   PVideoDevice::OpenArgs videoArgs;
   PString title;
@@ -658,6 +657,8 @@ Opal::EndPoint::CreateVideoOutputDevice(const OpalConnection & connection,
   media_fmt.AdjustVideoArgs(videoArgs);
 
   auto_delete = true;
-  device = PVideoOutputDevice::CreateOpenedDevice(videoArgs, false);
+  device = PVideoOutputDevice::CreateOpenedDevice (videoArgs, false);
+
   return device != NULL;
 }
+
diff --git a/lib/engine/components/opal/process/opal-endpoint.h 
b/lib/engine/components/opal/process/opal-endpoint.h
index 0e7fdea..434a97e 100644
--- a/lib/engine/components/opal/process/opal-endpoint.h
+++ b/lib/engine/components/opal/process/opal-endpoint.h
@@ -156,11 +156,11 @@ private:
 
     void ReportSTUNError (const std::string error);
 
-    virtual PBoolean CreateVideoOutputDevice (const OpalConnection & connection,
-                                              const OpalMediaFormat & media_fmt,
-                                              PBoolean preview,
-                                              PVideoOutputDevice * & device,
-                                              PBoolean & auto_delete);
+    PBoolean CreateVideoOutputDevice (const OpalConnection & connection,
+                                      const OpalMediaFormat & media_fmt,
+                                      PBoolean preview,
+                                      PVideoOutputDevice * & device,
+                                      PBoolean & auto_delete);
 
     /* used to get the STUNDetector results */
     PThread* stun_thread;
@@ -176,7 +176,6 @@ private:
     bool auto_answer;
 
     /* The various related endpoints */
-    GMPCSSEndpoint *pcssEP;
     Sip::EndPoint *sip_endpoint;
 #ifdef HAVE_H323
     H323::EndPoint *h323_endpoint;