[ekiga] Port ekiga code to ptlib/opal v15 (trunk currently)
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Port ekiga code to ptlib/opal v15 (trunk currently)
- Date: Mon, 13 Jul 2015 12:33:20 +0000 (UTC)
commit 4d9799252d180b85cf15a9311301fe6337c9d39b
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date: Mon Jul 13 14:31:05 2015 +0200
Port ekiga code to ptlib/opal v15 (trunk currently)
configure.ac | 4 +-
lib/engine/audiooutput/audiooutput-scheduler.cpp | 2 +-
lib/engine/components/opal/opal-call.cpp | 22 --------------------
lib/engine/components/opal/opal-main.cpp | 4 +++
.../components/opal/process/opal-endpoint.cpp | 2 +
5 files changed, 9 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fb7cc64..3f52f11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,8 @@ MINOR_VERSION=1
BUILD_TYPE=ReleaseCode
BUILD_NUMBER=0
-PTLIB_REC_VERSION="2.14.3"
-OPAL_REC_VERSION="3.14.3"
+PTLIB_REC_VERSION="2.15.1"
+OPAL_REC_VERSION="3.15.1"
AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION,[fix])
AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION,[fix])
diff --git a/lib/engine/audiooutput/audiooutput-scheduler.cpp
b/lib/engine/audiooutput/audiooutput-scheduler.cpp
index 97a64ba..9677102 100644
--- a/lib/engine/audiooutput/audiooutput-scheduler.cpp
+++ b/lib/engine/audiooutput/audiooutput-scheduler.cpp
@@ -237,7 +237,7 @@ void AudioEventScheduler::load_wav(const std::string & event_name, bool is_file_
}
if (wav->IsValid ()) {
- len = wav->GetDataLength();
+ len = wav->GetLength();
channels = wav->GetChannels ();
sample_rate = wav->GetSampleRate ();
bps = wav->GetSampleSize ();
diff --git a/lib/engine/components/opal/opal-call.cpp b/lib/engine/components/opal/opal-call.cpp
index c7d34a1..a3093db 100644
--- a/lib/engine/components/opal/opal-call.cpp
+++ b/lib/engine/components/opal/opal-call.cpp
@@ -473,7 +473,6 @@ Opal::Call::GetConnection ()
PBoolean
Opal::Call::OnEstablished (OpalConnection & connection)
{
- OpalRTPSession *session = NULL;
OpalMediaStreamPtr stream;
noAnswerTimer.Stop (false);
@@ -491,27 +490,6 @@ Opal::Call::OnEstablished (OpalConnection & connection)
Ekiga::Runtime::run_in_main (boost::bind (boost::ref (established), this->shared_from_this ()));
}
- if (PIsDescendant(&connection, OpalRTPConnection)) {
-
- stream = connection.GetMediaStream (OpalMediaType::Audio (), false);
- if (stream != NULL) {
-
- session = (OpalRTPSession*)PDownCast (OpalRTPConnection, &connection)->GetMediaSession
(stream->GetSessionID ());
- if (session) {
- session->SetIgnorePayloadTypeChanges (TRUE);
- }
- }
-
- stream = connection.GetMediaStream (OpalMediaType::Video (), false);
- if (stream != NULL) {
-
- session = (OpalRTPSession*)PDownCast (OpalRTPConnection, &connection)->GetMediaSession
(stream->GetSessionID ());
- if (session) {
- session->SetIgnorePayloadTypeChanges (TRUE);
- }
- }
- }
-
return OpalCall::OnEstablished (connection);
}
diff --git a/lib/engine/components/opal/opal-main.cpp b/lib/engine/components/opal/opal-main.cpp
index fda5fc7..01337a2 100644
--- a/lib/engine/components/opal/opal-main.cpp
+++ b/lib/engine/components/opal/opal-main.cpp
@@ -145,6 +145,10 @@ opal_init_pprocess (int argc,
char *argv [])
{
/* Ekiga PTLIB Process initialisation */
+
+ // SetDirectories must appear before GnomeMeeting (PProcess) object creation, otherwise it searches for
plugins in /usr/bin too, which increases ekiga startup time by several seconds
+ PPluginManager::GetPluginManager().SetDirectories (PString (P_DEFAULT_PLUGIN_DIR));
+
static GnomeMeeting instance;
instance.GetArguments ().SetArgs (argc, argv);
PArgList & args = instance.GetArguments ();
diff --git a/lib/engine/components/opal/process/opal-endpoint.cpp
b/lib/engine/components/opal/process/opal-endpoint.cpp
index 1ee13db..5576b6a 100644
--- a/lib/engine/components/opal/process/opal-endpoint.cpp
+++ b/lib/engine/components/opal/process/opal-endpoint.cpp
@@ -222,6 +222,7 @@ void Opal::EndPoint::SetMaximumJitter (unsigned max_val)
SetAudioJitterDelay (20, val);
+ /*
// Adjust setting for all sessions of all connections of all calls
for (PSafePtr<OpalCall> call = activeCalls;
call != NULL;
@@ -251,6 +252,7 @@ void Opal::EndPoint::SetMaximumJitter (unsigned max_val)
}
}
}
+ */
PTRACE (4, "Opal::EndPoint\tSet Maximum Jitter to " << val);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]