diff options
Diffstat (limited to 'libs/ui')
-rw-r--r-- | libs/ui/Android.mk | 3 | ||||
-rw-r--r-- | libs/ui/SharedBufferStack.cpp | 6 | ||||
-rw-r--r-- | libs/ui/SurfaceComposerClient.cpp | 5 | ||||
-rw-r--r-- | libs/ui/SurfaceFlingerSynchro.cpp | 42 |
4 files changed, 8 insertions, 48 deletions
diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk index 73d86ea..84aec61 100644 --- a/libs/ui/Android.mk +++ b/libs/ui/Android.mk @@ -27,8 +27,7 @@ LOCAL_SRC_FILES:= \ Region.cpp \ SharedBufferStack.cpp \ Surface.cpp \ - SurfaceComposerClient.cpp \ - SurfaceFlingerSynchro.cpp + SurfaceComposerClient.cpp LOCAL_SHARED_LIBRARIES := \ libcutils \ diff --git a/libs/ui/SharedBufferStack.cpp b/libs/ui/SharedBufferStack.cpp index b460757..46b6766 100644 --- a/libs/ui/SharedBufferStack.cpp +++ b/libs/ui/SharedBufferStack.cpp @@ -394,6 +394,12 @@ status_t SharedBufferServer::reallocate() return NO_ERROR; } +int32_t SharedBufferServer::getQueuedCount() const +{ + SharedBufferStack& stack( *mSharedStack ); + return stack.queued; +} + status_t SharedBufferServer::assertReallocate(int buffer) { ReallocateCondition condition(this, buffer); diff --git a/libs/ui/SurfaceComposerClient.cpp b/libs/ui/SurfaceComposerClient.cpp index 3baa281..eda84ef 100644 --- a/libs/ui/SurfaceComposerClient.cpp +++ b/libs/ui/SurfaceComposerClient.cpp @@ -42,7 +42,6 @@ #include <private/ui/LayerState.h> #include <private/ui/SharedBufferStack.h> -#include <private/ui/SurfaceFlingerSynchro.h> #define VERBOSE(...) ((void)0) //#define VERBOSE LOGD @@ -155,7 +154,6 @@ void SurfaceComposerClient::_init( { VERBOSE("Creating client %p, conn %p", this, conn.get()); - mSignalServer = 0; mPrebuiltLayerState = 0; mTransactionOpen = 0; mStatus = NO_ERROR; @@ -168,7 +166,7 @@ void SurfaceComposerClient::_init( } mControlMemory = mClient->getControlBlock(); - mSignalServer = new SurfaceFlingerSynchro(sm); + mSignalServer = sm; mControl = static_cast<SharedClient *>(mControlMemory->getBase()); } @@ -225,7 +223,6 @@ void SurfaceComposerClient::dispose() Mutex::Autolock _lg(gLock); Mutex::Autolock _lm(mLock); - delete mSignalServer; mSignalServer = 0; if (mClient != 0) { diff --git a/libs/ui/SurfaceFlingerSynchro.cpp b/libs/ui/SurfaceFlingerSynchro.cpp deleted file mode 100644 index c81db71..0000000 --- a/libs/ui/SurfaceFlingerSynchro.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <stdint.h> - -#include <private/ui/SurfaceFlingerSynchro.h> - -namespace android { - -// --------------------------------------------------------------------------- - -SurfaceFlingerSynchro::SurfaceFlingerSynchro(const sp<ISurfaceComposer>& flinger) - : mSurfaceComposer(flinger) -{ -} -SurfaceFlingerSynchro::~SurfaceFlingerSynchro() -{ -} - -status_t SurfaceFlingerSynchro::signal() -{ - mSurfaceComposer->signal(); - return NO_ERROR; -} - -// --------------------------------------------------------------------------- - -}; // namespace android - |