[Opalvoip-devel] Opal 3.18 beta 9 patch for aarch64
Brought to you by:
csoutheren,
rjongbloed
From: Douglas C. <dou...@gm...> - 2022-07-06 00:18:08
|
Hello, In order to build the most recent stable release I needed to apply the following patch and was wondering if someone could help explain considering the tip of master does not reflect this. --- diff --git a/include/opal/connection.h b/include/opal/connection.h index fed4822..24b8c63 100644 --- a/include/opal/connection.h +++ b/include/opal/connection.h @@ -1931,7 +1931,7 @@ class OpalConnection : public PSafeObject virtual void DisableRecording(); PDECLARE_NOTIFIER(RTP_DataFrame, OpalConnection, OnRecordAudio); - void InternalOnRecordAudio(PString key, PAutoPtr<RTP_DataFrame> frame); + void InternalOnRecordAudio(PString key, PAutoPtr<RTP_DataFrame> & frame); #if OPAL_VIDEO PDECLARE_NOTIFIER(RTP_DataFrame, OpalConnection, OnRecordVideo); void InternalOnRecordVideo(PString key, PAutoPtr<RTP_DataFrame> frame); diff --git a/include/opal/pres_ent.h b/include/opal/pres_ent.h index a15df89..fb281cc 100644 --- a/include/opal/pres_ent.h +++ b/include/opal/pres_ent.h @@ -337,10 +337,10 @@ class OpalPresentity : public PSafeObject const OpalPresenceInfo & info ///< Info on other presentity that changed state ); - typedef PNotifierTemplate< PAutoPtr<OpalPresenceInfo> > PresenceChangeNotifier; - #define PDECLARE_PresenceChangeNotifier(cls, fn) PDECLARE_NOTIFIER2(OpalPresentity, cls, fn, PAutoPtr<OpalPresenceInfo>) - #define PDECLARE_ASYNC_PresenceChangeNotifier(cls, fn) PDECLARE_ASYNC_NOTIFIER2(OpalPresentity, cls, fn, PAutoPtr<OpalPresenceInfo>) - #define PCREATE_PresenceChangeNotifier(fn) PCREATE_NOTIFIER2(fn, PAutoPtr<OpalPresenceInfo>) + typedef PNotifierTemplate< PAutoPtr<OpalPresenceInfo>& > PresenceChangeNotifier; + #define PDECLARE_PresenceChangeNotifier(cls, fn) PDECLARE_NOTIFIER2(OpalPresentity, cls, fn, PAutoPtr<OpalPresenceInfo>&) + #define PDECLARE_ASYNC_PresenceChangeNotifier(cls, fn) PDECLARE_ASYNC_NOTIFIER2(OpalPresentity, cls, fn, PAutoPtr<OpalPresenceInfo>&) + #define PCREATE_PresenceChangeNotifier(fn) PCREATE_NOTIFIER2(fn, PAutoPtr<OpalPresenceInfo>&) /// Set the notifier for the OnPresenceChange() function. void SetPresenceChangeNotifier( diff --git a/samples/openphone/main.cxx b/samples/openphone/main.cxx index 3a116fa..f5fbea5 100644 --- a/samples/openphone/main.cxx +++ b/samples/openphone/main.cxx @@ -3787,7 +3787,7 @@ bool MyManager::MonitorPresence(const PString & aor, const PString & uri, bool s } -void MyManager::OnPresenceChange(OpalPresentity &, PAutoPtr<OpalPresenceInfo> info) +void MyManager::OnPresenceChange(OpalPresentity &, PAutoPtr<OpalPresenceInfo> & info) { int count = m_speedDials->GetItemCount(); for (int index = 0; index < count; index++) { diff --git a/src/opal/connection.cxx b/src/opal/connection.cxx index 45127af..66c4201 100644 --- a/src/opal/connection.cxx +++ b/src/opal/connection.cxx @@ -1176,12 +1176,12 @@ void OpalConnection::OnRecordAudio(RTP_DataFrame & frame, P_INT_PTR param) const OpalMediaPatch * patch = (const OpalMediaPatch *)param; PAutoPtr<RTP_DataFrame> copyFrame(new RTP_DataFrame(frame.GetPointer(), frame.GetPacketSize())); - GetEndPoint().GetManager().QueueDecoupledEvent(new PSafeWorkArg2<OpalConnection, PString, PAutoPtr<RTP_DataFrame> >( + GetEndPoint().GetManager().QueueDecoupledEvent(new PSafeWorkArg2<OpalConnection, PString, PAutoPtr<RTP_DataFrame>& >( this, MakeRecordingKey(*patch), copyFrame, &OpalConnection::InternalOnRecordAudio), psprintf("%p", this)); } -void OpalConnection::InternalOnRecordAudio(PString key, PAutoPtr<RTP_DataFrame> frame) +void OpalConnection::InternalOnRecordAudio(PString key, PAutoPtr<RTP_DataFrame> & frame) { m_ownerCall.OnRecordAudio(key, *frame); } diff --git a/src/opal/opal_c.cxx b/src/opal/opal_c.cxx index f81a5b8..d0a9233 100644 --- a/src/opal/opal_c.cxx +++ b/src/opal/opal_c.cxx @@ -2969,7 +2969,7 @@ PString ConvertStringSetWithoutLastNewine(const PStringSet & set) return strm.Left(strm.GetLength()-1); } -void OpalManager_C::OnPresenceChange(OpalPresentity &, PAutoPtr<OpalPresenceInfo> info) +void OpalManager_C::OnPresenceChange(OpalPresentity &, PAutoPtr<OpalPresenceInfo> & info) { OpalMessageBuffer message(OpalIndPresenceChange); SET_MESSAGE_STRING(message, m_param.m_presenceStatus.m_entity, info->m_entity.AsString()); |