From e91655f8e26de597b47d5202d70a504688a6b137 Mon Sep 17 00:00:00 2001 From: "frkoenig@google.com" Date: Mon, 1 Aug 2011 23:14:32 +0000 Subject: [PATCH] Incorrect parameters being passed to trace function. And a small spelling error. Review URL: http://webrtc-codereview.appspot.com/98001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@287 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/vie_frame_provider_base.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/video_engine/main/source/vie_frame_provider_base.cc b/src/video_engine/main/source/vie_frame_provider_base.cc index 0fda87da9..64e40b31a 100644 --- a/src/video_engine/main/source/vie_frame_provider_base.cc +++ b/src/video_engine/main/source/vie_frame_provider_base.cc @@ -30,7 +30,11 @@ ViEFrameProviderBase::~ViEFrameProviderBase() { if(_frameCallbackMap.Size()>0) { - WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideo, ViEId(_engineId,_id), "FramCallbacks still exist when Provider deleted %d",_frameCallbackMap.Size()); + WEBRTC_TRACE(webrtc::kTraceWarning, + webrtc::kTraceVideo, + ViEId(_engineId,_id), + "FrameCallbacks still exist when Provider deleted %d", + _frameCallbackMap.Size()); } for(MapItem* item=_frameCallbackMap.First();item!=NULL;item=_frameCallbackMap.Next(item)) { @@ -178,7 +182,7 @@ int ViEFrameProviderBase::RegisterFrameCallback(int observerId,ViEFrameCallback* return -1; } WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _id), - "%s(0x%p)", callbackObject); + "%s(0x%p)", __FUNCTION__, callbackObject); { CriticalSectionScoped cs(_providerCritSect); @@ -230,7 +234,7 @@ int ViEFrameProviderBase::DeregisterFrameCallback(const ViEFrameCallback* callba return -1; } WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _id), - "%s(0x%p)", callbackObject); + "%s(0x%p)", __FUNCTION__, callbackObject); { @@ -279,7 +283,7 @@ bool ViEFrameProviderBase::IsFrameCallbackRegistered(const ViEFrameCallback* cal return false; } WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _id), - "%s(0x%p)", callbackObject); + "%s(0x%p)", __FUNCTION__, callbackObject); for (MapItem* mapItem = _frameCallbackMap.First(); mapItem != NULL;