Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 778dccf9 authored by Andy McFadden's avatar Andy McFadden
Browse files

Fix destructors 

Make destructors private -- only RefBase should be able to destroy
instances of these.

Change-Id: Iff52e226995fe5740a9dfc35af53dd6dd9d74501
parent feac1a43

cmds/screenrecord/FrameOutput.h

+5 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ public: 
        mExtTextureName(0),

        mPixelBuf(NULL)

        {}

    virtual ~FrameOutput() {

        delete[] mPixelBuf;

    }



    // Create an "input surface", similar in purpose to a MediaCodec input

    // surface, that the virtual display can send buffers to.  Also configures
@@ -59,6 +56,11 @@ private: 
    FrameOutput(const FrameOutput&);

    FrameOutput& operator=(const FrameOutput&);



    // Destruction via RefBase.

    virtual ~FrameOutput() {

        delete[] mPixelBuf;

    }



    // (overrides GLConsumer::FrameAvailableListener method)

    virtual void onFrameAvailable();

cmds/screenrecord/Overlay.h

+3 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ public: 
        mLastFrameNumber(-1),

        mTotalDroppedFrames(0)

        {}

    virtual ~Overlay() { assert(mState == UNINITIALIZED || mState == STOPPED); }



    // Creates a thread that performs the overlay.  Pass in the surface that

    // output will be sent to.
@@ -71,6 +70,9 @@ private: 
    Overlay(const Overlay&);

    Overlay& operator=(const Overlay&);



    // Destruction via RefBase.

    virtual ~Overlay() { assert(mState == UNINITIALIZED || mState == STOPPED); }



    // Draw the initial info screen.

    static void doDrawInfoPage(const EglWindow& window,

            const Program& texRender, TextRenderer& textRenderer);